diff -u b/core/modules/system/lib/Drupal/system/Tests/Entity/EntityQueryTest.php b/core/modules/system/lib/Drupal/system/Tests/Entity/EntityQueryTest.php
--- b/core/modules/system/lib/Drupal/system/Tests/Entity/EntityQueryTest.php
+++ b/core/modules/system/lib/Drupal/system/Tests/Entity/EntityQueryTest.php
@@ -509,7 +509,7 @@
    *
    * The tags and metadata should propogate to the SQL query object.
    */
-  protected function testMetaData() {
+  public function testMetaData() {
     $query = \Drupal::entityQuery('entity_test_mulrev');
     $query
       ->addTag('efq_metadata_test')
diff -u b/core/modules/system/lib/Drupal/system/Tests/Entity/UserRidQueryTest.php b/core/modules/system/lib/Drupal/system/Tests/Entity/UserRidQueryTest.php
--- b/core/modules/system/lib/Drupal/system/Tests/Entity/UserRidQueryTest.php
+++ b/core/modules/system/lib/Drupal/system/Tests/Entity/UserRidQueryTest.php
@@ -20,11 +20,12 @@
   /**
    * Test the special user role queries.
    */
-  protected function testUserRoleQuery() {
+  public function testUserRoleQuery() {
+    $perms = array('cancel account', 'change own username');
     $roles = array();
     $accounts = array();
-    foreach (array('cancel account', 'change own username') as $perm) {
-      $accounts[$perm] = $this->createUser(array(), array('cancel account'));
+    foreach ($perms as $perm) {
+      $accounts[$perm] = $this->createUser(array(), array($perm));
       foreach ($accounts[$perm]->getRoles() as $role) {
         if ($role != DRUPAL_AUTHENTICATED_RID) {
           $roles[$perm] = $role;
@@ -32,7 +33,7 @@
       }
     }
     $this->assertEqual(count($roles), 2);
-    foreach (array('cancel account', 'change own username') as $perm) {
+    foreach ($perms as $perm) {
       $results = \Drupal::entityQuery('user')
         ->condition('rid', $roles[$perm])
         ->execute();