diff --git a/include/async/inline_scheduler.hpp b/include/async/schedulers/inline_scheduler.hpp
similarity index 100%
rename from include/async/inline_scheduler.hpp
rename to include/async/schedulers/inline_scheduler.hpp
diff --git a/include/async/runloop_scheduler.hpp b/include/async/schedulers/runloop_scheduler.hpp
similarity index 100%
rename from include/async/runloop_scheduler.hpp
rename to include/async/schedulers/runloop_scheduler.hpp
diff --git a/include/async/thread_scheduler.hpp b/include/async/schedulers/thread_scheduler.hpp
similarity index 100%
rename from include/async/thread_scheduler.hpp
rename to include/async/schedulers/thread_scheduler.hpp
diff --git a/include/async/sync_wait.hpp b/include/async/sync_wait.hpp
index 7c78470..ece1723 100644
--- a/include/async/sync_wait.hpp
+++ b/include/async/sync_wait.hpp
@@ -1,7 +1,7 @@
 #pragma once
 
 #include <async/concepts.hpp>
-#include <async/runloop_scheduler.hpp>
+#include <async/schedulers/runloop_scheduler.hpp>
 #include <async/tags.hpp>
 #include <async/type_traits.hpp>
 
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index 3b2c5c9..4ba6335 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -5,6 +5,8 @@ function(add_tests)
             CATCH2
             FILES
             "${name}.cpp"
+            INCLUDE_DIRECTORIES
+            ${PROJECT_SOURCE_DIR}/test
             LIBRARIES
             warnings
             async
@@ -18,7 +20,6 @@ add_tests(
     forwarding_query
     freestanding_sync_wait
     hosted_sync_wait
-    inline_scheduler
     just
     just_error
     just_error_result_of
@@ -31,11 +32,9 @@ add_tests(
     read
     repeat
     retry
-    runloop_scheduler
     split
     stop_token
     then
-    thread_scheduler
     transfer
     type_traits
     upon_error
@@ -43,3 +42,5 @@ add_tests(
     variant_sender
     when_all
     when_any)
+
+add_subdirectory(schedulers)
diff --git a/test/freestanding_sync_wait.cpp b/test/freestanding_sync_wait.cpp
index 08c5b4c..a8fc645 100644
--- a/test/freestanding_sync_wait.cpp
+++ b/test/freestanding_sync_wait.cpp
@@ -1,10 +1,10 @@
 #include <async/concepts.hpp>
-#include <async/inline_scheduler.hpp>
 #include <async/just.hpp>
 #include <async/on.hpp>
 #include <async/read.hpp>
+#include <async/schedulers/inline_scheduler.hpp>
+#include <async/schedulers/thread_scheduler.hpp>
 #include <async/then.hpp>
-#include <async/thread_scheduler.hpp>
 #include <async/variant_sender.hpp>
 
 #define SIMULATE_FREESTANDING
diff --git a/test/hosted_sync_wait.cpp b/test/hosted_sync_wait.cpp
index d5ba23b..4b5c99c 100644
--- a/test/hosted_sync_wait.cpp
+++ b/test/hosted_sync_wait.cpp
@@ -1,11 +1,11 @@
 #include <async/concepts.hpp>
-#include <async/inline_scheduler.hpp>
 #include <async/just.hpp>
 #include <async/on.hpp>
 #include <async/read.hpp>
+#include <async/schedulers/inline_scheduler.hpp>
+#include <async/schedulers/thread_scheduler.hpp>
 #include <async/sync_wait.hpp>
 #include <async/then.hpp>
-#include <async/thread_scheduler.hpp>
 #include <async/variant_sender.hpp>
 
 #include <catch2/catch_test_macros.hpp>
diff --git a/test/let_error.cpp b/test/let_error.cpp
index 60b4978..ad3b6bd 100644
--- a/test/let_error.cpp
+++ b/test/let_error.cpp
@@ -2,9 +2,9 @@
 
 #include <async/concepts.hpp>
 #include <async/env.hpp>
-#include <async/inline_scheduler.hpp>
 #include <async/just.hpp>
 #include <async/let_error.hpp>
+#include <async/schedulers/inline_scheduler.hpp>
 #include <async/then.hpp>
 #include <async/variant_sender.hpp>
 
diff --git a/test/let_stopped.cpp b/test/let_stopped.cpp
index b108773..9e3c723 100644
--- a/test/let_stopped.cpp
+++ b/test/let_stopped.cpp
@@ -2,9 +2,9 @@
 
 #include <async/concepts.hpp>
 #include <async/env.hpp>
-#include <async/inline_scheduler.hpp>
 #include <async/just.hpp>
 #include <async/let_stopped.hpp>
+#include <async/schedulers/inline_scheduler.hpp>
 #include <async/then.hpp>
 #include <async/variant_sender.hpp>
 
diff --git a/test/let_value.cpp b/test/let_value.cpp
index 9c75930..72c7d77 100644
--- a/test/let_value.cpp
+++ b/test/let_value.cpp
@@ -2,9 +2,9 @@
 
 #include <async/concepts.hpp>
 #include <async/env.hpp>
-#include <async/inline_scheduler.hpp>
 #include <async/just.hpp>
 #include <async/let_value.hpp>
+#include <async/schedulers/inline_scheduler.hpp>
 #include <async/then.hpp>
 #include <async/variant_sender.hpp>
 
diff --git a/test/on.cpp b/test/on.cpp
index 941ee8a..e279386 100644
--- a/test/on.cpp
+++ b/test/on.cpp
@@ -1,10 +1,10 @@
 #include "detail/common.hpp"
 
 #include <async/concepts.hpp>
-#include <async/inline_scheduler.hpp>
 #include <async/just.hpp>
 #include <async/just_result_of.hpp>
 #include <async/on.hpp>
+#include <async/schedulers/inline_scheduler.hpp>
 #include <async/stop_token.hpp>
 #include <async/when_all.hpp>
 
diff --git a/test/read.cpp b/test/read.cpp
index c08cf6b..513e678 100644
--- a/test/read.cpp
+++ b/test/read.cpp
@@ -2,10 +2,10 @@
 
 #include <async/concepts.hpp>
 #include <async/env.hpp>
-#include <async/inline_scheduler.hpp>
 #include <async/just.hpp>
 #include <async/on.hpp>
 #include <async/read.hpp>
+#include <async/schedulers/inline_scheduler.hpp>
 #include <async/stop_token.hpp>
 #include <async/sync_wait.hpp>
 #include <async/tags.hpp>
diff --git a/test/repeat.cpp b/test/repeat.cpp
index 6fba3a8..792146a 100644
--- a/test/repeat.cpp
+++ b/test/repeat.cpp
@@ -1,11 +1,11 @@
 #include "detail/common.hpp"
 
 #include <async/concepts.hpp>
-#include <async/inline_scheduler.hpp>
 #include <async/just.hpp>
 #include <async/let_value.hpp>
 #include <async/on.hpp>
 #include <async/repeat.hpp>
+#include <async/schedulers/inline_scheduler.hpp>
 #include <async/variant_sender.hpp>
 #include <async/when_all.hpp>
 
diff --git a/test/retry.cpp b/test/retry.cpp
index a5d46e3..40cf7d7 100644
--- a/test/retry.cpp
+++ b/test/retry.cpp
@@ -1,11 +1,11 @@
 #include "detail/common.hpp"
 
 #include <async/concepts.hpp>
-#include <async/inline_scheduler.hpp>
 #include <async/just.hpp>
 #include <async/let_value.hpp>
 #include <async/on.hpp>
 #include <async/retry.hpp>
+#include <async/schedulers/inline_scheduler.hpp>
 #include <async/variant_sender.hpp>
 #include <async/when_all.hpp>
 
diff --git a/test/schedulers/CMakeLists.txt b/test/schedulers/CMakeLists.txt
new file mode 100644
index 0000000..62881aa
--- /dev/null
+++ b/test/schedulers/CMakeLists.txt
@@ -0,0 +1 @@
+add_tests(inline_scheduler runloop_scheduler thread_scheduler)
diff --git a/test/inline_scheduler.cpp b/test/schedulers/inline_scheduler.cpp
similarity index 97%
rename from test/inline_scheduler.cpp
rename to test/schedulers/inline_scheduler.cpp
index 1f2af85..09ce749 100644
--- a/test/inline_scheduler.cpp
+++ b/test/schedulers/inline_scheduler.cpp
@@ -3,7 +3,7 @@
 #include <async/completion_scheduler.hpp>
 #include <async/concepts.hpp>
 #include <async/env.hpp>
-#include <async/inline_scheduler.hpp>
+#include <async/schedulers/inline_scheduler.hpp>
 
 #include <catch2/catch_test_macros.hpp>
 
diff --git a/test/runloop_scheduler.cpp b/test/schedulers/runloop_scheduler.cpp
similarity index 95%
rename from test/runloop_scheduler.cpp
rename to test/schedulers/runloop_scheduler.cpp
index 1be5807..4009f45 100644
--- a/test/runloop_scheduler.cpp
+++ b/test/schedulers/runloop_scheduler.cpp
@@ -3,7 +3,7 @@
 #include <async/completion_scheduler.hpp>
 #include <async/just.hpp>
 #include <async/on.hpp>
-#include <async/runloop_scheduler.hpp>
+#include <async/schedulers/runloop_scheduler.hpp>
 
 #include <catch2/catch_test_macros.hpp>
 
diff --git a/test/thread_scheduler.cpp b/test/schedulers/thread_scheduler.cpp
similarity index 97%
rename from test/thread_scheduler.cpp
rename to test/schedulers/thread_scheduler.cpp
index e7c56fe..e25938a 100644
--- a/test/thread_scheduler.cpp
+++ b/test/schedulers/thread_scheduler.cpp
@@ -3,7 +3,7 @@
 #include <async/completion_scheduler.hpp>
 #include <async/concepts.hpp>
 #include <async/env.hpp>
-#include <async/thread_scheduler.hpp>
+#include <async/schedulers/thread_scheduler.hpp>
 
 #include <catch2/catch_test_macros.hpp>
 
diff --git a/test/split.cpp b/test/split.cpp
index 36149f6..8fcf618 100644
--- a/test/split.cpp
+++ b/test/split.cpp
@@ -1,9 +1,9 @@
 #include "detail/common.hpp"
 
 #include <async/concepts.hpp>
-#include <async/inline_scheduler.hpp>
 #include <async/just.hpp>
 #include <async/on.hpp>
+#include <async/schedulers/inline_scheduler.hpp>
 #include <async/split.hpp>
 #include <async/then.hpp>
 
diff --git a/test/then.cpp b/test/then.cpp
index 6af70aa..f698a63 100644
--- a/test/then.cpp
+++ b/test/then.cpp
@@ -2,8 +2,8 @@
 
 #include <async/concepts.hpp>
 #include <async/env.hpp>
-#include <async/inline_scheduler.hpp>
 #include <async/just.hpp>
+#include <async/schedulers/inline_scheduler.hpp>
 #include <async/then.hpp>
 
 #include <catch2/catch_test_macros.hpp>
diff --git a/test/transfer.cpp b/test/transfer.cpp
index 6e57ab9..45dc82f 100644
--- a/test/transfer.cpp
+++ b/test/transfer.cpp
@@ -1,9 +1,9 @@
 #include "detail/common.hpp"
 
 #include <async/concepts.hpp>
-#include <async/inline_scheduler.hpp>
 #include <async/just.hpp>
 #include <async/on.hpp>
+#include <async/schedulers/inline_scheduler.hpp>
 #include <async/then.hpp>
 #include <async/transfer.hpp>
 
diff --git a/test/type_traits.cpp b/test/type_traits.cpp
index 220ee0d..07101df 100644
--- a/test/type_traits.cpp
+++ b/test/type_traits.cpp
@@ -1,7 +1,7 @@
 #include "detail/common.hpp"
 
 #include <async/concepts.hpp>
-#include <async/inline_scheduler.hpp>
+#include <async/schedulers/inline_scheduler.hpp>
 #include <async/type_traits.hpp>
 
 #include <catch2/catch_test_macros.hpp>
diff --git a/test/upon_error.cpp b/test/upon_error.cpp
index 26dd6db..7f21536 100644
--- a/test/upon_error.cpp
+++ b/test/upon_error.cpp
@@ -1,8 +1,8 @@
 #include "detail/common.hpp"
 
 #include <async/concepts.hpp>
-#include <async/inline_scheduler.hpp>
 #include <async/just.hpp>
+#include <async/schedulers/inline_scheduler.hpp>
 #include <async/then.hpp>
 
 #include <catch2/catch_test_macros.hpp>
diff --git a/test/upon_stopped.cpp b/test/upon_stopped.cpp
index 931760c..3672541 100644
--- a/test/upon_stopped.cpp
+++ b/test/upon_stopped.cpp
@@ -1,8 +1,8 @@
 #include "detail/common.hpp"
 
 #include <async/concepts.hpp>
-#include <async/inline_scheduler.hpp>
 #include <async/just.hpp>
+#include <async/schedulers/inline_scheduler.hpp>
 #include <async/then.hpp>
 
 #include <catch2/catch_test_macros.hpp>
diff --git a/test/when_all.cpp b/test/when_all.cpp
index 52a63a3..93f2286 100644
--- a/test/when_all.cpp
+++ b/test/when_all.cpp
@@ -3,9 +3,9 @@
 #include <async/concepts.hpp>
 #include <async/just.hpp>
 #include <async/let_value.hpp>
+#include <async/schedulers/thread_scheduler.hpp>
 #include <async/sync_wait.hpp>
 #include <async/then.hpp>
-#include <async/thread_scheduler.hpp>
 #include <async/variant_sender.hpp>
 #include <async/when_all.hpp>
 
diff --git a/test/when_any.cpp b/test/when_any.cpp
index dd59dd5..9199539 100644
--- a/test/when_any.cpp
+++ b/test/when_any.cpp
@@ -2,9 +2,9 @@
 
 #include <async/concepts.hpp>
 #include <async/just.hpp>
+#include <async/schedulers/thread_scheduler.hpp>
 #include <async/sync_wait.hpp>
 #include <async/then.hpp>
-#include <async/thread_scheduler.hpp>
 #include <async/type_traits.hpp>
 #include <async/when_any.hpp>