diff --git a/build.zig b/build.zig
index 36bb1e0f73e6..11d716a17ffd 100644
--- a/build.zig
+++ b/build.zig
@@ -521,11 +521,10 @@ pub fn build(b: *std.Build) !void {
         optimization_modes,
         enable_macos_sdk,
         enable_ios_sdk,
-        false,
         enable_symlinks_windows,
     ));
     test_step.dependOn(tests.addCAbiTests(b, skip_non_native, skip_release));
-    test_step.dependOn(tests.addLinkTests(b, enable_macos_sdk, enable_ios_sdk, false, enable_symlinks_windows));
+    test_step.dependOn(tests.addLinkTests(b, enable_macos_sdk, enable_ios_sdk, enable_symlinks_windows));
     test_step.dependOn(tests.addStackTraceTests(b, test_filters, optimization_modes));
     test_step.dependOn(tests.addCliTests(b));
     test_step.dependOn(tests.addAssembleAndLinkTests(b, test_filters, optimization_modes));
diff --git a/build.zig.zon b/build.zig.zon
new file mode 100644
index 000000000000..3b0cd4a11dee
--- /dev/null
+++ b/build.zig.zon
@@ -0,0 +1,15 @@
+// The Zig compiler is not intended to be consumed as a package.
+// The sole purpose of this manifest file is to test the compiler.
+.{
+    .name = "zig",
+    .version = "0.0.0",
+    .dependencies = .{
+        .standalone_test_cases = .{
+            .path = "test/standalone",
+        },
+        .link_test_cases = .{
+            .path = "test/link",
+        },
+    },
+    .paths = .{""},
+}
diff --git a/lib/std/Build.zig b/lib/std/Build.zig
index 8081a0d70501..4938f616c95f 100644
--- a/lib/std/Build.zig
+++ b/lib/std/Build.zig
@@ -1973,25 +1973,6 @@ pub fn dependencyFromBuildZig(
     debug.panic("'{}' is not a build.zig struct of a dependecy in '{s}'", .{ build_zig, full_path });
 }
 
-pub fn anonymousDependency(
-    b: *Build,
-    /// The path to the directory containing the dependency's build.zig file,
-    /// relative to the current package's build.zig.
-    relative_build_root: []const u8,
-    /// A direct `@import` of the build.zig of the dependency.
-    comptime build_zig: type,
-    args: anytype,
-) *Dependency {
-    const arena = b.allocator;
-    const build_root = b.build_root.join(arena, &.{relative_build_root}) catch @panic("OOM");
-    const name = arena.dupe(u8, relative_build_root) catch @panic("OOM");
-    for (name) |*byte| switch (byte.*) {
-        '/', '\\' => byte.* = '.',
-        else => continue,
-    };
-    return dependencyInner(b, name, build_root, build_zig, "anonymous", &.{}, args);
-}
-
 fn userValuesAreSame(lhs: UserValue, rhs: UserValue) bool {
     switch (lhs) {
         .flag => {},
@@ -2039,7 +2020,7 @@ fn userValuesAreSame(lhs: UserValue, rhs: UserValue) bool {
     return true;
 }
 
-pub fn dependencyInner(
+fn dependencyInner(
     b: *Build,
     name: []const u8,
     build_root_string: []const u8,
diff --git a/test/link.zig b/test/link.zig
deleted file mode 100644
index 58b2dc9f9695..000000000000
--- a/test/link.zig
+++ /dev/null
@@ -1,94 +0,0 @@
-pub const Case = struct {
-    build_root: []const u8,
-    import: type,
-};
-
-pub const cases = [_]Case{
-    .{
-        .build_root = "test/link",
-        .import = @import("link/link.zig"),
-    },
-
-    .{
-        .build_root = "test/link/bss",
-        .import = @import("link/bss/build.zig"),
-    },
-    .{
-        .build_root = "test/link/common_symbols",
-        .import = @import("link/common_symbols/build.zig"),
-    },
-    .{
-        .build_root = "test/link/common_symbols_alignment",
-        .import = @import("link/common_symbols_alignment/build.zig"),
-    },
-    .{
-        .build_root = "test/link/interdependent_static_c_libs",
-        .import = @import("link/interdependent_static_c_libs/build.zig"),
-    },
-    .{
-        .build_root = "test/link/static_libs_from_object_files",
-        .import = @import("link/static_libs_from_object_files/build.zig"),
-    },
-    .{
-        .build_root = "test/link/glibc_compat",
-        .import = @import("link/glibc_compat/build.zig"),
-    },
-
-    // WASM Cases
-    .{
-        .build_root = "test/link/wasm/archive",
-        .import = @import("link/wasm/archive/build.zig"),
-    },
-    .{
-        .build_root = "test/link/wasm/basic-features",
-        .import = @import("link/wasm/basic-features/build.zig"),
-    },
-    .{
-        .build_root = "test/link/wasm/bss",
-        .import = @import("link/wasm/bss/build.zig"),
-    },
-    .{
-        .build_root = "test/link/wasm/export",
-        .import = @import("link/wasm/export/build.zig"),
-    },
-    .{
-        .build_root = "test/link/wasm/export-data",
-        .import = @import("link/wasm/export-data/build.zig"),
-    },
-    .{
-        .build_root = "test/link/wasm/extern",
-        .import = @import("link/wasm/extern/build.zig"),
-    },
-    .{
-        .build_root = "test/link/wasm/extern-mangle",
-        .import = @import("link/wasm/extern-mangle/build.zig"),
-    },
-    .{
-        .build_root = "test/link/wasm/function-table",
-        .import = @import("link/wasm/function-table/build.zig"),
-    },
-    .{
-        .build_root = "test/link/wasm/infer-features",
-        .import = @import("link/wasm/infer-features/build.zig"),
-    },
-    .{
-        .build_root = "test/link/wasm/producers",
-        .import = @import("link/wasm/producers/build.zig"),
-    },
-    .{
-        .build_root = "test/link/wasm/segments",
-        .import = @import("link/wasm/segments/build.zig"),
-    },
-    .{
-        .build_root = "test/link/wasm/shared-memory",
-        .import = @import("link/wasm/shared-memory/build.zig"),
-    },
-    .{
-        .build_root = "test/link/wasm/stack_pointer",
-        .import = @import("link/wasm/stack_pointer/build.zig"),
-    },
-    .{
-        .build_root = "test/link/wasm/type",
-        .import = @import("link/wasm/type/build.zig"),
-    },
-};
diff --git a/test/link/build.zig b/test/link/build.zig
new file mode 100644
index 000000000000..2774344d2778
--- /dev/null
+++ b/test/link/build.zig
@@ -0,0 +1,54 @@
+const std = @import("std");
+const builtin = @import("builtin");
+const link = @import("link.zig");
+
+pub fn build(b: *std.Build) void {
+    const step = b.step("test", "Run link test cases");
+    b.default_step = step;
+
+    const enable_ios_sdk = b.option(bool, "enable_ios_sdk", "Run tests requiring presence of iOS SDK and frameworks") orelse false;
+    const enable_macos_sdk = b.option(bool, "enable_macos_sdk", "Run tests requiring presence of macOS SDK and frameworks") orelse enable_ios_sdk;
+    const enable_symlinks_windows = b.option(bool, "enable_symlinks_windows", "Run tests requiring presence of symlinks on Windows") orelse false;
+    const omit_symlinks = builtin.os.tag == .windows and !enable_symlinks_windows;
+
+    const build_opts: link.BuildOptions = .{
+        .has_ios_sdk = enable_ios_sdk,
+        .has_macos_sdk = enable_macos_sdk,
+        .has_symlinks_windows = omit_symlinks,
+    };
+    step.dependOn(@import("elf.zig").testAll(b, build_opts));
+    step.dependOn(@import("macho.zig").testAll(b, build_opts));
+
+    add_dep_steps: for (b.available_deps) |available_dep| {
+        const dep_name, const dep_hash = available_dep;
+
+        const all_pkgs = @import("root").dependencies.packages;
+        inline for (@typeInfo(all_pkgs).Struct.decls) |decl| {
+            const pkg_hash = decl.name;
+            if (std.mem.eql(u8, dep_hash, pkg_hash)) {
+                const pkg = @field(all_pkgs, pkg_hash);
+                if (!@hasDecl(pkg, "build_zig")) {
+                    std.debug.panic("link test case '{s}' is missing a 'build.zig' file", .{dep_name});
+                }
+                const requires_ios_sdk = @hasDecl(pkg.build_zig, "requires_ios_sdk") and
+                    pkg.build_zig.requires_ios_sdk;
+                const requires_macos_sdk = @hasDecl(pkg.build_zig, "requires_macos_sdk") and
+                    pkg.build_zig.requires_macos_sdk;
+                const requires_symlinks = @hasDecl(pkg.build_zig, "requires_symlinks") and
+                    pkg.build_zig.requires_symlinks;
+                if ((requires_symlinks and omit_symlinks) or
+                    (requires_macos_sdk and !enable_macos_sdk) or
+                    (requires_ios_sdk and !enable_ios_sdk))
+                {
+                    continue :add_dep_steps;
+                }
+                break;
+            }
+        } else unreachable;
+
+        const dep = b.dependency(dep_name, .{});
+        const dep_step = dep.builder.default_step;
+        dep_step.name = b.fmt("link_test_cases.{s}", .{dep_name});
+        step.dependOn(dep_step);
+    }
+}
diff --git a/test/link/build.zig.zon b/test/link/build.zig.zon
new file mode 100644
index 000000000000..d304212c051a
--- /dev/null
+++ b/test/link/build.zig.zon
@@ -0,0 +1,69 @@
+.{
+    .name = "link_test_cases",
+    .version = "0.0.0",
+    .dependencies = .{
+        .bss = .{
+            .path = "bss",
+        },
+        .common_symbols_alignment = .{
+            .path = "common_symbols_alignment",
+        },
+        .interdependent_static_c_libs = .{
+            .path = "interdependent_static_c_libs",
+        },
+        .static_libs_from_object_files = .{
+            .path = "static_libs_from_object_files",
+        },
+        .glibc_compat = .{
+            .path = "glibc_compat",
+        },
+        // WASM Cases
+        .wasm_archive = .{
+            .path = "wasm/archive",
+        },
+        .wasm_basic_features = .{
+            .path = "wasm/basic-features",
+        },
+        .wasm_bss = .{
+            .path = "wasm/bss",
+        },
+        .wasm_export = .{
+            .path = "wasm/export",
+        },
+        .wasm_export_data = .{
+            .path = "wasm/export-data",
+        },
+        .wasm_extern = .{
+            .path = "wasm/extern",
+        },
+        .wasm_extern_mangle = .{
+            .path = "wasm/extern-mangle",
+        },
+        .wasm_function_table = .{
+            .path = "wasm/function-table",
+        },
+        .wasm_infer_features = .{
+            .path = "wasm/infer-features",
+        },
+        .wasm_producers = .{
+            .path = "wasm/producers",
+        },
+        .wasm_segments = .{
+            .path = "wasm/segments",
+        },
+        .wasm_shared_memory = .{
+            .path = "wasm/shared-memory",
+        },
+        .wasm_stack_pointer = .{
+            .path = "wasm/stack_pointer",
+        },
+        .wasm_type = .{
+            .path = "wasm/type",
+        },
+    },
+    .paths = .{
+        "build.zig",
+        "build.zig.zon",
+        "link.zig",
+    },
+}
diff --git a/test/standalone.zig b/test/standalone.zig
deleted file mode 100644
index 2f1b7d1339a0..000000000000
--- a/test/standalone.zig
+++ /dev/null
@@ -1,275 +0,0 @@
-pub const SimpleCase = struct {
-    src_path: []const u8,
-    link_libc: bool = false,
-    all_modes: bool = false,
-    target: std.Target.Query = .{},
-    is_test: bool = false,
-    is_exe: bool = true,
-    /// Run only on this OS.
-    os_filter: ?std.Target.Os.Tag = null,
-};
-
-pub const BuildCase = struct {
-    build_root: []const u8,
-    import: type,
-};
-
-pub const simple_cases = [_]SimpleCase{
-    .{
-        .src_path = "test/standalone/hello_world/hello.zig",
-        .all_modes = true,
-    },
-    .{
-        .src_path = "test/standalone/hello_world/hello_libc.zig",
-        .link_libc = true,
-        .all_modes = true,
-    },
-    .{
-        .src_path = "test/standalone/cat/main.zig",
-    },
-    // https://github.com/ziglang/zig/issues/6025
-    //.{
-    //    .src_path = "test/standalone/issue_9693/main.zig",
-    //},
-    .{
-        .src_path = "test/standalone/brace_expansion.zig",
-        .is_test = true,
-    },
-    .{
-        .src_path = "test/standalone/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/issue_9402/main.zig",
-        .os_filter = .windows,
-        .link_libc = true,
-    },
-
-    // Ensure the development tools are buildable. Alphabetically sorted.
-    // No need to build `tools/spirv/grammar.zig`.
-    .{ .src_path = "tools/gen_outline_atomics.zig" },
-    .{ .src_path = "tools/gen_spirv_spec.zig" },
-    .{ .src_path = "tools/gen_stubs.zig" },
-    .{ .src_path = "tools/generate_linux_syscalls.zig" },
-    .{ .src_path = "tools/process_headers.zig" },
-    .{ .src_path = "tools/update-linux-headers.zig" },
-    .{ .src_path = "tools/update_clang_options.zig" },
-    .{ .src_path = "tools/update_cpu_features.zig" },
-    .{ .src_path = "tools/update_glibc.zig" },
-    .{ .src_path = "tools/update_spirv_features.zig" },
-};
-
-pub const build_cases = [_]BuildCase{
-    .{
-        .build_root = "test/standalone/test_runner_path",
-        .import = @import("standalone/test_runner_path/build.zig"),
-    },
-    .{
-        .build_root = "test/standalone/test_runner_module_imports",
-        .import = @import("standalone/test_runner_module_imports/build.zig"),
-    },
-    // https://github.com/ziglang/zig/issues/17483
-    //.{
-    //    .build_root = "test/standalone/issue_13970",
-    //    .import = @import("standalone/issue_13970/build.zig"),
-    //},
-    .{
-        .build_root = "test/standalone/shared_library",
-        .import = @import("standalone/shared_library/build.zig"),
-    },
-    .{
-        .build_root = "test/standalone/mix_o_files",
-        .import = @import("standalone/mix_o_files/build.zig"),
-    },
-    .{
-        .build_root = "test/standalone/mix_c_files",
-        .import = @import("standalone/mix_c_files/build.zig"),
-    },
-    .{
-        .build_root = "test/standalone/global_linkage",
-        .import = @import("standalone/global_linkage/build.zig"),
-    },
-    .{
-        .build_root = "test/standalone/static_c_lib",
-        .import = @import("standalone/static_c_lib/build.zig"),
-    },
-    .{
-        .build_root = "test/standalone/issue_339",
-        .import = @import("standalone/issue_339/build.zig"),
-    },
-    .{
-        .build_root = "test/standalone/issue_8550",
-        .import = @import("standalone/issue_8550/build.zig"),
-    },
-    .{
-        .build_root = "test/standalone/issue_794",
-        .import = @import("standalone/issue_794/build.zig"),
-    },
-    .{
-        .build_root = "test/standalone/issue_5825",
-        .import = @import("standalone/issue_5825/build.zig"),
-    },
-    .{
-        .build_root = "test/standalone/pkg_import",
-        .import = @import("standalone/pkg_import/build.zig"),
-    },
-    .{
-        .build_root = "test/standalone/use_alias",
-        .import = @import("standalone/use_alias/build.zig"),
-    },
-    .{
-        .build_root = "test/standalone/install_raw_hex",
-        .import = @import("standalone/install_raw_hex/build.zig"),
-    },
-    // https://github.com/ziglang/zig/issues/17484
-    //.{
-    //    .build_root = "test/standalone/emit_asm_and_bin",
-    //    .import = @import("standalone/emit_asm_and_bin/build.zig"),
-    //},
-    // https://github.com/ziglang/zig/issues/17484
-    //.{
-    //    .build_root = "test/standalone/issue_12588",
-    //    .import = @import("standalone/issue_12588/build.zig"),
-    //},
-    .{
-        .build_root = "test/standalone/child_process",
-        .import = @import("standalone/child_process/build.zig"),
-    },
-    .{
-        .build_root = "test/standalone/embed_generated_file",
-        .import = @import("standalone/embed_generated_file/build.zig"),
-    },
-    .{
-        .build_root = "test/standalone/extern",
-        .import = @import("standalone/extern/build.zig"),
-    },
-    .{
-        .build_root = "test/standalone/dep_diamond",
-        .import = @import("standalone/dep_diamond/build.zig"),
-    },
-    .{
-        .build_root = "test/standalone/dep_triangle",
-        .import = @import("standalone/dep_triangle/build.zig"),
-    },
-    .{
-        .build_root = "test/standalone/dep_recursive",
-        .import = @import("standalone/dep_recursive/build.zig"),
-    },
-    .{
-        .build_root = "test/standalone/dep_mutually_recursive",
-        .import = @import("standalone/dep_mutually_recursive/build.zig"),
-    },
-    .{
-        .build_root = "test/standalone/dep_shared_builtin",
-        .import = @import("standalone/dep_shared_builtin/build.zig"),
-    },
-    .{
-        .build_root = "test/standalone/dirname",
-        .import = @import("standalone/dirname/build.zig"),
-    },
-    .{
-        .build_root = "test/standalone/empty_env",
-        .import = @import("standalone/empty_env/build.zig"),
-    },
-    .{
-        .build_root = "test/standalone/issue_11595",
-        .import = @import("standalone/issue_11595/build.zig"),
-    },
-    .{
-        .build_root = "test/standalone/load_dynamic_library",
-        .import = @import("standalone/load_dynamic_library/build.zig"),
-    },
-    .{
-        .build_root = "test/standalone/windows_resources",
-        .import = @import("standalone/windows_resources/build.zig"),
-    },
-    .{
-        .build_root = "test/standalone/windows_entry_points",
-        .import = @import("standalone/windows_entry_points/build.zig"),
-    },
-    .{
-        .build_root = "test/standalone/windows_spawn",
-        .import = @import("standalone/windows_spawn/build.zig"),
-    },
-    .{
-        .build_root = "test/standalone/self_exe_symlink",
-        .import = @import("standalone/self_exe_symlink/build.zig"),
-    },
-    .{
-        .build_root = "test/standalone/c_compiler",
-        .import = @import("standalone/c_compiler/build.zig"),
-    },
-    .{
-        .build_root = "test/standalone/pie",
-        .import = @import("standalone/pie/build.zig"),
-    },
-    .{
-        .build_root = "test/standalone/issue_12706",
-        .import = @import("standalone/issue_12706/build.zig"),
-    },
-    // TODO This test is disabled for doing naughty things in the build script.
-    // The logic needs to get moved to a child process instead of build.zig.
-    //.{
-    //    .build_root = "test/standalone/sigpipe",
-    //    .import = @import("standalone/sigpipe/build.zig"),
-    //},
-    // TODO restore this test
-    //.{
-    //    .build_root = "test/standalone/options",
-    //    .import = @import("standalone/options/build.zig"),
-    //},
-    .{
-        .build_root = "test/standalone/strip_empty_loop",
-        .import = @import("standalone/strip_empty_loop/build.zig"),
-    },
-    .{
-        .build_root = "test/standalone/strip_struct_init",
-        .import = @import("standalone/strip_struct_init/build.zig"),
-    },
-    .{
-        .build_root = "test/standalone/cmakedefine",
-        .import = @import("standalone/cmakedefine/build.zig"),
-    },
-    .{
-        .build_root = "test/standalone/zerolength_check",
-        .import = @import("standalone/zerolength_check/build.zig"),
-    },
-    .{
-        .build_root = "test/standalone/stack_iterator",
-        .import = @import("standalone/stack_iterator/build.zig"),
-    },
-    .{
-        .build_root = "test/standalone/coff_dwarf",
-        .import = @import("standalone/coff_dwarf/build.zig"),
-    },
-    .{
-        .build_root = "test/standalone/compiler_rt_panic",
-        .import = @import("standalone/compiler_rt_panic/build.zig"),
-    },
-    .{
-        .build_root = "test/standalone/ios",
-        .import = @import("standalone/ios/build.zig"),
-    },
-    .{
-        .build_root = "test/standalone/depend_on_main_mod",
-        .import = @import("standalone/depend_on_main_mod/build.zig"),
-    },
-    .{
-        .build_root = "test/standalone/install_headers",
-        .import = @import("standalone/install_headers/build.zig"),
-    },
-};
-
-const std = @import("std");
diff --git a/test/standalone/build.zig b/test/standalone/build.zig
new file mode 100644
index 000000000000..673a52cedd5e
--- /dev/null
+++ b/test/standalone/build.zig
@@ -0,0 +1,90 @@
+const std = @import("std");
+const builtin = @import("builtin");
+
+pub fn build(b: *std.Build) void {
+    const step = b.step("test", "Run standalone test cases");
+    b.default_step = step;
+
+    const enable_ios_sdk = b.option(bool, "enable_ios_sdk", "Run tests requiring presence of iOS SDK and frameworks") orelse false;
+    const enable_macos_sdk = b.option(bool, "enable_macos_sdk", "Run tests requiring presence of macOS SDK and frameworks") orelse enable_ios_sdk;
+    const enable_symlinks_windows = b.option(bool, "enable_symlinks_windows", "Run tests requiring presence of symlinks on Windows") orelse false;
+    const omit_symlinks = builtin.os.tag == .windows and !enable_symlinks_windows;
+
+    const simple_skip_debug = b.option(bool, "simple_skip_debug", "Simple tests skip debug builds") orelse false;
+    const simple_skip_release_safe = b.option(bool, "simple_skip_release_safe", "Simple tests skip release-safe builds") orelse false;
+    const simple_skip_release_fast = b.option(bool, "simple_skip_release_fast", "Simple tests skip release-fast builds") orelse false;
+    const simple_skip_release_small = b.option(bool, "simple_skip_release_small", "Simple tests skip release-small builds") orelse false;
+
+    const simple_dep = b.dependency("simple", .{
+        .skip_debug = simple_skip_debug,
+        .skip_release_safe = simple_skip_release_safe,
+        .skip_release_fast = simple_skip_release_fast,
+        .skip_release_small = simple_skip_release_small,
+    });
+    const simple_dep_step = simple_dep.builder.default_step;
+    simple_dep_step.name = "standalone_test_cases.simple";
+    step.dependOn(simple_dep_step);
+
+    // Ensure the development tools are buildable.
+    const tools_tests_step = b.step("standalone_test_cases.tools", "Test tools");
+    step.dependOn(tools_tests_step);
+    const tools_target = b.resolveTargetQuery(.{});
+    for ([_][]const u8{
+        // Alphabetically sorted. No need to build `tools/spirv/grammar.zig`.
+        "../../tools/gen_outline_atomics.zig",
+        "../../tools/gen_spirv_spec.zig",
+        "../../tools/gen_stubs.zig",
+        "../../tools/generate_linux_syscalls.zig",
+        "../../tools/process_headers.zig",
+        "../../tools/update-linux-headers.zig",
+        "../../tools/update_clang_options.zig",
+        "../../tools/update_cpu_features.zig",
+        "../../tools/update_glibc.zig",
+        "../../tools/update_spirv_features.zig",
+    }) |tool_src_path| {
+        const tool = b.addTest(.{
+            .name = std.fs.path.stem(tool_src_path),
+            .root_source_file = .{ .path = tool_src_path },
+            .optimize = .Debug,
+            .target = tools_target,
+        });
+        const run = b.addRunArtifact(tool);
+        tools_tests_step.dependOn(&run.step);
+    }
+
+    add_dep_steps: for (b.available_deps) |available_dep| {
+        const dep_name, const dep_hash = available_dep;
+
+        // The 'simple' dependency was already handled manually above.
+        if (std.mem.eql(u8, dep_name, "simple")) continue;
+
+        const all_pkgs = @import("root").dependencies.packages;
+        inline for (@typeInfo(all_pkgs).Struct.decls) |decl| {
+            const pkg_hash = decl.name;
+            if (std.mem.eql(u8, dep_hash, pkg_hash)) {
+                const pkg = @field(all_pkgs, pkg_hash);
+                if (!@hasDecl(pkg, "build_zig")) {
+                    std.debug.panic("standalone test case '{s}' is missing a 'build.zig' file", .{dep_name});
+                }
+                const requires_ios_sdk = @hasDecl(pkg.build_zig, "requires_ios_sdk") and
+                    pkg.build_zig.requires_ios_sdk;
+                const requires_macos_sdk = @hasDecl(pkg.build_zig, "requires_macos_sdk") and
+                    pkg.build_zig.requires_macos_sdk;
+                const requires_symlinks = @hasDecl(pkg.build_zig, "requires_symlinks") and
+                    pkg.build_zig.requires_symlinks;
+                if ((requires_symlinks and omit_symlinks) or
+                    (requires_macos_sdk and !enable_macos_sdk) or
+                    (requires_ios_sdk and !enable_ios_sdk))
+                {
+                    continue :add_dep_steps;
+                }
+                break;
+            }
+        } else unreachable;
+
+        const dep = b.dependency(dep_name, .{});
+        const dep_step = dep.builder.default_step;
+        dep_step.name = b.fmt("standalone_test_cases.{s}", .{dep_name});
+        step.dependOn(dep_step);
+    }
+}
diff --git a/test/standalone/build.zig.zon b/test/standalone/build.zig.zon
new file mode 100644
index 000000000000..8b59f261179e
--- /dev/null
+++ b/test/standalone/build.zig.zon
@@ -0,0 +1,163 @@
+.{
+    .name = "standalone_test_cases",
+    .version = "0.0.0",
+    .dependencies = .{
+        .simple = .{
+            .path = "simple",
+        },
+        .test_runner_path = .{
+            .path = "test_runner_path",
+        },
+        .test_runner_module_imports = .{
+            .path = "test_runner_module_imports",
+        },
+        // https://github.com/ziglang/zig/issues/17483
+        //.issue_13970 = .{
+        //    .path = "issue_13970",
+        //},
+        .shared_library = .{
+            .path = "shared_library",
+        },
+        .mix_o_files = .{
+            .path = "mix_o_files",
+        },
+        .mix_c_files = .{
+            .path = "mix_c_files",
+        },
+        .global_linkage = .{
+            .path = "global_linkage",
+        },
+        .static_c_lib = .{
+            .path = "static_c_lib",
+        },
+        .issue_339 = .{
+            .path = "issue_339",
+        },
+        .issue_8550 = .{
+            .path = "issue_8550",
+        },
+        .issue_794 = .{
+            .path = "issue_794",
+        },
+        .issue_5825 = .{
+            .path = "issue_5825",
+        },
+        .pkg_import = .{
+            .path = "pkg_import",
+        },
+        .use_alias = .{
+            .path = "use_alias",
+        },
+        .install_raw_hex = .{
+            .path = "install_raw_hex",
+        },
+        // https://github.com/ziglang/zig/issues/17484
+        //.emit_asm_and_bin = .{
+        //    .path = "emit_asm_and_bin",
+        //},
+        // https://github.com/ziglang/zig/issues/17484
+        //.issue_12588 = .{
+        //    .path = "issue_12588",
+        //},
+        .child_process = .{
+            .path = "child_process",
+        },
+        .embed_generated_file = .{
+            .path = "embed_generated_file",
+        },
+        .@"extern" = .{
+            .path = "extern",
+        },
+        .dep_diamond = .{
+            .path = "dep_diamond",
+        },
+        .dep_triangle = .{
+            .path = "dep_triangle",
+        },
+        .dep_recursive = .{
+            .path = "dep_recursive",
+        },
+        .dep_mutually_recursive = .{
+            .path = "dep_mutually_recursive",
+        },
+        .dep_shared_builtin = .{
+            .path = "dep_shared_builtin",
+        },
+        .dirname = .{
+            .path = "dirname",
+        },
+        .empty_env = .{
+            .path = "empty_env",
+        },
+        .issue_11595 = .{
+            .path = "issue_11595",
+        },
+        .load_dynamic_library = .{
+            .path = "load_dynamic_library",
+        },
+        .windows_resources = .{
+            .path = "windows_resources",
+        },
+        .windows_entry_points = .{
+            .path = "windows_entry_points",
+        },
+        .windows_spawn = .{
+            .path = "windows_spawn",
+        },
+        .self_exe_symlink = .{
+            .path = "self_exe_symlink",
+        },
+        .c_compiler = .{
+            .path = "c_compiler",
+        },
+        .pie = .{
+            .path = "pie",
+        },
+        .issue_12706 = .{
+            .path = "issue_12706",
+        },
+        // TODO This test is disabled for doing naughty things in the build script.
+        // The logic needs to get moved to a child process instead of build.zig.
+        //.sigpipe = .{
+        //    .path = "sigpipe",
+        //},
+        // TODO restore this test
+        //.options = .{
+        //    .path = "options",
+        //},
+        .strip_empty_loop = .{
+            .path = "strip_empty_loop",
+        },
+        .strip_struct_init = .{
+            .path = "strip_struct_init",
+        },
+        .cmakedefine = .{
+            .path = "cmakedefine",
+        },
+        .zerolength_check = .{
+            .path = "zerolength_check",
+        },
+        .stack_iterator = .{
+            .path = "stack_iterator",
+        },
+        .coff_dwarf = .{
+            .path = "coff_dwarf",
+        },
+        .compiler_rt_panic = .{
+            .path = "compiler_rt_panic",
+        },
+        .ios = .{
+            .path = "ios",
+        },
+        .depend_on_main_mod = .{
+            .path = "depend_on_main_mod",
+        },
+        .install_headers = .{
+            .path = "install_headers",
+        },
+    },
+    .paths = .{
+        "build.zig",
+        "build.zig.zon",
+    },
+}
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/simple/build.zig b/test/standalone/simple/build.zig
new file mode 100644
index 000000000000..8bcfbe0fcac2
--- /dev/null
+++ b/test/standalone/simple/build.zig
@@ -0,0 +1,123 @@
+const std = @import("std");
+const builtin = @import("builtin");
+
+pub fn build(b: *std.Build) void {
+    const step = b.step("test", "Run simple standalone test cases");
+    b.default_step = step;
+
+    const skip_debug = b.option(bool, "skip_debug", "Skip debug builds") orelse false;
+    const skip_release_safe = b.option(bool, "skip_release_safe", "Skip release-safe builds") orelse false;
+    const skip_release_fast = b.option(bool, "skip_release_fast", "Skip release-fast builds") orelse false;
+    const skip_release_small = b.option(bool, "skip_release_small", "Skip release-small builds") orelse false;
+
+    var optimize_modes_buf: [4]std.builtin.OptimizeMode = undefined;
+    var optimize_modes_len: usize = 0;
+    if (!skip_debug) {
+        optimize_modes_buf[optimize_modes_len] = .Debug;
+        optimize_modes_len += 1;
+    }
+    if (!skip_release_safe) {
+        optimize_modes_buf[optimize_modes_len] = .ReleaseSafe;
+        optimize_modes_len += 1;
+    }
+    if (!skip_release_fast) {
+        optimize_modes_buf[optimize_modes_len] = .ReleaseFast;
+        optimize_modes_len += 1;
+    }
+    if (!skip_release_small) {
+        optimize_modes_buf[optimize_modes_len] = .ReleaseSmall;
+        optimize_modes_len += 1;
+    }
+    const optimize_modes = optimize_modes_buf[0..optimize_modes_len];
+
+    for (cases) |case| {
+        for (optimize_modes) |optimize| {
+            if (!case.all_modes and optimize != .Debug) continue;
+            if (case.os_filter) |os_tag| {
+                if (os_tag != builtin.os.tag) continue;
+            }
+
+            const resolved_target = b.resolveTargetQuery(case.target);
+
+            if (case.is_exe) {
+                const exe = b.addExecutable(.{
+                    .name = std.fs.path.stem(case.src_path),
+                    .root_source_file = .{ .path = case.src_path },
+                    .optimize = optimize,
+                    .target = resolved_target,
+                });
+                if (case.link_libc) exe.linkLibC();
+
+                _ = exe.getEmittedBin();
+
+                step.dependOn(&exe.step);
+            }
+
+            if (case.is_test) {
+                const exe = b.addTest(.{
+                    .name = std.fs.path.stem(case.src_path),
+                    .root_source_file = .{ .path = case.src_path },
+                    .optimize = optimize,
+                    .target = resolved_target,
+                });
+                if (case.link_libc) exe.linkLibC();
+
+                const run = b.addRunArtifact(exe);
+                step.dependOn(&run.step);
+            }
+        }
+    }
+}
+
+const Case = struct {
+    src_path: []const u8,
+    link_libc: bool = false,
+    all_modes: bool = false,
+    target: std.Target.Query = .{},
+    is_test: bool = false,
+    is_exe: bool = true,
+    /// Run only on this OS.
+    os_filter: ?std.Target.Os.Tag = null,
+};
+
+const cases = [_]Case{
+    .{
+        .src_path = "hello_world/hello.zig",
+        .all_modes = true,
+    },
+    .{
+        .src_path = "hello_world/hello_libc.zig",
+        .link_libc = true,
+        .all_modes = true,
+    },
+    .{
+        .src_path = "cat/main.zig",
+    },
+    // https://github.com/ziglang/zig/issues/6025
+    //.{
+    //    .src_path = "issue_9693/main.zig",
+    //},
+    .{
+        .src_path = "brace_expansion.zig",
+        .is_test = true,
+    },
+    .{
+        .src_path = "issue_7030.zig",
+        .target = .{
+            .cpu_arch = .wasm32,
+            .os_tag = .freestanding,
+        },
+    },
+    .{ .src_path = "issue_12471/main.zig" },
+    .{ .src_path = "guess_number/main.zig" },
+    .{ .src_path = "main_return_error/error_u8.zig" },
+    .{ .src_path = "main_return_error/error_u8_non_zero.zig" },
+    .{ .src_path = "noreturn_call/inline.zig" },
+    .{ .src_path = "noreturn_call/as_arg.zig" },
+    .{ .src_path = "std_enums_big_enums.zig" },
+    .{
+        .src_path = "issue_9402/main.zig",
+        .os_filter = .windows,
+        .link_libc = true,
+    },
+};
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
diff --git a/test/tests.zig b/test/tests.zig
index 0c847e6e7fac..286ac7e91ce6 100644
--- a/test/tests.zig
+++ b/test/tests.zig
@@ -7,12 +7,10 @@ const Step = std.Build.Step;
 
 // Cases
 const compare_output = @import("compare_output.zig");
-const standalone = @import("standalone.zig");
 const stack_traces = @import("stack_traces.zig");
 const assemble_and_link = @import("assemble_and_link.zig");
 const translate_c = @import("translate_c.zig");
 const run_translated_c = @import("run_translated_c.zig");
-const link = @import("link.zig");
 
 // Implementations
 pub const TranslateCContext = @import("src/TranslateC.zig");
@@ -663,79 +661,35 @@ pub fn addStackTraceTests(
     return cases.step;
 }
 
+fn compilerHasPackageManager(b: *std.Build) bool {
+    // We can only use dependencies if the compiler was built with support for package management.
+    // (zig2 doesn't support it, but we still need to construct a build graph to build stage3.)
+    return b.available_deps.len != 0;
+}
+
 pub fn addStandaloneTests(
     b: *std.Build,
     optimize_modes: []const OptimizeMode,
     enable_macos_sdk: bool,
     enable_ios_sdk: bool,
-    omit_stage2: bool,
     enable_symlinks_windows: bool,
 ) *Step {
     const step = b.step("test-standalone", "Run the standalone tests");
-    const omit_symlinks = builtin.os.tag == .windows and !enable_symlinks_windows;
-
-    for (standalone.simple_cases) |case| {
-        for (optimize_modes) |optimize| {
-            if (!case.all_modes and optimize != .Debug) continue;
-            if (case.os_filter) |os_tag| {
-                if (os_tag != builtin.os.tag) continue;
-            }
-
-            const resolved_target = b.resolveTargetQuery(case.target);
-
-            if (case.is_exe) {
-                const exe = b.addExecutable(.{
-                    .name = std.fs.path.stem(case.src_path),
-                    .root_source_file = .{ .path = case.src_path },
-                    .optimize = optimize,
-                    .target = resolved_target,
-                });
-                if (case.link_libc) exe.linkLibC();
-
-                _ = exe.getEmittedBin();
-
-                step.dependOn(&exe.step);
-            }
-
-            if (case.is_test) {
-                const exe = b.addTest(.{
-                    .name = std.fs.path.stem(case.src_path),
-                    .root_source_file = .{ .path = case.src_path },
-                    .optimize = optimize,
-                    .target = resolved_target,
-                });
-                if (case.link_libc) exe.linkLibC();
-
-                const run = b.addRunArtifact(exe);
-                step.dependOn(&run.step);
-            }
-        }
-    }
-
-    inline for (standalone.build_cases) |case| {
-        const requires_stage2 = @hasDecl(case.import, "requires_stage2") and
-            case.import.requires_stage2;
-        const requires_symlinks = @hasDecl(case.import, "requires_symlinks") and
-            case.import.requires_symlinks;
-        const requires_macos_sdk = @hasDecl(case.import, "requires_macos_sdk") and
-            case.import.requires_macos_sdk;
-        const requires_ios_sdk = @hasDecl(case.import, "requires_ios_sdk") and
-            case.import.requires_ios_sdk;
-        const bad =
-            (requires_stage2 and omit_stage2) or
-            (requires_symlinks and omit_symlinks) or
-            (requires_macos_sdk and !enable_macos_sdk) or
-            (requires_ios_sdk and !enable_ios_sdk);
-        if (!bad) {
-            const dep = b.anonymousDependency(case.build_root, case.import, .{});
-            const dep_step = dep.builder.default_step;
-            assert(mem.startsWith(u8, dep.builder.dep_prefix, "test."));
-            const dep_prefix_adjusted = dep.builder.dep_prefix["test.".len..];
-            dep_step.name = b.fmt("{s}{s}", .{ dep_prefix_adjusted, dep_step.name });
-            step.dependOn(dep_step);
-        }
+    if (compilerHasPackageManager(b)) {
+        const test_cases_dep_name = "standalone_test_cases";
+        const test_cases_dep = b.dependency(test_cases_dep_name, .{
+            .enable_ios_sdk = enable_ios_sdk,
+            .enable_macos_sdk = enable_macos_sdk,
+            .enable_symlinks_windows = enable_symlinks_windows,
+            .simple_skip_debug = mem.indexOfScalar(OptimizeMode, optimize_modes, .Debug) == null,
+            .simple_skip_release_safe = mem.indexOfScalar(OptimizeMode, optimize_modes, .ReleaseSafe) == null,
+            .simple_skip_release_fast = mem.indexOfScalar(OptimizeMode, optimize_modes, .ReleaseFast) == null,
+            .simple_skip_release_small = mem.indexOfScalar(OptimizeMode, optimize_modes, .ReleaseSmall) == null,
+        });
+        const test_cases_dep_step = test_cases_dep.builder.default_step;
+        test_cases_dep_step.name = b.dupe(test_cases_dep_name);
+        step.dependOn(test_cases_dep.builder.default_step);
     }
-
     return step;
 }
 
@@ -743,49 +697,20 @@ pub fn addLinkTests(
     b: *std.Build,
     enable_macos_sdk: bool,
     enable_ios_sdk: bool,
-    omit_stage2: bool,
     enable_symlinks_windows: bool,
 ) *Step {
     const step = b.step("test-link", "Run the linker tests");
-    const omit_symlinks = builtin.os.tag == .windows and !enable_symlinks_windows;
-
-    inline for (link.cases) |case| {
-        if (mem.eql(u8, @typeName(case.import), "test.link.link")) {
-            const dep = b.anonymousDependency(case.build_root, case.import, .{
-                .has_macos_sdk = enable_macos_sdk,
-                .has_ios_sdk = enable_ios_sdk,
-                .has_symlinks_windows = !omit_symlinks,
-            });
-            const dep_step = dep.builder.default_step;
-            assert(mem.startsWith(u8, dep.builder.dep_prefix, "test."));
-            const dep_prefix_adjusted = dep.builder.dep_prefix["test.".len..];
-            dep_step.name = b.fmt("{s}{s}", .{ dep_prefix_adjusted, dep_step.name });
-            step.dependOn(dep_step);
-        } else {
-            const requires_stage2 = @hasDecl(case.import, "requires_stage2") and
-                case.import.requires_stage2;
-            const requires_symlinks = @hasDecl(case.import, "requires_symlinks") and
-                case.import.requires_symlinks;
-            const requires_macos_sdk = @hasDecl(case.import, "requires_macos_sdk") and
-                case.import.requires_macos_sdk;
-            const requires_ios_sdk = @hasDecl(case.import, "requires_ios_sdk") and
-                case.import.requires_ios_sdk;
-            const bad =
-                (requires_stage2 and omit_stage2) or
-                (requires_symlinks and omit_symlinks) or
-                (requires_macos_sdk and !enable_macos_sdk) or
-                (requires_ios_sdk and !enable_ios_sdk);
-            if (!bad) {
-                const dep = b.anonymousDependency(case.build_root, case.import, .{});
-                const dep_step = dep.builder.default_step;
-                assert(mem.startsWith(u8, dep.builder.dep_prefix, "test."));
-                const dep_prefix_adjusted = dep.builder.dep_prefix["test.".len..];
-                dep_step.name = b.fmt("{s}{s}", .{ dep_prefix_adjusted, dep_step.name });
-                step.dependOn(dep_step);
-            }
-        }
+    if (compilerHasPackageManager(b)) {
+        const test_cases_dep_name = "link_test_cases";
+        const test_cases_dep = b.dependency(test_cases_dep_name, .{
+            .enable_ios_sdk = enable_ios_sdk,
+            .enable_macos_sdk = enable_macos_sdk,
+            .enable_symlinks_windows = enable_symlinks_windows,
+        });
+        const test_cases_dep_step = test_cases_dep.builder.default_step;
+        test_cases_dep_step.name = b.dupe(test_cases_dep_name);
+        step.dependOn(test_cases_dep.builder.default_step);
     }
-
     return step;
 }