diff --git a/core/modules/system/templates/checkboxes.html.twig b/core/modules/system/templates/checkboxes.html.twig
index 19209d9..9159d18 100644
--- a/core/modules/system/templates/checkboxes.html.twig
+++ b/core/modules/system/templates/checkboxes.html.twig
@@ -14,4 +14,4 @@
  @todo: remove this file once https://www.drupal.org/node/1819284 is resolved.
  This is identical to core/modules/system/templates/container.html.twig
 #}
-<div{{ attributes.addClass('form-checkboxes') }}>{{ children }}</div>
+<div{{ attributes.addClass('js-form-checkboxes') }}>{{ children }}</div>
diff --git a/core/modules/system/templates/container.html.twig b/core/modules/system/templates/container.html.twig
index 167965c..2f71632 100644
--- a/core/modules/system/templates/container.html.twig
+++ b/core/modules/system/templates/container.html.twig
@@ -20,7 +20,6 @@
 {%
   set classes = [
     has_parent ? 'js-form-wrapper',
-    has_parent ? 'form-wrapper',
   ]
 %}
 <div{{ attributes.addClass(classes) }}>{{ children }}</div>
diff --git a/core/modules/views_ui/js/views-admin.js b/core/modules/views_ui/js/views-admin.js
index 28e2e96..b6e6b8e 100644
--- a/core/modules/views_ui/js/views-admin.js
+++ b/core/modules/views_ui/js/views-admin.js
@@ -1006,7 +1006,7 @@
 
       var $selectAll = $context.find('.js-form-item-options-value-all').once('filterConfigSelectAll');
       var $selectAllCheckbox = $selectAll.find('input[type=checkbox]');
-      var $checkboxes = $selectAll.closest('.form-checkboxes').find('.js-form-type-checkbox:not(.js-form-item-options-value-all) input[type="checkbox"]');
+      var $checkboxes = $selectAll.closest('.js-form-checkboxes').find('.js-form-type-checkbox:not(.js-form-item-options-value-all) input[type="checkbox"]');
 
       if ($selectAll.length) {
          // Show the select all checkbox.
diff --git a/core/modules/views_ui/src/Form/Ajax/AddHandler.php b/core/modules/views_ui/src/Form/Ajax/AddHandler.php
index eef8f7d..4d451ed 100644
--- a/core/modules/views_ui/src/Form/Ajax/AddHandler.php
+++ b/core/modules/views_ui/src/Form/Ajax/AddHandler.php
@@ -105,7 +105,7 @@ public function buildForm(array $form, FormStateInterface $form_state) {
       );
 
       $form['options']['name'] = array(
-        '#prefix' => '<div class="views-radio-box form-checkboxes views-filterable-options">',
+        '#prefix' => '<div class="views-radio-box js-form-checkboxes form-checkboxes views-filterable-options">',
         '#suffix' => '</div>',
         '#tree' => TRUE,
         '#default_value' => 'all',
diff --git a/core/themes/classy/templates/form/checkboxes.html.twig b/core/themes/classy/templates/form/checkboxes.html.twig
index 9199f7e..d3aae9c 100644
--- a/core/themes/classy/templates/form/checkboxes.html.twig
+++ b/core/themes/classy/templates/form/checkboxes.html.twig
@@ -12,4 +12,4 @@
  @todo: remove this file once https://www.drupal.org/node/1819284 is resolved.
  This is identical to core/modules/system/templates/container.html.twig
 #}
-<div{{ attributes.addClass('form-checkboxes') }}>{{ children }}</div>
+<div{{ attributes.addClass('js-form-checkboxes form-checkboxes') }}>{{ children }}</div>