diff --git a/core/modules/node/lib/Drupal/node/Tests/NodeQueryAlterTest.php b/core/modules/node/lib/Drupal/node/Tests/NodeQueryAlterTest.php
index 8ae64d7..6746d81 100644
--- a/core/modules/node/lib/Drupal/node/Tests/NodeQueryAlterTest.php
+++ b/core/modules/node/lib/Drupal/node/Tests/NodeQueryAlterTest.php
@@ -196,7 +196,7 @@ function testNodeQueryAlterOverride() {
     // $account instead of the global $user, we will log in as
     // noAccessUser2.
     $this->drupalLogin($this->noAccessUser2);
-    state()->set('system.node_test_node_access_all_uid', $this->noAccessUser->uid);
+    state()->set('node_access_test.all_uid', $this->noAccessUser->uid);
     drupal_static_reset('node_access_view_all_nodes');
     try {
       $query = db_select('node', 'mytab')
@@ -211,6 +211,6 @@ function testNodeQueryAlterOverride() {
     catch (Exception $e) {
       $this->fail(t('Altered query is malformed'));
     }
-    state()->delete('system.node_test_node_access_all_uid');
+    state()->delete('node_access_test.all_uid');
   }
 }
diff --git a/core/modules/node/tests/modules/node_access_test/node_access_test.module b/core/modules/node/tests/modules/node_access_test/node_access_test.module
index 3038208..3413a8a 100644
--- a/core/modules/node/tests/modules/node_access_test/node_access_test.module
+++ b/core/modules/node/tests/modules/node_access_test/node_access_test.module
@@ -21,7 +21,9 @@ function node_access_test_node_grants($account, $op) {
   if ($op == 'view' && user_access('node test view', $account)) {
     $grants['node_access_test'] = array(8888, 8889);
   }
-  if ($op == 'view' && $account->uid == state()->get('system.node_test_node_access_all_uid', 0)) {
+
+  $all_uid_access = variable_get('node_access_test.all_uid') ?: 0;
+  if ($op == 'view' && $account->uid == $all_uid_access) {
     $grants['node_access_all'] = array(0);
   }
   return $grants;
diff --git a/core/modules/system/system.install b/core/modules/system/system.install
index bab197f..a8819c1 100644
--- a/core/modules/system/system.install
+++ b/core/modules/system/system.install
@@ -2063,18 +2063,6 @@ function system_update_8022() {
   $schema->createTable('router', $tables['router']);
 }
 
-/*
- * Convert node_test_node_access_all_uid variable to system.node_test_node_access_all_uid state api values.
- *
- * @ingroup state_upgrade
- */
-function system_update_8023() {
-  if ($value = update_variable_get('node_test_node_access_all_uid', FALSE)) {
-    state()->set('system.node_test_node_access_all_uid', $value);
-  }
-  update_variable_del('node_test_node_access_all_uid');
-}
-
 /**
  * Create the 'key_value_expire' table.
  */