diff --git a/build.zig b/build.zig
index e8e1dcc0b6..a12dd691c5 100644
--- a/build.zig
+++ b/build.zig
@@ -328,7 +328,7 @@ pub fn build(b: *Builder) !void {
     ));
 
     toolchain_step.dependOn(tests.addCompareOutputTests(b, test_filter, modes));
-    toolchain_step.dependOn(tests.addStandaloneTests(b, test_filter, modes));
+    toolchain_step.dependOn(tests.addStandaloneTests(b, test_filter, modes, skip_non_native, target));
     toolchain_step.dependOn(tests.addStackTraceTests(b, test_filter, modes));
     toolchain_step.dependOn(tests.addCliTests(b, test_filter, modes));
     toolchain_step.dependOn(tests.addAssembleAndLinkTests(b, test_filter, modes));
diff --git a/test/standalone.zig b/test/standalone.zig
index f2251e5204..14a9865c6c 100644
--- a/test/standalone.zig
+++ b/test/standalone.zig
@@ -8,26 +8,26 @@ pub fn addCases(cases: *tests.StandaloneContext) void {
     cases.add("test/standalone/guess_number/main.zig");
     cases.add("test/standalone/main_return_error/error_u8.zig");
     cases.add("test/standalone/main_return_error/error_u8_non_zero.zig");
-    cases.addBuildFile("test/standalone/main_pkg_path/build.zig");
-    cases.addBuildFile("test/standalone/shared_library/build.zig");
-    cases.addBuildFile("test/standalone/mix_o_files/build.zig");
-    cases.addBuildFile("test/standalone/global_linkage/build.zig");
-    cases.addBuildFile("test/standalone/static_c_lib/build.zig");
-    cases.addBuildFile("test/standalone/link_interdependent_static_c_libs/build.zig");
-    cases.addBuildFile("test/standalone/link_static_lib_as_system_lib/build.zig");
-    cases.addBuildFile("test/standalone/issue_339/build.zig");
-    cases.addBuildFile("test/standalone/issue_8550/build.zig");
-    cases.addBuildFile("test/standalone/issue_794/build.zig");
-    cases.addBuildFile("test/standalone/issue_5825/build.zig");
-    cases.addBuildFile("test/standalone/pkg_import/build.zig");
-    cases.addBuildFile("test/standalone/use_alias/build.zig");
-    cases.addBuildFile("test/standalone/brace_expansion/build.zig");
-    cases.addBuildFile("test/standalone/empty_env/build.zig");
-    cases.addBuildFile("test/standalone/issue_7030/build.zig");
+    cases.addBuildFile("test/standalone/main_pkg_path/build.zig", .{});
+    cases.addBuildFile("test/standalone/shared_library/build.zig", .{});
+    cases.addBuildFile("test/standalone/mix_o_files/build.zig", .{});
+    cases.addBuildFile("test/standalone/global_linkage/build.zig", .{});
+    cases.addBuildFile("test/standalone/static_c_lib/build.zig", .{});
+    cases.addBuildFile("test/standalone/link_interdependent_static_c_libs/build.zig", .{});
+    cases.addBuildFile("test/standalone/link_static_lib_as_system_lib/build.zig", .{});
+    cases.addBuildFile("test/standalone/issue_339/build.zig", .{});
+    cases.addBuildFile("test/standalone/issue_8550/build.zig", .{});
+    cases.addBuildFile("test/standalone/issue_794/build.zig", .{});
+    cases.addBuildFile("test/standalone/issue_5825/build.zig", .{});
+    cases.addBuildFile("test/standalone/pkg_import/build.zig", .{});
+    cases.addBuildFile("test/standalone/use_alias/build.zig", .{});
+    cases.addBuildFile("test/standalone/brace_expansion/build.zig", .{});
+    cases.addBuildFile("test/standalone/empty_env/build.zig", .{});
+    cases.addBuildFile("test/standalone/issue_7030/build.zig", .{});
     if (std.Target.current.os.tag != .wasi) {
-        cases.addBuildFile("test/standalone/load_dynamic_library/build.zig");
+        cases.addBuildFile("test/standalone/load_dynamic_library/build.zig", .{});
     }
     if (std.Target.current.cpu.arch == .x86_64) { // TODO add C ABI support for other architectures
-        cases.addBuildFile("test/stage1/c_abi/build.zig");
+        cases.addBuildFile("test/stage1/c_abi/build.zig", .{});
     }
 }
diff --git a/test/tests.zig b/test/tests.zig
index 243428a537..63b851e90b 100644
--- a/test/tests.zig
+++ b/test/tests.zig
@@ -399,7 +399,7 @@ pub fn addCompileErrorTests(b: *build.Builder, test_filter: ?[]const u8, modes:
     return cases.step;
 }
 
-pub fn addStandaloneTests(b: *build.Builder, test_filter: ?[]const u8, modes: []const Mode) *build.Step {
+pub fn addStandaloneTests(b: *build.Builder, test_filter: ?[]const u8, modes: []const Mode, skip_non_native: bool, target: std.zig.CrossTarget) *build.Step {
     const cases = b.allocator.create(StandaloneContext) catch unreachable;
     cases.* = StandaloneContext{
         .b = b,
@@ -407,6 +407,8 @@ pub fn addStandaloneTests(b: *build.Builder, test_filter: ?[]const u8, modes: []
         .test_index = 0,
         .test_filter = test_filter,
         .modes = modes,
+        .skip_non_native = skip_non_native,
+        .target = target,
     };
 
     standalone.addCases(cases);
@@ -1136,6 +1138,8 @@ pub const StandaloneContext = struct {
     test_index: usize,
     test_filter: ?[]const u8,
     modes: []const Mode,
+    skip_non_native: bool,
+    target: std.zig.CrossTarget,
 
     pub fn addC(self: *StandaloneContext, root_src: []const u8) void {
         self.addAllArgs(root_src, true);
@@ -1145,10 +1149,10 @@ pub const StandaloneContext = struct {
         self.addAllArgs(root_src, false);
     }
 
-    pub fn addBuildFile(self: *StandaloneContext, build_file: []const u8) void {
+    pub fn addBuildFile(self: *StandaloneContext, build_file: []const u8, features: struct { build_modes: bool = false, cross_targets: bool = false }) void {
         const b = self.b;
 
-        const annotated_case_name = b.fmt("build {s} (Debug)", .{build_file});
+        const annotated_case_name = b.fmt("build {s}", .{build_file});
         if (self.test_filter) |filter| {
             if (mem.indexOf(u8, annotated_case_name, filter) == null) return;
         }
@@ -1167,12 +1171,30 @@ pub const StandaloneContext = struct {
             zig_args.append("--verbose") catch unreachable;
         }
 
-        const run_cmd = b.addSystemCommand(zig_args.items);
+        if (features.cross_targets and !self.target.isNative()) {
+            const target_arg = fmt.allocPrint(b.allocator, "-Dtarget={s}", .{self.target.zigTriple(b.allocator) catch unreachable}) catch unreachable;
+            zig_args.append(target_arg) catch unreachable;
+        }
 
-        const log_step = b.addLog("PASS {s}\n", .{annotated_case_name});
-        log_step.step.dependOn(&run_cmd.step);
+        const modes = if (features.build_modes) self.modes else &[1]Mode{.Debug};
+        for (modes) |mode| {
+            const arg = switch (mode) {
+                .Debug => "",
+                .ReleaseFast => "-Drelease-fast",
+                .ReleaseSafe => "-Drelease-safe",
+                .ReleaseSmall => "-Drelease-small",
+            };
+            const zig_args_base_len = zig_args.items.len;
+            if (arg.len > 0)
+                zig_args.append(arg) catch unreachable;
+            defer zig_args.resize(zig_args_base_len) catch unreachable;
 
-        self.step.dependOn(&log_step.step);
+            const run_cmd = b.addSystemCommand(zig_args.items);
+            const log_step = b.addLog("PASS {s} ({s})\n", .{ annotated_case_name, @tagName(mode) });
+            log_step.step.dependOn(&run_cmd.step);
+
+            self.step.dependOn(&log_step.step);
+        }
     }
 
     pub fn addAllArgs(self: *StandaloneContext, root_src: []const u8, link_libc: bool) void {