diff --git a/test/classes/controllers/ServerVariablesControllerTest.php b/test/classes/controllers/ServerVariablesControllerTest.php
index 69f390d5f1..c5a8a8e698 100644
--- a/test/classes/controllers/ServerVariablesControllerTest.php
+++ b/test/classes/controllers/ServerVariablesControllerTest.php
@@ -241,7 +241,7 @@ class ServerVariablesControllerTest extends PMATestCase
 
         //validate 2: Server Variables
         $this->assertContains(
-            '<table id="serverVariables" class="data filteredData noclick">',
+            '<table id="serverVariables" class="width100 data filteredData noclick">',
             $html
         );
         $this->assertContains(
@@ -249,7 +249,7 @@ class ServerVariablesControllerTest extends PMATestCase
             $html
         );
         $this->assertContains(
-            __('Global value'),
+            __('Value'),
             $html
         );
     }
diff --git a/test/libraries/PMA_FormDisplay_tpl_test.php b/test/libraries/PMA_FormDisplay_tpl_test.php
index bebeeac05c..1dc2e97f6b 100644
--- a/test/libraries/PMA_FormDisplay_tpl_test.php
+++ b/test/libraries/PMA_FormDisplay_tpl_test.php
@@ -66,7 +66,7 @@ class PMA_FormDisplay_Tpl_Test extends PHPUnit_Framework_TestCase
         $result = PMA_displayTabsTop(array('one', 'two'));
 
         $this->assertContains(
-            '<ul class="tabs"',
+            '<ul class="tabs responsivetable"',
             $result
         );
 
diff --git a/test/libraries/PMA_server_status_queries_test.php b/test/libraries/PMA_server_status_queries_test.php
index c9c5d23ebe..21e7b381d9 100644
--- a/test/libraries/PMA_server_status_queries_test.php
+++ b/test/libraries/PMA_server_status_queries_test.php
@@ -214,7 +214,7 @@ class PMA_ServerStatusQueries_Test extends PHPUnit_Framework_TestCase
 
         //validate 3:serverstatusquerieschart
         $this->assertContains(
-            '<div id="serverstatusquerieschart" data-chart="',
+            '<div id="serverstatusquerieschart" class="width100" data-chart="',
             $html
         );
 
diff --git a/test/libraries/PMA_server_status_test.php b/test/libraries/PMA_server_status_test.php
index 98f4cb3a7d..af7b0d7447 100644
--- a/test/libraries/PMA_server_status_test.php
+++ b/test/libraries/PMA_server_status_test.php
@@ -181,7 +181,7 @@ class PMA_ServerStatus_Test extends PHPUnit_Framework_TestCase
         );
 
         //validate 2: PMA_getHtmlForServerStateTraffic
-        $traffic_html = '<table id="serverstatustraffic" class="data noclick">';
+        $traffic_html = '<table id="serverstatustraffic" class="width100 data noclick">';
         $this->assertContains(
             $traffic_html,
             $html
@@ -213,7 +213,7 @@ class PMA_ServerStatus_Test extends PHPUnit_Framework_TestCase
             $html
         );
         $this->assertContains(
-            '<table id="serverstatusconnections" class="data noclick">',
+            '<table id="serverstatusconnections" class="width100 data noclick">',
             $html
         );
         $this->assertContains(