diff --git a/core/modules/entity/lib/Drupal/entity/Tests/EntityDisplayTest.php b/core/modules/entity/lib/Drupal/entity/Tests/EntityDisplayTest.php
index 3396f89..65ca339 100644
--- a/core/modules/entity/lib/Drupal/entity/Tests/EntityDisplayTest.php
+++ b/core/modules/entity/lib/Drupal/entity/Tests/EntityDisplayTest.php
@@ -28,6 +28,7 @@ protected function setUp() {
     parent::setUp();
 
     $this->installSchema('field', array('field_config', 'field_config_instance'));
+    $this->installConfig(array('field'));
   }
 
   /**
diff --git a/core/modules/field/field.install b/core/modules/field/field.install
index 695fd89..47eebe3 100644
--- a/core/modules/field/field.install
+++ b/core/modules/field/field.install
@@ -484,6 +484,21 @@ function field_update_8002() {
 }
 
 /**
+ * Moves field_storage_default and field_language_fallback to config.
+ *
+ * @ingroup config_upgrade
+ */
+function field_update_8003() {
+  update_variables_to_config('field.settings', array(
+    'field_storage_default' => 'storage_default',
+  ));
+  if (variable_get('language_count', 1) >= 1) {
+    state()->set('field.language_fallback', TRUE);
+  }
+  update_variable_del('field_language_fallback');
+}
+
+/**
  * @} End of "addtogroup updates-7.x-to-8.x".
  * The next series of updates should start at 9000.
  */
diff --git a/core/modules/hal/lib/Drupal/hal/Tests/NormalizerTestBase.php b/core/modules/hal/lib/Drupal/hal/Tests/NormalizerTestBase.php
index 224586d..34d8a7e 100644
--- a/core/modules/hal/lib/Drupal/hal/Tests/NormalizerTestBase.php
+++ b/core/modules/hal/lib/Drupal/hal/Tests/NormalizerTestBase.php
@@ -39,6 +39,7 @@ function setUp() {
     $this->installSchema('user', array('users'));
     $this->installSchema('language', array('language'));
     $this->installSchema('entity_test', array('entity_test'));
+    $this->installConfig(array('field'));
 
     // Add English as a language.
     $english = new Language(array(
diff --git a/core/modules/system/lib/Drupal/system/Tests/Entity/EntityUnitTestBase.php b/core/modules/system/lib/Drupal/system/Tests/Entity/EntityUnitTestBase.php
index b747e79..61eb8c1 100644
--- a/core/modules/system/lib/Drupal/system/Tests/Entity/EntityUnitTestBase.php
+++ b/core/modules/system/lib/Drupal/system/Tests/Entity/EntityUnitTestBase.php
@@ -27,6 +27,7 @@ public function setUp() {
     $this->installSchema('system', 'sequences');
     $this->installSchema('field', array('field_config', 'field_config_instance'));
     $this->installSchema('entity_test', 'entity_test');
+    $this->installConfig(array('field'));
   }
 
   /**
diff --git a/core/modules/text/lib/Drupal/text/Tests/Formatter/TextPlainUnitTest.php b/core/modules/text/lib/Drupal/text/Tests/Formatter/TextPlainUnitTest.php
index 716ead7..f5517e1 100644
--- a/core/modules/text/lib/Drupal/text/Tests/Formatter/TextPlainUnitTest.php
+++ b/core/modules/text/lib/Drupal/text/Tests/Formatter/TextPlainUnitTest.php
@@ -47,6 +47,7 @@ function setUp() {
 
     $this->installSchema('field', 'field_config');
     $this->installSchema('field', 'field_config_instance');
+    $this->installConfig(array('field'));
 
     // @todo Add helper methods for all of the following.