diff --git a/.gitmodules b/.gitmodules
index 37e8830..fee9922 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,3 +1,3 @@
 [submodule "cmake/modules"]
 	path = cmake/modules
-	url = b3rgmann@git.bergmann89.de:cpp/CMakeModules.git
+	url = https://git.bergmann89.de/cpp/CMakeModules.git
diff --git a/cmake/modules b/cmake/modules
index 94b9877..165bf7c 160000
--- a/cmake/modules
+++ b/cmake/modules
@@ -1 +1 @@
-Subproject commit 94b9877d65e46c9d8169ebc46f163d02e4d9dcf3
+Subproject commit 165bf7c7702ec184b46b046889b62ef4a63afccf
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index 72731ac..21c71db 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -6,6 +6,8 @@ Include                             ( cmake_tests OPTIONAL RESULT_VARIABLE HAS_C
 
 Find_Package                        ( Sanitizers QUIET )
 
+Find_Package                ( Sanitizers QUIET )
+
 # Test ############################################################################################
 
 Find_Package                        ( GTest )
@@ -45,6 +47,11 @@ ForEach                             ( FILE IN LISTS CPPMP_TEST_SOURCE_FILES )
         Add_Sanitizers                      ( ${TEST_NAME} )
     EndIf                               ( )
 
+    # Sanitizers
+    If                          ( Sanitizers_FOUND )
+        Add_Sanitizers              ( ${TEST_NAME} )
+    EndIf                       ( )
+
     # pedantic
     If                                  ( HAS_PEDANTIC )
         Pedantic_Apply_Flags_Target         ( ${TEST_NAME} ALL )