diff --git a/packages/animations/browser/test/BUILD.bazel b/packages/animations/browser/test/BUILD.bazel
index 2dbee71f51..79b21d2ef2 100644
--- a/packages/animations/browser/test/BUILD.bazel
+++ b/packages/animations/browser/test/BUILD.bazel
@@ -1,4 +1,17 @@
 load("//tools:defaults.bzl", "jasmine_node_test", "karma_web_test_suite", "ts_library")
+load("//tools/circular_dependency_test:index.bzl", "circular_dependency_test")
+
+circular_dependency_test(
+    name = "circular_deps_test",
+    entry_point = "angular/packages/animations/browser/index.js",
+    deps = ["//packages/animations/browser"],
+)
+
+circular_dependency_test(
+    name = "testing_circular_deps_test",
+    entry_point = "angular/packages/animations/browser/testing/index.js",
+    deps = ["//packages/animations/browser/testing"],
+)
 
 ts_library(
     name = "test_lib",
diff --git a/packages/animations/test/BUILD.bazel b/packages/animations/test/BUILD.bazel
index 46aab59498..8153e436ab 100644
--- a/packages/animations/test/BUILD.bazel
+++ b/packages/animations/test/BUILD.bazel
@@ -1,4 +1,11 @@
 load("//tools:defaults.bzl", "jasmine_node_test", "karma_web_test_suite", "ts_library")
+load("//tools/circular_dependency_test:index.bzl", "circular_dependency_test")
+
+circular_dependency_test(
+    name = "circular_deps_test",
+    entry_point = "angular/packages/animations/index.js",
+    deps = ["//packages/animations"],
+)
 
 ts_library(
     name = "test_lib",
diff --git a/packages/common/http/test/BUILD.bazel b/packages/common/http/test/BUILD.bazel
index 3448e1a0d5..bf662c1c41 100644
--- a/packages/common/http/test/BUILD.bazel
+++ b/packages/common/http/test/BUILD.bazel
@@ -1,4 +1,11 @@
 load("//tools:defaults.bzl", "jasmine_node_test", "karma_web_test_suite", "ts_library")
+load("//tools/circular_dependency_test:index.bzl", "circular_dependency_test")
+
+circular_dependency_test(
+    name = "circular_deps_test",
+    entry_point = "angular/packages/common/http/index.js",
+    deps = ["//packages/common/http"],
+)
 
 ts_library(
     name = "test_lib",
diff --git a/packages/common/http/testing/test/BUILD.bazel b/packages/common/http/testing/test/BUILD.bazel
index 0e2c33b509..51763ab425 100644
--- a/packages/common/http/testing/test/BUILD.bazel
+++ b/packages/common/http/testing/test/BUILD.bazel
@@ -1,4 +1,11 @@
 load("//tools:defaults.bzl", "jasmine_node_test", "karma_web_test_suite", "ts_library")
+load("//tools/circular_dependency_test:index.bzl", "circular_dependency_test")
+
+circular_dependency_test(
+    name = "circular_deps_test",
+    entry_point = "angular/packages/common/http/testing/index.js",
+    deps = ["//packages/common/http/testing"],
+)
 
 ts_library(
     name = "test_lib",
diff --git a/packages/common/test/BUILD.bazel b/packages/common/test/BUILD.bazel
index 050ff558e7..4a0bd15c85 100644
--- a/packages/common/test/BUILD.bazel
+++ b/packages/common/test/BUILD.bazel
@@ -1,4 +1,17 @@
 load("//tools:defaults.bzl", "jasmine_node_test", "karma_web_test_suite", "ts_library")
+load("//tools/circular_dependency_test:index.bzl", "circular_dependency_test")
+
+circular_dependency_test(
+    name = "circular_deps_test",
+    entry_point = "angular/packages/common/index.js",
+    deps = ["//packages/common"],
+)
+
+circular_dependency_test(
+    name = "testing_circular_deps_test",
+    entry_point = "angular/packages/common/testing/index.js",
+    deps = ["//packages/common/testing"],
+)
 
 ts_library(
     name = "test_lib",
diff --git a/packages/common/upgrade/test/BUILD.bazel b/packages/common/upgrade/test/BUILD.bazel
index 48d0de53d1..64a6a6cd67 100644
--- a/packages/common/upgrade/test/BUILD.bazel
+++ b/packages/common/upgrade/test/BUILD.bazel
@@ -1,4 +1,11 @@
 load("//tools:defaults.bzl", "jasmine_node_test", "ts_library")
+load("//tools/circular_dependency_test:index.bzl", "circular_dependency_test")
+
+circular_dependency_test(
+    name = "circular_deps_test",
+    entry_point = "angular/packages/common/upgrade/index.js",
+    deps = ["//packages/common/upgrade"],
+)
 
 ts_library(
     name = "test_lib",
diff --git a/packages/compiler/test/BUILD.bazel b/packages/compiler/test/BUILD.bazel
index 1310243b86..ac43c2b336 100644
--- a/packages/compiler/test/BUILD.bazel
+++ b/packages/compiler/test/BUILD.bazel
@@ -1,4 +1,5 @@
 load("//tools:defaults.bzl", "jasmine_node_test", "karma_web_test_suite", "ts_library")
+load("//tools/circular_dependency_test:index.bzl", "circular_dependency_test")
 
 # Test that should only be run in node
 NODE_ONLY = [
@@ -10,6 +11,12 @@ UTILS = [
     "aot/test_util.ts",
 ]
 
+circular_dependency_test(
+    name = "circular_deps_test",
+    entry_point = "angular/packages/compiler/index.js",
+    deps = ["//packages/compiler"],
+)
+
 ts_library(
     name = "test_utils",
     testonly = True,
diff --git a/packages/core/test/BUILD.bazel b/packages/core/test/BUILD.bazel
index ba26a009e5..d5fc991815 100644
--- a/packages/core/test/BUILD.bazel
+++ b/packages/core/test/BUILD.bazel
@@ -1,7 +1,20 @@
 load("//tools:defaults.bzl", "jasmine_node_test", "karma_web_test_suite", "ts_library")
+load("//tools/circular_dependency_test:index.bzl", "circular_dependency_test")
 
 package(default_visibility = ["//visibility:public"])
 
+circular_dependency_test(
+    name = "circular_deps_test",
+    entry_point = "angular/packages/core/index.js",
+    deps = ["//packages/core"],
+)
+
+circular_dependency_test(
+    name = "testing_circular_deps_test",
+    entry_point = "angular/packages/core/testing/index.js",
+    deps = ["//packages/core/testing"],
+)
+
 ts_library(
     name = "test_lib",
     testonly = True,
diff --git a/packages/elements/test/BUILD.bazel b/packages/elements/test/BUILD.bazel
index f7a77e8857..7261036483 100644
--- a/packages/elements/test/BUILD.bazel
+++ b/packages/elements/test/BUILD.bazel
@@ -1,4 +1,11 @@
 load("//tools:defaults.bzl", "karma_web_test_suite", "ts_library")
+load("//tools/circular_dependency_test:index.bzl", "circular_dependency_test")
+
+circular_dependency_test(
+    name = "circular_deps_test",
+    entry_point = "angular/packages/elements/index.js",
+    deps = ["//packages/elements"],
+)
 
 ts_library(
     name = "test_lib",
diff --git a/packages/forms/test/BUILD.bazel b/packages/forms/test/BUILD.bazel
index 78ee356406..f9a3325516 100644
--- a/packages/forms/test/BUILD.bazel
+++ b/packages/forms/test/BUILD.bazel
@@ -1,4 +1,11 @@
 load("//tools:defaults.bzl", "jasmine_node_test", "karma_web_test_suite", "ts_library")
+load("//tools/circular_dependency_test:index.bzl", "circular_dependency_test")
+
+circular_dependency_test(
+    name = "circular_deps_test",
+    entry_point = "angular/packages/forms/index.js",
+    deps = ["//packages/forms"],
+)
 
 ts_library(
     name = "test_lib",
diff --git a/packages/language-service/test/BUILD.bazel b/packages/language-service/test/BUILD.bazel
index f23e62bf27..00ccbd3407 100644
--- a/packages/language-service/test/BUILD.bazel
+++ b/packages/language-service/test/BUILD.bazel
@@ -1,4 +1,11 @@
 load("//tools:defaults.bzl", "jasmine_node_test", "ts_library")
+load("//tools/circular_dependency_test:index.bzl", "circular_dependency_test")
+
+circular_dependency_test(
+    name = "circular_deps_test",
+    entry_point = "angular/packages/language-service/index.js",
+    deps = ["//packages/language-service"],
+)
 
 ts_library(
     name = "test_lib",
diff --git a/packages/localize/test/BUILD.bazel b/packages/localize/test/BUILD.bazel
index 6b1b5f437d..70622deefd 100644
--- a/packages/localize/test/BUILD.bazel
+++ b/packages/localize/test/BUILD.bazel
@@ -1,4 +1,11 @@
 load("//tools:defaults.bzl", "jasmine_node_test", "ts_library")
+load("//tools/circular_dependency_test:index.bzl", "circular_dependency_test")
+
+circular_dependency_test(
+    name = "circular_deps_test",
+    entry_point = "angular/packages/localize/index.js",
+    deps = ["//packages/localize"],
+)
 
 ts_library(
     name = "test_lib",
diff --git a/packages/platform-browser-dynamic/test/BUILD.bazel b/packages/platform-browser-dynamic/test/BUILD.bazel
index 32868366f6..c798c052e7 100644
--- a/packages/platform-browser-dynamic/test/BUILD.bazel
+++ b/packages/platform-browser-dynamic/test/BUILD.bazel
@@ -1,4 +1,11 @@
 load("//tools:defaults.bzl", "jasmine_node_test", "karma_web_test_suite", "ts_library")
+load("//tools/circular_dependency_test:index.bzl", "circular_dependency_test")
+
+circular_dependency_test(
+    name = "circular_deps_test",
+    entry_point = "angular/packages/platform-browser-dynamic/index.js",
+    deps = ["//packages/platform-browser-dynamic"],
+)
 
 ts_library(
     name = "test_lib",
diff --git a/packages/platform-browser/animations/test/BUILD.bazel b/packages/platform-browser/animations/test/BUILD.bazel
index 2c1e3eee74..f14e31e55a 100644
--- a/packages/platform-browser/animations/test/BUILD.bazel
+++ b/packages/platform-browser/animations/test/BUILD.bazel
@@ -1,4 +1,11 @@
 load("//tools:defaults.bzl", "jasmine_node_test", "karma_web_test_suite", "ts_library")
+load("//tools/circular_dependency_test:index.bzl", "circular_dependency_test")
+
+circular_dependency_test(
+    name = "circular_deps_test",
+    entry_point = "angular/packages/platform-browser/animations/index.js",
+    deps = ["//packages/platform-browser/animations"],
+)
 
 ts_library(
     name = "test_lib",
diff --git a/packages/platform-browser/test/BUILD.bazel b/packages/platform-browser/test/BUILD.bazel
index cc0013e90b..901e3f6c94 100644
--- a/packages/platform-browser/test/BUILD.bazel
+++ b/packages/platform-browser/test/BUILD.bazel
@@ -1,10 +1,23 @@
 load("//tools:defaults.bzl", "jasmine_node_test", "karma_web_test_suite", "ts_library")
+load("//tools/circular_dependency_test:index.bzl", "circular_dependency_test")
 
 exports_files([
     "browser/static_assets/200.html",
     "static_assets/test.html",
 ])
 
+circular_dependency_test(
+    name = "circular_deps_test",
+    entry_point = "angular/packages/platform-browser/index.js",
+    deps = ["//packages/platform-browser"],
+)
+
+circular_dependency_test(
+    name = "testing_circular_deps_test",
+    entry_point = "angular/packages/platform-browser/testing/index.js",
+    deps = ["//packages/platform-browser/testing"],
+)
+
 ts_library(
     name = "test_lib",
     testonly = True,
diff --git a/packages/platform-server/test/BUILD.bazel b/packages/platform-server/test/BUILD.bazel
index 8c6469cace..b51853d191 100644
--- a/packages/platform-server/test/BUILD.bazel
+++ b/packages/platform-server/test/BUILD.bazel
@@ -1,4 +1,17 @@
 load("//tools:defaults.bzl", "jasmine_node_test", "ts_library")
+load("//tools/circular_dependency_test:index.bzl", "circular_dependency_test")
+
+circular_dependency_test(
+    name = "circular_deps_test",
+    entry_point = "angular/packages/platform-server/index.js",
+    deps = ["//packages/platform-server"],
+)
+
+circular_dependency_test(
+    name = "testing_circular_deps_test",
+    entry_point = "angular/packages/platform-server/testing/index.js",
+    deps = ["//packages/platform-server/testing"],
+)
 
 ts_library(
     name = "test_lib",
diff --git a/packages/router/test/BUILD.bazel b/packages/router/test/BUILD.bazel
index 9a26fa7611..bbadc0ccba 100644
--- a/packages/router/test/BUILD.bazel
+++ b/packages/router/test/BUILD.bazel
@@ -1,4 +1,17 @@
 load("//tools:defaults.bzl", "jasmine_node_test", "karma_web_test_suite", "ts_library")
+load("//tools/circular_dependency_test:index.bzl", "circular_dependency_test")
+
+circular_dependency_test(
+    name = "circular_deps_test",
+    entry_point = "angular/packages/router/index.js",
+    deps = ["//packages/router"],
+)
+
+circular_dependency_test(
+    name = "testing_circular_deps_test",
+    entry_point = "angular/packages/router/testing/index.js",
+    deps = ["//packages/router/testing"],
+)
 
 ts_library(
     name = "test_lib",
diff --git a/packages/router/upgrade/test/BUILD.bazel b/packages/router/upgrade/test/BUILD.bazel
index 56154ab969..f6ccbd1045 100644
--- a/packages/router/upgrade/test/BUILD.bazel
+++ b/packages/router/upgrade/test/BUILD.bazel
@@ -1,4 +1,11 @@
 load("//tools:defaults.bzl", "karma_web_test_suite", "ts_library")
+load("//tools/circular_dependency_test:index.bzl", "circular_dependency_test")
+
+circular_dependency_test(
+    name = "circular_deps_test",
+    entry_point = "angular/packages/router/upgrade/index.js",
+    deps = ["//packages/router/upgrade"],
+)
 
 ts_library(
     name = "test_lib",
diff --git a/packages/service-worker/config/test/BUILD.bazel b/packages/service-worker/config/test/BUILD.bazel
index 7733992778..6d0a35c3a8 100644
--- a/packages/service-worker/config/test/BUILD.bazel
+++ b/packages/service-worker/config/test/BUILD.bazel
@@ -1,4 +1,11 @@
 load("//tools:defaults.bzl", "jasmine_node_test", "ts_library")
+load("//tools/circular_dependency_test:index.bzl", "circular_dependency_test")
+
+circular_dependency_test(
+    name = "circular_deps_test",
+    entry_point = "angular/packages/service-worker/config/index.js",
+    deps = ["//packages/service-worker/config"],
+)
 
 ts_library(
     name = "test_lib",
diff --git a/packages/service-worker/test/BUILD.bazel b/packages/service-worker/test/BUILD.bazel
index 4786be9ee6..16956f533a 100644
--- a/packages/service-worker/test/BUILD.bazel
+++ b/packages/service-worker/test/BUILD.bazel
@@ -1,4 +1,11 @@
 load("//tools:defaults.bzl", "jasmine_node_test", "karma_web_test_suite", "ts_library")
+load("//tools/circular_dependency_test:index.bzl", "circular_dependency_test")
+
+circular_dependency_test(
+    name = "circular_deps_test",
+    entry_point = "angular/packages/service-worker/index.js",
+    deps = ["//packages/service-worker"],
+)
 
 ts_library(
     name = "test_lib",
diff --git a/packages/service-worker/worker/test/BUILD.bazel b/packages/service-worker/worker/test/BUILD.bazel
index 5cbb07b681..4ef4b2b910 100644
--- a/packages/service-worker/worker/test/BUILD.bazel
+++ b/packages/service-worker/worker/test/BUILD.bazel
@@ -1,4 +1,11 @@
 load("//tools:defaults.bzl", "jasmine_node_test", "ts_library")
+load("//tools/circular_dependency_test:index.bzl", "circular_dependency_test")
+
+circular_dependency_test(
+    name = "circular_deps_test",
+    entry_point = "angular/packages/service-worker/worker/main.js",
+    deps = ["//packages/service-worker/worker:main"],
+)
 
 ts_library(
     name = "test_lib",
diff --git a/packages/upgrade/src/common/test/BUILD.bazel b/packages/upgrade/src/common/test/BUILD.bazel
index dc8abe07b8..97506c93d2 100644
--- a/packages/upgrade/src/common/test/BUILD.bazel
+++ b/packages/upgrade/src/common/test/BUILD.bazel
@@ -1,4 +1,11 @@
 load("//tools:defaults.bzl", "karma_web_test_suite", "ts_library")
+load("//tools/circular_dependency_test:index.bzl", "circular_dependency_test")
+
+circular_dependency_test(
+    name = "circular_deps_test",
+    entry_point = "angular/packages/upgrade/index.js",
+    deps = ["//packages/upgrade"],
+)
 
 ts_library(
     name = "test_lib",
diff --git a/packages/upgrade/static/test/BUILD.bazel b/packages/upgrade/static/test/BUILD.bazel
index 5c1a710315..a1efce37db 100644
--- a/packages/upgrade/static/test/BUILD.bazel
+++ b/packages/upgrade/static/test/BUILD.bazel
@@ -1,4 +1,11 @@
 load("//tools:defaults.bzl", "karma_web_test_suite", "ts_library")
+load("//tools/circular_dependency_test:index.bzl", "circular_dependency_test")
+
+circular_dependency_test(
+    name = "circular_deps_test",
+    entry_point = "angular/packages/upgrade/static/index.js",
+    deps = ["//packages/upgrade/static"],
+)
 
 ts_library(
     name = "test_lib",
diff --git a/packages/upgrade/static/testing/test/BUILD.bazel b/packages/upgrade/static/testing/test/BUILD.bazel
index 554d922c89..8a9c4f3ba6 100644
--- a/packages/upgrade/static/testing/test/BUILD.bazel
+++ b/packages/upgrade/static/testing/test/BUILD.bazel
@@ -1,6 +1,13 @@
 package(default_visibility = ["//visibility:public"])
 
 load("//tools:defaults.bzl", "karma_web_test_suite", "ts_library")
+load("//tools/circular_dependency_test:index.bzl", "circular_dependency_test")
+
+circular_dependency_test(
+    name = "circular_deps_test",
+    entry_point = "angular/packages/upgrade/static/testing/index.js",
+    deps = ["//packages/upgrade/static/testing"],
+)
 
 ts_library(
     name = "test_lib",