diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index e7844a47b..3b330144d 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -202,15 +202,9 @@ jobs:
           make HOST=host-ctp TOOLCHAIN=host TOIT_CHECK_PROPAGATED_TYPES=1 sdk
 
       - name: Build test SDKS
+        shell: bash
         if: env.DO_MORE_TESTS
         run: |
-          make BUILD=build-debug BUILD_TYPE=Debug sdk
-          make HOST=host32 BUILD_TYPE=Debug sdk
-          make HOST=host-ctp TOOLCHAIN=host TOIT_CHECK_PROPAGATED_TYPES=1 sdk
-          # It's wasteful to rebuild the SDK just to change the optimization level and assert, but
-          # it's the easiest way to make sure all tests are run in that configuration.
-
-
           # It's wasteful to rebuild the SDK just to change the optimization level and assert, but
           # it's the easiest way to make sure all tests are run in that configuration.
           TOIT_OPTIMIZATION_OVERRIDE=0 TOIT_ASSERT_OVERRIDE=0 make HOST=host-O0 TOOLCHAIN=host sdk
@@ -266,17 +260,19 @@ jobs:
           make HOST=host-ctp TOIT_CHECK_PROPAGATED_TYPES=1 test
 
       - name: Test 32-bit debug
-        if: env.DO_MORE_TESTS && runner.os == 'Linux'
+        if: env.DO_MORE_TESTS == 'true' && runner.os == 'Linux'
         run: |
           make HOST=host32 BUILD_TYPE=Debug test
 
       - name: Test 64-bit debug
-        if: env.DO_MORE_TESTS
+        shell: bash
+        if: env.DO_MORE_TESTS == 'true'
         run: |
           make BUILD=build-debug BUILD_TYPE=Debug test
 
       - name: Test different optimization levels
-        if: env.DO_MORE_TESTS
+        shell: bash
+        if: env.DO_MORE_TESTS == 'true'
         run: |
           TOIT_OPTIMIZATION_OVERRIDE=0 TOIT_ASSERT_OVERRIDE=0 make HOST=host-O0 TOOLCHAIN=host test
           TOIT_OPTIMIZATION_OVERRIDE=2 TOIT_ASSERT_OVERRIDE=1 make HOST=host-O2 TOOLCHAIN=host test