diff --git a/tests/PHPUnit/Framework/TestCase/SystemTestCase.php b/tests/PHPUnit/Framework/TestCase/SystemTestCase.php
index 8b85f255aaad3d464f595a1490fdaf1612519f58..3c8061fef0a51fb7527a17bda3da55a4aa93210a 100755
--- a/tests/PHPUnit/Framework/TestCase/SystemTestCase.php
+++ b/tests/PHPUnit/Framework/TestCase/SystemTestCase.php
@@ -528,6 +528,11 @@ abstract class SystemTestCase extends PHPUnit_Framework_TestCase
      */
     protected static function restoreDbTables($tables)
     {
+        $db = Db::fetchOne("SELECT DATABASE()");
+        if (empty($db)) {
+            Db::exec("USE " . Config::getInstance()->database_tests['dbname']);
+        }
+
         DbHelper::truncateAllTables();
 
         // insert data
diff --git a/tests/PHPUnit/UI b/tests/PHPUnit/UI
index 87fee9b1024b1c03d5d5d66a4fb4f699231e8e5f..4cdf80fc99025b71e5d8e59419d2af749e466df6 160000
--- a/tests/PHPUnit/UI
+++ b/tests/PHPUnit/UI
@@ -1 +1 @@
-Subproject commit 87fee9b1024b1c03d5d5d66a4fb4f699231e8e5f
+Subproject commit 4cdf80fc99025b71e5d8e59419d2af749e466df6