diff --git a/core/modules/views/lib/Drupal/views/Tests/ViewTestBase.php b/core/modules/views/lib/Drupal/views/Tests/ViewTestBase.php
index 1ac7c0e..02c86f5 100644
--- a/core/modules/views/lib/Drupal/views/Tests/ViewTestBase.php
+++ b/core/modules/views/lib/Drupal/views/Tests/ViewTestBase.php
@@ -41,8 +41,8 @@ protected function setUp() {
    */
   protected function enableViewsTestModule() {
     // Define the schema and views data variable before enabling the test module.
-    $GLOBALS['views_test_data_schema'] = $this->schemaDefinition();
-    $GLOBALS['views_test_data_views_data'] = $this->viewsData();
+    state()->set('views_test_data_schema', $this->schemaDefinition());
+    state()->set('views_test_data_views_data', $this->viewsData());
 
     module_enable(array('views_test_data'));
     $this->resetAll();
diff --git a/core/modules/views/tests/views_test_data/views_test_data.install b/core/modules/views/tests/views_test_data/views_test_data.install
index 53f402a..41aed29 100644
--- a/core/modules/views/tests/views_test_data/views_test_data.install
+++ b/core/modules/views/tests/views_test_data/views_test_data.install
@@ -9,7 +9,12 @@
  * Implements hook_schema().
  */
 function views_test_data_schema() {
-  return $GLOBALS['views_test_data_schema'];
+  // \Drupal\views\Tests\ViewUnitTestBase uses $GLOBALS, while
+  // \Drupal\views\Tests\ViewTestBase uses state().
+  if (isset($GLOBALS['views_test_data_schema'])) {
+    return $GLOBALS['views_test_data_schema'];
+  }
+  return state()->get('views_test_data_schema');
 }
 
 /**
diff --git a/core/modules/views/tests/views_test_data/views_test_data.module b/core/modules/views/tests/views_test_data/views_test_data.module
index 9d5257e..ec14fdb 100644
--- a/core/modules/views/tests/views_test_data/views_test_data.module
+++ b/core/modules/views/tests/views_test_data/views_test_data.module
@@ -23,7 +23,12 @@ function views_test_data_permission() {
  * Implements hook_views_data().
  */
 function views_test_data_views_data() {
-  return $GLOBALS['views_test_data_views_data'];
+  // \Drupal\views\Tests\ViewUnitTestBase uses $GLOBALS, while
+  // \Drupal\views\Tests\ViewTestBase uses state().
+  if (isset($GLOBALS['views_test_data_views_data'])) {
+    return $GLOBALS['views_test_data_views_data'];
+  }
+  return state()->get('views_test_data_views_data');
 }
 
 function views_test_data_test_static_access_callback($access) {