diff --git a/build.zig b/build.zig
index d9f5d1e884a0bf8130459f3add73d2ffeea01829..fe83aa3fc3080b7d7f2e6772e6c7325dc6505b42 100644
--- a/build.zig
+++ b/build.zig
@@ -72,7 +72,7 @@ pub fn build(b: *std.Build) !void {
     const check_case_exe = b.addExecutable(.{
         .name = "check-case",
         .root_source_file = b.path("test/src/Cases.zig"),
-        .target = b.host,
+        .target = b.graph.host,
         .optimize = optimize,
         .single_threaded = single_threaded,
     });
@@ -541,7 +541,7 @@ pub fn build(b: *std.Build) !void {
     const opt_mingw_src_path = b.option([]const u8, "mingw-src", "path to mingw-w64 source directory");
     const update_mingw_exe = b.addExecutable(.{
         .name = "update_mingw",
-        .target = b.host,
+        .target = b.graph.host,
         .root_source_file = b.path("tools/update_mingw.zig"),
     });
     const update_mingw_run = b.addRunArtifact(update_mingw_exe);
@@ -1259,7 +1259,7 @@ fn generateLangRef(b: *std.Build) std.Build.LazyPath {
     const doctest_exe = b.addExecutable(.{
         .name = "doctest",
         .root_source_file = b.path("tools/doctest.zig"),
-        .target = b.host,
+        .target = b.graph.host,
         .optimize = .Debug,
     });
 
@@ -1297,7 +1297,7 @@ fn generateLangRef(b: *std.Build) std.Build.LazyPath {
     const docgen_exe = b.addExecutable(.{
         .name = "docgen",
         .root_source_file = b.path("tools/docgen.zig"),
-        .target = b.host,
+        .target = b.graph.host,
         .optimize = .Debug,
     });
 
diff --git a/test/compile_errors.zig b/test/compile_errors.zig
index ec3726e94d0665cac0c99abc84836dcc5b3b8f17..0dc191260f26eb2def38dee7440d51d8bff86845 100644
--- a/test/compile_errors.zig
+++ b/test/compile_errors.zig
@@ -4,7 +4,7 @@ const Cases = @import("src/Cases.zig");
 
 pub fn addCases(ctx: *Cases, b: *std.Build) !void {
     {
-        const case = ctx.obj("multiline error messages", b.host);
+        const case = ctx.obj("multiline error messages", b.graph.host);
 
         case.addError(
             \\comptime {
@@ -39,7 +39,7 @@ pub fn addCases(ctx: *Cases, b: *std.Build) !void {
     }
 
     {
-        const case = ctx.obj("isolated carriage return in multiline string literal", b.host);
+        const case = ctx.obj("isolated carriage return in multiline string literal", b.graph.host);
 
         case.addError("const foo = \\\\\test\r\r rogue carriage return\n;", &[_][]const u8{
             ":1:19: error: expected ';' after declaration",
@@ -48,7 +48,7 @@ pub fn addCases(ctx: *Cases, b: *std.Build) !void {
     }
 
     {
-        const case = ctx.obj("missing semicolon at EOF", b.host);
+        const case = ctx.obj("missing semicolon at EOF", b.graph.host);
         case.addError(
             \\const foo = 1
         , &[_][]const u8{
@@ -57,7 +57,7 @@ pub fn addCases(ctx: *Cases, b: *std.Build) !void {
     }
 
     {
-        const case = ctx.obj("argument causes error", b.host);
+        const case = ctx.obj("argument causes error", b.graph.host);
 
         case.addError(
             \\pub export fn entry() void {
@@ -80,7 +80,7 @@ pub fn addCases(ctx: *Cases, b: *std.Build) !void {
     }
 
     {
-        const case = ctx.obj("astgen failure in file struct", b.host);
+        const case = ctx.obj("astgen failure in file struct", b.graph.host);
 
         case.addError(
             \\pub export fn entry() void {
@@ -95,7 +95,7 @@ pub fn addCases(ctx: *Cases, b: *std.Build) !void {
     }
 
     {
-        const case = ctx.obj("invalid store to comptime field", b.host);
+        const case = ctx.obj("invalid store to comptime field", b.graph.host);
 
         case.addError(
             \\const a = @import("a.zig");
@@ -119,7 +119,7 @@ pub fn addCases(ctx: *Cases, b: *std.Build) !void {
     }
 
     {
-        const case = ctx.obj("file in multiple modules", b.host);
+        const case = ctx.obj("file in multiple modules", b.graph.host);
         case.addDepModule("foo", "foo.zig");
 
         case.addError(
@@ -138,7 +138,7 @@ pub fn addCases(ctx: *Cases, b: *std.Build) !void {
     }
 
     {
-        const case = ctx.obj("wrong same named struct", b.host);
+        const case = ctx.obj("wrong same named struct", b.graph.host);
 
         case.addError(
             \\const a = @import("a.zig");
@@ -172,7 +172,7 @@ pub fn addCases(ctx: *Cases, b: *std.Build) !void {
     }
 
     {
-        const case = ctx.obj("non-printable invalid character", b.host);
+        const case = ctx.obj("non-printable invalid character", b.graph.host);
 
         case.addError("\xff\xfe" ++
             \\export fn foo() bool {
@@ -185,7 +185,7 @@ pub fn addCases(ctx: *Cases, b: *std.Build) !void {
     }
 
     {
-        const case = ctx.obj("imported generic method call with invalid param", b.host);
+        const case = ctx.obj("imported generic method call with invalid param", b.graph.host);
 
         case.addError(
             \\pub const import = @import("import.zig");
diff --git a/test/link/bss/build.zig b/test/link/bss/build.zig
index cbe913781cafe98c8199b443d32aba65d6f7715d..27fd016ea17f3ee1abc4f7321ca2562d4770fb5f 100644
--- a/test/link/bss/build.zig
+++ b/test/link/bss/build.zig
@@ -7,7 +7,7 @@ pub fn build(b: *std.Build) void {
     const exe = b.addExecutable(.{
         .name = "bss",
         .root_source_file = b.path("main.zig"),
-        .target = b.host,
+        .target = b.graph.host,
         .optimize = .Debug,
     });
 
diff --git a/test/link/common_symbols/build.zig b/test/link/common_symbols/build.zig
index dd093a891a14b47fcf616fe63755037ef56e4cd1..3f0e4a19f0f27227a0d50989d1b2e83b159fa3fb 100644
--- a/test/link/common_symbols/build.zig
+++ b/test/link/common_symbols/build.zig
@@ -14,7 +14,7 @@ fn add(b: *std.Build, test_step: *std.Build.Step, optimize: std.builtin.Optimize
     const lib_a = b.addStaticLibrary(.{
         .name = "a",
         .optimize = optimize,
-        .target = b.host,
+        .target = b.graph.host,
     });
     lib_a.addCSourceFiles(.{
         .files = &.{ "c.c", "a.c", "b.c" },
diff --git a/test/link/common_symbols_alignment/build.zig b/test/link/common_symbols_alignment/build.zig
index 7e732762ef8a8d50a4fb402e503977383b7dd2f3..384d60b90dcec264b4fe0723c306af0c194e74aa 100644
--- a/test/link/common_symbols_alignment/build.zig
+++ b/test/link/common_symbols_alignment/build.zig
@@ -14,7 +14,7 @@ fn add(b: *std.Build, test_step: *std.Build.Step, optimize: std.builtin.Optimize
     const lib_a = b.addStaticLibrary(.{
         .name = "a",
         .optimize = optimize,
-        .target = b.host,
+        .target = b.graph.host,
     });
     lib_a.addCSourceFiles(.{
         .files = &.{"a.c"},
diff --git a/test/link/interdependent_static_c_libs/build.zig b/test/link/interdependent_static_c_libs/build.zig
index 7b84235b0c1ee3e1e649abbe89959c98ccd77baa..8a700b74ffca9a6aa810fe2f26b7066b15c5b785 100644
--- a/test/link/interdependent_static_c_libs/build.zig
+++ b/test/link/interdependent_static_c_libs/build.zig
@@ -14,7 +14,7 @@ fn add(b: *std.Build, test_step: *std.Build.Step, optimize: std.builtin.Optimize
     const lib_a = b.addStaticLibrary(.{
         .name = "a",
         .optimize = optimize,
-        .target = b.host,
+        .target = b.graph.host,
     });
     lib_a.addCSourceFile(.{ .file = b.path("a.c"), .flags = &[_][]const u8{} });
     lib_a.addIncludePath(b.path("."));
@@ -22,7 +22,7 @@ fn add(b: *std.Build, test_step: *std.Build.Step, optimize: std.builtin.Optimize
     const lib_b = b.addStaticLibrary(.{
         .name = "b",
         .optimize = optimize,
-        .target = b.host,
+        .target = b.graph.host,
     });
     lib_b.addCSourceFile(.{ .file = b.path("b.c"), .flags = &[_][]const u8{} });
     lib_b.addIncludePath(b.path("."));
diff --git a/test/link/macho.zig b/test/link/macho.zig
index 235c1f157ed6b7be4c706c140df018674c7965e5..b77bd279cbe547d735944986783484c27ac9ebb3 100644
--- a/test/link/macho.zig
+++ b/test/link/macho.zig
@@ -83,14 +83,14 @@ pub fn testAll(b: *Build, build_opts: BuildOptions) *Step {
 
         // Tests requiring presence of macOS SDK in system path
         if (build_opts.has_macos_sdk) {
-            macho_step.dependOn(testDeadStripDylibs(b, .{ .target = b.host }));
-            macho_step.dependOn(testHeaderpad(b, .{ .target = b.host }));
-            macho_step.dependOn(testLinkDirectlyCppTbd(b, .{ .target = b.host }));
-            macho_step.dependOn(testMergeLiteralsObjc(b, .{ .target = b.host }));
-            macho_step.dependOn(testNeededFramework(b, .{ .target = b.host }));
-            macho_step.dependOn(testObjc(b, .{ .target = b.host }));
-            macho_step.dependOn(testObjcpp(b, .{ .target = b.host }));
-            macho_step.dependOn(testWeakFramework(b, .{ .target = b.host }));
+            macho_step.dependOn(testDeadStripDylibs(b, .{ .target = b.graph.host }));
+            macho_step.dependOn(testHeaderpad(b, .{ .target = b.graph.host }));
+            macho_step.dependOn(testLinkDirectlyCppTbd(b, .{ .target = b.graph.host }));
+            macho_step.dependOn(testMergeLiteralsObjc(b, .{ .target = b.graph.host }));
+            macho_step.dependOn(testNeededFramework(b, .{ .target = b.graph.host }));
+            macho_step.dependOn(testObjc(b, .{ .target = b.graph.host }));
+            macho_step.dependOn(testObjcpp(b, .{ .target = b.graph.host }));
+            macho_step.dependOn(testWeakFramework(b, .{ .target = b.graph.host }));
         }
     }
 
diff --git a/test/link/static_libs_from_object_files/build.zig b/test/link/static_libs_from_object_files/build.zig
index dd679e7ef809540bc4bb0b00eb20e2105f21f864..8e4a6151beb4b628763d92367e2f05a3342669ff 100644
--- a/test/link/static_libs_from_object_files/build.zig
+++ b/test/link/static_libs_from_object_files/build.zig
@@ -59,7 +59,7 @@ fn add(b: *Build, test_step: *Step, files: []const LazyPath, optimize: std.built
             .name = "test1",
             .root_source_file = b.path("main.zig"),
             .optimize = optimize,
-            .target = b.host,
+            .target = b.graph.host,
         });
 
         for (files) |file| {
@@ -77,12 +77,12 @@ fn add(b: *Build, test_step: *Step, files: []const LazyPath, optimize: std.built
     {
         const lib_a = b.addStaticLibrary(.{
             .name = "test2_a",
-            .target = b.host,
+            .target = b.graph.host,
             .optimize = optimize,
         });
         const lib_b = b.addStaticLibrary(.{
             .name = "test2_b",
-            .target = b.host,
+            .target = b.graph.host,
             .optimize = optimize,
         });
 
@@ -94,7 +94,7 @@ fn add(b: *Build, test_step: *Step, files: []const LazyPath, optimize: std.built
         const exe = b.addExecutable(.{
             .name = "test2",
             .root_source_file = b.path("main.zig"),
-            .target = b.host,
+            .target = b.graph.host,
             .optimize = optimize,
         });
         exe.linkLibrary(lib_a);
@@ -111,19 +111,19 @@ fn add(b: *Build, test_step: *Step, files: []const LazyPath, optimize: std.built
     {
         const lib_a = b.addStaticLibrary(.{
             .name = "test3_a",
-            .target = b.host,
+            .target = b.graph.host,
             .optimize = optimize,
         });
         const lib_b = b.addStaticLibrary(.{
             .name = "test3_b",
-            .target = b.host,
+            .target = b.graph.host,
             .optimize = optimize,
         });
 
         for (files, 1..) |file, i| {
             const obj = b.addObject(.{
                 .name = b.fmt("obj_{}", .{i}),
-                .target = b.host,
+                .target = b.graph.host,
                 .optimize = optimize,
             });
             obj.addCSourceFile(.{ .file = file, .flags = &flags });
@@ -135,7 +135,7 @@ fn add(b: *Build, test_step: *Step, files: []const LazyPath, optimize: std.built
         const exe = b.addExecutable(.{
             .name = "test3",
             .root_source_file = b.path("main.zig"),
-            .target = b.host,
+            .target = b.graph.host,
             .optimize = optimize,
         });
         exe.linkLibrary(lib_a);
diff --git a/test/src/CompareOutput.zig b/test/src/CompareOutput.zig
index 7d0440c89096f77a387d89c47c5da2e43f680949..0179057987fcad7436747fb7a53e28d405328047 100644
--- a/test/src/CompareOutput.zig
+++ b/test/src/CompareOutput.zig
@@ -96,7 +96,7 @@ pub fn addCase(self: *CompareOutput, case: TestCase) void {
 
             const exe = b.addExecutable(.{
                 .name = "test",
-                .target = b.host,
+                .target = b.graph.host,
                 .optimize = .Debug,
             });
             exe.addAssemblyFile(write_src.files.items[0].getPath());
@@ -121,7 +121,7 @@ pub fn addCase(self: *CompareOutput, case: TestCase) void {
                     .name = "test",
                     .root_source_file = write_src.files.items[0].getPath(),
                     .optimize = optimize,
-                    .target = b.host,
+                    .target = b.graph.host,
                 });
                 if (case.link_libc) {
                     exe.linkSystemLibrary("c");
@@ -146,7 +146,7 @@ pub fn addCase(self: *CompareOutput, case: TestCase) void {
             const exe = b.addExecutable(.{
                 .name = "test",
                 .root_source_file = write_src.files.items[0].getPath(),
-                .target = b.host,
+                .target = b.graph.host,
                 .optimize = .Debug,
             });
             if (case.link_libc) {
diff --git a/test/src/RunTranslatedC.zig b/test/src/RunTranslatedC.zig
index 74d11927688425b647d6af3bc0531f131c81759e..e437a33ba4def432dbc4e7db9afd454868cc7876 100644
--- a/test/src/RunTranslatedC.zig
+++ b/test/src/RunTranslatedC.zig
@@ -77,7 +77,7 @@ pub fn addCase(self: *RunTranslatedCContext, case: *const TestCase) void {
     }
     const translate_c = b.addTranslateC(.{
         .root_source_file = write_src.files.items[0].getPath(),
-        .target = b.host,
+        .target = b.graph.host,
         .optimize = .Debug,
     });
 
diff --git a/test/src/StackTrace.zig b/test/src/StackTrace.zig
index 76ffe53c59aab82d792ca5320b1814019612296d..1ffcb1f880b774dc35753d912df136f0c1d5d7e6 100644
--- a/test/src/StackTrace.zig
+++ b/test/src/StackTrace.zig
@@ -56,7 +56,7 @@ fn addExpect(
         .name = "test",
         .root_source_file = write_src.files.items[0].getPath(),
         .optimize = optimize_mode,
-        .target = b.host,
+        .target = b.graph.host,
         .error_tracing = mode_config.error_tracing,
     });
 
diff --git a/test/standalone/c_compiler/build.zig b/test/standalone/c_compiler/build.zig
index a3c842d8d51e167d254bb8fca289e55db1af04d0..d4fcde119870af276bb0f7f20fb9f4daca0f36fe 100644
--- a/test/standalone/c_compiler/build.zig
+++ b/test/standalone/c_compiler/build.zig
@@ -23,7 +23,7 @@ fn add(
     cpp_name: []const u8,
     optimize: std.builtin.OptimizeMode,
 ) void {
-    const target = b.host;
+    const target = b.graph.host;
 
     const exe_c = b.addExecutable(.{
         .name = c_name,
diff --git a/test/standalone/child_process/build.zig b/test/standalone/child_process/build.zig
index 35317602b5e949793d6c196a7c227e49c05587fe..0180fb8a83d62cda8a0fdfd039bc494f176e2b18 100644
--- a/test/standalone/child_process/build.zig
+++ b/test/standalone/child_process/build.zig
@@ -6,7 +6,7 @@ pub fn build(b: *std.Build) void {
     b.default_step = test_step;
 
     const optimize: std.builtin.OptimizeMode = .Debug;
-    const target = b.host;
+    const target = b.graph.host;
 
     if (builtin.os.tag == .wasi) return;
 
diff --git a/test/standalone/dep_diamond/build.zig b/test/standalone/dep_diamond/build.zig
index b14503e349197115d24b861705c3af3156445135..44338b36d44568b001374b6523afc7651f428af5 100644
--- a/test/standalone/dep_diamond/build.zig
+++ b/test/standalone/dep_diamond/build.zig
@@ -13,7 +13,7 @@ pub fn build(b: *std.Build) void {
     const exe = b.addExecutable(.{
         .name = "test",
         .root_source_file = b.path("test.zig"),
-        .target = b.host,
+        .target = b.graph.host,
         .optimize = optimize,
     });
     exe.root_module.addAnonymousImport("foo", .{
diff --git a/test/standalone/dep_mutually_recursive/build.zig b/test/standalone/dep_mutually_recursive/build.zig
index 804abbce18d6fec648297f4ad053ef84da52817e..0dc739b7aff081bc71b9f8e734143e1ce8215d53 100644
--- a/test/standalone/dep_mutually_recursive/build.zig
+++ b/test/standalone/dep_mutually_recursive/build.zig
@@ -18,7 +18,7 @@ pub fn build(b: *std.Build) void {
     const exe = b.addExecutable(.{
         .name = "test",
         .root_source_file = b.path("test.zig"),
-        .target = b.host,
+        .target = b.graph.host,
         .optimize = optimize,
     });
     exe.root_module.addImport("foo", foo);
diff --git a/test/standalone/dep_recursive/build.zig b/test/standalone/dep_recursive/build.zig
index 0ab732db4b0692f9ffe4ab02295e7157f301a33d..bc1b7a55bb3d4733d2fe8026cf64448d3e9a0f18 100644
--- a/test/standalone/dep_recursive/build.zig
+++ b/test/standalone/dep_recursive/build.zig
@@ -14,7 +14,7 @@ pub fn build(b: *std.Build) void {
     const exe = b.addExecutable(.{
         .name = "test",
         .root_source_file = b.path("test.zig"),
-        .target = b.host,
+        .target = b.graph.host,
         .optimize = optimize,
     });
     exe.root_module.addImport("foo", foo);
diff --git a/test/standalone/dep_shared_builtin/build.zig b/test/standalone/dep_shared_builtin/build.zig
index de84e2848d59e10e0c1569101dcbf7f176d3d6a9..85a58da95a4822dddb1cb11f3caec7c9da1f26a5 100644
--- a/test/standalone/dep_shared_builtin/build.zig
+++ b/test/standalone/dep_shared_builtin/build.zig
@@ -9,7 +9,7 @@ pub fn build(b: *std.Build) void {
     const exe = b.addExecutable(.{
         .name = "test",
         .root_source_file = b.path("test.zig"),
-        .target = b.host,
+        .target = b.graph.host,
         .optimize = optimize,
     });
     exe.root_module.addAnonymousImport("foo", .{
diff --git a/test/standalone/dep_triangle/build.zig b/test/standalone/dep_triangle/build.zig
index f9f29099d5e77a800822f2cc102f4d2233798544..c8562fd7168cd47d8421ddc9491249ff5cadd875 100644
--- a/test/standalone/dep_triangle/build.zig
+++ b/test/standalone/dep_triangle/build.zig
@@ -13,7 +13,7 @@ pub fn build(b: *std.Build) void {
     const exe = b.addExecutable(.{
         .name = "test",
         .root_source_file = b.path("test.zig"),
-        .target = b.host,
+        .target = b.graph.host,
         .optimize = optimize,
     });
     exe.root_module.addAnonymousImport("foo", .{
diff --git a/test/standalone/empty_env/build.zig b/test/standalone/empty_env/build.zig
index 344e8047bd12bf18ce7ad56b6c13bd99175c7eee..ed733995bfea014b77c3ff979e43c0d60d184347 100644
--- a/test/standalone/empty_env/build.zig
+++ b/test/standalone/empty_env/build.zig
@@ -15,7 +15,7 @@ pub fn build(b: *std.Build) void {
     const main = b.addExecutable(.{
         .name = "main",
         .root_source_file = b.path("main.zig"),
-        .target = b.host,
+        .target = b.graph.host,
         .optimize = optimize,
     });
 
diff --git a/test/standalone/extern/build.zig b/test/standalone/extern/build.zig
index 878b92ab5838ea05bfdc92cd158c8c8e50dbf2f4..a378735b666b64fe072f265a16af4808b67294fe 100644
--- a/test/standalone/extern/build.zig
+++ b/test/standalone/extern/build.zig
@@ -6,7 +6,7 @@ pub fn build(b: *std.Build) void {
     const obj = b.addObject(.{
         .name = "exports",
         .root_source_file = b.path("exports.zig"),
-        .target = b.host,
+        .target = b.graph.host,
         .optimize = optimize,
     });
     const main = b.addTest(.{
diff --git a/test/standalone/global_linkage/build.zig b/test/standalone/global_linkage/build.zig
index 9edbc9612967dc8cdd55f76d8dcbfd2c2bf78f69..50e270d1c359a4564902bf75178d4a28d84507cf 100644
--- a/test/standalone/global_linkage/build.zig
+++ b/test/standalone/global_linkage/build.zig
@@ -5,7 +5,7 @@ pub fn build(b: *std.Build) void {
     b.default_step = test_step;
 
     const optimize: std.builtin.OptimizeMode = .Debug;
-    const target = b.host;
+    const target = b.graph.host;
 
     const obj1 = b.addStaticLibrary(.{
         .name = "obj1",
diff --git a/test/standalone/issue_11595/build.zig b/test/standalone/issue_11595/build.zig
index b6e17f1eef6df7359be041767ca429a5d4e578df..d0592b546bd8e70dc52dd555cf6a2fa8547382cf 100644
--- a/test/standalone/issue_11595/build.zig
+++ b/test/standalone/issue_11595/build.zig
@@ -6,7 +6,7 @@ pub fn build(b: *std.Build) void {
     b.default_step = test_step;
 
     const optimize: std.builtin.OptimizeMode = .Debug;
-    const target = b.host;
+    const target = b.graph.host;
 
     if (builtin.os.tag == .windows) {
         // https://github.com/ziglang/zig/issues/12419
diff --git a/test/standalone/issue_12588/build.zig b/test/standalone/issue_12588/build.zig
index 255f67c83b40c6eb29603367e7fb0c19e6a3f260..f82dd5193043ab7048950106e2a96c95d841ae0f 100644
--- a/test/standalone/issue_12588/build.zig
+++ b/test/standalone/issue_12588/build.zig
@@ -10,7 +10,7 @@ pub fn build(b: *std.Build) void {
         .name = "main",
         .root_source_file = b.path("main.zig"),
         .optimize = optimize,
-        .target = b.host,
+        .target = b.graph.host,
     });
     _ = obj.getEmittedLlvmIr();
     _ = obj.getEmittedLlvmBc();
diff --git a/test/standalone/issue_12706/build.zig b/test/standalone/issue_12706/build.zig
index 528eba89d3a7e6761c704e73dd5963c3d42dbd59..9cb858d0194e0a175214d2ab40f89bb0536f7a89 100644
--- a/test/standalone/issue_12706/build.zig
+++ b/test/standalone/issue_12706/build.zig
@@ -6,7 +6,7 @@ pub fn build(b: *std.Build) void {
     b.default_step = test_step;
 
     const optimize: std.builtin.OptimizeMode = .Debug;
-    const target = b.host;
+    const target = b.graph.host;
 
     const exe = b.addExecutable(.{
         .name = "main",
diff --git a/test/standalone/issue_339/build.zig b/test/standalone/issue_339/build.zig
index 6327c5ed97fecad9b9c2b479c4225c5823c060b1..321a6352549467b6931f62cc4d1d590f76799bf1 100644
--- a/test/standalone/issue_339/build.zig
+++ b/test/standalone/issue_339/build.zig
@@ -5,7 +5,7 @@ pub fn build(b: *std.Build) void {
     b.default_step = test_step;
 
     const optimize: std.builtin.OptimizeMode = .Debug;
-    const target = b.host;
+    const target = b.graph.host;
 
     const obj = b.addObject(.{
         .name = "test",
diff --git a/test/standalone/load_dynamic_library/build.zig b/test/standalone/load_dynamic_library/build.zig
index 27f8f6de7cce9397df749a9e2486cc6edebb347f..1fe7d6141f4a8a33fc439662cb0b6191f8eacf84 100644
--- a/test/standalone/load_dynamic_library/build.zig
+++ b/test/standalone/load_dynamic_library/build.zig
@@ -6,7 +6,7 @@ pub fn build(b: *std.Build) void {
     b.default_step = test_step;
 
     const optimize: std.builtin.OptimizeMode = .Debug;
-    const target = b.host;
+    const target = b.graph.host;
 
     if (builtin.os.tag == .wasi) return;
 
diff --git a/test/standalone/mix_c_files/build.zig b/test/standalone/mix_c_files/build.zig
index 779d4d030e08448c75acef195a2f283927f60ad2..0b626ba0faa4edc5e55b1b4abae6bcf338b57b4a 100644
--- a/test/standalone/mix_c_files/build.zig
+++ b/test/standalone/mix_c_files/build.zig
@@ -19,7 +19,7 @@ fn add(b: *std.Build, test_step: *std.Build.Step, optimize: std.builtin.Optimize
     const exe = b.addExecutable(.{
         .name = "test",
         .root_source_file = b.path("main.zig"),
-        .target = b.host,
+        .target = b.graph.host,
         .optimize = optimize,
     });
     exe.addCSourceFile(.{ .file = b.path("test.c"), .flags = &[_][]const u8{"-std=c11"} });
diff --git a/test/standalone/mix_o_files/build.zig b/test/standalone/mix_o_files/build.zig
index dd8ef9a4c4bbaa1008c1a217011d3b9497da322c..7be4ff5090ac9730a524a100f973bcd747ad2dbb 100644
--- a/test/standalone/mix_o_files/build.zig
+++ b/test/standalone/mix_o_files/build.zig
@@ -5,7 +5,7 @@ pub fn build(b: *std.Build) void {
     b.default_step = test_step;
 
     const optimize: std.builtin.OptimizeMode = .Debug;
-    const target = b.host;
+    const target = b.graph.host;
 
     const obj = b.addObject(.{
         .name = "base64",
diff --git a/test/standalone/options/build.zig b/test/standalone/options/build.zig
index 747a5e72ea9dcca8139ef2b2d2ea4aea98fe8e20..1c17e30d6a03a909e7080412e644934dc0063158 100644
--- a/test/standalone/options/build.zig
+++ b/test/standalone/options/build.zig
@@ -3,7 +3,7 @@ const std = @import("std");
 pub fn build(b: *std.Build) void {
     const main = b.addTest(.{
         .root_source_file = b.path("src/main.zig"),
-        .target = b.host,
+        .target = b.graph.host,
         .optimize = .Debug,
     });
 
diff --git a/test/standalone/pkg_import/build.zig b/test/standalone/pkg_import/build.zig
index 4bef1d756f489280105c369af6197eb91881fd42..b0d0c035ddb80dd5183b46fb9c471154e0a9d3d9 100644
--- a/test/standalone/pkg_import/build.zig
+++ b/test/standalone/pkg_import/build.zig
@@ -10,7 +10,7 @@ pub fn build(b: *std.Build) void {
         .name = "test",
         .root_source_file = b.path("test.zig"),
         .optimize = optimize,
-        .target = b.host,
+        .target = b.graph.host,
     });
     exe.root_module.addAnonymousImport("my_pkg", .{ .root_source_file = b.path("pkg.zig") });
 
diff --git a/test/standalone/self_exe_symlink/build.zig b/test/standalone/self_exe_symlink/build.zig
index 77799cfa00cc5610b6719f076319a27b44d1dfaf..2b7b3d423c5d3e1b656d2001c7b39fa4ddae1bc9 100644
--- a/test/standalone/self_exe_symlink/build.zig
+++ b/test/standalone/self_exe_symlink/build.zig
@@ -7,7 +7,7 @@ pub fn build(b: *std.Build) void {
     b.default_step = test_step;
 
     const optimize: std.builtin.OptimizeMode = .Debug;
-    const target = b.host;
+    const target = b.graph.host;
 
     // The test requires getFdPath in order to to get the path of the
     // File returned by openSelfExe
diff --git a/test/standalone/shared_library/build.zig b/test/standalone/shared_library/build.zig
index 2765a2ec07bba4bca9b2c17a8a94290ece36e151..c23efd0e922a3dc46820b5f3c35ac1eaf872fa44 100644
--- a/test/standalone/shared_library/build.zig
+++ b/test/standalone/shared_library/build.zig
@@ -10,7 +10,7 @@ pub fn build(b: *std.Build) void {
     }
 
     const optimize: std.builtin.OptimizeMode = .Debug;
-    const target = b.host;
+    const target = b.graph.host;
     const lib = b.addSharedLibrary(.{
         .name = "mathtest",
         .root_source_file = b.path("mathtest.zig"),
diff --git a/test/standalone/static_c_lib/build.zig b/test/standalone/static_c_lib/build.zig
index c025aa9b393876b305a7be8631f93e9f25c8c23f..c952e9b25013e1395c6a235532b7da33827687f8 100644
--- a/test/standalone/static_c_lib/build.zig
+++ b/test/standalone/static_c_lib/build.zig
@@ -9,7 +9,7 @@ pub fn build(b: *std.Build) void {
     const foo = b.addStaticLibrary(.{
         .name = "foo",
         .optimize = optimize,
-        .target = b.host,
+        .target = b.graph.host,
     });
     foo.addCSourceFile(.{ .file = b.path("foo.c"), .flags = &[_][]const u8{} });
     foo.addIncludePath(b.path("."));
diff --git a/test/standalone/strip_empty_loop/build.zig b/test/standalone/strip_empty_loop/build.zig
index aadfbd2fc0b0e55fc63d6789e43d4173dd3ae305..d34120ed06b8230902e9dedc1d5339bfbf012f9b 100644
--- a/test/standalone/strip_empty_loop/build.zig
+++ b/test/standalone/strip_empty_loop/build.zig
@@ -5,7 +5,7 @@ pub fn build(b: *std.Build) void {
     b.default_step = test_step;
 
     const optimize = std.builtin.OptimizeMode.Debug;
-    const target = b.host;
+    const target = b.graph.host;
 
     const main = b.addExecutable(.{
         .name = "main",
diff --git a/test/standalone/windows_argv/build.zig b/test/standalone/windows_argv/build.zig
index 3c978aa35db2b7124e3b5189980846372e19180d..8c6488a86f208bb8d779b2986e249f09f1a59972 100644
--- a/test/standalone/windows_argv/build.zig
+++ b/test/standalone/windows_argv/build.zig
@@ -35,7 +35,7 @@ pub fn build(b: *std.Build) !void {
     const fuzz = b.addExecutable(.{
         .name = "fuzz",
         .root_source_file = b.path("fuzz.zig"),
-        .target = b.host,
+        .target = b.graph.host,
         .optimize = optimize,
     });
 
diff --git a/test/standalone/windows_bat_args/build.zig b/test/standalone/windows_bat_args/build.zig
index 1d0a82b920d6628ec0a3ced862b965ef8bb9bb51..7c35cf2b768ef27b0293fca74d36d187ceeae58e 100644
--- a/test/standalone/windows_bat_args/build.zig
+++ b/test/standalone/windows_bat_args/build.zig
@@ -6,7 +6,7 @@ pub fn build(b: *std.Build) !void {
     b.default_step = test_step;
 
     const optimize: std.builtin.OptimizeMode = .Debug;
-    const target = b.host;
+    const target = b.graph.host;
 
     if (builtin.os.tag != .windows) return;
 
diff --git a/test/standalone/windows_resources/build.zig b/test/standalone/windows_resources/build.zig
index da88659b4ddd98bced29133a7e31b0b1ef36f295..27f4fa919ee2b5470b9f1686ae10644c919a21a4 100644
--- a/test/standalone/windows_resources/build.zig
+++ b/test/standalone/windows_resources/build.zig
@@ -12,10 +12,10 @@ pub fn build(b: *std.Build) void {
 
     const generated_h_step = b.addWriteFile("generated.h", "#define GENERATED_DEFINE \"foo\"");
 
-    add(b, b.host, .any, test_step, generated_h_step);
+    add(b, b.graph.host, .any, test_step, generated_h_step);
     add(b, target, .any, test_step, generated_h_step);
 
-    add(b, b.host, .gnu, test_step, generated_h_step);
+    add(b, b.graph.host, .gnu, test_step, generated_h_step);
     add(b, target, .gnu, test_step, generated_h_step);
 }
 
diff --git a/test/standalone/windows_spawn/build.zig b/test/standalone/windows_spawn/build.zig
index aef6ed4594f3f265ada862909ccd53da99109eda..7f59ff1da4a81c7e3778ab5aa96981347a369905 100644
--- a/test/standalone/windows_spawn/build.zig
+++ b/test/standalone/windows_spawn/build.zig
@@ -6,7 +6,7 @@ pub fn build(b: *std.Build) void {
     b.default_step = test_step;
 
     const optimize: std.builtin.OptimizeMode = .Debug;
-    const target = b.host;
+    const target = b.graph.host;
 
     if (builtin.os.tag != .windows) return;
 
diff --git a/test/tests.zig b/test/tests.zig
index dd4d098a0f9952ae6c72a4a77990507c29045811..bdbd70b51ddc61a1e371a23c8501f8e3b90c452e 100644
--- a/test/tests.zig
+++ b/test/tests.zig
@@ -658,7 +658,7 @@ pub fn addStackTraceTests(
     const check_exe = b.addExecutable(.{
         .name = "check-stack-trace",
         .root_source_file = b.path("test/src/check-stack-trace.zig"),
-        .target = b.host,
+        .target = b.graph.host,
         .optimize = .Debug,
     });