diff --git a/.codefresh/bazel.rc b/.codefresh/bazel.rc
index 5a2fa5ca6d..43b19f4b47 100644
--- a/.codefresh/bazel.rc
+++ b/.codefresh/bazel.rc
@@ -35,8 +35,3 @@ build --verbose_failures=true
 # https://github.com/bazelbuild/rules_typescript/pull/356
 build --action_env=PATH
 test --action_env=PATH --test_env=PATH
-
-# Exclude tests known to not work on Windows.
-
-# Chrome web tests are currently broken.
-test --test_tag_filters=-browser:chromium-local
diff --git a/.codefresh/codefresh.yml b/.codefresh/codefresh.yml
index fd74b0f32f..c1550040f9 100644
--- a/.codefresh/codefresh.yml
+++ b/.codefresh/codefresh.yml
@@ -12,7 +12,7 @@ steps:
     dockerfile: ./Dockerfile.win-1809
 
   RunTests:
-    title: Run Example
+    title: Run Tests
     image: ${{BuildImage}}
     commands:
     # Install dependencies
@@ -20,5 +20,8 @@ steps:
     # Add Bazel CI config
     - copy .codefresh\bazel.rc %ProgramData%\bazel.bazelrc
     # Run tests
-    - yarn test-ivy-aot //packages/animations/test //packages/common/test //packages/forms/test //packages/http/test //packages/platform-browser/test //packages/platform-browser-dynamic/test //packages/router/test
-    - yarn bazel test //tools/ts-api-guardian:all //tools/public_api_guard/... //packages/language-service/test //packages/compiler-cli/ngcc/test:test //packages/compiler-cli/integrationtest:integrationtest //packages/compiler-cli/test/compliance:compliance //packages/compiler/test //packages/compiler-cli/test:ngc //packages/compiler-cli/test/ngtsc:ngtsc
+    # At the moment 'browser:chromium-local' are broken in CI while locally they work
+    # VE
+    - yarn bazel test --build_tag_filters=-ivy-only --test_tag_filters=-ivy-only,-browser:chromium-local //...
+    # Ivy
+    - yarn bazel test --define=compile=aot --build_tag_filters=-no-ivy-aot,-fixme-ivy-aot --test_tag_filters=-no-ivy-aot,-fixme-ivy-aot,-browser:chromium-local //...