diff --git a/libraries/classes/Util.php b/libraries/classes/Util.php
index 2c33f0be81..758ebafb3b 100644
--- a/libraries/classes/Util.php
+++ b/libraries/classes/Util.php
@@ -1988,7 +1988,8 @@ class Util
                 // all tables in db
                 // - get the total number of tables
                 //  (needed for proper working of the MaxTableList feature)
-                $totalNumTables = count($GLOBALS['dbi']->getTables($db));
+                $tables = $GLOBALS['dbi']->getTables($db);
+                $totalNumTables = count($tables);
                 if ($isResultLimited) {
                     // fetch the details for a possible limited subset
                     $limitOffset = self::getTableListPosition($request, $db);
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
index cee0899fbf..f296e97b6b 100644
--- a/phpunit.xml.dist
+++ b/phpunit.xml.dist
@@ -13,6 +13,7 @@
   displayDetailsOnTestsThatTriggerNotices="true"
   displayDetailsOnTestsThatTriggerErrors="true"
   displayDetailsOnTestsThatTriggerDeprecations="false"
+  displayDetailsOnIncompleteTests="true"
   requireCoverageMetadata="true"
   beStrictAboutOutputDuringTests="true"
   colors="true"
diff --git a/test/classes/Stubs/DbiDummy.php b/test/classes/Stubs/DbiDummy.php
index 8f66ad0fe5..710216b6c7 100644
--- a/test/classes/Stubs/DbiDummy.php
+++ b/test/classes/Stubs/DbiDummy.php
@@ -2653,51 +2653,16 @@ class DbiDummy implements DbiExtension
             ],
             [
                 'query' => 'SHOW TABLE STATUS FROM `test_db`',
-                'columns' => [
-                    'Name',
-                    'Engine',
-                    'Version',
-                    'Row_format',
-                    'Rows',
-                    'Avg_row_length',
-                    'Data_length',
-                    'Max_data_length',
-                    'Index_length',
-                    'Data_free',
-                    'Auto_increment',
-                    'Create_time',
-                    'Update_time',
-                    'Check_time',
-                    'Collation',
-                    'Checksum',
-                    'Create_options',
-                    'Comment',
-                    'Max_index_length',
-                    'Temporary',
-                ],
+                'columns' => ['Name', 'Engine', 'Version', 'Row_format', 'Rows', 'Avg_row_length', 'Data_length', 'Max_data_length', 'Index_length', 'Data_free', 'Auto_increment', 'Create_time', 'Update_time', 'Check_time', 'Collation', 'Checksum', 'Create_options', 'Comment', 'Max_index_length', 'Temporary'],
                 'result' => [
-                    [
-                        'test_table',
-                        'InnoDB',
-                        '10',
-                        'Dynamic',
-                        '3',
-                        '5461',
-                        '16384',
-                        '0',
-                        '0',
-                        '0',
-                        '4',
-                        '2011-12-13 14:15:16',
-                        null,
-                        null,
-                        'utf8mb4_general_ci',
-                        null,
-                        '',
-                        '',
-                        '0',
-                        'N',
-                    ],
+                    ['test_table', 'InnoDB', '10', 'Dynamic', '3', '5461', '16384', '0', '0', '0', '4', '2011-12-13 14:15:16', null, null, 'utf8mb4_general_ci', null, '', '', '0', 'N'],
+                ],
+            ],
+            [
+                'query' => 'SHOW TABLE STATUS FROM `test_db` WHERE `Name` IN (\'test_table\')',
+                'columns' => ['Name', 'Engine', 'Version', 'Row_format', 'Rows', 'Avg_row_length', 'Data_length', 'Max_data_length', 'Index_length', 'Data_free', 'Auto_increment', 'Create_time', 'Update_time', 'Check_time', 'Collation', 'Checksum', 'Create_options', 'Comment', 'Max_index_length', 'Temporary'],
+                'result' => [
+                    ['test_table', 'InnoDB', '10', 'Dynamic', '3', '5461', '16384', '0', '0', '0', '4', '2011-12-13 14:15:16', null, null, 'utf8mb4_general_ci', null, '', '', '0', 'N'],
                 ],
             ],
             [