diff --git a/docs/DEVELOPER.md b/docs/DEVELOPER.md
index cedb78917f6..cf160778f56 100644
--- a/docs/DEVELOPER.md
+++ b/docs/DEVELOPER.md
@@ -78,10 +78,8 @@ Bazel is used as the primary tool for building and testing Angular. Building and
 incremental with Bazel, and it's possible to only run tests for an individual package instead
 of for all packages. Read more about this in the [BAZEL.md](./BAZEL.md) document.
 
-You should execute all test suites before submitting a PR to GitHub. Note that not all tests
-support both Ivy and View Engine, so they need to be run separately:
-- `yarn test-ivy-aot //packages/...`
-- `yarn test-non-ivy //packages/...`
+You should execute all test suites before submitting a PR to GitHub.
+- `yarn test //packages/...`
 
 **Note**: The first test run will be much slower than future runs. This is because future runs will
 benefit from Bazel's capability to do incremental builds.
diff --git a/package.json b/package.json
index 742e5bf1c99..d4631e2851e 100644
--- a/package.json
+++ b/package.json
@@ -24,11 +24,11 @@
     "/ ": "",
     "postinstall": "node scripts/webdriver-manager-update.js && node --preserve-symlinks --preserve-symlinks-main ./tools/postinstall-patches.js",
     "prepare": "husky install",
-    "test-ivy-aot": "bazelisk test --config=ivy --build_tag_filters=-no-ivy-aot,-fixme-ivy-aot --test_tag_filters=-no-ivy-aot,-fixme-ivy-aot",
-    "test-non-ivy": "bazelisk test --build_tag_filters=-ivy-only --test_tag_filters=-ivy-only",
+    "test": "bazelisk test --build_tag_filters=-no-ivy-aot --test_tag_filters=-no-ivy-aot",
+    "test-view-engine-only": "bazelisk test --config=view-engine --build_tag_filters=no-ivy-aot --test_tag_filters=no-ivy-aot",
+    "test-ivy-aot": "echo \\`test-ivy-aot\\` no longer valid, use \\`yarn test\\` instead",
+    "test-non-ivy": "echo \\`test-ivy-aot\\` no longer valid, use \\`yarn test-view-engine-only\\` instead",
     "test-tsec": "bazelisk test //... --build_tag_filters=tsec --test_tag_filters=tsec",
-    "test-fixme-ivy-aot": "bazelisk test --config=ivy --build_tag_filters=-no-ivy-aot --test_tag_filters=-no-ivy-aot",
-    "list-fixme-ivy-targets": "bazelisk query --output=label 'attr(\"tags\", \"\\[.*fixme-ivy.*\\]\", //...) except kind(\"sh_binary\", //...) except kind(\"devmode_js_sources\", //...)' | sort",
     "lint": "yarn -s tslint && yarn -s ng-dev format changed --check",
     "tslint": "tslint -c tslint.json --project tsconfig-tslint.json",
     "public-api:check": "node goldens/public-api/manage.js test",
diff --git a/packages/compiler-cli/test/compliance/README.md b/packages/compiler-cli/test/compliance/README.md
index 9c189528987..0e6205d648d 100644
--- a/packages/compiler-cli/test/compliance/README.md
+++ b/packages/compiler-cli/test/compliance/README.md
@@ -154,15 +154,15 @@ Note:
 The simplest way to run all the compliance tests is:
 
 ```sh
-yarn test-ivy-aot //packages/compiler-cli/test/compliance/...
+yarn test //packages/compiler-cli/test/compliance/...
 ```
 
 If you only want to run one of the three types of test you can be more specific:
 
 ```sh
-yarn test-ivy-aot //packages/compiler-cli/test/compliance/full
-yarn test-ivy-aot //packages/compiler-cli/test/compliance/linked
-yarn test-ivy-aot //packages/compiler-cli/test/compliance/test_cases/...
+yarn test //packages/compiler-cli/test/compliance/full
+yarn test //packages/compiler-cli/test/compliance/linked
+yarn test //packages/compiler-cli/test/compliance/test_cases/...
 ```
 
 (The last command runs the partial compilation tests.)
@@ -201,8 +201,8 @@ to the Bazel test command.
 For example:
 
 ```sg
-yarn test-ivy-aot //packages/compiler-cli/test/compliance/full --config=debug
-yarn test-ivy-aot //packages/compiler-cli/test/compliance/linked --config=debug
+yarn test //packages/compiler-cli/test/compliance/full --config=debug
+yarn test //packages/compiler-cli/test/compliance/linked --config=debug
 ```
 
 To debug generating the partial golden output use the following form of Bazel command: