diff --git a/homeassistant/components/apple_tv/manifest.json b/homeassistant/components/apple_tv/manifest.json
index 2f37d941ac8..8ca42beab61 100644
--- a/homeassistant/components/apple_tv/manifest.json
+++ b/homeassistant/components/apple_tv/manifest.json
@@ -4,5 +4,6 @@
   "documentation": "https://www.home-assistant.io/integrations/apple_tv",
   "requirements": ["pyatv==0.3.13"],
   "dependencies": ["configurator"],
+  "after_dependencies": ["discovery"],
   "codeowners": []
 }
diff --git a/homeassistant/components/freebox/manifest.json b/homeassistant/components/freebox/manifest.json
index 5a29a619a33..7a66490c90d 100644
--- a/homeassistant/components/freebox/manifest.json
+++ b/homeassistant/components/freebox/manifest.json
@@ -4,5 +4,6 @@
   "documentation": "https://www.home-assistant.io/integrations/freebox",
   "requirements": ["aiofreepybox==0.0.8"],
   "dependencies": [],
+  "after_dependencies": ["discovery"],
   "codeowners": ["@snoof85"]
 }
diff --git a/homeassistant/components/octoprint/manifest.json b/homeassistant/components/octoprint/manifest.json
index d63a543f227..98e7c320a60 100644
--- a/homeassistant/components/octoprint/manifest.json
+++ b/homeassistant/components/octoprint/manifest.json
@@ -4,5 +4,6 @@
   "documentation": "https://www.home-assistant.io/integrations/octoprint",
   "requirements": [],
   "dependencies": [],
+  "after_dependencies": ["discovery"],
   "codeowners": []
 }
diff --git a/homeassistant/components/roku/manifest.json b/homeassistant/components/roku/manifest.json
index b92a95af9d7..ba67f61b2ee 100644
--- a/homeassistant/components/roku/manifest.json
+++ b/homeassistant/components/roku/manifest.json
@@ -4,5 +4,6 @@
   "documentation": "https://www.home-assistant.io/integrations/roku",
   "requirements": ["roku==4.0.0"],
   "dependencies": [],
+  "after_dependencies": ["discovery"],
   "codeowners": []
 }
diff --git a/homeassistant/components/sabnzbd/manifest.json b/homeassistant/components/sabnzbd/manifest.json
index 78cfd4aa1f0..6fec5c008b3 100644
--- a/homeassistant/components/sabnzbd/manifest.json
+++ b/homeassistant/components/sabnzbd/manifest.json
@@ -4,5 +4,6 @@
   "documentation": "https://www.home-assistant.io/integrations/sabnzbd",
   "requirements": ["pysabnzbd==1.1.0"],
   "dependencies": ["configurator"],
+  "after_dependencies": ["discovery"],
   "codeowners": []
 }
diff --git a/homeassistant/components/xiaomi_aqara/manifest.json b/homeassistant/components/xiaomi_aqara/manifest.json
index 4568f67dbf5..fade5e1a51b 100644
--- a/homeassistant/components/xiaomi_aqara/manifest.json
+++ b/homeassistant/components/xiaomi_aqara/manifest.json
@@ -4,5 +4,6 @@
   "documentation": "https://www.home-assistant.io/integrations/xiaomi_aqara",
   "requirements": ["PyXiaomiGateway==0.12.4"],
   "dependencies": [],
+  "after_dependencies": ["discovery"],
   "codeowners": ["@danielhiversen", "@syssi"]
 }
diff --git a/homeassistant/components/yeelight/manifest.json b/homeassistant/components/yeelight/manifest.json
index 35c2a8ddfac..1a181536d0b 100644
--- a/homeassistant/components/yeelight/manifest.json
+++ b/homeassistant/components/yeelight/manifest.json
@@ -4,5 +4,6 @@
   "documentation": "https://www.home-assistant.io/integrations/yeelight",
   "requirements": ["yeelight==0.5.0"],
   "dependencies": [],
+  "after_dependencies": ["discovery"],
   "codeowners": ["@rytilahti", "@zewelor"]
 }
diff --git a/script/hassfest/dependencies.py b/script/hassfest/dependencies.py
index 4b9dc21abb9..4d8fbb226f8 100644
--- a/script/hassfest/dependencies.py
+++ b/script/hassfest/dependencies.py
@@ -103,8 +103,6 @@ ALLOWED_USED_COMPONENTS = {
     "homeassistant",
     "system_log",
     "person",
-    # Discovery
-    "discovery",
     # Other
     "mjpeg",  # base class, has no reqs or component to load.
     "stream",  # Stream cannot install on all systems, can be imported without reqs.