diff --git a/.github/workflows/build-linux.yml b/.github/workflows/build-linux.yml
index ac0ee3308..b5ff9aa39 100644
--- a/.github/workflows/build-linux.yml
+++ b/.github/workflows/build-linux.yml
@@ -35,6 +35,9 @@ on:
       extras:
         type: boolean
         default: false
+      tests:
+        type: boolean
+        default: false
       gcc-ver:
         type: string
         default: "10"
@@ -112,6 +115,7 @@ jobs:
             -DBUILD_SIZECHECK:BOOL=${{ inputs.extras }} \
             -DBUILD_SKELETON:BOOL=${{ inputs.extras }} \
             -DBUILD_DOCS:BOOL=${{ inputs.docs }} \
+            -DBUILD_TESTS:BOOL=${{ inputs.tests }} \
             -DINSTALL_DATA_FILES:BOOL=${{ inputs.common-files }} \
             -DINSTALL_SCRIPTS:BOOL=${{ inputs.common-files }}
       - name: Build DFHack
diff --git a/.github/workflows/build-windows.yml b/.github/workflows/build-windows.yml
index 97398933d..16a947fb4 100644
--- a/.github/workflows/build-windows.yml
+++ b/.github/workflows/build-windows.yml
@@ -29,6 +29,9 @@ on:
       stonesense:
         type: boolean
         default: false
+      tests:
+        type: boolean
+        default: false
       launchdf:
         type: boolean
         default: false
@@ -80,7 +83,7 @@ jobs:
             win-msvc
       - name: Cross-compile
         env:
-          CMAKE_EXTRA_ARGS: '-DBUILD_STONESENSE:BOOL=${{ inputs.stonesense }} -DBUILD_DOCS:BOOL=${{ inputs.docs }} -DINSTALL_DATA_FILES:BOOL=${{ inputs.common-files }} -DINSTALL_SCRIPTS:BOOL=${{ inputs.common-files }} -DBUILD_DFLAUNCH:BOOL=${{ inputs.launchdf }}'
+          CMAKE_EXTRA_ARGS: '-DBUILD_STONESENSE:BOOL=${{ inputs.stonesense }} -DBUILD_DOCS:BOOL=${{ inputs.docs }} -DINSTALL_DATA_FILES:BOOL=${{ inputs.common-files }} -DINSTALL_SCRIPTS:BOOL=${{ inputs.common-files }} -DBUILD_DFLAUNCH:BOOL=${{ inputs.launchdf }} -DBUILD_TESTS:BOOL=${{ inputs.tests }}'
         run: |
           cd build
           bash -x build-win64-from-linux.sh
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 3490ff6a6..6b0882d8d 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -20,6 +20,7 @@ jobs:
       structures_ref: ${{ inputs.structures_ref }}
       artifact-name: test-msvc
       cache-id: test
+      tests: true
 
   build-linux:
     name: Linux gcc-${{ matrix.gcc }}
@@ -32,6 +33,7 @@ jobs:
       cache-id: test
       stonesense: ${{ matrix.plugins == 'all' }}
       extras: ${{ matrix.plugins == 'all' }}
+      tests: true
       gcc-ver: ${{ matrix.gcc }}
     secrets: inherit
     strategy: