diff --git a/CMakeLists.txt b/CMakeLists.txt
index 39e6d55d96f32dba6ec7f84a084b5f8e9c3c2cc2..b9e8bcdd66260356cca18c54ec1601f36927fd82 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -75,11 +75,11 @@ if (BUILD_PYTHON_INTERFACE)
 endif ()
 
 # Add a cache variable to allow not compiling and running tests
-set (RUN_TESTS TRUE CACHE BOOL "compile and run unit tests")
+set (BUILD_TESTING TRUE CACHE BOOL "compile and run unit tests")
 
 # Required dependencies
 set(BOOST_COMPONENTS thread date_time system)
-if (RUN_TESTS)
+if (BUILD_TESTING)
   set(BOOST_COMPONENTS ${BOOST_COMPONENTS} filesystem unit_test_framework chrono)
 endif ()
 if (BUILD_PYTHON_INTERFACE)
@@ -156,7 +156,7 @@ add_subdirectory(src)
 if (BUILD_PYTHON_INTERFACE)
   add_subdirectory(python)
 endif ()
-if (RUN_TESTS)
+if (BUILD_TESTING)
   add_subdirectory(test)
 endif ()
 
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index 86201e6d73fbe99130fd22c7f13e65dd4075306b..6a6f1d27be3b4d11f2da62deceb4d12d1a3c28a4 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -16,7 +16,7 @@ endmacro(add_fcl_test)
 
 include_directories(${CMAKE_CURRENT_BINARY_DIR})
 
-IF(RUN_TESTS)
+IF(BUILD_TESTING)
   add_library(utility STATIC utility.cpp)
 ELSE()
   add_library(utility STATIC EXCLUDE_FROM_ALL utility.cpp)