diff --git a/.circleci/config.yml b/.circleci/config.yml
index 78b0fca487..5cef28412b 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -543,11 +543,12 @@ jobs:
 workflows:
   version: 2.1
 
-  anvil-per-test:
+  Fix-failing-tests:
     when:
       or:
-        - equal: ["skip", << pipeline.git.branch >>]
+        - equal: ["Fix-failing-tests", << pipeline.git.branch >>]
     jobs:
+      - lint
       - build-testable
 
       - test-contracts:
@@ -557,15 +558,16 @@ workflows:
           parallelism: 8
 
       - test-contracts:
-          name: "test-bfp-market"
+          name: "test-main"
           requires: [build-testable]
-          workspace: "@synthetixio/bfp-market"
-          parallelism: 4
+          workspace: "@synthetixio/main"
+          parallelism: 2
+          batch-size: 8
 
   tests:
     unless:
       or:
-        - equal: ["skip", << pipeline.git.branch >>]
+        - equal: ["Fix-failing-tests", << pipeline.git.branch >>]
         - equal: ["update-subgraphs", << pipeline.git.branch >>]
         - equal: ["scheduled_pipeline", << pipeline.trigger_source >>]