diff --git a/CMakeLists.txt b/CMakeLists.txt
index eff478e5..9c4e065b 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -79,6 +79,7 @@ else()
 	endif()
 endif()
 
+option(GLM_TEST_ENABLE "Build unit tests" ON)
 option(GLM_TEST_ENABLE_SIMD_SSE2 "Enable SSE2 optimizations" OFF)
 option(GLM_TEST_ENABLE_SIMD_SSE3 "Enable SSE3 optimizations" OFF)
 option(GLM_TEST_ENABLE_SIMD_AVX "Enable AVX optimizations" OFF)
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index b93b7c4a..e83261f6 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -7,10 +7,12 @@ function(glmCreateTestGTC NAME)
 		COMMAND $<TARGET_FILE:${SAMPLE_NAME}> )
 endfunction()
 
-add_subdirectory(bug)
-add_subdirectory(core)
-add_subdirectory(ext)
-add_subdirectory(gtc)
-add_subdirectory(gtx)
+if(GLM_TEST_ENABLE)
+	add_subdirectory(bug)
+	add_subdirectory(core)
+	add_subdirectory(ext)
+	add_subdirectory(gtc)
+	add_subdirectory(gtx)
+endif()