diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index 34aa7fab..3da08e66 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -21,12 +21,15 @@ SET(test_runner_SRCS
   test_id3v2.cpp
 )
 
-ADD_EXECUTABLE(test_runner ${test_runner_SRCS})
-TARGET_LINK_LIBRARIES(test_runner tag ${CPPUNIT_LIBRARIES})
+# Fails without CppUnit.  These can be uncommented (with an appropriate guard
+# checking for CppUnit availability) after the CppUnit configure check has
+# also been fixed).
+#ADD_EXECUTABLE(test_runner ${test_runner_SRCS})
+#TARGET_LINK_LIBRARIES(test_runner tag ${CPPUNIT_LIBRARIES})
 
-ADD_CUSTOM_TARGET(check
-    ./test_runner
-    DEPENDS test_runner
-)
+#ADD_CUSTOM_TARGET(check
+#    ./test_runner
+#    DEPENDS test_runner
+#)
 
 endif(BUILD_TESTS)