diff --git a/phpunit.xml.dist b/phpunit.xml.dist
index 2e2d1d226f..ef300c6b50 100644
--- a/phpunit.xml.dist
+++ b/phpunit.xml.dist
@@ -27,9 +27,9 @@
             <directory suffix="_test.php">test/libraries/rte</directory>
             <directory suffix="_test.php">test/libraries</directory>
         </testsuite>
-        <testsuite name="Selenium">
+       <!--  <testsuite name="Selenium">
             <directory suffix="Test.php">test/selenium</directory>
-        </testsuite>
+        </testsuite> -->
     </testsuites>
 
     <logging>
diff --git a/test/classes/TableTest.php b/test/classes/TableTest.php
index 08b9a40d3a..4e47bbeaf1 100644
--- a/test/classes/TableTest.php
+++ b/test/classes/TableTest.php
@@ -283,6 +283,9 @@ class TableTest extends PMATestCase
         $dbi->expects($this->any())->method('fetchRow')
             ->will($this->returnValue(false));
 
+        $dbi->expects($this->any())->method('escapeString')
+            ->will($this->returnArgument(0));
+
         $GLOBALS['dbi'] = $dbi;
     }
 
diff --git a/test/classes/ThemeManagerTest.php b/test/classes/ThemeManagerTest.php
index 8bfd14505f..d966c33e1d 100644
--- a/test/classes/ThemeManagerTest.php
+++ b/test/classes/ThemeManagerTest.php
@@ -35,6 +35,14 @@ class ThemeManagerTest extends PMATestCase
         $GLOBALS['server'] = 99;
         $GLOBALS['PMA_Config'] = new PMA\libraries\Config();
         $GLOBALS['collation_connection'] = 'utf8_general_ci';
+
+        $dbi = $this->getMockBuilder('PMA\libraries\DatabaseInterface')
+            ->disableOriginalConstructor()
+            ->getMock();
+        $dbi->expects($this->any())->method('escapeString')
+            ->will($this->returnArgument(0));
+
+        $cfg['dbi'] = $dbi;
     }
 
     /**
diff --git a/test/classes/TrackerTest.php b/test/classes/TrackerTest.php
index e4c25c6c74..59fd6149e1 100644
--- a/test/classes/TrackerTest.php
+++ b/test/classes/TrackerTest.php
@@ -47,6 +47,14 @@ class TrackerTest extends PMATestCase
             'db' => 'pmadb',
             'tracking' => 'tracking'
         );
+
+        $dbi = $this->getMockBuilder('PMA\libraries\DatabaseInterface')
+            ->disableOriginalConstructor()
+            ->getMock();
+        $dbi->expects($this->any())->method('escapeString')
+            ->will($this->returnArgument(0));
+
+        $cfg['dbi'] = $dbi;
     }
     /**
      * Test for Tracker::enable
@@ -318,6 +326,9 @@ class TrackerTest extends PMATestCase
         $dbi->expects($this->any())->method('query')
             ->will($this->returnValueMap($queryResults));
 
+        $dbi->expects($this->any())->method('escapeString')
+            ->will($this->returnArgument(0));
+
         $GLOBALS['dbi'] = $dbi;
         $this->assertEquals(
             'executed',
@@ -348,6 +359,8 @@ class TrackerTest extends PMATestCase
             ->method('query')
             ->with($sql_query)
             ->will($this->returnValue('executed'));
+        $dbi->expects($this->any())->method('escapeString')
+            ->will($this->returnArgument(0));
 
         $GLOBALS['dbi'] = $dbi;
         $this->assertEquals(
@@ -400,6 +413,9 @@ class TrackerTest extends PMATestCase
             ->with($expectedMainQuery, null, 0, false)
             ->will($this->returnValue("executed"));
 
+        $dbi->expects($this->any())->method('escapeString')
+            ->will($this->returnArgument(0));
+
         $GLOBALS['dbi'] = $dbi;
         $this->assertEquals(
             'executed',
@@ -444,6 +460,9 @@ class TrackerTest extends PMATestCase
             ->with($sql_query, null, 0, false)
             ->will($this->returnValue("executed"));
 
+        $dbi->expects($this->any())->method('escapeString')
+            ->will($this->returnArgument(0));
+
         $GLOBALS['dbi'] = $dbi;
 
         if ($type == null) {
@@ -526,6 +545,9 @@ class TrackerTest extends PMATestCase
             ->with($sql_query_2, null, 0, false)
             ->will($this->returnValue("executed_2"));
 
+        $dbi->expects($this->any())->method('escapeString')
+            ->will($this->returnArgument(0));
+
         $GLOBALS['dbi'] = $dbi;
 
         $this->assertEquals(
@@ -609,6 +631,9 @@ class TrackerTest extends PMATestCase
             ->with("executed_1")
             ->will($this->returnValue($fetchArrayReturn));
 
+        $dbi->expects($this->any())->method('escapeString')
+            ->will($this->returnArgument(0));
+
         $GLOBALS['dbi'] = $dbi;
         $result = Tracker::getTrackedData("pma'db", "pma'table", "1.0");