diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 2f2fb750..bbe50732 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -22,8 +22,7 @@ jobs:
             cpu: amd64
             builder: ubuntu-latest
             shell: bash --noprofile --norc -e -o pipefail
-            tests: all
-            testOrc: true
+            tests: orc
           - os: macos
             cpu: amd64
             builder: macos-latest
@@ -49,7 +48,7 @@ jobs:
       run:
         shell: ${{ matrix.shell }} {0}
 
-    name: '${{ matrix.os }}-${{ matrix.cpu }}-tests-${{ matrix.tests }}-${{ matrix.testOrc }}'
+    name: '${{ matrix.os }}-${{ matrix.cpu }}-tests-${{ matrix.tests }}'
     runs-on: ${{ matrix.builder }}
     timeout-minutes: 80
     steps:
@@ -68,11 +67,13 @@ jobs:
       ## Part 1 Tests ##
       - name: Setup ORC Test on Some Linux
         if: matrix.testOrc == true
-        run: echo '--mm:orc' >> config.nims
+        run: |
+          echo '--mm:orc' >> config.nims
+          echo '' >> config.nims
 
       ## Part 1 Tests ##
       - name: Unit tests
-        if: matrix.tests == 'unittest' || matrix.tests == 'all'
+        if: matrix.tests == 'unittest' || matrix.tests == 'all' || matrix.tests == 'orc'
         run: make -j${ncpu} test
 
       # workaround for https://github.com/NomicFoundation/hardhat/issues/3877
@@ -82,7 +83,7 @@ jobs:
          node-version: 18.15
 
       - name: Start Ethereum node with Codex contracts
-        if: matrix.tests == 'contract' || matrix.tests == 'integration' || matrix.tests == 'all'
+        if: matrix.tests == 'contract' || matrix.tests == 'integration' || matrix.tests == 'all' || matrix.tests == 'orc'
         working-directory: vendor/codex-contracts-eth
         env:
           MSYS2_PATH_TYPE: inherit
@@ -92,12 +93,12 @@ jobs:
 
       ## Part 2 Tests ##
       - name: Contract tests
-        if: matrix.tests == 'contract' || matrix.tests == 'all'
+        if: matrix.tests == 'contract' || matrix.tests == 'all' || matrix.tests == 'orc'
         run: make -j${ncpu} testContracts
 
       ## Part 3 Tests ##
       - name: Integration tests
-        if: matrix.tests == 'integration' || matrix.tests == 'all'
+        if: matrix.tests == 'integration' || matrix.tests == 'all' || matrix.tests == 'orc'
         run: make -j${ncpu} testIntegration
 
   coverage: