diff --git a/modules/cart/commerce_cart.info.yml b/modules/cart/commerce_cart.info.yml
index 5bea2eaa..14b3a5f4 100644
--- a/modules/cart/commerce_cart.info.yml
+++ b/modules/cart/commerce_cart.info.yml
@@ -6,9 +6,9 @@ core: 8.x
 dependencies:
   - commerce:commerce
   - commerce:commerce_order
-  - commerce:commerce_product
 config_devel:
   install:
-    - core.entity_form_mode.commerce_order_item.add_to_cart
     - views.view.commerce_cart_form
     - views.view.commerce_carts
+  optional:
+    - core.entity_view_mode.commerce_product_attribute_value.add_to_cart.yml
diff --git a/modules/cart/config/install/core.entity_view_mode.commerce_product_attribute_value.add_to_cart.yml b/modules/cart/config/optional/core.entity_view_mode.commerce_product_attribute_value.add_to_cart.yml
similarity index 100%
rename from modules/cart/config/install/core.entity_view_mode.commerce_product_attribute_value.add_to_cart.yml
rename to modules/cart/config/optional/core.entity_view_mode.commerce_product_attribute_value.add_to_cart.yml
diff --git a/modules/cart/tests/src/Functional/CartBrowserTestBase.php b/modules/cart/tests/src/Functional/CartBrowserTestBase.php
index 644a1983..c8e3e623 100644
--- a/modules/cart/tests/src/Functional/CartBrowserTestBase.php
+++ b/modules/cart/tests/src/Functional/CartBrowserTestBase.php
@@ -44,10 +44,7 @@ abstract class CartBrowserTestBase extends OrderBrowserTestBase {
    * @var array
    */
   public static $modules = [
-    'commerce_cart',
     'commerce_cart_test',
-    'node',
-    'taxonomy',
   ];
 
   /**
@@ -56,7 +53,6 @@ abstract class CartBrowserTestBase extends OrderBrowserTestBase {
   protected function getAdministratorPermissions() {
     return array_merge([
       'administer commerce_product',
-      'access content',
     ], parent::getAdministratorPermissions());
   }
 
diff --git a/modules/cart/tests/src/Functional/CartTest.php b/modules/cart/tests/src/Functional/CartTest.php
index 2222c783..d853b8da 100644
--- a/modules/cart/tests/src/Functional/CartTest.php
+++ b/modules/cart/tests/src/Functional/CartTest.php
@@ -41,7 +41,6 @@ class CartTest extends OrderBrowserTestBase {
    */
   public static $modules = [
     'commerce_cart',
-    'node',
   ];
 
   /**
diff --git a/modules/cart/tests/src/Kernel/CartProviderTest.php b/modules/cart/tests/src/Kernel/CartProviderTest.php
index c54308e7..0838b781 100644
--- a/modules/cart/tests/src/Kernel/CartProviderTest.php
+++ b/modules/cart/tests/src/Kernel/CartProviderTest.php
@@ -27,7 +27,6 @@ class CartProviderTest extends CommerceKernelTestBase {
     'path',
     'profile',
     'state_machine',
-    'commerce_product',
     'commerce_order',
   ];
 
diff --git a/modules/checkout/commerce_checkout.info.yml b/modules/checkout/commerce_checkout.info.yml
index 6e50a941..7c9656d4 100644
--- a/modules/checkout/commerce_checkout.info.yml
+++ b/modules/checkout/commerce_checkout.info.yml
@@ -10,6 +10,7 @@ dependencies:
 config_devel:
   install:
     - commerce_checkout.commerce_checkout_flow.default
+    - views.view.commerce_checkout_order_summary
+  optional:
     - core.entity_view_display.commerce_product_variation.default.summary
     - core.entity_view_mode.commerce_product_variation.summary
-    - views.view.commerce_checkout_order_summary
diff --git a/modules/checkout/config/install/core.entity_view_display.commerce_product_variation.default.summary.yml b/modules/checkout/config/optional/core.entity_view_display.commerce_product_variation.default.summary.yml
similarity index 100%
rename from modules/checkout/config/install/core.entity_view_display.commerce_product_variation.default.summary.yml
rename to modules/checkout/config/optional/core.entity_view_display.commerce_product_variation.default.summary.yml
diff --git a/modules/checkout/config/install/core.entity_view_mode.commerce_product_variation.summary.yml b/modules/checkout/config/optional/core.entity_view_mode.commerce_product_variation.summary.yml
similarity index 100%
rename from modules/checkout/config/install/core.entity_view_mode.commerce_product_variation.summary.yml
rename to modules/checkout/config/optional/core.entity_view_mode.commerce_product_variation.summary.yml
diff --git a/modules/promotion/tests/modules/commerce_promotion_test/commerce_promotion_test.info.yml b/modules/promotion/tests/modules/commerce_promotion_test/commerce_promotion_test.info.yml
index 72b0c681..b30bec30 100644
--- a/modules/promotion/tests/modules/commerce_promotion_test/commerce_promotion_test.info.yml
+++ b/modules/promotion/tests/modules/commerce_promotion_test/commerce_promotion_test.info.yml
@@ -5,4 +5,5 @@ package: Testing
 core: 8.x
 dependencies:
   - commerce:commerce_cart
+  - commerce:commerce_product
   - commerce:commerce_promotion