diff --git a/CMakeLists.txt b/CMakeLists.txt
index f6ddf7597..cd8e95a4b 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -140,15 +140,16 @@ endif(COVERAGE)
 include(FindPackageHandleStandardArgs)
 set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${PROJECT_SOURCE_DIR}/cmake")
 
-find_package(PkgConfig QUIET)
-
-if(PKG_CONFIG_FOUND)
-    pkg_check_modules(CHECK QUIET check>=0.10)
-endif()
-
+find_package(Check)
 if(NOT CHECK_FOUND)
-    find_package(Check QUIET 0.10)
-endif()
+    message(WARNING "Check is required to build and run tests")
+endif(NOT CHECK_FOUND)
+if(CHECK_FOUND)
+    check_symbol_exists(ck_assert_int_eq check.h CHECK_WORKING)
+    if(NOT CHECK_WORKING)
+        message(WARNING "Check version too old to build tests")
+    endif(NOT CHECK_WORKING)
+endif(CHECK_FOUND)
 
 find_package(Threads)
 
@@ -165,10 +166,10 @@ include_directories(
 
 add_subdirectory(src)
 
-if(CHECK_FOUND)
-    include_directories(${include_directories} ${CHECK_INCLUDES})
+if(CHECK_WORKING)
+    include_directories(${include_directories} "${CHECK_INCLUDES}")
     add_subdirectory(test)
-endif(CHECK_FOUND)
+endif(CHECK_WORKING)
 
 
 if(HAVE_RUST)
@@ -192,4 +193,4 @@ message(STATUS "HAVE_SIGNAME: " ${HAVE_SIGNAME})
 
 message(STATUS "HAVE_BACKTRACE: " ${HAVE_BACKTRACE})
 
-message(STATUS "CHECK_FOUND: " ${CHECK_FOUND})
+message(STATUS "CHECK_WORKING: " ${CHECK_WORKING})