diff --git a/test/cmake_install_test/CMakeLists.txt b/test/cmake_install_test/CMakeLists.txt
new file mode 100644
index 00000000..dcc1e797
--- /dev/null
+++ b/test/cmake_install_test/CMakeLists.txt
@@ -0,0 +1,17 @@
+# Copyright 2018, 2019 Peter Dimov
+# Distributed under the Boost Software License, Version 1.0.
+# See accompanying file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt
+
+cmake_minimum_required(VERSION 3.5...3.16)
+
+project(cmake_subdir_test LANGUAGES CXX)
+
+find_package(boost_optional REQUIRED)
+
+add_executable(main main.cpp)
+target_link_libraries(main Boost::optional)
+
+enable_testing()
+add_test(main main)
+
+add_custom_target(check COMMAND ${CMAKE_CTEST_COMMAND} --output-on-failure -C $<CONFIG>)
diff --git a/test/cmake_install_test/main.cpp b/test/cmake_install_test/main.cpp
new file mode 100644
index 00000000..f17b4a32
--- /dev/null
+++ b/test/cmake_install_test/main.cpp
@@ -0,0 +1,13 @@
+// Copyright 2024 Peter Dimov
+// Distributed under the Boost Software License, Version 1.0.
+// https://www.boost.org/LICENSE_1_0.txt
+
+#include <boost/optional/optional.hpp>
+
+int main()
+{
+    boost::optional<int> o1;
+    boost::optional<int> o2( 0 );
+    o1 = o2;
+    return *o1;
+}
diff --git a/test/cmake_subdir_test/CMakeLists.txt b/test/cmake_subdir_test/CMakeLists.txt
new file mode 100644
index 00000000..1b860f0e
--- /dev/null
+++ b/test/cmake_subdir_test/CMakeLists.txt
@@ -0,0 +1,18 @@
+# Copyright 2018, 2019 Peter Dimov
+# Distributed under the Boost Software License, Version 1.0.
+# See accompanying file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt
+
+cmake_minimum_required(VERSION 3.5...3.16)
+
+project(cmake_subdir_test LANGUAGES CXX)
+
+set(BOOST_INCLUDE_LIBRARIES optional)
+add_subdirectory(../../../.. boostorg/boost)
+
+add_executable(main main.cpp)
+target_link_libraries(main Boost::optional)
+
+enable_testing()
+add_test(main main)
+
+add_custom_target(check COMMAND ${CMAKE_CTEST_COMMAND} --output-on-failure -C $<CONFIG>)
diff --git a/test/cmake_subdir_test/main.cpp b/test/cmake_subdir_test/main.cpp
new file mode 100644
index 00000000..f17b4a32
--- /dev/null
+++ b/test/cmake_subdir_test/main.cpp
@@ -0,0 +1,13 @@
+// Copyright 2024 Peter Dimov
+// Distributed under the Boost Software License, Version 1.0.
+// https://www.boost.org/LICENSE_1_0.txt
+
+#include <boost/optional/optional.hpp>
+
+int main()
+{
+    boost::optional<int> o1;
+    boost::optional<int> o2( 0 );
+    o1 = o2;
+    return *o1;
+}