diff --git a/.circleci/config.yml b/.circleci/config.yml
index 1e9be1287071..f1ca2d5f02ba 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -186,25 +186,6 @@ jobs:
       - run: bazel build --build_tag_filters=-docs-package,-release-package -- src/...
       - *slack_notify_on_failure
 
-  # ------------------------------------------------------------------------------------------
-  # Job that runs the unit tests on Bazel-provided browsers (Chrome and Firefox headless).
-  # ------------------------------------------------------------------------------------------
-  tests_browsers:
-    <<: *job_defaults
-    resource_class: xlarge
-    environment:
-      GCP_DECRYPT_TOKEN: *gcp_decrypt_token
-    steps:
-      - checkout_and_rebase
-      - *restore_cache
-      - *setup_bazel_ci_config
-      - *setup_bazel_remote_execution
-      - *yarn_install
-      - *setup_bazel_binary
-
-      - run: bazel test --build_tag_filters=-e2e --test_tag_filters=-e2e --build_tests_only -- src/...
-      - *slack_notify_on_failure
-
   # -------------------------------------------------------------------------------------------
   # Job that builds all release packages. The built packages can be then used in the same
   # workflow to publish snapshot builds.
@@ -408,8 +389,6 @@ workflows:
     jobs:
       - bazel_build:
           filters: *ignore_presubmit_branch_filter
-      - tests_browsers:
-          filters: *ignore_presubmit_branch_filter
       - build_release_packages:
           filters: *ignore_presubmit_branch_filter
       - upload_release_packages:
@@ -426,7 +405,6 @@ workflows:
           filters: *publish_branches_filter
           requires:
             - build_release_packages
-            - tests_browsers
 
   # Snapshot tests workflow that is scheduled to run all specified jobs every hour.
   # This workflow runs various jobs against the Angular snapshot builds from Github.
diff --git a/.github/angular-robot.yml b/.github/angular-robot.yml
index 190a05ded225..0d635d57b447 100644
--- a/.github/angular-robot.yml
+++ b/.github/angular-robot.yml
@@ -55,7 +55,6 @@ merge:
     # list of PR statuses that need to be successful
     requiredStatuses:
       - 'ci/circleci: bazel_build'
-      - 'ci/circleci: tests_browsers'
       - 'ci/circleci: build_release_packages'
 
   # the comment that will be added when the merge label is added despite failing checks, leave empty or set to false to disable
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 9bf8a1c2c5d6..460edde7e0b0 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -147,3 +147,19 @@ jobs:
         run: yarn install --frozen-lockfile
       - name: Run linker JIT tests
         run: yarn test-linker-jit
+
+  test:
+    runs-on: ubuntu-latest-4core
+    steps:
+      - name: Initialize environment
+        uses: angular/dev-infra/github-actions/npm/checkout-and-setup-node@9931e1a8d1b62fcd2267e89f9993a494856cc1cd
+        with:
+          cache-node-modules: true
+      - name: Setup Bazel
+        uses: angular/dev-infra/github-actions/bazel/setup@9931e1a8d1b62fcd2267e89f9993a494856cc1cd
+      - name: Setup Bazel RBE
+        uses: angular/dev-infra/github-actions/bazel/configure-remote@9931e1a8d1b62fcd2267e89f9993a494856cc1cd
+      - name: Install node modules
+        run: yarn install --frozen-lockfile
+      - name: Run tests
+        run: bazel test --build_tag_filters=-e2e --test_tag_filters=-e2e --build_tests_only -- src/...