diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index e90dcb4..b3870af 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -71,7 +71,7 @@ acl 7.x-1.0-beta1 (2010-11-06):
     - Fix line endings (no functional change).
     - #798106: Convert another left-over db_result() call.
     - #824642: Avoid type conversion problems when FALSE is passed rather than 0.
-    - #798106: Fix incomplete porting (db_query).
+    - #798106: Fix incomplete porting (\Drupal::database()->query).
     - #761696: Simpletests: provide some dummy files.
     - #798108: Remove drupal_install_schema() and drupal_uninstall_schema() calls.
     - Port database statements.
diff --git a/src/Tests/AclTest.php b/src/Tests/AclTest.php
index 51d9670..840f818 100644
--- a/src/Tests/AclTest.php
+++ b/src/Tests/AclTest.php
@@ -68,11 +68,11 @@ class AclTest extends WebTestBase {
     acl_create_acl('test1', $node1->getTitle());
     $acl_id = acl_get_id_by_name('test1', $node1->getTitle());
     $this->assertNotNull($acl_id, t('ACL ID was successfully found.'), $group = 'ACL');
-    $records = db_query('SELECT acl_id, name FROM {acl} WHERE acl_id = :acl_id', array(':acl_id' => $acl_id))->fetchAll();
+    $records = \Drupal::database()->query('SELECT acl_id, name FROM {acl} WHERE acl_id = :acl_id', array(':acl_id' => $acl_id))->fetchAll();
     $this->assertEqual(count($records), 1, t('ACL was successfully created.'), $group = 'ACL');
     acl_delete_acl($records[0]->acl_id);
 
-    $records = db_query('SELECT acl_id, name FROM {acl} WHERE acl_id = :acl_id', array(':acl_id' => $records[0]->acl_id))->fetchAll();
+    $records = \Drupal::database()->query('SELECT acl_id, name FROM {acl} WHERE acl_id = :acl_id', array(':acl_id' => $records[0]->acl_id))->fetchAll();
     $this->pass(var_export($records, TRUE));
     $this->assertEqual(count($records), 0, t('ACL was successfully removed.'), $group = 'ACL');
   }
@@ -91,20 +91,20 @@ class AclTest extends WebTestBase {
     // made it in.
     $acl_id = acl_get_id_by_name('test2', $node1->getTitle());
     $this->assertNotNull($acl_id, t('ACL ID was successfully found.'), $group = 'ACL');
-    $records = db_query('SELECT acl_id, name FROM {acl} WHERE acl_id = :acl_id', array(':acl_id' => $acl_id))->fetchAll();
+    $records = \Drupal::database()->query('SELECT acl_id, name FROM {acl} WHERE acl_id = :acl_id', array(':acl_id' => $acl_id))->fetchAll();
     $this->assertEqual(count($records), 1, t('ACL was succesfully created.'), $group = 'ACL');
 
     // Add user (can't we use the user created in setup?).
     $web_user_1 = $this->drupalCreateUser();
     //$this->drupalLogin($web_user);
     acl_add_user($acl_id, $web_user_1->id());
-    $records = db_query('SELECT acl_id, uid FROM {acl_user} WHERE uid = :uid', array(':uid' => $web_user_1->id()))->fetchAll();
+    $records = \Drupal::database()->query('SELECT acl_id, uid FROM {acl_user} WHERE uid = :uid', array(':uid' => $web_user_1->id()))->fetchAll();
     // Verify user is added.
     $this->assertEqual(count($records), 1, t('User was successfully added.'), $group = 'ACL');
 
     // Remove user.
     acl_remove_user($acl_id, $web_user_1->id());
-    $records = db_query('SELECT acl_id, uid FROM {acl_user} WHERE uid = :uid', array(':uid' => $web_user_1->id()))->fetchAll();
+    $records = \Drupal::database()->query('SELECT acl_id, uid FROM {acl_user} WHERE uid = :uid', array(':uid' => $web_user_1->id()))->fetchAll();
     // Verify user is removed.
     $this->assertEqual(count($records), 0, t('User was successfully removed.'), $group = 'ACL');
   }
@@ -125,28 +125,28 @@ class AclTest extends WebTestBase {
     $acl_id1 = acl_create_acl('test3', 'test', 1);
     $this->assertNotNull($acl_id1, t('ACL ID was created.'), $group = 'ACL');
     // Add two nodes.
-    $query = db_select('node', 'n')
+    $query = \Drupal::database()->select('node', 'n')
       ->fields('n', array('nid'))
       ->condition('nid', array($node1->id(), $node2->id()), 'IN');
     acl_add_nodes($query, $acl_id1, 1, 1, 1);
-    $count = db_query('SELECT COUNT(nid) FROM {acl_node} WHERE acl_id = :acl_id', array(':acl_id' => $acl_id1))->fetchField();
+    $count = \Drupal::database()->query('SELECT COUNT(nid) FROM {acl_node} WHERE acl_id = :acl_id', array(':acl_id' => $acl_id1))->fetchField();
     $this->assertEqual($count, 2, t("2 nodes under control ($count)."), $group = 'ACL');
     // Add a third node.
     acl_node_add_acl($node3->id(), $acl_id1, 1, 1, 1);
-    $count = db_query('SELECT COUNT(nid) FROM {acl_node} WHERE acl_id = :acl_id', array(':acl_id' => $acl_id1))->fetchField();
+    $count = \Drupal::database()->query('SELECT COUNT(nid) FROM {acl_node} WHERE acl_id = :acl_id', array(':acl_id' => $acl_id1))->fetchField();
     $this->assertEqual($count, 3, t('3 nodes under control.'), $group = 'ACL');
     // Add the second node again.
     acl_node_add_acl($node2->id(), $acl_id1, 1, 1, 1);
-    $count = db_query('SELECT COUNT(nid) FROM {acl_node} WHERE acl_id = :acl_id', array(':acl_id' => $acl_id1))->fetchField();
+    $count = \Drupal::database()->query('SELECT COUNT(nid) FROM {acl_node} WHERE acl_id = :acl_id', array(':acl_id' => $acl_id1))->fetchField();
     $this->assertEqual($count, 3, t('Still only 3 nodes under control.'), $group = 'ACL');
 
     // Remove the second node again.
     acl_node_remove_acl($node2->id(), $acl_id1);
-    $count = db_query('SELECT COUNT(nid) FROM {acl_node} WHERE acl_id = :acl_id', array(':acl_id' => $acl_id1))->fetchField();
+    $count = \Drupal::database()->query('SELECT COUNT(nid) FROM {acl_node} WHERE acl_id = :acl_id', array(':acl_id' => $acl_id1))->fetchField();
     $this->assertEqual($count, 2, t('2 nodes left under control.'), $group = 'ACL');
     // Remove the second node again.
     acl_node_remove_acl($node2->id(), $acl_id1);
-    $count = db_query('SELECT COUNT(nid) FROM {acl_node} WHERE acl_id = :acl_id', array(':acl_id' => $acl_id1))->fetchField();
+    $count = \Drupal::database()->query('SELECT COUNT(nid) FROM {acl_node} WHERE acl_id = :acl_id', array(':acl_id' => $acl_id1))->fetchField();
     $this->assertEqual($count, 2, t('Still 2 nodes left under control.'), $group = 'ACL');
 
     // Create another ACL and add nodes.
@@ -154,13 +154,13 @@ class AclTest extends WebTestBase {
     $this->assertNotNull($acl_id2, t('ACL ID was created.'), $group = 'ACL');
     acl_node_add_acl($node1->id(), $acl_id2, 1, 1, 1);
     acl_node_add_acl($node2->id(), $acl_id2, 1, 1, 1);
-    $count = db_query('SELECT COUNT(nid) FROM {acl_node} WHERE acl_id = :acl_id', array(':acl_id' => $acl_id2))->fetchField();
+    $count = \Drupal::database()->query('SELECT COUNT(nid) FROM {acl_node} WHERE acl_id = :acl_id', array(':acl_id' => $acl_id2))->fetchField();
     $this->assertEqual($count, 2, t('2 nodes under control.'), $group = 'ACL');
     // Remove a node (which has two ACLs).
     acl_node_clear_acls($node1->id(), 'test3');
-    $count = db_query('SELECT COUNT(nid) FROM {acl_node} WHERE acl_id = :acl_id', array(':acl_id' => $acl_id1))->fetchField();
+    $count = \Drupal::database()->query('SELECT COUNT(nid) FROM {acl_node} WHERE acl_id = :acl_id', array(':acl_id' => $acl_id1))->fetchField();
     $this->assertEqual($count, 1, t('1 node left under control.'), $group = 'ACL');
-    $count = db_query('SELECT COUNT(nid) FROM {acl_node} WHERE acl_id = :acl_id', array(':acl_id' => $acl_id2))->fetchField();
+    $count = \Drupal::database()->query('SELECT COUNT(nid) FROM {acl_node} WHERE acl_id = :acl_id', array(':acl_id' => $acl_id2))->fetchField();
     $this->assertEqual($count, 1, t('1 node left under control.'), $group = 'ACL');
   }