diff --git a/perf/flame.jl b/perf/flame.jl
index c8d3fea..cd21837 100644
--- a/perf/flame.jl
+++ b/perf/flame.jl
@@ -3,7 +3,7 @@ using Revise; include(joinpath("perf", "flame.jl"))
 =#
 
 import MultiBroadcastFusion as MBF
-include(joinpath(pkgdir(MBF), "test", "utils.jl"))
+include(joinpath(pkgdir(MBF), "test", "execution", "utils.jl"))
 
 # ===========================================
 
diff --git a/test/expr_code_lowered_single_expression.jl b/test/collection/expr_code_lowered_single_expression.jl
similarity index 100%
rename from test/expr_code_lowered_single_expression.jl
rename to test/collection/expr_code_lowered_single_expression.jl
diff --git a/test/expr_errors_and_edge_cases.jl b/test/collection/expr_errors_and_edge_cases.jl
similarity index 100%
rename from test/expr_errors_and_edge_cases.jl
rename to test/collection/expr_errors_and_edge_cases.jl
diff --git a/test/expr_fused_pairs.jl b/test/collection/expr_fused_pairs.jl
similarity index 100%
rename from test/expr_fused_pairs.jl
rename to test/collection/expr_fused_pairs.jl
diff --git a/test/expr_materialize_args.jl b/test/collection/expr_materialize_args.jl
similarity index 100%
rename from test/expr_materialize_args.jl
rename to test/collection/expr_materialize_args.jl
diff --git a/test/collection/runtests.jl b/test/collection/runtests.jl
new file mode 100644
index 0000000..e8c1c44
--- /dev/null
+++ b/test/collection/runtests.jl
@@ -0,0 +1,12 @@
+#=
+using Revise; include(joinpath("test", "collection", "runtests.jl"))
+=#
+using Test
+using SafeTestsets
+
+#! format: off
+@safetestset "expr_code_lowered_single_expression" begin; @time include("expr_code_lowered_single_expression.jl"); end
+@safetestset "expr_materialize_args" begin; @time include("expr_materialize_args.jl"); end
+@safetestset "expr_fused_pairs" begin; @time include("expr_fused_pairs.jl"); end
+@safetestset "expr_errors_and_edge_cases" begin; @time include("expr_errors_and_edge_cases.jl"); end
+#! format: on
diff --git a/test/bm_fused_reads_vs_hard_coded.jl b/test/execution/bm_fused_reads_vs_hard_coded.jl
similarity index 100%
rename from test/bm_fused_reads_vs_hard_coded.jl
rename to test/execution/bm_fused_reads_vs_hard_coded.jl
diff --git a/test/bm_fused_shared_reads.jl b/test/execution/bm_fused_shared_reads.jl
similarity index 100%
rename from test/bm_fused_shared_reads.jl
rename to test/execution/bm_fused_shared_reads.jl
diff --git a/test/bm_fused_shared_reads_writes.jl b/test/execution/bm_fused_shared_reads_writes.jl
similarity index 100%
rename from test/bm_fused_shared_reads_writes.jl
rename to test/execution/bm_fused_shared_reads_writes.jl
diff --git a/test/execution/runtests.jl b/test/execution/runtests.jl
new file mode 100644
index 0000000..f30994c
--- /dev/null
+++ b/test/execution/runtests.jl
@@ -0,0 +1,9 @@
+#=
+using Revise; include(joinpath("test", "execution", "runtests.jl"))
+=#
+
+#! format: off
+@safetestset "fused_shared_reads" begin; @time include("bm_fused_shared_reads.jl"); end
+@safetestset "fused_shared_reads_writes" begin; @time include("bm_fused_shared_reads_writes.jl"); end
+@safetestset "bm_fused_reads_vs_hard_coded" begin; @time include("bm_fused_reads_vs_hard_coded.jl"); end
+#! format: on
diff --git a/test/utils.jl b/test/execution/utils.jl
similarity index 100%
rename from test/utils.jl
rename to test/execution/utils.jl
diff --git a/test/runtests.jl b/test/runtests.jl
index 8de2eec..8828b4b 100644
--- a/test/runtests.jl
+++ b/test/runtests.jl
@@ -1,16 +1,8 @@
 #=
+using Revise; include(joinpath("test", "collection", "runtests.jl"))
+using Revise; include(joinpath("test", "execution", "runtests.jl"))
 using Revise; include(joinpath("test", "runtests.jl"))
 =#
-using Test
-using SafeTestsets
 
-#! format: off
-@safetestset "expr_code_lowered_single_expression" begin; @time include("expr_code_lowered_single_expression.jl"); end
-@safetestset "expr_materialize_args" begin; @time include("expr_materialize_args.jl"); end
-@safetestset "expr_fused_pairs" begin; @time include("expr_fused_pairs.jl"); end
-@safetestset "expr_errors_and_edge_cases" begin; @time include("expr_errors_and_edge_cases.jl"); end
-
-@safetestset "fused_shared_reads" begin; @time include("bm_fused_shared_reads.jl"); end
-@safetestset "fused_shared_reads_writes" begin; @time include("bm_fused_shared_reads_writes.jl"); end
-@safetestset "bm_fused_reads_vs_hard_coded" begin; @time include("bm_fused_reads_vs_hard_coded.jl"); end
-#! format: on
+include(joinpath("collection", "runtests.jl"))
+include(joinpath("execution", "runtests.jl"))