diff --git a/tools/gulp-tasks/public-api.js b/tools/gulp-tasks/public-api.js
index de39638da4..68520276cc 100644
--- a/tools/gulp-tasks/public-api.js
+++ b/tools/gulp-tasks/public-api.js
@@ -7,20 +7,15 @@
  */
 
 // NOTE: This list shold be in sync with aio/tools/transforms/angular-api-package/index.js
+// NOTE: Some packages have moved to Bazel; these are tested in tools/public_api_guard/BUILD.bazel
 const entrypoints = [
   'dist/packages-dist/animations/animations.d.ts',
   'dist/packages-dist/animations/browser.d.ts',
   'dist/packages-dist/animations/browser/testing.d.ts',
-  'dist/packages-dist/common/common.d.ts',
-  'dist/packages-dist/common/testing.d.ts',
-  'dist/packages-dist/common/http.d.ts',
-  'dist/packages-dist/common/http/testing.d.ts',
   // The API surface of the compiler is currently unstable - all of the important APIs are exposed
   // via @angular/core, @angular/platform-browser or @angular/platform-browser-dynamic instead.
   //'dist/packages-dist/compiler/index.d.ts',
   //'dist/packages-dist/compiler/testing.d.ts',
-  'dist/packages-dist/core/core.d.ts',
-  'dist/packages-dist/core/testing.d.ts',
   'dist/packages-dist/forms/forms.d.ts',
   'dist/packages-dist/http/http.d.ts',
   'dist/packages-dist/http/testing.d.ts',
@@ -33,9 +28,6 @@ const entrypoints = [
   'dist/packages-dist/platform-webworker-dynamic/platform-webworker-dynamic.d.ts',
   'dist/packages-dist/platform-server/platform-server.d.ts',
   'dist/packages-dist/platform-server/testing.d.ts',
-  'dist/packages-dist/router/router.d.ts',
-  'dist/packages-dist/router/testing.d.ts',
-  'dist/packages-dist/router/upgrade.d.ts',
   'dist/packages-dist/service-worker/service-worker.d.ts',
   'dist/packages-dist/service-worker/config.d.ts',
   'dist/packages-dist/upgrade/upgrade.d.ts',
diff --git a/tools/public_api_guard/BUILD.bazel b/tools/public_api_guard/BUILD.bazel
index 1e111c4226..22a1f74f90 100644
--- a/tools/public_api_guard/BUILD.bazel
+++ b/tools/public_api_guard/BUILD.bazel
@@ -2,25 +2,61 @@ load("//tools/ts-api-guardian:index.bzl", "ts_api_guardian_test")
 
 [
     ts_api_guardian_test(
-        name = "%s_api" % i.replace("/", "_"),
+        name = "%s_%s_api" % (
+            bundle[0],
+            bundle[1].replace("/", "_"),
+        ),
         actual = "packages/%s/npm_package/%s.d.ts" % (
-            i.split("/")[0],
-            "/".join(i.split("/")[1:]),
+            bundle[0],
+            bundle[1],
         ),
         data = glob([
-            "%s/**/*.d.ts" % i.split("/")[0],
+            "%s/**/*.d.ts" % bundle[0],
         ]) + [
-            "//packages/%s:npm_package" % i.split("/")[0],
+            "//packages/%s:npm_package" % bundle[0],
         ],
-        golden = "tools/public_api_guard/%s.d.ts" % i,
+        golden = "tools/public_api_guard/%s/%s.d.ts" % (
+            bundle[0],
+            bundle[1],
+        ),
     )
-    for i in [
-        "core/core",
-        "core/testing",
-        "common/http/testing",
-        "common/common",
-        "common/http",
-        "common/testing",
+    for bundle in [
+        [
+            "core",
+            "core",
+        ],
+        [
+            "core",
+            "testing",
+        ],
+        [
+            "common",
+            "http/testing",
+        ],
+        [
+            "common",
+            "common",
+        ],
+        [
+            "common",
+            "http",
+        ],
+        [
+            "common",
+            "testing",
+        ],
+        [
+            "router",
+            "router",
+        ],
+        [
+            "router",
+            "testing",
+        ],
+        [
+            "router",
+            "upgrade",
+        ],
         # TODO(alexeagle): add remaining packages here once they have ng_package's
     ]
 ]