diff --git a/CMakeLists.txt b/CMakeLists.txt
index 6a50a0f..50182af 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -2,6 +2,8 @@ cmake_minimum_required (VERSION 2.8.4)
 set(project_name clangmm)
 project(${project_name})
 
+option(LIBCLANGMM_BUILD_TESTS "Build unit tests" OFF)
+
 if(APPLE)
   set(Boost_USE_STATIC_LIBS "YES")
   set(CMAKE_MACOSX_RPATH 1)
@@ -9,5 +11,7 @@ endif()
 
 add_subdirectory(src)
 
-# enable_testing()
-# add_subdirectory(tests)
+if(libclangmm_BUILD_TESTS)
+  enable_testing()
+  add_subdirectory(tests)
+endif()