diff --git a/core/lib/Drupal/Core/Database/Connection.php b/core/lib/Drupal/Core/Database/Connection.php
index 5acd236..4277875 100644
--- a/core/lib/Drupal/Core/Database/Connection.php
+++ b/core/lib/Drupal/Core/Database/Connection.php
@@ -399,8 +399,7 @@ public function getFullQualifiedTableName($table) {
    */
   public function prepareQuery($query) {
     $query = $this->prefixTables($query);
-
-    return $this->connection->prepare($query);
+    return $this->prepare($query, $this->defaultOptions());
   }

   /**
diff --git a/core/lib/Drupal/Core/Database/Driver/sqlite/Connection.php b/core/lib/Drupal/Core/Database/Driver/sqlite/Connection.php
index 23dd261..3ffaa40 100644
--- a/core/lib/Drupal/Core/Database/Driver/sqlite/Connection.php
+++ b/core/lib/Drupal/Core/Database/Driver/sqlite/Connection.php
@@ -380,13 +380,6 @@ public function mapConditionOperator($operator) {
     return isset($specials[$operator]) ? $specials[$operator] : NULL;
   }

-  /**
-   * {@inheritdoc}
-   */
-  public function prepareQuery($query) {
-    return $this->prepare($this->prefixTables($query));
-  }
-
   public function nextId($existing_id = 0) {
     $this->startTransaction();
     // We can safely use literal queries here instead of the slower query
diff --git a/core/tests/Drupal/Tests/Core/Database/ConnectionTest.php b/core/tests/Drupal/Tests/Core/Database/ConnectionTest.php
index 8f4aa7a..d031112 100644
--- a/core/tests/Drupal/Tests/Core/Database/ConnectionTest.php
+++ b/core/tests/Drupal/Tests/Core/Database/ConnectionTest.php
@@ -301,4 +301,25 @@ public function testFilterComments($expected, $comment) {
     );
   }

+  /**
+   * Tests that the method prepareQuery calls the method prepare.
+   */
+  public function testPrepareQuery() {
+    $connection = $this->getMockBuilder('Drupal\Core\Database\Connection')
+      ->disableOriginalConstructor()
+      ->setMethods(array('prepare', 'prefixTables'))
+      ->getMockForAbstractClass();
+
+    $connection->expects($this->once())
+      ->method('prefixTables')
+      ->willReturn('SELECT * FROM test');
+
+    // This method must be called by prepareQuery.
+    $connection->expects($this->once())
+      ->method('prepare')
+      ->willReturn(FALSE);
+
+    $this->assertFalse($connection->prepareQuery('SELECT * FROM {test}'));
+  }
+
 }