diff --git a/examples/hardware-test/CMakeLists.txt b/examples/hardware-test/CMakeLists.txt
index 3d7a3f9ed..d76093ad3 100644
--- a/examples/hardware-test/CMakeLists.txt
+++ b/examples/hardware-test/CMakeLists.txt
@@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 3.9)
 project (hardware-test)
 find_package (32BLIT CONFIG REQUIRED PATHS ../..)
 
-if(32BLIT_PICO)
+if(PICO_BOARD STREQUAL "pimoroni_picosystem")
     # PicoSystem has its own picosystem-hardware-test
     return()
 endif()
diff --git a/examples/picosystem-hardware-test/CMakeLists.txt b/examples/picosystem-hardware-test/CMakeLists.txt
index ce7b4b88f..ecea602dc 100644
--- a/examples/picosystem-hardware-test/CMakeLists.txt
+++ b/examples/picosystem-hardware-test/CMakeLists.txt
@@ -2,10 +2,10 @@ cmake_minimum_required(VERSION 3.9)
 project (picosystem-hardware-test)
 find_package (32BLIT CONFIG REQUIRED PATHS ../..)
 
-if(NOT 32BLIT_PICO)
+if(NOT PICO_BOARD STREQUAL "pimoroni_picosystem")
     # Hooks into the Pico SDK to get battery charge and VBUS status
     return()
 endif()
 
 blit_executable (picosystem-hardware-test hardware-test.cpp)
-blit_metadata (picosystem-hardware-test metadata.yml)
\ No newline at end of file
+blit_metadata (picosystem-hardware-test metadata.yml)