diff --git a/CMakeLists.txt b/CMakeLists.txt
index 0b5a3f8..ad2d943 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -81,7 +81,7 @@ add_subdirectory(include/beman/iterator_interface)
 
 add_subdirectory(examples)
 if(ITERATOR_INTERFACE_ENABLE_TESTING)
-  add_subdirectory(tests)
+  add_subdirectory(tests/beman/iterator_interface)
 endif()
 
 # Coverage
diff --git a/tests/CMakeLists.txt b/tests/beman/iterator_interface/CMakeLists.txt
similarity index 93%
rename from tests/CMakeLists.txt
rename to tests/beman/iterator_interface/CMakeLists.txt
index 4feb4e7..84b45ed 100644
--- a/tests/CMakeLists.txt
+++ b/tests/beman/iterator_interface/CMakeLists.txt
@@ -1,5 +1,5 @@
 # cmake-format: off
-# tests/CMakeLists.txt -*-cmake-*-
+# tests/beman/iterator_interface/CMakeLists.txt -*-cmake-*-
 # SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 # cmake-format: on
 
diff --git a/tests/iterator_interface.test.cpp b/tests/beman/iterator_interface/iterator_interface.test.cpp
similarity index 98%
rename from tests/iterator_interface.test.cpp
rename to tests/beman/iterator_interface/iterator_interface.test.cpp
index 5697ac3..fb707a1 100644
--- a/tests/iterator_interface.test.cpp
+++ b/tests/beman/iterator_interface/iterator_interface.test.cpp
@@ -1,4 +1,4 @@
-// tests/iterator_interfaces.test.cpp -*-C++-*-
+// tests/beman/iterator_interface/iterator_interfaces.test.cpp -*-C++-*-
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 
 #include <beman/iterator_interface/iterator_interface.hpp>