diff --git a/ConfigureChecks.cmake b/ConfigureChecks.cmake
index 471dba6f..725a9b50 100644
--- a/ConfigureChecks.cmake
+++ b/ConfigureChecks.cmake
@@ -20,6 +20,9 @@ ELSE(ZLIB_FOUND)
 	SET(HAVE_ZLIB 0)
 ENDIF(ZLIB_FOUND)
 
-# Currently breaks CMake when CppUnit is not present.
-#SET(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake/modules)
-#FIND_PACKAGE(CppUnit)
+SET(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake/modules)
+FIND_PACKAGE(CppUnit)
+IF (NOT CPPUNIT_FOUND AND BUILD_TESTS)
+	MESSAGE(STATUS "CppUnit not found, disabling tests.")
+	SET(BUILD_TESTS OFF)
+ENDIF(NOT CPPUNIT_FOUND AND BUILD_TESTS)
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index 3da08e66..34aa7fab 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -21,15 +21,12 @@ SET(test_runner_SRCS
   test_id3v2.cpp
 )
 
-# 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_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)