diff --git a/build.zig b/build.zig
index 6a707621fc..034388db3c 100644
--- a/build.zig
+++ b/build.zig
@@ -94,7 +94,7 @@ pub fn build(b: *std.Build) !void {
     const skip_freebsd = b.option(bool, "skip-freebsd", "Main test suite skips targets with freebsd OS") orelse false;
     const skip_netbsd = b.option(bool, "skip-netbsd", "Main test suite skips targets with netbsd OS") orelse false;
     const skip_windows = b.option(bool, "skip-windows", "Main test suite skips targets with windows OS") orelse false;
-    const skip_macos = b.option(bool, "skip-macos", "Main test suite skips targets with macos OS") orelse false;
+    const skip_darwin = b.option(bool, "skip-darwin", "Main test suite skips targets with darwin OSs") orelse false;
     const skip_linux = b.option(bool, "skip-linux", "Main test suite skips targets with linux OS") orelse false;
     const skip_llvm = b.option(bool, "skip-llvm", "Main test suite skips targets that use LLVM backend") orelse false;
 
@@ -423,7 +423,7 @@ pub fn build(b: *std.Build) !void {
         .skip_freebsd = skip_freebsd,
         .skip_netbsd = skip_netbsd,
         .skip_windows = skip_windows,
-        .skip_macos = skip_macos,
+        .skip_darwin = skip_darwin,
         .skip_linux = skip_linux,
         .skip_llvm = skip_llvm,
         .skip_libc = skip_libc,
@@ -454,7 +454,7 @@ pub fn build(b: *std.Build) !void {
         .skip_freebsd = skip_freebsd,
         .skip_netbsd = skip_netbsd,
         .skip_windows = skip_windows,
-        .skip_macos = skip_macos,
+        .skip_darwin = skip_darwin,
         .skip_linux = skip_linux,
         .skip_llvm = skip_llvm,
         .skip_libc = skip_libc,
@@ -477,7 +477,7 @@ pub fn build(b: *std.Build) !void {
         .skip_freebsd = skip_freebsd,
         .skip_netbsd = skip_netbsd,
         .skip_windows = skip_windows,
-        .skip_macos = skip_macos,
+        .skip_darwin = skip_darwin,
         .skip_linux = skip_linux,
         .skip_llvm = skip_llvm,
         .skip_libc = true,
@@ -499,7 +499,7 @@ pub fn build(b: *std.Build) !void {
         .skip_freebsd = skip_freebsd,
         .skip_netbsd = skip_netbsd,
         .skip_windows = skip_windows,
-        .skip_macos = skip_macos,
+        .skip_darwin = skip_darwin,
         .skip_linux = skip_linux,
         .skip_llvm = skip_llvm,
         .skip_libc = true,
@@ -521,7 +521,7 @@ pub fn build(b: *std.Build) !void {
         .skip_freebsd = skip_freebsd,
         .skip_netbsd = skip_netbsd,
         .skip_windows = skip_windows,
-        .skip_macos = skip_macos,
+        .skip_darwin = skip_darwin,
         .skip_linux = skip_linux,
         .skip_llvm = skip_llvm,
         .skip_libc = skip_libc,
@@ -562,7 +562,7 @@ pub fn build(b: *std.Build) !void {
         .skip_freebsd = skip_freebsd,
         .skip_netbsd = skip_netbsd,
         .skip_windows = skip_windows,
-        .skip_macos = skip_macos,
+        .skip_darwin = skip_darwin,
         .skip_linux = skip_linux,
         .skip_llvm = skip_llvm,
         .skip_release = skip_release,
diff --git a/ci/x86_64-freebsd-debug.sh b/ci/x86_64-freebsd-debug.sh
index 2c8071dfc1..ae2fdbce61 100755
--- a/ci/x86_64-freebsd-debug.sh
+++ b/ci/x86_64-freebsd-debug.sh
@@ -49,7 +49,7 @@ stage3-debug/bin/zig build test docs \
   -Dskip-linux \
   -Dskip-netbsd \
   -Dskip-windows \
-  -Dskip-macos \
+  -Dskip-darwin \
   --search-prefix "$PREFIX" \
   --zig-lib-dir "$PWD/../lib" \
   --test-timeout 2m
diff --git a/ci/x86_64-freebsd-release.sh b/ci/x86_64-freebsd-release.sh
index 9e0439a33e..39d653cc97 100755
--- a/ci/x86_64-freebsd-release.sh
+++ b/ci/x86_64-freebsd-release.sh
@@ -49,7 +49,7 @@ stage3-release/bin/zig build test docs \
   -Dskip-linux \
   -Dskip-netbsd \
   -Dskip-windows \
-  -Dskip-macos \
+  -Dskip-darwin \
   --search-prefix "$PREFIX" \
   --zig-lib-dir "$PWD/../lib" \
   --test-timeout 2m
diff --git a/ci/x86_64-linux-debug-llvm.sh b/ci/x86_64-linux-debug-llvm.sh
index 44b0a506bb..3c11820352 100755
--- a/ci/x86_64-linux-debug-llvm.sh
+++ b/ci/x86_64-linux-debug-llvm.sh
@@ -57,7 +57,7 @@ stage3-debug/bin/zig build test docs \
   -Dskip-freebsd \
   -Dskip-netbsd \
   -Dskip-windows \
-  -Dskip-macos \
+  -Dskip-darwin \
   -Dtarget=native-native-musl \
   --search-prefix "$PREFIX" \
   --zig-lib-dir "$PWD/../lib" \
diff --git a/ci/x86_64-linux-debug.sh b/ci/x86_64-linux-debug.sh
index d2274d4bf8..fb28044877 100755
--- a/ci/x86_64-linux-debug.sh
+++ b/ci/x86_64-linux-debug.sh
@@ -56,7 +56,7 @@ stage3-debug/bin/zig build test docs \
   -Dskip-freebsd \
   -Dskip-netbsd \
   -Dskip-windows \
-  -Dskip-macos \
+  -Dskip-darwin \
   -Dskip-llvm \
   -Dtarget=native-native-musl \
   --search-prefix "$PREFIX" \
diff --git a/test/src/Cases.zig b/test/src/Cases.zig
index 2fdcc45195..95ee7e21e7 100644
--- a/test/src/Cases.zig
+++ b/test/src/Cases.zig
@@ -447,7 +447,7 @@ pub const CaseTestOptions = struct {
     skip_freebsd: bool,
     skip_netbsd: bool,
     skip_windows: bool,
-    skip_macos: bool,
+    skip_darwin: bool,
     skip_linux: bool,
     skip_llvm: bool,
     skip_libc: bool,
@@ -475,7 +475,7 @@ pub fn lowerToBuildSteps(
         if (options.skip_freebsd and case.target.query.os_tag == .freebsd) continue;
         if (options.skip_netbsd and case.target.query.os_tag == .netbsd) continue;
         if (options.skip_windows and case.target.query.os_tag == .windows) continue;
-        if (options.skip_macos and case.target.query.os_tag == .macos) continue;
+        if (options.skip_darwin and case.target.query.os_tag != null and case.target.query.os_tag.?.isDarwin()) continue;
         if (options.skip_linux and case.target.query.os_tag == .linux) continue;
 
         const would_use_llvm = @import("../tests.zig").wouldUseLlvm(
diff --git a/test/tests.zig b/test/tests.zig
index a6931c408f..75e5d4439a 100644
--- a/test/tests.zig
+++ b/test/tests.zig
@@ -2234,7 +2234,7 @@ const ModuleTestOptions = struct {
     skip_freebsd: bool,
     skip_netbsd: bool,
     skip_windows: bool,
-    skip_macos: bool,
+    skip_darwin: bool,
     skip_linux: bool,
     skip_llvm: bool,
     skip_libc: bool,
@@ -2269,7 +2269,7 @@ pub fn addModuleTests(b: *std.Build, options: ModuleTestOptions) *Step {
         if (options.skip_freebsd and test_target.target.os_tag == .freebsd) continue;
         if (options.skip_netbsd and test_target.target.os_tag == .netbsd) continue;
         if (options.skip_windows and test_target.target.os_tag == .windows) continue;
-        if (options.skip_macos and test_target.target.os_tag == .macos) continue;
+        if (options.skip_darwin and test_target.target.os_tag != null and test_target.target.os_tag.?.isDarwin()) continue;
         if (options.skip_linux and test_target.target.os_tag == .linux) continue;
 
         const would_use_llvm = wouldUseLlvm(test_target.use_llvm, test_target.target, test_target.optimize_mode);
@@ -2506,7 +2506,7 @@ const CAbiTestOptions = struct {
     skip_freebsd: bool,
     skip_netbsd: bool,
     skip_windows: bool,
-    skip_macos: bool,
+    skip_darwin: bool,
     skip_linux: bool,
     skip_llvm: bool,
     skip_release: bool,
@@ -2525,7 +2525,7 @@ pub fn addCAbiTests(b: *std.Build, options: CAbiTestOptions) *Step {
             if (options.skip_freebsd and c_abi_target.target.os_tag == .freebsd) continue;
             if (options.skip_netbsd and c_abi_target.target.os_tag == .netbsd) continue;
             if (options.skip_windows and c_abi_target.target.os_tag == .windows) continue;
-            if (options.skip_macos and c_abi_target.target.os_tag == .macos) continue;
+            if (options.skip_darwin and c_abi_target.target.os_tag != null and c_abi_target.target.os_tag.?.isDarwin()) continue;
             if (options.skip_linux and c_abi_target.target.os_tag == .linux) continue;
 
             const would_use_llvm = wouldUseLlvm(c_abi_target.use_llvm, c_abi_target.target, .Debug);