diff --git a/core/config/schema/core.data_types.schema.yml b/core/config/schema/core.data_types.schema.yml
index 41332e3..c54f39d 100644
--- a/core/config/schema/core.data_types.schema.yml
+++ b/core/config/schema/core.data_types.schema.yml
@@ -189,23 +189,6 @@ theme_breakpoints_default:
     - type: string
       label: 'Breakpoint value'
 
-views_field_bulk_form:
-  type: views_field
-  label: 'Bulk operation'
-  mapping:
-    action_title:
-      type: label
-      label: 'Action title'
-    include_exclude:
-      type: string
-      label: 'Available actions'
-    selected_actions:
-      type: sequence
-      label: 'Available actions'
-      sequence:
-        - type: string
-          label: 'Action'
-
 # Array of routes with route_name and route_params keys.
 route:
   type: mapping
diff --git a/core/modules/action/action.views_execution.inc b/core/modules/action/action.views_execution.inc
deleted file mode 100644
index 32bc883..0000000
--- a/core/modules/action/action.views_execution.inc
+++ /dev/null
@@ -1,24 +0,0 @@
-<?php
-
-/**
- * @file
- * Provides views runtime hooks for action.module.
- */
-
-use Drupal\Component\Utility\String;
-
-/**
- * Implements hook_views_form_substitutions().
- */
-function action_views_form_substitutions() {
-  // Views String::checkPlain()s the column label, so we need to match that.
-  $select_all_placeholder = String::checkPlain('<!--action-bulk-form-select-all-->');
-  $select_all = array(
-    '#type' => 'checkbox',
-    '#default_value' => FALSE,
-    '#attributes' => array('class' => array('action-table-select-all')),
-  );
-  return array(
-    $select_all_placeholder => drupal_render($select_all),
-  );
-}
diff --git a/core/modules/action/tests/action_bulk_test/action_bulk_test.info.yml b/core/modules/action/tests/action_bulk_test/action_bulk_test.info.yml
deleted file mode 100644
index 37b4285..0000000
--- a/core/modules/action/tests/action_bulk_test/action_bulk_test.info.yml
+++ /dev/null
@@ -1,10 +0,0 @@
-name: 'Action bulk form test'
-type: module
-description: 'Support module for action bulk form testing.'
-package: Testing
-version: VERSION
-core: 8.x
-dependencies:
-  - action
-  - views
-  - node
diff --git a/core/modules/node/src/Plugin/views/field/NodeBulkForm.php b/core/modules/node/src/Plugin/views/field/NodeBulkForm.php
index 1f8a247..94a8c1a 100644
--- a/core/modules/node/src/Plugin/views/field/NodeBulkForm.php
+++ b/core/modules/node/src/Plugin/views/field/NodeBulkForm.php
@@ -8,7 +8,7 @@
 namespace Drupal\node\Plugin\views\field;
 
 use Drupal\Core\Entity\EntityManagerInterface;
-use Drupal\system\Plugin\views\field\BulkForm;
+use Drupal\views\Plugin\views\field\BulkForm;
 
 /**
  * Defines a node operations bulk form element.
diff --git a/core/modules/user/src/Plugin/views/field/UserBulkForm.php b/core/modules/user/src/Plugin/views/field/UserBulkForm.php
index b5f008b..4f63ef6 100644
--- a/core/modules/user/src/Plugin/views/field/UserBulkForm.php
+++ b/core/modules/user/src/Plugin/views/field/UserBulkForm.php
@@ -9,7 +9,7 @@
 
 use Drupal\Core\Entity\EntityManagerInterface;
 use Drupal\Core\Form\FormStateInterface;
-use Drupal\system\Plugin\views\field\BulkForm;
+use Drupal\views\Plugin\views\field\BulkForm;
 use Drupal\user\UserInterface;
 
 /**
diff --git a/core/modules/views/config/schema/views.data_types.schema.yml b/core/modules/views/config/schema/views.data_types.schema.yml
index 50a075e..da69bc1 100644
--- a/core/modules/views/config/schema/views.data_types.schema.yml
+++ b/core/modules/views/config/schema/views.data_types.schema.yml
@@ -585,6 +585,23 @@ views_field:
       type: string
       label: 'Plugin ID'
 
+views_field_bulk_form:
+  type: views_field
+  label: 'Bulk operation'
+  mapping:
+    action_title:
+      type: label
+      label: 'Action title'
+    include_exclude:
+      type: string
+      label: 'Available actions'
+    selected_actions:
+      type: sequence
+      label: 'Available actions'
+      sequence:
+        - type: string
+          label: 'Action'
+
 views_pager:
   type: mapping
   label: 'Pager'
diff --git a/core/modules/system/src/Plugin/views/field/BulkForm.php b/core/modules/views/src/Plugin/views/field/BulkForm.php
similarity index 99%
rename from core/modules/system/src/Plugin/views/field/BulkForm.php
rename to core/modules/views/src/Plugin/views/field/BulkForm.php
index 7270571..07e0cf6 100644
--- a/core/modules/system/src/Plugin/views/field/BulkForm.php
+++ b/core/modules/views/src/Plugin/views/field/BulkForm.php
@@ -2,10 +2,10 @@
 
 /**
  * @file
- * Contains \Drupal\system\Plugin\views\field\BulkForm.
+ * Contains \Drupal\views\Plugin\views\field\BulkForm.
  */
 
-namespace Drupal\system\Plugin\views\field;
+namespace Drupal\views\Plugin\views\field;
 
 use Drupal\Core\Entity\EntityStorageInterface;
 use Drupal\Core\Form\FormStateInterface;
diff --git a/core/modules/action/src/Tests/BulkFormTest.php b/core/modules/views/src/Tests/BulkFormTest.php
similarity index 94%
rename from core/modules/action/src/Tests/BulkFormTest.php
rename to core/modules/views/src/Tests/BulkFormTest.php
index f92329c..850c7d0 100644
--- a/core/modules/action/src/Tests/BulkFormTest.php
+++ b/core/modules/views/src/Tests/BulkFormTest.php
@@ -2,28 +2,34 @@
 
 /**
  * @file
- * Contains \Drupal\action\Tests\BulkFormTest.
+ * Contains \Drupal\views\Tests\BulkFormTest.
  */
 
-namespace Drupal\action\Tests;
+namespace Drupal\views\Tests;
 
-use Drupal\simpletest\WebTestBase;
 use Drupal\views\Views;
 
 /**
  * Tests the views bulk form test.
  *
- * @group action
- * @see \Drupal\action\Plugin\views\field\BulkForm
+ * @group views
+ * @see \Drupal\views\Plugin\views\field\BulkForm
  */
-class BulkFormTest extends WebTestBase {
+class BulkFormTest extends ViewTestBase {
 
   /**
    * Modules to install.
    *
    * @var array
    */
-  public static $modules = array('node', 'action_bulk_test');
+  public static $modules = array('node');
+
+  /**
+   * Views used by this test.
+   *
+   * @var array
+   */
+  public static $testViews = array('test_bulk_form');
 
   /**
    * Tests the bulk form.
diff --git a/core/modules/action/tests/action_bulk_test/config/install/views.view.test_bulk_form.yml b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_bulk_form.yml
similarity index 100%
rename from core/modules/action/tests/action_bulk_test/config/install/views.view.test_bulk_form.yml
rename to core/modules/views/tests/modules/views_test_config/test_views/views.view.test_bulk_form.yml
