diff --git a/.github/workflows/interchange_ci.yml b/.github/workflows/interchange_ci.yml
index 8b16d795..6cedef94 100644
--- a/.github/workflows/interchange_ci.yml
+++ b/.github/workflows/interchange_ci.yml
@@ -90,6 +90,4 @@ jobs:
         DEVICE: ${{ matrix.device }}
       run: |
         cd build
-        make chipdb-$DEVICE-bin-check-test-data
-        make chipdb-$DEVICE-bin-check
         make all-$DEVICE-tests -j`nproc`
diff --git a/fpga_interchange/examples/chipdb.cmake b/fpga_interchange/examples/chipdb.cmake
index 60814845..3cca7840 100644
--- a/fpga_interchange/examples/chipdb.cmake
+++ b/fpga_interchange/examples/chipdb.cmake
@@ -370,6 +370,11 @@ function(generate_chipdb)
     add_dependencies(all-${family}-archcheck-tests chipdb-${device}-bin-check-test-data chipdb-${device}-bin-check)
 
     # All tests targets for this device are added to this target
-    add_custom_target(all-${device}-tests)
+    add_custom_target(
+        all-${device}-tests
+        DEPENDS
+            chipdb-${device}-bin-check-test-data
+            chipdb-${device}-bin-check
+    )
 endfunction()