diff --git a/VibeTunnel.xcworkspace/contents.xcworkspacedata b/VibeTunnel.xcworkspace/contents.xcworkspacedata
index dfef5a6d..dae99c5b 100644
--- a/VibeTunnel.xcworkspace/contents.xcworkspacedata
+++ b/VibeTunnel.xcworkspace/contents.xcworkspacedata
@@ -7,4 +7,7 @@
    <FileRef
       location = "group:ios/VibeTunnel-iOS.xcodeproj">
    </FileRef>
+   <FileRef
+      location = "group:mac/VibeTunnel/VibeTunnel-Mac.xctestplan">
+   </FileRef>
 </Workspace>
diff --git a/mac/VibeTunnel-Mac.xcodeproj/xcshareddata/xcschemes/VibeTunnel-Mac.xcscheme b/mac/VibeTunnel-Mac.xcodeproj/xcshareddata/xcschemes/VibeTunnel-Mac.xcscheme
index cb676012..555783d9 100644
--- a/mac/VibeTunnel-Mac.xcodeproj/xcshareddata/xcschemes/VibeTunnel-Mac.xcscheme
+++ b/mac/VibeTunnel-Mac.xcodeproj/xcshareddata/xcschemes/VibeTunnel-Mac.xcscheme
@@ -27,8 +27,13 @@
       buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      shouldUseLaunchSchemeArgsEnv = "YES"
-      shouldAutocreateTestPlan = "YES">
+      shouldUseLaunchSchemeArgsEnv = "YES">
+      <TestPlans>
+         <TestPlanReference
+            reference = "container:VibeTunnel/VibeTunnel-Mac.xctestplan"
+            default = "YES">
+         </TestPlanReference>
+      </TestPlans>
    </TestAction>
    <LaunchAction
       buildConfiguration = "Debug"
diff --git a/mac/VibeTunnel/VibeTunnel-Mac.xctestplan b/mac/VibeTunnel/VibeTunnel-Mac.xctestplan
new file mode 100644
index 00000000..bdeb4a6e
--- /dev/null
+++ b/mac/VibeTunnel/VibeTunnel-Mac.xctestplan
@@ -0,0 +1,30 @@
+{
+  "configurations" : [
+    {
+      "id" : "9D7E1994-9FC3-4F5E-B761-5D212EC7615B",
+      "name" : "Test Scheme Action",
+      "options" : {
+
+      }
+    }
+  ],
+  "defaultOptions" : {
+    "codeCoverage" : false,
+    "performanceAntipatternCheckerEnabled" : true,
+    "targetForVariableExpansion" : {
+      "containerPath" : "container:VibeTunnel-Mac.xcodeproj",
+      "identifier" : "788687F02DFF4FCB00B22C15",
+      "name" : "VibeTunnel"
+    }
+  },
+  "testTargets" : [
+    {
+      "target" : {
+        "containerPath" : "container:VibeTunnel-Mac.xcodeproj",
+        "identifier" : "788687FD2DFF4FCB00B22C15",
+        "name" : "VibeTunnelTests"
+      }
+    }
+  ],
+  "version" : 1
+}