diff --git a/tests/PHPUnit/bootstrap.php b/tests/PHPUnit/bootstrap.php
index e067ef11c3e07597faed0466fe95aa8c052bd9da..b37816e23173a8626002305a5a89bc9c5ad9a293 100644
--- a/tests/PHPUnit/bootstrap.php
+++ b/tests/PHPUnit/bootstrap.php
@@ -113,8 +113,12 @@ Try again.";
     $url = Fixture::getRootUrl() . 'tests/PHPUnit/proxy/index.php?module=TestRunner&action=check';
     $response = Http::sendHttpRequestBy('curl', $url, 2);
 
-    // The SQL error is for Travis...
-    if ($response === 'OK' || strpos($response, 'Table 'piwik_tests.option' doesn't exist') !== false) {
+    if ($response === 'OK'
+        // The SQL error is for Travis...
+        || strpos($response, 'Table 'piwik_tests.option' doesn't exist') !== false
+        || strpos($response, 'Table 'piwik_tests.piwiktests_option' doesn't exist') !== false
+    ) {
+
         return;
     }