diff --git a/test/standalone.zig b/test/standalone.zig
index 6a957b7a1d..34eb28f4a7 100644
--- a/test/standalone.zig
+++ b/test/standalone.zig
@@ -11,43 +11,43 @@ pub const SimpleCase = struct {
 
 pub const simple_cases = [_]SimpleCase{
     .{
-        .src_path = "test/standalone/hello_world/hello.zig",
+        .src_path = "test/standalone/simple/hello_world/hello.zig",
         .all_modes = true,
     },
     .{
-        .src_path = "test/standalone/hello_world/hello_libc.zig",
+        .src_path = "test/standalone/simple/hello_world/hello_libc.zig",
         .link_libc = true,
         .all_modes = true,
     },
     .{
-        .src_path = "test/standalone/cat/main.zig",
+        .src_path = "test/standalone/simple/cat/main.zig",
     },
     // https://github.com/ziglang/zig/issues/6025
     //.{
-    //    .src_path = "test/standalone/issue_9693/main.zig",
+    //    .src_path = "test/standalone/simple/issue_9693/main.zig",
     //},
     .{
-        .src_path = "test/standalone/brace_expansion.zig",
+        .src_path = "test/standalone/simple/brace_expansion.zig",
         .is_test = true,
     },
     .{
-        .src_path = "test/standalone/issue_7030.zig",
+        .src_path = "test/standalone/simple/issue_7030.zig",
         .target = .{
             .cpu_arch = .wasm32,
             .os_tag = .freestanding,
         },
     },
 
-    .{ .src_path = "test/standalone/issue_12471/main.zig" },
-    .{ .src_path = "test/standalone/guess_number/main.zig" },
-    .{ .src_path = "test/standalone/main_return_error/error_u8.zig" },
-    .{ .src_path = "test/standalone/main_return_error/error_u8_non_zero.zig" },
-    .{ .src_path = "test/standalone/noreturn_call/inline.zig" },
-    .{ .src_path = "test/standalone/noreturn_call/as_arg.zig" },
-    .{ .src_path = "test/standalone/std_enums_big_enums.zig" },
+    .{ .src_path = "test/standalone/simple/issue_12471/main.zig" },
+    .{ .src_path = "test/standalone/simple/guess_number/main.zig" },
+    .{ .src_path = "test/standalone/simple/main_return_error/error_u8.zig" },
+    .{ .src_path = "test/standalone/simple/main_return_error/error_u8_non_zero.zig" },
+    .{ .src_path = "test/standalone/simple/noreturn_call/inline.zig" },
+    .{ .src_path = "test/standalone/simple/noreturn_call/as_arg.zig" },
+    .{ .src_path = "test/standalone/simple/std_enums_big_enums.zig" },
 
     .{
-        .src_path = "test/standalone/issue_9402/main.zig",
+        .src_path = "test/standalone/simple/issue_9402/main.zig",
         .os_filter = .windows,
         .link_libc = true,
     },
diff --git a/test/standalone/build.zig.zon b/test/standalone/build.zig.zon
index c60aeb10e6..d65d9c778f 100644
--- a/test/standalone/build.zig.zon
+++ b/test/standalone/build.zig.zon
@@ -2,6 +2,9 @@
     .name = "standalone_test_cases",
     .version = "0.0.0",
     .dependencies = .{
+        // "Simple" test cases (those in the 'simple' directory) are configured by the root build
+        // script, outside of this package.
+
         .test_runner_path = .{
             .path = "test_runner_path",
         },
diff --git a/test/standalone/brace_expansion.zig b/test/standalone/simple/brace_expansion.zig
similarity index 100%
rename from test/standalone/brace_expansion.zig
rename to test/standalone/simple/brace_expansion.zig
diff --git a/test/standalone/cat/main.zig b/test/standalone/simple/cat/main.zig
similarity index 100%
rename from test/standalone/cat/main.zig
rename to test/standalone/simple/cat/main.zig
diff --git a/test/standalone/guess_number/main.zig b/test/standalone/simple/guess_number/main.zig
similarity index 100%
rename from test/standalone/guess_number/main.zig
rename to test/standalone/simple/guess_number/main.zig
diff --git a/test/standalone/hello_world/hello.zig b/test/standalone/simple/hello_world/hello.zig
similarity index 100%
rename from test/standalone/hello_world/hello.zig
rename to test/standalone/simple/hello_world/hello.zig
diff --git a/test/standalone/hello_world/hello_libc.zig b/test/standalone/simple/hello_world/hello_libc.zig
similarity index 100%
rename from test/standalone/hello_world/hello_libc.zig
rename to test/standalone/simple/hello_world/hello_libc.zig
diff --git a/test/standalone/issue_12471/main.zig b/test/standalone/simple/issue_12471/main.zig
similarity index 100%
rename from test/standalone/issue_12471/main.zig
rename to test/standalone/simple/issue_12471/main.zig
diff --git a/test/standalone/issue_7030.zig b/test/standalone/simple/issue_7030.zig
similarity index 100%
rename from test/standalone/issue_7030.zig
rename to test/standalone/simple/issue_7030.zig
diff --git a/test/standalone/issue_9402/main.zig b/test/standalone/simple/issue_9402/main.zig
similarity index 100%
rename from test/standalone/issue_9402/main.zig
rename to test/standalone/simple/issue_9402/main.zig
diff --git a/test/standalone/main_return_error/error_u8.zig b/test/standalone/simple/main_return_error/error_u8.zig
similarity index 100%
rename from test/standalone/main_return_error/error_u8.zig
rename to test/standalone/simple/main_return_error/error_u8.zig
diff --git a/test/standalone/main_return_error/error_u8_non_zero.zig b/test/standalone/simple/main_return_error/error_u8_non_zero.zig
similarity index 100%
rename from test/standalone/main_return_error/error_u8_non_zero.zig
rename to test/standalone/simple/main_return_error/error_u8_non_zero.zig
diff --git a/test/standalone/noreturn_call/as_arg.zig b/test/standalone/simple/noreturn_call/as_arg.zig
similarity index 100%
rename from test/standalone/noreturn_call/as_arg.zig
rename to test/standalone/simple/noreturn_call/as_arg.zig
diff --git a/test/standalone/noreturn_call/inline.zig b/test/standalone/simple/noreturn_call/inline.zig
similarity index 100%
rename from test/standalone/noreturn_call/inline.zig
rename to test/standalone/simple/noreturn_call/inline.zig
diff --git a/test/standalone/std_enums_big_enums.zig b/test/standalone/simple/std_enums_big_enums.zig
similarity index 100%
rename from test/standalone/std_enums_big_enums.zig
rename to test/standalone/simple/std_enums_big_enums.zig