diff --git a/CMakeLists.txt b/CMakeLists.txt
index 4a0a639..2a95039 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -23,7 +23,7 @@ endif ()
 # Options
 if (NOT BOOST_SUPERPROJECT_VERSION)
     option(BOOST_STATIC_STRING_INSTALL "Install boost::static_string files" ${BOOST_STATIC_STRING_IS_ROOT})
-    option(BOOST_STATIC_STRING_BUILD_TESTS "Build boost::static_string tests" ${BUILD_TESTING})
+    option(BOOST_STATIC_STRING_BUILD_TESTS "Build boost::static_string tests" OFF)
 else ()
     set(BOOST_STATIC_STRING_BUILD_TESTS ${BUILD_TESTING})
 endif ()
@@ -112,7 +112,7 @@ if (BOOST_STATIC_STRING_INSTALL AND NOT BOOST_SUPERPROJECT_VERSION)
 endif ()
 
 
-if (BOOST_STATIC_STRING_BUILD_TESTS)
+if (BUILD_TESTING OR BOOST_STATIC_STRING_BUILD_TESTS)
     add_subdirectory(test)
 endif ()
 
diff --git a/meta/libraries.json b/meta/libraries.json
index db0db91..52a31c0 100644
--- a/meta/libraries.json
+++ b/meta/libraries.json
@@ -11,6 +11,7 @@
         "String"
     ],
     "maintainers": [
+        "Krystian Stasiowski <sdkrystian@gmail.com>",
         "Alan de Freitas <alandefreitas@gmail.com>",
         "Vinnie Falco <vinnie.falco@gmail.com>"
     ],
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index 9a9c727..97a0994 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -7,6 +7,12 @@
 # Official repository: https://github.com/boostorg/static_string
 #
 
+# Custom target used by the boost super-project
+if(NOT TARGET tests)
+        add_custom_target(tests)
+        set_property(TARGET tests PROPERTY FOLDER _deps)
+endif()
+
 set(BOOST_STATIC_STRING_TESTS_FILES
         CMakeLists.txt
         Jamfile
@@ -23,3 +29,4 @@ add_executable(boost_static_string_tests ${BOOST_STATIC_STRING_TESTS_FILES})
 # See: BOOST_STATIC_STRING_UNIT_TEST_LIBRARIES
 target_link_libraries(boost_static_string_tests PRIVATE Boost::static_string)
 add_test(NAME boost_static_string_tests COMMAND boost_static_string_tests)
+add_dependencies(tests boost_static_string_tests)