diff --git a/CMakeLists.txt b/CMakeLists.txt
index f60acf5..aba836f 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,25 +1,32 @@
-# Copyright 2019 Mike Dev
+# Generated by `boostdep --cmake optional`
+# Copyright 2020, 2021 Peter Dimov
 # Distributed under the Boost Software License, Version 1.0.
-# See accompanying file LICENSE_1_0.txt or copy at https://www.boost.org/LICENSE_1_0.txt
+# https://www.boost.org/LICENSE_1_0.txt
 
-cmake_minimum_required( VERSION 3.5...3.20 )
-project( boost_optional VERSION "${BOOST_SUPERPROJECT_VERSION}" LANGUAGES CXX )
+cmake_minimum_required(VERSION 3.5...3.20)
 
-add_library( boost_optional INTERFACE )
-add_library( Boost::optional ALIAS boost_optional )
+project(boost_optional VERSION "${BOOST_SUPERPROJECT_VERSION}" LANGUAGES CXX)
 
-target_include_directories( boost_optional INTERFACE include )
+add_library(boost_optional INTERFACE)
+add_library(Boost::optional ALIAS boost_optional)
 
-target_link_libraries( boost_optional
-    INTERFACE
-        Boost::assert
-        Boost::config
-        Boost::core
-        Boost::detail
-        Boost::move
-        Boost::predef
-        Boost::static_assert
-        Boost::throw_exception
-        Boost::type_traits
-        Boost::utility
+target_include_directories(boost_optional INTERFACE include)
+
+target_link_libraries(boost_optional
+  INTERFACE
+    Boost::assert
+    Boost::config
+    Boost::core
+    Boost::move
+    Boost::predef
+    Boost::static_assert
+    Boost::throw_exception
+    Boost::type_traits
+    Boost::utility
 )
+
+if(BUILD_TESTING AND EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/test/CMakeLists.txt")
+
+  add_subdirectory(test)
+
+endif()