diff --git a/libraries/dbi/DBIDummy.class.php b/libraries/dbi/DBIDummy.class.php
index 95407f6c1f..d288aa7cbb 100644
--- a/libraries/dbi/DBIDummy.class.php
+++ b/libraries/dbi/DBIDummy.class.php
@@ -118,7 +118,7 @@ $GLOBALS['dummy_queries'] = array(
     array(
         'query' => 'SELECT @@collation_server',
         'result' => array(
-            array('collation_server', 'utf8_general_ci'),
+            array('utf8_general_ci'),
         )
     ),
     array(
@@ -425,9 +425,9 @@ $GLOBALS['dummy_queries'] = array(
     ),
     array(
         'query' => 'SELECT @@collation_database',
-        'columns' => array('variable_name', 'variable_value'),
+        'columns' => array('@@collation_database'),
         'result' => array(
-            array('foo', 'bar'),
+            array('bar'),
         )
     ),
     array(
@@ -611,7 +611,7 @@ $GLOBALS['dummy_queries'] = array(
     ),
     array(
         'query' => 'SELECT @@default_authentication_plugin',
-        'result' => array(array('Variable_name' => 'mysql_native_password'))
+        'result' => array(array('@@default_authentication_plugin' => 'mysql_native_password'))
     ),
     array(
         'query' => "SELECT TABLE_NAME FROM information_schema.VIEWS WHERE "
diff --git a/test/classes/plugin/import/ImportLdi_test.php b/test/classes/plugin/import/ImportLdi_test.php
index 7f6e968424..1cd3925aff 100644
--- a/test/classes/plugin/import/ImportLdi_test.php
+++ b/test/classes/plugin/import/ImportLdi_test.php
@@ -85,11 +85,7 @@ class ImportLdi_Test extends PHPUnit_Framework_TestCase
         $dbi->expects($this->any())->method('numRows')
             ->will($this->returnValue(10));
 
-        $fetchRowResult = array(
-            "PMA_row",
-            "ON"
-        );
-
+        $fetchRowResult = array("ON");
         $dbi->expects($this->any())->method('fetchRow')
             ->will($this->returnValue($fetchRowResult));