diff --git a/core/modules/views/src/Tests/NodeAccessTest.php b/core/modules/views/src/Tests/NodeAccessTest.php
index 1a9204f..851f5a1 100644
--- a/core/modules/views/src/Tests/NodeAccessTest.php
+++ b/core/modules/views/src/Tests/NodeAccessTest.php
@@ -44,7 +44,7 @@ class NodeAccessTest extends FieldTestBase {
    *
    * @var array
    */
-  public static $modules = ['user', 'node', 'entity_reference', 'views', 'views_test_remove_inner_joins', 'views_test_config'];
+  public static $modules = ['user', 'node', 'entity_reference', 'views', 'views_test_config'];
 
   protected function setUp() {
     parent::setUp(FALSE);
diff --git a/core/modules/views/tests/modules/views_test_mynodeaccess/views_test_mynodeaccess.info.yml b/core/modules/views/tests/modules/views_test_mynodeaccess/views_test_mynodeaccess.info.yml
index 313025d..4e14307 100644
--- a/core/modules/views/tests/modules/views_test_mynodeaccess/views_test_mynodeaccess.info.yml
+++ b/core/modules/views/tests/modules/views_test_mynodeaccess/views_test_mynodeaccess.info.yml
@@ -1,8 +1,8 @@
-name: My node access test module
+name: 'My node access test module'
 description: Implement hook_node_grants and see what happens.
-package: Aangstrom
+package: Testing
 type: module
-version: 1.0
+version: VERSION
 core: 8.x
 dependencies:
   - node
diff --git a/core/modules/views/tests/modules/views_test_remove_inner_joins/views_test_remove_inner_joins.info.yml b/core/modules/views/tests/modules/views_test_remove_inner_joins/views_test_remove_inner_joins.info.yml
deleted file mode 100644
index 24396332..0000000
--- a/core/modules/views/tests/modules/views_test_remove_inner_joins/views_test_remove_inner_joins.info.yml
+++ /dev/null
@@ -1,8 +0,0 @@
-name: Views Test Remove inner joins
-description: Heavy-handed fix for https://www.drupal.org/node/2273849.
-package: Aangstrom
-type: module
-version: 1.0
-core: 8.x
-dependencies:
-  - views
diff --git a/core/modules/views/tests/modules/views_test_remove_inner_joins/views_test_remove_inner_joins.module b/core/modules/views/tests/modules/views_test_remove_inner_joins/views_test_remove_inner_joins.module
deleted file mode 100644
index 44ce517..0000000
--- a/core/modules/views/tests/modules/views_test_remove_inner_joins/views_test_remove_inner_joins.module
+++ /dev/null
@@ -1,17 +0,0 @@
-<?php
-
-/**
- * @file
- * Test module for testing the node access system.
- *
- * Heavy-handed fix for https://www.drupal.org/node/2273849.
- */
-
-/**
- * Implements hook_views_data_alter().
- *
- * Do not use INNER JOIN when creating a Views query.
- */
-function views_test_remove_inner_joins_views_data_alter(array &$data) {
-  unset($data['node_field_data']['table']['join']['node']['type']);
-}