diff --git a/BUILD.bazel b/BUILD.bazel
index 3cfdc28c6d..bea8d6fcf0 100644
--- a/BUILD.bazel
+++ b/BUILD.bazel
@@ -2,8 +2,6 @@ package(default_visibility = ["//visibility:public"])
 
 exports_files([
     "tsconfig.json",
-    "node_modules/angular/angular.js",
-    "node_modules/angular-mocks/angular-mocks.js",
 ])
 
 # This rule belongs in node_modules/BUILD
@@ -44,7 +42,7 @@ filegroup(
 )
 
 filegroup(
-    name = "angular_bootstrap_scripts",
+    name = "web_test_bootstrap_scripts",
     # do not sort
     srcs = [
         "//:node_modules/reflect-metadata/Reflect.js",
@@ -56,3 +54,12 @@ filegroup(
         "//:node_modules/zone.js/dist/jasmine-patch.js",
     ],
 )
+
+filegroup(
+    name = "angularjs",
+    # do not sort
+    srcs = [
+        "//:node_modules/angular/angular.js",
+        "//:node_modules/angular-mocks/angular-mocks.js",
+    ],
+)
diff --git a/packages/common/test/BUILD.bazel b/packages/common/test/BUILD.bazel
index 7d634254aa..8022ddd33e 100644
--- a/packages/common/test/BUILD.bazel
+++ b/packages/common/test/BUILD.bazel
@@ -23,21 +23,21 @@ ts_library(
 
 jasmine_node_test(
     name = "test",
-    bootstrap = ["angular_src/packages/_testing_init/init_node_spec.js"],
+    bootstrap = ["angular_src/tools/testing/init_node_spec.js"],
     deps = [
         ":test_lib",
-        "//packages/_testing_init:node",
+        "//tools/testing:node",
     ],
 )
 
 ts_web_test(
     name = "test_web",
     bootstrap = [
-        "//:angular_bootstrap_scripts",
+        "//:web_test_bootstrap_scripts",
     ],
     # do not sort
     deps = [
-        "//packages/_testing_init:browser",
+        "//tools/testing:browser",
         ":test_lib",
     ],
 )
diff --git a/packages/compiler/test/BUILD.bazel b/packages/compiler/test/BUILD.bazel
index 300f184cfa..b74e1d0fe9 100644
--- a/packages/compiler/test/BUILD.bazel
+++ b/packages/compiler/test/BUILD.bazel
@@ -37,27 +37,27 @@ ts_library(
 
 jasmine_node_test(
     name = "test",
-    bootstrap = ["angular_src/packages/_testing_init/init_node_spec.js"],
+    bootstrap = ["angular_src/tools/testing/init_node_spec.js"],
     # dissable since tests are running but not yet passing
     tags = ["manual"],
     deps = [
         ":test_lib",
         ":test_node_only_lib",
-        "//packages/_testing_init:node",
         "//packages/core",
+        "//tools/testing:node",
     ],
 )
 
 ts_web_test(
     name = "test_web",
     bootstrap = [
-        "//:angular_bootstrap_scripts",
+        "//:web_test_bootstrap_scripts",
     ],
     # dissable since tests are running but not yet passing
     tags = ["manual"],
     # do not sort
     deps = [
-        "//packages/_testing_init:browser",
+        "//tools/testing:browser",
         ":test_lib",
     ],
 )
diff --git a/packages/core/test/BUILD.bazel b/packages/core/test/BUILD.bazel
index 9ca36e14f8..3c6557e073 100644
--- a/packages/core/test/BUILD.bazel
+++ b/packages/core/test/BUILD.bazel
@@ -51,24 +51,24 @@ ts_library(
 
 jasmine_node_test(
     name = "test",
-    bootstrap = ["angular_src/packages/_testing_init/init_node_spec.js"],
+    bootstrap = ["angular_src/tools/testing/init_node_spec.js"],
     deps = [
         ":test_lib",
         ":test_node_only_lib",
-        "//packages/_testing_init:node",
         "//packages/platform-server",
         "//packages/platform-server/testing",
+        "//tools/testing:node",
     ],
 )
 
 ts_web_test(
     name = "test_web",
     bootstrap = [
-        "//:angular_bootstrap_scripts",
+        "//:web_test_bootstrap_scripts",
     ],
     # do not sort
     deps = [
-        "//packages/_testing_init:browser",
+        "//tools/testing:browser",
         ":test_lib",
     ],
 )
diff --git a/packages/forms/test/BUILD.bazel b/packages/forms/test/BUILD.bazel
index ef3cb90ec8..1f39b47911 100644
--- a/packages/forms/test/BUILD.bazel
+++ b/packages/forms/test/BUILD.bazel
@@ -18,21 +18,23 @@ ts_library(
 
 jasmine_node_test(
     name = "test",
-    bootstrap = ["angular_src/packages/_testing_init/init_node_spec.js"],
+    bootstrap = ["angular_src/tools/testing/init_node_spec.js"],
     deps = [
         ":test_lib",
-        "//packages/_testing_init:node",
+        "//tools/testing:node",
     ],
 )
 
 ts_web_test(
     name = "test_web",
     bootstrap = [
-        "//:angular_bootstrap_scripts",
+        "//:web_test_bootstrap_scripts",
     ],
+    # "exclusive" - a work around for circle CI to prevent too many concurrent tests. :-()
+    tags = ["exclusive"],
     # do not sort
     deps = [
-        "//packages/_testing_init:browser",
+        "//tools/testing:browser",
         ":test_lib",
     ],
 )
diff --git a/packages/http/test/BUILD.bazel b/packages/http/test/BUILD.bazel
index 56ffd0730f..27364cf715 100644
--- a/packages/http/test/BUILD.bazel
+++ b/packages/http/test/BUILD.bazel
@@ -19,21 +19,23 @@ ts_library(
 
 jasmine_node_test(
     name = "test",
-    bootstrap = ["angular_src/packages/_testing_init/init_node_spec.js"],
+    bootstrap = ["angular_src/tools/testing/init_node_spec.js"],
     deps = [
         ":test_lib",
-        "//packages/_testing_init:node",
+        "//tools/testing:node",
     ],
 )
 
 ts_web_test(
     name = "test_web",
     bootstrap = [
-        "//:angular_bootstrap_scripts",
+        "//:web_test_bootstrap_scripts",
     ],
+    # "exclusive" - a work around for circle CI to prevent too many concurrent tests. :-()
+    tags = ["exclusive"],
     # do not sort
     deps = [
-        "//packages/_testing_init:browser",
+        "//tools/testing:browser",
         ":test_lib",
     ],
 )
diff --git a/packages/language-service/test/BUILD.bazel b/packages/language-service/test/BUILD.bazel
index d165805049..8bf96dbe20 100644
--- a/packages/language-service/test/BUILD.bazel
+++ b/packages/language-service/test/BUILD.bazel
@@ -15,11 +15,11 @@ ts_library(
 
 jasmine_node_test(
     name = "test",
-    bootstrap = ["angular_src/packages/_testing_init/init_node_spec.js"],
+    bootstrap = ["angular_src/tools/testing/init_node_spec.js"],
     # dissable since tests are running but not yet passing
     tags = ["manual"],
     deps = [
         ":test_lib",
-        "//packages/_testing_init:node",
+        "//tools/testing:node",
     ],
 )
diff --git a/packages/platform-browser-dynamic/test/BUILD.bazel b/packages/platform-browser-dynamic/test/BUILD.bazel
index cb2aef562f..09c3a0e595 100644
--- a/packages/platform-browser-dynamic/test/BUILD.bazel
+++ b/packages/platform-browser-dynamic/test/BUILD.bazel
@@ -19,25 +19,25 @@ ts_library(
 
 jasmine_node_test(
     name = "test",
-    bootstrap = ["angular_src/packages/_testing_init/init_node_spec.js"],
+    bootstrap = ["angular_src/tools/testing/init_node_spec.js"],
     # dissable since tests are running but not yet passing
     tags = ["manual"],
     deps = [
         ":test_lib",
-        "//packages/_testing_init:node",
+        "//tools/testing:node",
     ],
 )
 
 ts_web_test(
     name = "test_web",
     bootstrap = [
-        "//:angular_bootstrap_scripts",
+        "//:web_test_bootstrap_scripts",
     ],
     # dissable since tests are running but not yet passing
     tags = ["manual"],
     # do not sort
     deps = [
-        "//packages/_testing_init:browser",
+        "//tools/testing:browser",
         ":test_lib",
     ],
 )
diff --git a/packages/platform-browser/test/BUILD.bazel b/packages/platform-browser/test/BUILD.bazel
index bb58950daf..8a102941cd 100644
--- a/packages/platform-browser/test/BUILD.bazel
+++ b/packages/platform-browser/test/BUILD.bazel
@@ -25,25 +25,25 @@ ts_library(
 
 jasmine_node_test(
     name = "test",
-    bootstrap = ["angular_src/packages/_testing_init/init_node_spec.js"],
+    bootstrap = ["angular_src/tools/testing/init_node_spec.js"],
     # dissable since tests are running but not yet passing
     tags = ["manual"],
     deps = [
         ":test_lib",
-        "//packages/_testing_init:node",
+        "//tools/testing:node",
     ],
 )
 
 ts_web_test(
     name = "test_web",
     bootstrap = [
-        "//:angular_bootstrap_scripts",
+        "//:web_test_bootstrap_scripts",
     ],
     # dissable since tests are running but not yet passing
     tags = ["manual"],
     # do not sort
     deps = [
-        "//packages/_testing_init:browser",
+        "//tools/testing:browser",
         ":test_lib",
     ],
 )
diff --git a/packages/platform-server/test/BUILD.bazel b/packages/platform-server/test/BUILD.bazel
index de549a4b07..5fbdf6f688 100644
--- a/packages/platform-server/test/BUILD.bazel
+++ b/packages/platform-server/test/BUILD.bazel
@@ -25,9 +25,9 @@ ts_library(
 
 jasmine_node_test(
     name = "test",
-    bootstrap = ["angular_src/packages/_testing_init/init_node_spec.js"],
+    bootstrap = ["angular_src/tools/testing/init_node_spec.js"],
     deps = [
         ":test_lib",
-        "//packages/_testing_init:node",
+        "//tools/testing:node",
     ],
 )
diff --git a/packages/platform-webworker/test/BUILD.bazel b/packages/platform-webworker/test/BUILD.bazel
index 8b6bf8ea74..0da9f89b1e 100644
--- a/packages/platform-webworker/test/BUILD.bazel
+++ b/packages/platform-webworker/test/BUILD.bazel
@@ -21,21 +21,21 @@ ts_library(
 
 jasmine_node_test(
     name = "test",
-    bootstrap = ["angular_src/packages/_testing_init/init_node_spec.js"],
+    bootstrap = ["angular_src/tools/testing/init_node_spec.js"],
     deps = [
         ":test_lib",
-        "//packages/_testing_init:node",
+        "//tools/testing:node",
     ],
 )
 
 ts_web_test(
     name = "test_web",
     bootstrap = [
-        "//:angular_bootstrap_scripts",
+        "//:web_test_bootstrap_scripts",
     ],
     # do not sort
     deps = [
-        "//packages/_testing_init:browser",
+        "//tools/testing:browser",
         ":test_lib",
     ],
 )
diff --git a/packages/router/test/BUILD.bazel b/packages/router/test/BUILD.bazel
index cb83c37361..d7c98af84c 100644
--- a/packages/router/test/BUILD.bazel
+++ b/packages/router/test/BUILD.bazel
@@ -22,21 +22,21 @@ ts_library(
 
 jasmine_node_test(
     name = "test",
-    bootstrap = ["angular_src/packages/_testing_init/init_node_spec.js"],
+    bootstrap = ["angular_src/tools/testing/init_node_spec.js"],
     deps = [
         ":test_lib",
-        "//packages/_testing_init:node",
+        "//tools/testing:node",
     ],
 )
 
 ts_web_test(
     name = "test_web",
     bootstrap = [
-        "//:angular_bootstrap_scripts",
+        "//:web_test_bootstrap_scripts",
     ],
     # do not sort
     deps = [
-        "//packages/_testing_init:browser",
+        "//tools/testing:browser",
         ":test_lib",
     ],
 )
diff --git a/packages/service-worker/test/BUILD.bazel b/packages/service-worker/test/BUILD.bazel
index 636c8302a1..f9e00ecc67 100644
--- a/packages/service-worker/test/BUILD.bazel
+++ b/packages/service-worker/test/BUILD.bazel
@@ -20,21 +20,21 @@ ts_library(
 
 jasmine_node_test(
     name = "test",
-    bootstrap = ["angular_src/packages/_testing_init/init_node_spec.js"],
+    bootstrap = ["angular_src/tools/testing/init_node_spec.js"],
     deps = [
         ":test_lib",
-        "//packages/_testing_init:node",
+        "//tools/testing:node",
     ],
 )
 
 ts_web_test(
     name = "test_web",
     bootstrap = [
-        "//:angular_bootstrap_scripts",
+        "//:web_test_bootstrap_scripts",
     ],
     # do not sort
     deps = [
-        "//packages/_testing_init:browser",
+        "//tools/testing:browser",
         ":test_lib",
     ],
 )
diff --git a/packages/upgrade/test/BUILD.bazel b/packages/upgrade/test/BUILD.bazel
index 4005d5df2c..23e57c6c2f 100644
--- a/packages/upgrade/test/BUILD.bazel
+++ b/packages/upgrade/test/BUILD.bazel
@@ -22,13 +22,14 @@ ts_library(
 ts_web_test(
     name = "test_web",
     bootstrap = [
-        "//:angular_bootstrap_scripts",
-        "//:node_modules/angular/angular.js",
-        "//:node_modules/angular-mocks/angular-mocks.js",
+        "//:web_test_bootstrap_scripts",
+        "//:angularjs",
     ],
+    # "exclusive" - a work around for circle CI to prevent too many concurrent tests. :-()
+    tags = ["exclusive"],
     # do not sort
     deps = [
-        "//packages/_testing_init:browser",
+        "//tools/testing:browser",
         ":test_lib",
     ],
 )
diff --git a/packages/_testing_init/BUILD.bazel b/tools/testing/BUILD.bazel
similarity index 100%
rename from packages/_testing_init/BUILD.bazel
rename to tools/testing/BUILD.bazel
diff --git a/packages/_testing_init/init_browser_spec.ts b/tools/testing/init_browser_spec.ts
similarity index 100%
rename from packages/_testing_init/init_browser_spec.ts
rename to tools/testing/init_browser_spec.ts
diff --git a/packages/_testing_init/init_node_spec.ts b/tools/testing/init_node_spec.ts
similarity index 100%
rename from packages/_testing_init/init_node_spec.ts
rename to tools/testing/init_node_spec.ts