diff --git a/frontend_tests/casper_tests/09-edit.js b/frontend_tests/casper_tests/09-edit.js
index ee8898655d..c837958c20 100644
--- a/frontend_tests/casper_tests/09-edit.js
+++ b/frontend_tests/casper_tests/09-edit.js
@@ -43,7 +43,7 @@ casper.then(function () {
     });
 });
 
-casper.waitForSelector(".message_edit_notice", function () {
+casper.waitForSelector(".selected_message .message_edit_notice", function () {
     casper.test.assertSelectorHasText(".last_message .message_content", "test edited");
 });
 
@@ -67,7 +67,7 @@ casper.then(function () {
     });
 });
 
-casper.waitForSelector(".message_edit_notice", function () {
+casper.waitForSelector(".selected_message .message_edit_notice", function () {
     casper.test.assertSelectorHasText(".last_message .sender-status", "test edited one line with me");
 });