diff --git a/test/browser/maintenance_message_test.rb b/test/browser/maintenance_message_test.rb
index 06b837337..b8d80dadd 100644
--- a/test/browser/maintenance_message_test.rb
+++ b/test/browser/maintenance_message_test.rb
@@ -57,16 +57,10 @@ class MaintenanceMessageTest < TestCase
             :value        => message,
             :match_result => false,
           },
-          {
-            :where    => :instance2,
-            :execute  => 'check',
-            :css      => '.modal-header',
-            :result   => true,
-          },
           {
             :where    => :instance2,
             :execute  => 'watch_for',
-            :area     => 'body',
+            :area     => '.modal',
             :value    => message,
           },
           {
@@ -121,16 +115,10 @@ class MaintenanceMessageTest < TestCase
             :value        => message + ' #2',
             :match_result => false,
           },
-          {
-            :where   => :instance1,
-            :execute => 'check',
-            :css     => 'div.modal-backdrop.fade.in',
-            :result  => false,
-          },
           {
             :where    => :instance2,
             :execute  => 'watch_for',
-            :area     => 'body',
+            :area     => '.modal',
             :value    => message + ' #2',
           },
           {
@@ -197,18 +185,16 @@ class MaintenanceMessageTest < TestCase
             :match_result => false,
           },
           {
-            :where        => :instance2,
-            :execute      => 'match',
-            :css          => 'body',
-            :value        => message + ' #3',
-            :match_result => true,
+            :where   => :instance2,
+            :execute => 'watch_for',
+            :area    => '.modal',
+            :value   => message + ' #3',
           },
           {
-            :where        => :instance2,
-            :execute      => 'match',
-            :css          => 'body',
-            :value        => 'Reload application',
-            :match_result => true,
+            :where   => :instance2,
+            :execute => 'watch_for',
+            :area    => '.modal',
+            :value   => 'Reload application',
           },
         ],
       },