diff --git a/phpunit.xml.dist b/phpunit.xml.dist
index 2e2d1d226f..ac0488f79a 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/plugin/export/ExportXmlTest.php b/test/classes/plugin/export/ExportXmlTest.php
index 5518ab9d7c..1d1bc147a6 100644
--- a/test/classes/plugin/export/ExportXmlTest.php
+++ b/test/classes/plugin/export/ExportXmlTest.php
@@ -327,36 +327,33 @@ class ExportXmlTest extends PMATestCase
         unset($GLOBALS['xml_export_procedures']);
         $GLOBALS['output_charset_conversion'] = 0;
 
-        $result = array(
+        $dbi = $this->getMockBuilder('PMA\libraries\DatabaseInterface')
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $result_1 = array(
             array(
                 'DEFAULT_COLLATION_NAME' => 'utf8_general_ci',
                 'DEFAULT_CHARACTER_SET_NAME' => 'utf-8',
 
             )
         );
-        $dbi = $this->getMockBuilder('PMA\libraries\DatabaseInterface')
-            ->disableOriginalConstructor()
-            ->getMock();
-
-        $dbi->expects($this->at(0))
-            ->method('fetchResult')
-            ->with(
-                'SELECT `DEFAULT_CHARACTER_SET_NAME`, `DEFAULT_COLLATION_NAME`'
-                . ' FROM `information_schema`.`SCHEMATA` WHERE `SCHEMA_NAME`'
-                . ' = \'d<"b\' LIMIT 1'
-            )
-            ->will($this->returnValue($result));
-
-        $result = array(
+        $result_2 = array(
             't1' => array(null, '"tbl"')
         );
 
-        $dbi->expects($this->exactly(4))
+        $result_3 = array(
+            't2' => array(null, '"tbl"')
+        );
+
+
+        $dbi->expects($this->exactly(5))
             ->method('fetchResult')
             ->willReturnOnConsecutiveCalls(
-                $result,
+                $result_1,
+                $result_2,
                 true,
-                $result,
+                $result_3,
                 false
             );