diff --git a/core/modules/system/src/Tests/Database/SelectTest.php b/core/modules/system/src/Tests/Database/SelectTest.php
index eebc6df..08cf38c 100644
--- a/core/modules/system/src/Tests/Database/SelectTest.php
+++ b/core/modules/system/src/Tests/Database/SelectTest.php
@@ -24,6 +24,7 @@ function testSimpleSelect() {
     $query->addField('test', 'name');
     $query->addField('test', 'age', 'age');
     $num_records = $query->countQuery()->execute()->fetchField();
+    debug($num_records);
 
     $this->assertEqual($num_records, 4, 'Returned the correct number of rows.');
   }
@@ -43,6 +44,7 @@ function testSimpleSelectWithEnsuringTable() {
     // The table should be recreated, add back the sample data and re-run the
     // test.
     try {
+      \Drupal::database()->schema()->ensureTableExists('test', $this->getSchema('test'));
       static::addSampleData();
     }
     catch (\Exception $e) {
diff --git a/core/modules/system/tests/modules/error_test/src/Controller/ErrorTestController.php b/core/modules/system/tests/modules/error_test/src/Controller/ErrorTestController.php
index e2e819f..a753d35 100644
--- a/core/modules/system/tests/modules/error_test/src/Controller/ErrorTestController.php
+++ b/core/modules/system/tests/modules/error_test/src/Controller/ErrorTestController.php
@@ -69,7 +69,7 @@ public function triggerException() {
    */
   public function triggerPDOException() {
     define('SIMPLETEST_COLLECT_ERRORS', FALSE);
-    $this->database->query('SELECT * FROM bananas_are_awesome', []);
+    $this->database->query('SELECT * FROM bananas_are_awesome', [], ['create_missing_table' => FALSE]);
   }
 
 }