diff --git a/libcxx/test/std/language.support/support.coroutines/coroutine.handle/coroutine.handle.hash/hash.pass.cpp b/libcxx/test/std/language.support/support.coroutines/coroutine.handle/coroutine.handle.hash/hash.pass.cpp
--- a/libcxx/test/std/language.support/support.coroutines/coroutine.handle/coroutine.handle.hash/hash.pass.cpp
+++ b/libcxx/test/std/language.support/support.coroutines/coroutine.handle/coroutine.handle.hash/hash.pass.cpp
@@ -19,9 +19,16 @@
 // }
 
 #include <coroutine>
+#ifdef TEST_MODULES
+import std;
+#endif
+#ifndef TEST_MODULES
 #include <type_traits>
+#endif
 #include <memory>
+#ifndef TEST_MODULES
 #include <utility>
+#endif
 #include <cstdint>
 #include <cassert>
 #include <functional>
diff --git a/libcxx/test/std/language.support/support.coroutines/coroutine.handle/coroutine.handle.capacity/operator_bool.pass.cpp b/libcxx/test/std/language.support/support.coroutines/coroutine.handle/coroutine.handle.capacity/operator_bool.pass.cpp
--- a/libcxx/test/std/language.support/support.coroutines/coroutine.handle/coroutine.handle.capacity/operator_bool.pass.cpp
+++ b/libcxx/test/std/language.support/support.coroutines/coroutine.handle/coroutine.handle.capacity/operator_bool.pass.cpp
@@ -17,7 +17,12 @@
 // constexpr explicit operator bool() const noexcept
 
 #include <coroutine>
+#ifdef TEST_MODULES
+import std;
+#endif
+#ifndef TEST_MODULES
 #include <type_traits>
+#endif
 #include <cassert>
 
 #include "test_macros.h"
diff --git a/libcxx/test/std/language.support/support.coroutines/coroutine.handle/coroutine.handle.compare/equal_comp.pass.cpp b/libcxx/test/std/language.support/support.coroutines/coroutine.handle/coroutine.handle.compare/equal_comp.pass.cpp
--- a/libcxx/test/std/language.support/support.coroutines/coroutine.handle/coroutine.handle.compare/equal_comp.pass.cpp
+++ b/libcxx/test/std/language.support/support.coroutines/coroutine.handle/coroutine.handle.compare/equal_comp.pass.cpp
@@ -17,8 +17,15 @@
 // constexpr bool operator==(coroutine_handle<> x, coroutine_handle<> y) noexcept;
 
 #include <coroutine>
+#ifdef TEST_MODULES
+import std;
+#endif
+#ifndef TEST_MODULES
 #include <type_traits>
+#endif
+#ifndef TEST_MODULES
 #include <utility>
+#endif
 #include <cstdint>
 #include <cassert>
 
diff --git a/libcxx/test/std/language.support/support.coroutines/coroutine.handle/coroutine.handle.compare/less_comp.pass.cpp b/libcxx/test/std/language.support/support.coroutines/coroutine.handle/coroutine.handle.compare/less_comp.pass.cpp
--- a/libcxx/test/std/language.support/support.coroutines/coroutine.handle/coroutine.handle.compare/less_comp.pass.cpp
+++ b/libcxx/test/std/language.support/support.coroutines/coroutine.handle/coroutine.handle.compare/less_comp.pass.cpp
@@ -17,8 +17,15 @@
 // constexpr strong_ordering operator<=>(coroutine_handle<> x, coroutine_handle<> y) noexcept;
 
 #include <coroutine>
+#ifdef TEST_MODULES
+import std;
+#endif
+#ifndef TEST_MODULES
 #include <type_traits>
+#endif
+#ifndef TEST_MODULES
 #include <utility>
+#endif
 #include <cstdint>
 #include <cassert>
 
diff --git a/libcxx/test/std/language.support/support.coroutines/coroutine.handle/coroutine.handle.completion/done.pass.cpp b/libcxx/test/std/language.support/support.coroutines/coroutine.handle/coroutine.handle.completion/done.pass.cpp
--- a/libcxx/test/std/language.support/support.coroutines/coroutine.handle/coroutine.handle.completion/done.pass.cpp
+++ b/libcxx/test/std/language.support/support.coroutines/coroutine.handle/coroutine.handle.completion/done.pass.cpp
@@ -17,9 +17,16 @@
 // bool done() const
 
 #include <coroutine>
+#ifdef TEST_MODULES
+import std;
+#endif
+#ifndef TEST_MODULES
 #include <type_traits>
+#endif
 #include <memory>
+#ifndef TEST_MODULES
 #include <utility>
+#endif
 #include <cstdint>
 #include <cassert>
 
diff --git a/libcxx/test/std/language.support/support.coroutines/coroutine.handle/coroutine.handle.con/assign.pass.cpp b/libcxx/test/std/language.support/support.coroutines/coroutine.handle/coroutine.handle.con/assign.pass.cpp
--- a/libcxx/test/std/language.support/support.coroutines/coroutine.handle/coroutine.handle.con/assign.pass.cpp
+++ b/libcxx/test/std/language.support/support.coroutines/coroutine.handle/coroutine.handle.con/assign.pass.cpp
@@ -17,7 +17,12 @@
 // coroutine_handle& operator=(nullptr_t) noexcept
 
 #include <coroutine>
+#ifdef TEST_MODULES
+import std;
+#endif
+#ifndef TEST_MODULES
 #include <type_traits>
+#endif
 #include <cassert>
 
 #include "test_macros.h"
diff --git a/libcxx/test/std/language.support/support.coroutines/coroutine.handle/coroutine.handle.con/construct.pass.cpp b/libcxx/test/std/language.support/support.coroutines/coroutine.handle/coroutine.handle.con/construct.pass.cpp
--- a/libcxx/test/std/language.support/support.coroutines/coroutine.handle/coroutine.handle.con/construct.pass.cpp
+++ b/libcxx/test/std/language.support/support.coroutines/coroutine.handle/coroutine.handle.con/construct.pass.cpp
@@ -18,7 +18,12 @@
 // constexpr coroutine_handle(nullptr_t) noexcept
 
 #include <coroutine>
+#ifdef TEST_MODULES
+import std;
+#endif
+#ifndef TEST_MODULES
 #include <type_traits>
+#endif
 #include <cassert>
 
 #include "test_macros.h"
diff --git a/libcxx/test/std/language.support/support.coroutines/coroutine.handle/coroutine.handle.export/address.pass.cpp b/libcxx/test/std/language.support/support.coroutines/coroutine.handle/coroutine.handle.export/address.pass.cpp
--- a/libcxx/test/std/language.support/support.coroutines/coroutine.handle/coroutine.handle.export/address.pass.cpp
+++ b/libcxx/test/std/language.support/support.coroutines/coroutine.handle/coroutine.handle.export/address.pass.cpp
@@ -17,7 +17,12 @@
 // constexpr void* address() const noexcept
 
 #include <coroutine>
+#ifdef TEST_MODULES
+import std;
+#endif
+#ifndef TEST_MODULES
 #include <type_traits>
+#endif
 #include <cassert>
 
 #include "test_macros.h"
diff --git a/libcxx/test/std/language.support/support.coroutines/coroutine.handle/coroutine.handle.export/from_address.pass.cpp b/libcxx/test/std/language.support/support.coroutines/coroutine.handle/coroutine.handle.export/from_address.pass.cpp
--- a/libcxx/test/std/language.support/support.coroutines/coroutine.handle/coroutine.handle.export/from_address.pass.cpp
+++ b/libcxx/test/std/language.support/support.coroutines/coroutine.handle/coroutine.handle.export/from_address.pass.cpp
@@ -17,7 +17,12 @@
 // static coroutine_handle from_address(void*) noexcept
 
 #include <coroutine>
+#ifdef TEST_MODULES
+import std;
+#endif
+#ifndef TEST_MODULES
 #include <type_traits>
+#endif
 #include <cassert>
 
 #include "test_macros.h"
diff --git a/libcxx/test/std/language.support/support.coroutines/coroutine.handle/coroutine.handle.noop/noop_coroutine.pass.cpp b/libcxx/test/std/language.support/support.coroutines/coroutine.handle/coroutine.handle.noop/noop_coroutine.pass.cpp
--- a/libcxx/test/std/language.support/support.coroutines/coroutine.handle/coroutine.handle.noop/noop_coroutine.pass.cpp
+++ b/libcxx/test/std/language.support/support.coroutines/coroutine.handle/coroutine.handle.noop/noop_coroutine.pass.cpp
@@ -17,7 +17,12 @@
 
 #include <coroutine>
 #include <cassert>
+#ifdef TEST_MODULES
+import std;
+#endif
+#ifndef TEST_MODULES
 #include <type_traits>
+#endif
 
 #include "test_macros.h"
 
diff --git a/libcxx/test/std/language.support/support.coroutines/coroutine.handle/coroutine.handle.prom/promise.pass.cpp b/libcxx/test/std/language.support/support.coroutines/coroutine.handle/coroutine.handle.prom/promise.pass.cpp
--- a/libcxx/test/std/language.support/support.coroutines/coroutine.handle/coroutine.handle.prom/promise.pass.cpp
+++ b/libcxx/test/std/language.support/support.coroutines/coroutine.handle/coroutine.handle.prom/promise.pass.cpp
@@ -17,9 +17,16 @@
 // Promise& promise() const
 
 #include <coroutine>
+#ifdef TEST_MODULES
+import std;
+#endif
+#ifndef TEST_MODULES
 #include <type_traits>
+#endif
 #include <memory>
+#ifndef TEST_MODULES
 #include <utility>
+#endif
 #include <cstdint>
 #include <cassert>
 
diff --git a/libcxx/test/std/language.support/support.coroutines/coroutine.handle/coroutine.handle.resumption/destroy.pass.cpp b/libcxx/test/std/language.support/support.coroutines/coroutine.handle/coroutine.handle.resumption/destroy.pass.cpp
--- a/libcxx/test/std/language.support/support.coroutines/coroutine.handle/coroutine.handle.resumption/destroy.pass.cpp
+++ b/libcxx/test/std/language.support/support.coroutines/coroutine.handle/coroutine.handle.resumption/destroy.pass.cpp
@@ -17,9 +17,16 @@
 // void destroy() const
 
 #include <coroutine>
+#ifdef TEST_MODULES
+import std;
+#endif
+#ifndef TEST_MODULES
 #include <type_traits>
+#endif
 #include <memory>
+#ifndef TEST_MODULES
 #include <utility>
+#endif
 #include <cstdint>
 #include <cassert>
 
diff --git a/libcxx/test/std/language.support/support.coroutines/coroutine.handle/coroutine.handle.resumption/resume.pass.cpp b/libcxx/test/std/language.support/support.coroutines/coroutine.handle/coroutine.handle.resumption/resume.pass.cpp
--- a/libcxx/test/std/language.support/support.coroutines/coroutine.handle/coroutine.handle.resumption/resume.pass.cpp
+++ b/libcxx/test/std/language.support/support.coroutines/coroutine.handle/coroutine.handle.resumption/resume.pass.cpp
@@ -18,9 +18,16 @@
 // void resume() const
 
 #include <coroutine>
+#ifdef TEST_MODULES
+import std;
+#endif
+#ifndef TEST_MODULES
 #include <type_traits>
+#endif
 #include <memory>
+#ifndef TEST_MODULES
 #include <utility>
+#endif
 #include <cstdint>
 #include <cassert>
 
diff --git a/libcxx/test/std/language.support/support.coroutines/coroutine.handle/void_handle.pass.cpp b/libcxx/test/std/language.support/support.coroutines/coroutine.handle/void_handle.pass.cpp
--- a/libcxx/test/std/language.support/support.coroutines/coroutine.handle/void_handle.pass.cpp
+++ b/libcxx/test/std/language.support/support.coroutines/coroutine.handle/void_handle.pass.cpp
@@ -10,7 +10,12 @@
 // UNSUPPORTED: libcpp-no-coroutines
 
 #include <coroutine>
+#ifdef TEST_MODULES
+import std;
+#endif
+#ifndef TEST_MODULES
 #include <type_traits>
+#endif
 
 #include "test_macros.h"
 
diff --git a/libcxx/test/std/language.support/support.coroutines/coroutine.traits/promise_type.pass.cpp b/libcxx/test/std/language.support/support.coroutines/coroutine.traits/promise_type.pass.cpp
--- a/libcxx/test/std/language.support/support.coroutines/coroutine.traits/promise_type.pass.cpp
+++ b/libcxx/test/std/language.support/support.coroutines/coroutine.traits/promise_type.pass.cpp
@@ -10,7 +10,12 @@
 // UNSUPPORTED: libcpp-no-coroutines
 
 #include <coroutine>
+#ifdef TEST_MODULES
+import std;
+#endif
+#ifndef TEST_MODULES
 #include <type_traits>
+#endif
 
 #include "test_macros.h"
 
diff --git a/libcxx/test/std/language.support/support.coroutines/coroutine.trivial.awaitables/suspend_always.pass.cpp b/libcxx/test/std/language.support/support.coroutines/coroutine.trivial.awaitables/suspend_always.pass.cpp
--- a/libcxx/test/std/language.support/support.coroutines/coroutine.trivial.awaitables/suspend_always.pass.cpp
+++ b/libcxx/test/std/language.support/support.coroutines/coroutine.trivial.awaitables/suspend_always.pass.cpp
@@ -10,9 +10,16 @@
 // UNSUPPORTED: libcpp-no-coroutines
 
 #include <coroutine>
+#ifdef TEST_MODULES
+import std;
+#endif
+#ifndef TEST_MODULES
 #include <type_traits>
+#endif
 #include <cassert>
+#ifndef TEST_MODULES
 #include <utility>
+#endif
 
 #include "test_macros.h"
 
diff --git a/libcxx/test/std/language.support/support.coroutines/coroutine.trivial.awaitables/suspend_never.pass.cpp b/libcxx/test/std/language.support/support.coroutines/coroutine.trivial.awaitables/suspend_never.pass.cpp
--- a/libcxx/test/std/language.support/support.coroutines/coroutine.trivial.awaitables/suspend_never.pass.cpp
+++ b/libcxx/test/std/language.support/support.coroutines/coroutine.trivial.awaitables/suspend_never.pass.cpp
@@ -10,9 +10,16 @@
 // UNSUPPORTED: libcpp-no-coroutines
 
 #include <coroutine>
+#ifdef TEST_MODULES
+import std;
+#endif
+#ifndef TEST_MODULES
 #include <type_traits>
+#endif
 #include <cassert>
+#ifndef TEST_MODULES
 #include <utility>
+#endif
 
 #include "test_macros.h"
 
diff --git a/libcxx/test/std/language.support/support.coroutines/end.to.end/generator.pass.cpp b/libcxx/test/std/language.support/support.coroutines/end.to.end/generator.pass.cpp
--- a/libcxx/test/std/language.support/support.coroutines/end.to.end/generator.pass.cpp
+++ b/libcxx/test/std/language.support/support.coroutines/end.to.end/generator.pass.cpp
@@ -13,7 +13,12 @@
 // UNSUPPORTED: ubsan
 
 #include <coroutine>
+#ifdef TEST_MODULES
+import std;
+#endif
+#ifndef TEST_MODULES
 #include <vector>
+#endif
 #include <cassert>
 
 #include "test_macros.h"
diff --git a/libcxx/test/std/language.support/support.coroutines/end.to.end/oneshot_func.pass.cpp b/libcxx/test/std/language.support/support.coroutines/end.to.end/oneshot_func.pass.cpp
--- a/libcxx/test/std/language.support/support.coroutines/end.to.end/oneshot_func.pass.cpp
+++ b/libcxx/test/std/language.support/support.coroutines/end.to.end/oneshot_func.pass.cpp
@@ -10,7 +10,12 @@
 // UNSUPPORTED: libcpp-no-coroutines
 
 #include <coroutine>
+#ifdef TEST_MODULES
+import std;
+#endif
+#ifndef TEST_MODULES
 #include <vector>
+#endif
 #include <cassert>
 
 #include "test_macros.h"