diff --git a/frontend_tests/casper_tests/15-delete-message.js b/frontend_tests/casper_tests/15-delete-message.js
deleted file mode 100644
index c657cd0c4b..0000000000
--- a/frontend_tests/casper_tests/15-delete-message.js
+++ /dev/null
@@ -1,51 +0,0 @@
-"use strict";
-
-var common = require("../casper_lib/common.js");
-
-common.start_and_log_in();
-
-var last_message_id;
-var msgs_qty;
-
-casper.then(function () {
-    casper.waitUntilVisible("#zhome");
-});
-
-casper.then(function () {
-    msgs_qty = this.evaluate(function () {
-        return $("#zhome .message_row").length;
-    });
-    last_message_id = this.evaluate(function () {
-        var msg = $("#zhome .message_row").last();
-        msg.find(".info").trigger("click");
-        $(".delete_message").trigger("click");
-        return msg.attr("id");
-    });
-});
-
-casper.then(function () {
-    casper.waitUntilVisible("#delete_message_modal", function () {
-        casper.click("#do_delete_message_button");
-    });
-});
-casper.then(function () {
-    casper.test.assertVisible("#do_delete_message_spinner .loading_indicator_spinner");
-    casper.test.assertNotVisible("#do_delete_message_button");
-});
-
-casper.then(function () {
-    casper.waitFor(function check_length() {
-        return casper.evaluate(function (expected_length) {
-            return $("#zhome .message_row").length === expected_length;
-        }, msgs_qty - 1);
-    });
-});
-
-casper.then(function () {
-    casper.test.assertDoesntExist(last_message_id);
-    casper.test.assertNotVisible("#do_delete_message_spinner .loading_indicator_spinner");
-});
-
-casper.run(function () {
-    casper.test.done();
-});
diff --git a/frontend_tests/puppeteer_tests/13-delete-message.js b/frontend_tests/puppeteer_tests/13-delete-message.js
new file mode 100644
index 0000000000..dec0e7baa3
--- /dev/null
+++ b/frontend_tests/puppeteer_tests/13-delete-message.js
@@ -0,0 +1,38 @@
+"use strict";
+
+const common = require("../puppeteer_lib/common");
+
+async function click_delete_and_return_last_msg_id(page) {
+    return await page.evaluate(() => {
+        const msg = $("#zhome .message_row").last();
+        msg.find(".info").trigger("click");
+        $(".delete_message").trigger("click");
+        return msg.attr("id");
+    });
+}
+
+async function delete_message_test(page) {
+    await common.log_in(page);
+    const messages_quantitiy = await page.evaluate(() => $("#zhome .message_row").length);
+    const last_message_id = await click_delete_and_return_last_msg_id(page);
+
+    await page.waitForSelector("#delete_message_modal", {visible: true});
+    await page.click("#do_delete_message_button");
+    await page.waitForSelector("#do_delete_message_spinner .loading_indicator_spinner", {
+        visible: true,
+    });
+    await page.waitForSelector("#do_delete_message_button", {hidden: true});
+
+    await page.waitForFunction(
+        (expected_length) => $("#zhome .message_row").length === expected_length,
+        {},
+        messages_quantitiy - 1,
+    );
+
+    await common.assert_selector_doesnt_exist(page, last_message_id);
+    await page.waitForSelector("#do_delete_message_spinner .loading_indicator_spinner", {
+        hidden: true,
+    });
+}
+
+common.run_test(delete_message_test);