diff --git a/core/modules/system/lib/Drupal/system/Tests/Upgrade/BareMinimalUpgradePathTest.php b/core/modules/system/lib/Drupal/system/Tests/Upgrade/BareMinimalUpgradePathTest.php
index 9bcf5d6..c93b56c 100644
--- a/core/modules/system/lib/Drupal/system/Tests/Upgrade/BareMinimalUpgradePathTest.php
+++ b/core/modules/system/lib/Drupal/system/Tests/Upgrade/BareMinimalUpgradePathTest.php
@@ -80,5 +80,13 @@ public function testBasicMinimalUpgrade() {
     // Confirm that no {menu_links} entry exists for user/autocomplete.
     $result = db_query('SELECT COUNT(*) FROM {menu_links} WHERE link_path = :user_autocomplete', array(':user_autocomplete' => 'user/autocomplete'))->fetchField();
     $this->assertFalse($result, 'No {menu_links} entry exists for user/autocomplete');
+
+    // Verify that all required modules are enabled.
+    $enabled = module_list();
+    $required = array_filter(system_rebuild_module_data(), function ($data) {
+      return !empty($data->info['required']);
+    });
+    $this->assertEqual(array_diff_key($required, $enabled), array());
   }
+  
 }
diff --git a/core/modules/system/system.install b/core/modules/system/system.install
index 3ea2dab..135ab99 100644
--- a/core/modules/system/system.install
+++ b/core/modules/system/system.install
@@ -2306,6 +2306,13 @@ function system_update_8039() {
 }
 
 /**
+ * Enable the new Entity module.
+ */
+function system_update_8040() {
+  update_module_enable(array('entity'));
+}
+
+/**
  * @} End of "defgroup updates-7.x-to-8.x".
  * The next series of updates should start at 9000.
  */