diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 7a5f38a795..bda33661f1 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -263,7 +263,7 @@ jobs:
           - platform: x86_64
             distro: focal
             image: openrct2/openrct2-build:8-focal
-            build_flags: -DCMAKE_POSITION_INDEPENDENT_CODE=on -DCMAKE_CXX_FLAGS="-g1 -gz"
+            build_flags: -DCMAKE_POSITION_INDEPENDENT_CODE=on -DCMAKE_CXX_FLAGS="-g1 -gz" -DWITH_TESTS=off
           - platform: x86_64
             distro: jammy
             image: openrct2/openrct2-build:8-jammy
@@ -271,7 +271,7 @@ jobs:
           - platform: x86_64
             distro: bullseye
             image: openrct2/openrct2-build:8-bullseye
-            build_flags: -DCMAKE_POSITION_INDEPENDENT_CODE=on -DCMAKE_CXX_FLAGS="-g -gz -fno-var-tracking-assignments"
+            build_flags: -DCMAKE_POSITION_INDEPENDENT_CODE=on -DCMAKE_CXX_FLAGS="-g -gz -fno-var-tracking-assignments" -DWITH_TESTS=off
           - platform: i686
             distro: focal
             image: openrct2/openrct2-build:8-focal32
diff --git a/test/tests/BitSetTests.cpp b/test/tests/BitSetTests.cpp
index d195b0e95f..cef793ef9a 100644
--- a/test/tests/BitSetTests.cpp
+++ b/test/tests/BitSetTests.cpp
@@ -15,11 +15,7 @@ using namespace OpenRCT2;
 TEST(BitTest, test_index_construction)
 {
     BitSet<64u> bits({ 0u, 2u, 4u, 6u, 8u, 10u });
-#if defined(_M_X64) || defined(_M_ARM64)
-    static_assert(std::is_same_v<decltype(bits)::BlockType, uint64_t>);
-#else
-    static_assert(std::is_same_v<decltype(bits)::BlockType, uint32_t>);
-#endif
+    static_assert(sizeof(decltype(bits)::BlockType) == sizeof(uintptr_t));
     constexpr auto size = sizeof(bits);
     static_assert(size == 8u);
 
@@ -94,7 +90,7 @@ TEST(BitTest, test_big)
     static_assert(size == 32u);
 
     bits.flip();
-#if defined(_M_X64) || defined(_M_ARM64)
+#if defined(_M_X64) || defined(_M_ARM64) || defined(__x86_64__)
     static_assert(std::is_same_v<decltype(bits)::BlockType, uint64_t>);
     static_assert(bits.data().size() == 4);
     ASSERT_EQ(bits.data()[0], ~0uLL);