diff --git a/.circleci/config.yml b/.circleci/config.yml
index 317c9158f6c..ac54d75ec06 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -407,18 +407,6 @@ jobs:
           command: create_ecr_manifest yarn-project x86_64,arm64
           aztec_manifest_key: yarn-project
 
-  yarn-project-test:
-    docker:
-      - image: aztecprotocol/alpine-build-image
-    resource_class: small
-    steps:
-      - *checkout
-      - *setup_env
-      - run:
-          name: "Build and test"
-          command: cond_spot_run_build yarn-project-test 64
-          aztec_manifest_key: yarn-project-test
-
   prover-client-test:
     docker:
       - image: aztecprotocol/alpine-build-image
@@ -755,7 +743,6 @@ workflows:
       - end-to-end: *defaults_yarn_project
       - build-docs: *defaults_yarn_project_pre_join
       - prover-client-test: *defaults_yarn_project
-      - yarn-project-test: *defaults_yarn_project
       - yarn-project-x86_64: *defaults_yarn_project_pre_join
       - yarn-project-arm64: *defaults_yarn_project_pre_join
       - yarn-project-ecr-manifest:
@@ -804,7 +791,6 @@ workflows:
             - boxes-vanilla
             - boxes-react
             - noir-packages-tests
-            - yarn-project-test
             - prover-client-test
             - e2e-join
           <<: *defaults
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 6fee521f74c..23c4d074d2f 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -77,8 +77,6 @@ jobs:
   bb-native-tests:
     needs: setup
     runs-on: ${{ inputs.username || github.actor }}-x86
-    strategy:
-      fail-fast: false
     steps:
       - {uses: actions/checkout@v4, with: { ref: "${{ github.event.pull_request.head.sha }}"}}
       # Only allow one memory-hunger prover test to use this runner
@@ -93,6 +91,34 @@ jobs:
         # limit our parallelism to half our cores
         run: earthly --no-output +test --hardware_concurrency=64
 
+  yarn-project-formatting:
+    needs: setup
+    runs-on: ${{ github.actor }}-x86
+    steps:
+      - {uses: actions/checkout@v4, with: { ref: "${{ github.event.pull_request.head.sha }}"}}
+      # Only allow one memory-hunger prover test to use this runner
+      - uses: ./.github/ci-setup-action
+        with:
+          dockerhub_password: "${{ secrets.DOCKERHUB_PASSWORD }}"
+          concurrency_key: yarn-project-test-${{ github.actor }}-x86
+      - name: "Yarn Project Tests"
+        timeout-minutes: 25
+        run: earthly --no-output ./yarn-project/+format-check
+
+  yarn-project-test:
+    needs: setup
+    runs-on: ${{ github.actor }}-x86
+    steps:
+      - {uses: actions/checkout@v4, with: { ref: "${{ github.event.pull_request.head.sha }}"}}
+      # Only allow one memory-hunger prover test to use this runner
+      - uses: ./.github/ci-setup-action
+        with:
+          dockerhub_password: "${{ secrets.DOCKERHUB_PASSWORD }}"
+          concurrency_key: yarn-project-test-${{ github.actor }}-x86
+      - name: "Yarn Project Tests"
+        timeout-minutes: 25
+        run: earthly --no-output ./yarn-project/+test
+
   # push benchmarking binaries to dockerhub registry
   bb-bench-binaries:
     needs: setup
@@ -142,13 +168,13 @@ jobs:
         run: earthly --no-output +bench-ultra-honk --bench_mode=cache
 
   merge-check:
-    runs-on: ${{ inputs.username || github.actor }}-x86
-    needs: [e2e, bb-native-tests, bb-bench]
+    runs-on: ubuntu-latest
+    needs: [e2e, bb-native-tests, bb-bench, yarn-project-formatting, yarn-project-test]
     steps:
       - run: echo Pull request merging now allowed.
 
   notify:
-    needs: [e2e, bb-native-tests, bb-bench]
+    needs: [e2e, bb-native-tests, bb-bench, yarn-project-formatting, yarn-project-test]
     runs-on: ubuntu-latest
     if: ${{ github.ref == 'refs/heads/master' && failure() }}
     steps:
diff --git a/.github/workflows/setup-runner.yml b/.github/workflows/setup-runner.yml
index 2863a7a63f2..b0b4139d8bf 100644
--- a/.github/workflows/setup-runner.yml
+++ b/.github/workflows/setup-runner.yml
@@ -58,7 +58,7 @@ jobs:
       group: start-builder-${{ inputs.runner_label }}
     steps:
       - name: Start EC2 runner
-        uses: AztecProtocol/ec2-action-builder@v0.15
+        uses: AztecProtocol/ec2-action-builder@v0.14e
         with:
           github_token: ${{ secrets.GH_SELF_HOSTED_RUNNER_TOKEN }}
           aws_access_key_id: ${{ secrets.AWS_ACCESS_KEY_ID }}
diff --git a/yarn-project/Earthfile b/yarn-project/Earthfile
index 0118394dc78..c582587cd7d 100644
--- a/yarn-project/Earthfile
+++ b/yarn-project/Earthfile
@@ -93,3 +93,11 @@ export-end-to-end:
     SAVE IMAGE aztecprotocol/end-to-end:$EARTHLY_GIT_HASH
     FROM +aztec
     SAVE IMAGE aztecprotocol/aztec:$EARTHLY_GIT_HASH
+
+format-check:
+    FROM +build
+    RUN yarn formatting
+
+test:
+    FROM +build
+    RUN yarn test
\ No newline at end of file