diff --git a/tests/src/Kernel/Processor/ContentAccessTest.php b/tests/src/Kernel/Processor/ContentAccessTest.php
index 42f2691..f98d727 100644
--- a/tests/src/Kernel/Processor/ContentAccessTest.php
+++ b/tests/src/Kernel/Processor/ContentAccessTest.php
@@ -123,7 +123,7 @@ class ContentAccessTest extends ProcessorTestBase {
     user_role_grant_permissions('anonymous', array('access content', 'access comments'));
     $this->index->reindex();
     $this->index->indexItems();
-    $this->assertEqual(5, $this->index->getTrackerInstance()->getIndexedItemsCount(), '5 items indexed, as expected.');
+    $this->assertEquals(5, $this->index->getTrackerInstance()->getIndexedItemsCount(), '5 items indexed, as expected.');
 
     $query = Utility::createQuery($this->index);
     $result = $query->execute();
@@ -138,7 +138,7 @@ class ContentAccessTest extends ProcessorTestBase {
     user_role_grant_permissions('anonymous', array('access comments'));
     $this->index->reindex();
     $this->index->indexItems();
-    $this->assertEqual(5, $this->index->getTrackerInstance()->getIndexedItemsCount(), '5 items indexed, as expected.');
+    $this->assertEquals(5, $this->index->getTrackerInstance()->getIndexedItemsCount(), '5 items indexed, as expected.');
 
     $query = Utility::createQuery($this->index);
     $result = $query->execute();
@@ -150,49 +150,36 @@ class ContentAccessTest extends ProcessorTestBase {
    * Tests searching for own unpublished content.
    */
   public function testQueryAccessOwn() {
-    // Create user that will be passed into the query.
+    // Create the user that will be passed into the query.
     $permissions = array(
       'access content',
       'access comments',
       'view own unpublished content'
     );
+    $authenticated_user = $this->createUser($permissions);
+    $uid = $authenticated_user->id();
 
-    $role = Role::create(array('id' => 'role', 'name' => 'Role test'));
-    $role->save();
-    user_role_grant_permissions($role->id(), $permissions);
-
-    $authenticated_user = User::create(array('uid' => 2, 'name' => 'Test', 'roles' => array($role->id())));
-    $authenticated_user->enforceIsNew();
-    $authenticated_user->save();
-
-    $this->nodes[3] = Node::create(array('status' => NODE_NOT_PUBLISHED, 'type' => 'page', 'title' => 'foo', 'uid' => 2));
+    $this->nodes[3] = Node::create(array('status' => NODE_NOT_PUBLISHED, 'type' => 'page', 'title' => 'foo', 'uid' => $uid));
     $this->nodes[3]->save();
     $this->index->indexItems();
-    $this->assertEqual(7, $this->index->getTrackerInstance()->getIndexedItemsCount(), '7 items indexed, as expected.');
+    $this->assertEquals(7, $this->index->getTrackerInstance()->getIndexedItemsCount(), '7 items indexed, as expected.');
 
     $query = Utility::createQuery($this->index);
     $query->setOption('search_api_access_account', $authenticated_user);
     $result = $query->execute();
 
-    $this->assertResults($result, array('user' => array(0, 2), 'node' => array(3)));
+    $this->assertResults($result, array('user' => array(0, $uid), 'node' => array(3)));
   }
 
   /**
    * Tests building the query when content is accessible based on node grants.
    */
   public function testQueryAccessWithNodeGrants() {
-    // Create user that will be passed into the query.
+    // Create the user that will be passed into the query.
     $permissions = array(
       'access content',
     );
-
-    $role = Role::create(array('id' => 'role', 'name' => 'Role test'));
-    $role->save();
-    user_role_grant_permissions($role->id(), $permissions);
-
-    $authenticated_user = User::create(array('uid' => 2, 'name' => 'Test', 'roles' => array($role->id())));
-    $authenticated_user->enforceIsNew();
-    $authenticated_user->save();
+    $authenticated_user = $this->createUser($permissions);
 
     Database::getConnection()->insert('node_access')
       ->fields(array(
@@ -210,7 +197,7 @@ class ContentAccessTest extends ProcessorTestBase {
     $query->setOption('search_api_access_account', $authenticated_user);
     $result = $query->execute();
 
-    $this->assertResults($result, array('user' => array(0, 2), 'node' => array(0)));
+    $this->assertResults($result, array('user' => array(0, $authenticated_user->id()), 'node' => array(0)));
   }
 
   /**
@@ -289,4 +276,30 @@ class ContentAccessTest extends ProcessorTestBase {
     $this->assertEquals($ids, $results);
   }
 
+  /**
+   * Creates a new user account.
+   *
+   * @param string[] $permissions
+   *   The permissions to set for the user.
+   *
+   * @return \Drupal\user\UserInterface
+   *   The new user object.
+   */
+  protected function createUser($permissions) {
+    $role = Role::create(array('id' => 'role', 'name' => 'Role test'));
+    $role->save();
+    user_role_grant_permissions($role->id(), $permissions);
+
+    $values = array(
+      'uid' => 2,
+      'name' => 'Test',
+      'roles' => array($role->id()),
+    );
+    $authenticated_user = User::create($values);
+    $authenticated_user->enforceIsNew();
+    $authenticated_user->save();
+
+    return $authenticated_user;
+  }
+
 }