diff --git a/goldens/public-api/angular_devkit/schematics/tools/index.api.md b/goldens/public-api/angular_devkit/schematics/tools/index.api.md
index d53e3fe77640..932a02991bbb 100644
--- a/goldens/public-api/angular_devkit/schematics/tools/index.api.md
+++ b/goldens/public-api/angular_devkit/schematics/tools/index.api.md
@@ -12,9 +12,9 @@ import { Observable } from 'rxjs';
 import { Path } from '@angular-devkit/core';
 import { PathFragment } from '@angular-devkit/core';
 import { schema } from '@angular-devkit/core';
+import { Subject } from 'rxjs';
 import { Url } from 'url';
 import { virtualFs } from '@angular-devkit/core';
-import { workflow } from '@angular-devkit/schematics';
 
 // @public (undocumented)
 export class CollectionCannotBeResolvedException extends BaseException {
diff --git a/packages/angular_devkit/schematics/BUILD.bazel b/packages/angular_devkit/schematics/BUILD.bazel
index 077ac07bfdaf..a0cf541ebd42 100644
--- a/packages/angular_devkit/schematics/BUILD.bazel
+++ b/packages/angular_devkit/schematics/BUILD.bazel
@@ -1,6 +1,6 @@
 load("@npm//@angular/build-tooling/bazel/api-golden:index.bzl", "api_golden_test_npm_package")
-load("@npm//@bazel/jasmine:index.bzl", "jasmine_node_test")
-load("//tools:defaults2.bzl", "npm_package", "ts_project")
+load("@npm2//:defs.bzl", "npm_link_all_packages")
+load("//tools:defaults2.bzl", "jasmine_test", "npm_package", "ts_project")
 
 # Copyright Google Inc. All Rights Reserved.
 #
@@ -10,6 +10,8 @@ package(default_visibility = ["//visibility:public"])
 
 licenses(["notice"])
 
+npm_link_all_packages()
+
 # @angular-devkit/schematics
 
 ts_project(
@@ -25,12 +27,11 @@ ts_project(
     ],
     module_name = "@angular-devkit/schematics",
     deps = [
+        ":node_modules/@angular-devkit/core",
         "//:node_modules/@types/node",
         "//:node_modules/jsonc-parser",
         "//:node_modules/magic-string",
         "//:node_modules/rxjs",
-        "//packages/angular_devkit/core:core_rjs",
-        "//packages/angular_devkit/core/node:node_rjs",  # TODO: get rid of this for 6.0
     ],
 )
 
@@ -39,18 +40,17 @@ ts_project(
     testonly = True,
     srcs = glob(["src/**/*_spec.ts"]),
     deps = [
+        ":node_modules/@angular-devkit/core",
         ":schematics",
         "//:node_modules/@types/jasmine",
         "//:node_modules/rxjs",
-        "//packages/angular_devkit/core:core_rjs",
-        "//packages/angular_devkit/core/node:node_rjs",
         "//packages/angular_devkit/schematics/testing:testing_rjs",
     ],
 )
 
-jasmine_node_test(
+jasmine_test(
     name = "schematics_test",
-    deps = [":schematics_test_lib"],
+    data = [":schematics_test_lib_rjs"],
 )
 
 genrule(
diff --git a/packages/angular_devkit/schematics/src/rules/base_spec.ts b/packages/angular_devkit/schematics/src/rules/base_spec.ts
index 9414174b0113..09963fd48b1f 100644
--- a/packages/angular_devkit/schematics/src/rules/base_spec.ts
+++ b/packages/angular_devkit/schematics/src/rules/base_spec.ts
@@ -8,12 +8,12 @@
 
 /* eslint-disable @typescript-eslint/no-non-null-assertion */
 import { Path, virtualFs } from '@angular-devkit/core';
-import { HostTree, MergeStrategy, partitionApplyMerge } from '@angular-devkit/schematics';
 import { lastValueFrom, of as observableOf } from 'rxjs';
 import { Rule, SchematicContext, Source } from '../engine/interface';
-import { Tree } from '../tree/interface';
+import { HostTree } from '../tree/host-tree';
+import { MergeStrategy, Tree } from '../tree/interface';
 import { empty } from '../tree/static';
-import { apply, applyToSubtree, chain } from './base';
+import { apply, applyToSubtree, chain, partitionApplyMerge } from './base';
 import { callRule, callSource } from './call';
 import { move } from './move';
 
diff --git a/packages/angular_devkit/schematics/src/rules/call_spec.ts b/packages/angular_devkit/schematics/src/rules/call_spec.ts
index e8a0755ab485..ef71747fb2df 100644
--- a/packages/angular_devkit/schematics/src/rules/call_spec.ts
+++ b/packages/angular_devkit/schematics/src/rules/call_spec.ts
@@ -8,10 +8,9 @@
 
 /* eslint-disable @typescript-eslint/no-non-null-assertion */
 /* eslint-disable @typescript-eslint/no-explicit-any */
-import { MergeStrategy } from '@angular-devkit/schematics';
 import { of as observableOf } from 'rxjs';
 import { Rule, SchematicContext, Source } from '../engine/interface';
-import { Tree } from '../tree/interface';
+import { MergeStrategy, Tree } from '../tree/interface';
 import { empty } from '../tree/static';
 import {
   InvalidRuleResultException,
diff --git a/packages/angular_devkit/schematics/src/rules/template_spec.ts b/packages/angular_devkit/schematics/src/rules/template_spec.ts
index 377068d15c32..076550e6f043 100644
--- a/packages/angular_devkit/schematics/src/rules/template_spec.ts
+++ b/packages/angular_devkit/schematics/src/rules/template_spec.ts
@@ -8,8 +8,8 @@
 
 /* eslint-disable import/no-extraneous-dependencies */
 import { normalize } from '@angular-devkit/core';
-import { UnitTestTree } from '@angular-devkit/schematics/testing';
 import { of as observableOf } from 'rxjs';
+import { UnitTestTree } from '../../testing';
 import { SchematicContext } from '../engine/interface';
 import { HostTree } from '../tree/host-tree';
 import { FileEntry, MergeStrategy } from '../tree/interface';
diff --git a/packages/angular_devkit/schematics/src/sink/host_spec.ts b/packages/angular_devkit/schematics/src/sink/host_spec.ts
index 9d4965e5a834..9a89b82af91d 100644
--- a/packages/angular_devkit/schematics/src/sink/host_spec.ts
+++ b/packages/angular_devkit/schematics/src/sink/host_spec.ts
@@ -7,8 +7,8 @@
  */
 
 import { normalize, virtualFs } from '@angular-devkit/core';
-import { HostSink } from '@angular-devkit/schematics';
 import { HostCreateTree, HostTree } from '../tree/host-tree';
+import { HostSink } from './host';
 
 describe('FileSystemSink', () => {
   it('works', (done) => {
diff --git a/packages/angular_devkit/schematics/tools/file-system-utility.ts b/packages/angular_devkit/schematics/tools/file-system-utility.ts
index ea51d9fced96..467ef722bcbf 100644
--- a/packages/angular_devkit/schematics/tools/file-system-utility.ts
+++ b/packages/angular_devkit/schematics/tools/file-system-utility.ts
@@ -7,9 +7,9 @@
  */
 
 import { JsonValue } from '@angular-devkit/core';
-import { FileDoesNotExistException } from '@angular-devkit/schematics';
 import { readFileSync } from 'fs';
 import { ParseError, parse, printParseErrorCode } from 'jsonc-parser';
+import { FileDoesNotExistException } from '../src/exception/exception';
 
 export function readJsonFile(path: string): JsonValue {
   let data;
diff --git a/packages/angular_devkit/schematics/tools/workflow/node-workflow.ts b/packages/angular_devkit/schematics/tools/workflow/node-workflow.ts
index b976477f1bb4..c8bf5fee5354 100644
--- a/packages/angular_devkit/schematics/tools/workflow/node-workflow.ts
+++ b/packages/angular_devkit/schematics/tools/workflow/node-workflow.ts
@@ -8,7 +8,7 @@
 
 import { Path, getSystemPath, normalize, schema, virtualFs } from '@angular-devkit/core';
 import { NodeJsSyncHost } from '@angular-devkit/core/node';
-import { workflow } from '@angular-devkit/schematics';
+import { workflow } from '../../src';
 import { BuiltinTaskExecutor } from '../../tasks/node';
 import { FileSystemEngine } from '../description';
 import { OptionTransform } from '../file-system-engine-host-base';