diff --git a/modules/iris b/modules/iris
index 7f3a1c838..8104bf726 160000
--- a/modules/iris
+++ b/modules/iris
@@ -1 +1 @@
-Subproject commit 7f3a1c838e45e74e0041d2b2ccc8e06b03fb4461
+Subproject commit 8104bf726122384bea8e18feac2d956ffa26bf7f
diff --git a/test/alloy/alloy.cpp b/test/alloy/alloy.cpp
index 9062edb92..6c249df13 100644
--- a/test/alloy/alloy.cpp
+++ b/test/alloy/alloy.cpp
@@ -5,8 +5,7 @@
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 =============================================================================*/
 
-#include <iris_test.hpp>
-
+#include <iris/config.hpp>
 #include <iris/io_fwd.hpp>
 
 #include <iris/alloy/adapted/std_tuple.hpp>
@@ -17,6 +16,8 @@
 #include <iris/alloy/tuple.hpp>
 #include <iris/alloy/utility.hpp>
 
+#include <catch2/catch_test_macros.hpp>
+
 namespace alloy = iris::alloy;
 
 struct NonAdaptedStruct
@@ -395,16 +396,16 @@ TEST_CASE("tuple")
     STATIC_CHECK(!std::is_constructible_v<alloy::tuple<int const&>, double>);
     STATIC_CHECK(!std::is_constructible_v<alloy::tuple<int const&>, double&>);
     STATIC_CHECK(!std::is_constructible_v<alloy::tuple<int const&>, double&&>);
-    
+
     STATIC_CHECK(!std::is_constructible_v<alloy::tuple<int const&>, alloy::tuple<double>&>);
     STATIC_CHECK(!std::is_constructible_v<alloy::tuple<int const&>, alloy::tuple<double&>&>);
-    
+
     STATIC_CHECK(!std::is_constructible_v<alloy::tuple<int const&>, alloy::tuple<double> const&>);
     STATIC_CHECK(!std::is_constructible_v<alloy::tuple<int const&>, alloy::tuple<double&> const&>);
-    
+
     STATIC_CHECK(!std::is_constructible_v<alloy::tuple<int const&>, alloy::tuple<double>&&>);
     STATIC_CHECK(!std::is_constructible_v<alloy::tuple<int const&>, alloy::tuple<double&>&&>);
-    
+
     STATIC_CHECK(!std::is_constructible_v<alloy::tuple<int const&>, alloy::tuple<double> const&&>);
     STATIC_CHECK(!std::is_constructible_v<alloy::tuple<int const&>, alloy::tuple<double&> const&&>);
 
diff --git a/test/x4/iris_x4_test.hpp b/test/x4/iris_x4_test.hpp
index aa98e50db..cc54d29a5 100644
--- a/test/x4/iris_x4_test.hpp
+++ b/test/x4/iris_x4_test.hpp
@@ -11,13 +11,15 @@
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 =============================================================================*/
 
-#include "iris_test.hpp"
+#include <iris/config.hpp>
 
 #include <iris/x4/core/parser.hpp>
 #include <iris/x4/core/move_to.hpp>
 #include <iris/x4/parse.hpp>
 #include <iris/x4/parse_debug.hpp>
 
+#include <catch2/catch_test_macros.hpp>  // IWYU pragma: export
+
 #include <iterator>
 #include <string_view>
 #include <type_traits>