diff --git a/config/views.settings.yml b/config/views.settings.yml
index b655c401740cb3bf851b03067626cf72e27348e0..4b9c81c5d650fd5cf1caba70232bdab1794528de 100644
--- a/config/views.settings.yml
+++ b/config/views.settings.yml
@@ -21,3 +21,15 @@ ui:
   always_live_preview: '1'
   always_live_preview_button: '1'
   exposed_filter_any_label: 'new_any'
+field_rewrite_elements:
+  div: DIV
+  span: SPAN
+  h1: H1
+  h2: H2
+  h3: H3
+  h4: H4
+  h5: H5
+  h6: H6
+  p: P
+  strong: STRONG
+  em: EM
diff --git a/lib/Drupal/views/Plugin/views/field/FieldPluginBase.php b/lib/Drupal/views/Plugin/views/field/FieldPluginBase.php
index 706f4135de590eeea4e18d82cf1645b0a45b5559..2a44c9d716935dc73ad17719370c2a9e08e18d2f 100644
--- a/lib/Drupal/views/Plugin/views/field/FieldPluginBase.php
+++ b/lib/Drupal/views/Plugin/views/field/FieldPluginBase.php
@@ -270,21 +270,11 @@ function get_elements() {
     static $elements = NULL;
     if (!isset($elements)) {
       // @todo Add possible html5 elements.
-      $elements = variable_get('views_field_rewrite_elements', array(
-        '' => t('- Use default -'),
-        '0' => t('- None -'),
-        'div' => 'DIV',
-        'span' => 'SPAN',
-        'h1' => 'H1',
-        'h2' => 'H2',
-        'h3' => 'H3',
-        'h4' => 'H4',
-        'h5' => 'H5',
-        'h6' => 'H6',
-        'p' => 'P',
-        'strong' => 'STRONG',
-        'em' => 'EM',
-      ));
+      $elements = array(
+        '' => t(' - Use default -'),
+        '0' => t('- None -')
+      );
+      $elements += config('views.settings')->get('field_rewrite_elements');
     }
 
     return $elements;
diff --git a/lib/Drupal/views/Tests/Handler/FieldTest.php b/lib/Drupal/views/Tests/Handler/FieldTest.php
index 80f31b3b11ff05c52eeb8f8557e9ff3614b0f48f..147e9f177d648c12aeeb322a4e1fff0afe66b74a 100644
--- a/lib/Drupal/views/Tests/Handler/FieldTest.php
+++ b/lib/Drupal/views/Tests/Handler/FieldTest.php
@@ -476,6 +476,8 @@ public function testFieldClasses() {
       'em',
       'marquee'
     );
+    sort($expected_elements);
+
     $this->assertEqual(array_keys($element_types), $expected_elements);
   }
 
diff --git a/tests/views_test_data/views_test_data.install b/tests/views_test_data/views_test_data.install
index 9ad4cad431e553412714d129f938ce1510daa8b6..bb1353131ad447e390f692c5dce34246177024e6 100644
--- a/tests/views_test_data/views_test_data.install
+++ b/tests/views_test_data/views_test_data.install
@@ -17,9 +17,7 @@ function views_test_data_schema() {
  */
 function views_test_data_install() {
   // Add the marquee tag to possible html elements to test the field handler.
-  $default_values = array(
-    '' => t('- Use default -'),
-    '0' => t('- None -'),
+  $values = array(
     'div' => 'DIV',
     'span' => 'SPAN',
     'h1' => 'H1',
@@ -31,7 +29,7 @@ function views_test_data_install() {
     'p' => 'P',
     'strong' => 'STRONG',
     'em' => 'EM',
+    'marquee' => 'MARQUEE'
   );
-  $default_values['marquee'] = 'MARQUEE';
-  variable_set('views_field_rewrite_elements', $default_values);
+  config('views.settings')->set('field_rewrite_elements', $values)->save();
 }