diff --git a/core/modules/node/lib/Drupal/node/Tests/NodeQueryAlterTest.php b/core/modules/node/lib/Drupal/node/Tests/NodeQueryAlterTest.php
index 1f367cf..96fba82 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 @@ class NodeQueryAlterTest extends NodeTestBase {
     // $account instead of the global $user, we will log in as
     // noAccessUser2.
     $this->drupalLogin($this->noAccessUser2);
-    variable_set('node_test_node_access_all_uid', $this->noAccessUser->uid);
+    state()->set('system.node_test_node_access_all_uid', $this->noAccessUser->uid);
     drupal_static_reset('node_access_view_all_nodes');
     try {
       $query = db_select('node', 'mytab')
@@ -211,6 +211,6 @@ class NodeQueryAlterTest extends NodeTestBase {
     catch (Exception $e) {
       $this->fail(t('Altered query is malformed'));
     }
-    variable_del('node_test_node_access_all_uid');
+    state()->delete('system.node_test_node_access_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 a503217..3038208 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,7 @@ 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 == variable_get('node_test_node_access_all_uid', 0)) {
+  if ($op == 'view' && $account->uid == state()->get('system.node_test_node_access_all_uid', 0)) {
     $grants['node_access_all'] = array(0);
   }
   return $grants;
diff --git a/core/modules/system/system.install b/core/modules/system/system.install
index 05459d0..e5c7d04 100644
--- a/core/modules/system/system.install
+++ b/core/modules/system/system.install
@@ -2101,6 +2101,18 @@ 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');
+}
+
 /**
  * @} End of "defgroup updates-7.x-to-8.x".
  * The next series of updates should start at 9000.