diff --git a/qa/CMakeLists.txt b/qa/CMakeLists.txt
index 95419cd156..7ebada410a 100644
--- a/qa/CMakeLists.txt
+++ b/qa/CMakeLists.txt
@@ -46,7 +46,7 @@ add_subdirectory( pcbnew )
 add_subdirectory( eeschema )
 
 add_subdirectory( libs )
-# add_subdirectory( utils/kicad2step )
+add_subdirectory( utils/kicad2step )
 
 # Utility/debugging/profiling programs
 add_subdirectory( common_tools )
diff --git a/qa/utils/kicad2step/CMakeLists.txt b/qa/utils/kicad2step/CMakeLists.txt
index 84ee243c90..fa58e300b1 100644
--- a/qa/utils/kicad2step/CMakeLists.txt
+++ b/qa/utils/kicad2step/CMakeLists.txt
@@ -21,6 +21,11 @@
 
 # kicad2step s-expr handling routines
 
+if( NOT TARGET kicad2step_lib )
+    # Can't build this test without the underlying library
+    return()
+endif()
+
 set( K2S_TEST_SRCS
     test_module.cpp