diff --git a/core/modules/views_ui/lib/Drupal/views_ui/Tests/DisplayTest.php b/core/modules/views_ui/lib/Drupal/views_ui/Tests/DisplayTest.php
index 4e74450..2f2f60a 100644
--- a/core/modules/views_ui/lib/Drupal/views_ui/Tests/DisplayTest.php
+++ b/core/modules/views_ui/lib/Drupal/views_ui/Tests/DisplayTest.php
@@ -251,7 +251,7 @@ public function testDisplayAreas() {
     // Assert that the expected text is found in each area category.
     foreach ($areas as $type => $class) {
       $element = $this->xpath('//div[contains(@class, :class)]/div', array(':class' => $class));
-      $this->assertEqual((string) $element[0], "The selected display type does not utilize $type plugins");
+      $this->assertEqual((string) $element[0], format_string('The selected display type does not utilize @type plugins', array('@type' => $type)));
     }
   }
 
diff --git a/core/modules/views_ui/templates/views-ui-container.html.twig b/core/modules/views_ui/templates/views-ui-container.html.twig
new file mode 100644
index 0000000..d45b158
--- /dev/null
+++ b/core/modules/views_ui/templates/views-ui-container.html.twig
@@ -0,0 +1,15 @@
+{#
+/**
+ * @file
+ * Default theme implementation for a generic views UI container/wrapper.
+ *
+ * Available variables:
+ * - attributes: HTML attributes to apply to the container element.
+ * - children: The remaining elements such as dropbuttons and tabs.
+ *
+ * @see template_preprocess_views_ui_container()
+ *
+ * @ingroup themeable
+ */
+#}
+<div{{ attributes }}>{{ children }}</div>
diff --git a/core/modules/views_ui/views_ui.module b/core/modules/views_ui/views_ui.module
index 269bdcd..66af7a9 100644
--- a/core/modules/views_ui/views_ui.module
+++ b/core/modules/views_ui/views_ui.module
@@ -181,7 +181,8 @@ function views_ui_theme() {
     // Generic container wrapper, to use instead of theme_container when an id
     // is not desired.
     'views_ui_container' => array(
-      'render element' => 'element',
+      'variables' => array('children' => NULL, 'attributes' => array()),
+      'template' => 'views-ui-container',
       'file' => 'views_ui.theme.inc',
     ),
   );
diff --git a/core/modules/views_ui/views_ui.theme.inc b/core/modules/views_ui/views_ui.theme.inc
index 8e503fc..f71a338 100644
--- a/core/modules/views_ui/views_ui.theme.inc
+++ b/core/modules/views_ui/views_ui.theme.inc
@@ -8,14 +8,6 @@
 use Drupal\Core\Template\Attribute;
 
 /**
- * Generic <div> container function.
- */
-function theme_views_ui_container($variables) {
-  $element = $variables['element'];
-  return '<div' . new Attribute($element['#attributes']) . '>' . $element['#children'] . '</div>';
-}
-
-/**
  * Prepares variables for Views UI display tab setting templates.
  *
  * Default template: views-ui-display-tab-setting.html.twig.