diff --git a/lldb/packages/Python/lldbsuite/test/decorators.py b/lldb/packages/Python/lldbsuite/test/decorators.py
index 75ac18d68c39d..62ab13958462d 100644
--- a/lldb/packages/Python/lldbsuite/test/decorators.py
+++ b/lldb/packages/Python/lldbsuite/test/decorators.py
@@ -1085,12 +1085,36 @@ def decorate(func):
     return decorate
 
 def skipEmbeddedSwift(func):
+    """Skip a test that ought to work in embedded Swift but currently doesn't.
+
+    Use this when the test's inferior builds and runs as embedded Swift and the
+    debugger is what gets the wrong answer -- i.e. a gap in LLDB's embedded
+    support that is expected to be closed. For a test whose own source cannot be
+    compiled as embedded Swift at all, use `requiresNonEmbeddedSwift` instead so
+    the two populations stay distinguishable.
+    """
     def skip_fn(swift_embedded=None, **kwargs):
         if swift_embedded == "swiftembed":
             return "not supported in embedded Swift"
         return None
     return _skipForVariant("swift_embedded", skip_fn, func)
 
+def requiresNonEmbeddedSwift(func):
+    """Skip a test whose own source requires non-embedded Swift.
+
+    Behaves exactly like `skipEmbeddedSwift`; the separate name records that the
+    test cannot run as embedded Swift because the inferior does not compile in
+    that mode -- it imports Foundation or another ObjC module, enables library
+    evolution, uses `_Concurrency`, or relies on a language feature Embedded
+    Swift rejects. Nothing in LLDB can make these pass, so they should not be
+    counted against embedded debugging support.
+    """
+    def skip_fn(swift_embedded=None, **kwargs):
+        if swift_embedded == "swiftembed":
+            return "test requires non-embedded Swift"
+        return None
+    return _skipForVariant("swift_embedded", skip_fn, func)
+
 def skipEmbeddedSwiftOnLinux(func):
     def skip_fn(swift_embedded=None, **kwargs):
         if swift_embedded == "swiftembed" and lldbplatformutil.getPlatform() == "linux":
diff --git a/lldb/test/API/commands/dwim-print/swift/TestSwiftDWIMPrint.py b/lldb/test/API/commands/dwim-print/swift/TestSwiftDWIMPrint.py
index cc468e1f3de2f..dbd5c6d5c945d 100644
--- a/lldb/test/API/commands/dwim-print/swift/TestSwiftDWIMPrint.py
+++ b/lldb/test/API/commands/dwim-print/swift/TestSwiftDWIMPrint.py
@@ -8,7 +8,7 @@
 import lldbsuite.test.lldbutil as lldbutil
 
 class TestCase(TestBase):
-    @skipEmbeddedSwift
+    @requiresNonEmbeddedSwift
     @swiftTest
     def test_swift_po_address(self):
         self.build()
@@ -21,7 +21,7 @@ def test_swift_po_address(self):
         self.expect(f"dwim-print -O -- 0x{hex_addr}", patterns=[f"Object@0x0*{hex_addr}"])
         self.expect(f"dwim-print -O -- {addr}", patterns=[f"Object@0x0*{hex_addr}"])
 
-    @skipEmbeddedSwift
+    @requiresNonEmbeddedSwift
     @swiftTest
     def test_swift_po_non_address_hex(self):
         """No special handling of non-memory integer values."""
@@ -31,7 +31,7 @@ def test_swift_po_non_address_hex(self):
         )
         self.expect(f"dwim-print -O -- 0x1000", substrs=["4096"])
 
-    @skipEmbeddedSwift
+    @requiresNonEmbeddedSwift
     @swiftTest
     def test_print_swift_object_does_not_show_name(self):
         """Ensure that objects are printed without a name, and without the '='
diff --git a/lldb/test/API/commands/frame/var/direct-ivar/swift/TestSwiftFrameVarDirectIvar.py b/lldb/test/API/commands/frame/var/direct-ivar/swift/TestSwiftFrameVarDirectIvar.py
index ea66f84fb9ee1..a92fc11f46159 100644
--- a/lldb/test/API/commands/frame/var/direct-ivar/swift/TestSwiftFrameVarDirectIvar.py
+++ b/lldb/test/API/commands/frame/var/direct-ivar/swift/TestSwiftFrameVarDirectIvar.py
@@ -5,7 +5,7 @@
 
 
 class TestCase(TestBase):
-    @skipEmbeddedSwift
+    @requiresNonEmbeddedSwift
     @swiftTest
     @skipUnlessDarwin
     def test_objc_self(self):
@@ -13,7 +13,7 @@ def test_objc_self(self):
         lldbutil.run_to_source_breakpoint(self, "check self", lldb.SBFileSpec("main.swift"))
         self.expect("frame variable _prop", startstr="(Int) _prop = 30")
 
-    @skipEmbeddedSwift
+    @requiresNonEmbeddedSwift
     @swiftTest
     @skipUnlessDarwin
     def test_objc_self_capture_idiom(self):
diff --git a/lldb/test/API/functionalities/asan/swift/TestSwiftAsan.py b/lldb/test/API/functionalities/asan/swift/TestSwiftAsan.py
index 257e626797332..b754e331874dc 100644
--- a/lldb/test/API/functionalities/asan/swift/TestSwiftAsan.py
+++ b/lldb/test/API/functionalities/asan/swift/TestSwiftAsan.py
@@ -25,7 +25,7 @@ class AsanSwiftTestCase(lldbtest.TestBase):
 
     mydir = lldbtest.TestBase.compute_mydir(__file__)
 
-    @skipEmbeddedSwift
+    @requiresNonEmbeddedSwift
     @swiftTest
     @skipIfWindows
     @skipIfLinux
diff --git a/lldb/test/API/functionalities/breakpoint/swift_exception/TestExpressionErrorBreakpoint.py b/lldb/test/API/functionalities/breakpoint/swift_exception/TestExpressionErrorBreakpoint.py
index 53ed9659d3c11..05ab926dfdc45 100644
--- a/lldb/test/API/functionalities/breakpoint/swift_exception/TestExpressionErrorBreakpoint.py
+++ b/lldb/test/API/functionalities/breakpoint/swift_exception/TestExpressionErrorBreakpoint.py
@@ -21,7 +21,7 @@
 
 @skipIfWindows
 class TestSwiftErrorBreakpoint(TestBase):
-    @skipEmbeddedSwift
+    @requiresNonEmbeddedSwift
     @decorators.skipIfLinux  # <rdar://problem/30909618>
     @swiftTest
     def test_swift_error_no_typename(self):
@@ -29,21 +29,21 @@ def test_swift_error_no_typename(self):
         self.build()
         self.do_tests(None)
 
-    @skipEmbeddedSwift
+    @requiresNonEmbeddedSwift
     @swiftTest
     def test_swift_error_matching_base_typename(self):
         """Tests that swift error throws are correctly caught by the Swift Error breakpoint"""
         self.build()
         self.do_tests("EnumError")
 
-    @skipEmbeddedSwift
+    @requiresNonEmbeddedSwift
     @swiftTest
     def test_swift_error_matching_full_typename(self):
         """Tests that swift error throws are correctly caught by the Swift Error breakpoint"""
         self.build()
         self.do_tests("a.EnumError")
 
-    @skipEmbeddedSwift
+    @requiresNonEmbeddedSwift
     @swiftTest
     def test_swift_error_bogus_typename(self):
         """Tests that swift error throws are correctly caught by the Swift Error breakpoint"""
diff --git a/lldb/test/API/functionalities/data-formatter/swift/bridged-string/TestSwiftBridgedStringFormatters.py b/lldb/test/API/functionalities/data-formatter/swift/bridged-string/TestSwiftBridgedStringFormatters.py
index 636b0430080e5..035b42496917c 100644
--- a/lldb/test/API/functionalities/data-formatter/swift/bridged-string/TestSwiftBridgedStringFormatters.py
+++ b/lldb/test/API/functionalities/data-formatter/swift/bridged-string/TestSwiftBridgedStringFormatters.py
@@ -6,7 +6,7 @@
 
 class TestCase(TestBase):
 
-    @skipEmbeddedSwift
+    @requiresNonEmbeddedSwift
     @swiftTest
     @skipUnlessFoundation
     def test(self):
diff --git a/lldb/test/API/functionalities/data-formatter/swift/date/TestSwiftDateFormatters.py b/lldb/test/API/functionalities/data-formatter/swift/date/TestSwiftDateFormatters.py
index 1cd30a9fb64bc..4fd698532bc65 100644
--- a/lldb/test/API/functionalities/data-formatter/swift/date/TestSwiftDateFormatters.py
+++ b/lldb/test/API/functionalities/data-formatter/swift/date/TestSwiftDateFormatters.py
@@ -11,7 +11,7 @@
 
 
 class TestCase(TestBase):
-    @skipEmbeddedSwift
+    @requiresNonEmbeddedSwift
     @skipUnlessFoundationEssentials
     @skipIfLinux  # https://github.com/swiftlang/llvm-project/issues/13465
     @swiftTest
diff --git a/lldb/test/API/functionalities/data-formatter/swift/string-index/TestSwiftStringIndexFormatters.py b/lldb/test/API/functionalities/data-formatter/swift/string-index/TestSwiftStringIndexFormatters.py
index 1dfbc463edaa9..723370af1be7c 100644
--- a/lldb/test/API/functionalities/data-formatter/swift/string-index/TestSwiftStringIndexFormatters.py
+++ b/lldb/test/API/functionalities/data-formatter/swift/string-index/TestSwiftStringIndexFormatters.py
@@ -11,7 +11,7 @@
 
 
 class TestCase(TestBase):
-    @skipEmbeddedSwift
+    @requiresNonEmbeddedSwift
     @skipUnlessFoundationEssentials
     @skipIfLinux  # https://github.com/swiftlang/llvm-project/issues/13465
     @swiftTest
@@ -77,7 +77,7 @@ def test_swift_string_index_formatters_native(self):
             ],
         )
 
-    @skipEmbeddedSwift
+    @requiresNonEmbeddedSwift
     @skipUnlessFoundation
     @swiftTest
     def test_swift_string_index_formatters_bridged(self):
diff --git a/lldb/test/API/functionalities/data-formatter/swift/substring/TestSwiftSubstringFormatters.py b/lldb/test/API/functionalities/data-formatter/swift/substring/TestSwiftSubstringFormatters.py
index 86b0c60d2a3eb..164949ef8f587 100644
--- a/lldb/test/API/functionalities/data-formatter/swift/substring/TestSwiftSubstringFormatters.py
+++ b/lldb/test/API/functionalities/data-formatter/swift/substring/TestSwiftSubstringFormatters.py
@@ -9,7 +9,7 @@
 
 
 class TestCase(TestBase):
-    @skipEmbeddedSwift
+    @requiresNonEmbeddedSwift
     @swiftTest
     def test_swift_substring_formatters(self):
         """Test Subtring summary strings."""
diff --git a/lldb/test/API/functionalities/mtc/swift-property/TestSwiftMTCProperty.py b/lldb/test/API/functionalities/mtc/swift-property/TestSwiftMTCProperty.py
index 3591d8514165e..7afa44672d400 100644
--- a/lldb/test/API/functionalities/mtc/swift-property/TestSwiftMTCProperty.py
+++ b/lldb/test/API/functionalities/mtc/swift-property/TestSwiftMTCProperty.py
@@ -13,7 +13,7 @@
 
 
 class MTCSwiftPropertyTestCase(TestBase):
-    @skipEmbeddedSwift
+    @requiresNonEmbeddedSwift
     @skipUnlessDarwin
     @swiftTest
     def test(self):
diff --git a/lldb/test/API/functionalities/mtc/swift/TestSwiftMTC.py b/lldb/test/API/functionalities/mtc/swift/TestSwiftMTC.py
index 14fba642452b4..db25431c81269 100644
--- a/lldb/test/API/functionalities/mtc/swift/TestSwiftMTC.py
+++ b/lldb/test/API/functionalities/mtc/swift/TestSwiftMTC.py
@@ -13,7 +13,7 @@
 
 
 class MTCSwiftTestCase(TestBase):
-    @skipEmbeddedSwift
+    @requiresNonEmbeddedSwift
     @skipUnlessDarwin
     @swiftTest
     def test(self):
diff --git a/lldb/test/API/functionalities/progress_reporting/swift_progress_reporting/TestSwiftProgressReporting.py b/lldb/test/API/functionalities/progress_reporting/swift_progress_reporting/TestSwiftProgressReporting.py
index 9794f200ecb6c..0a36dfe29e7cd 100644
--- a/lldb/test/API/functionalities/progress_reporting/swift_progress_reporting/TestSwiftProgressReporting.py
+++ b/lldb/test/API/functionalities/progress_reporting/swift_progress_reporting/TestSwiftProgressReporting.py
@@ -15,7 +15,7 @@ def setUp(self):
         self.listener = lldbutil.start_listening_from(self.broadcaster,
                                         lldb.SBDebugger.eBroadcastBitProgress)
 
-    @skipEmbeddedSwift
+    @requiresNonEmbeddedSwift
     # Don't run ClangImporter tests if Clangimporter is disabled.
     @skipIf(setting=('symbols.use-swift-clangimporter', 'false'))
     @skipUnlessDarwin
diff --git a/lldb/test/API/functionalities/swift-runtime-reporting/exclusivity-violation/TestExclusivityViolation.py b/lldb/test/API/functionalities/swift-runtime-reporting/exclusivity-violation/TestExclusivityViolation.py
index b4ec99f5a4ee9..9f29bca58db38 100644
--- a/lldb/test/API/functionalities/swift-runtime-reporting/exclusivity-violation/TestExclusivityViolation.py
+++ b/lldb/test/API/functionalities/swift-runtime-reporting/exclusivity-violation/TestExclusivityViolation.py
@@ -25,7 +25,7 @@ class SwiftRuntimeReportingExclusivityViolationTestCase(lldbtest.TestBase):
     mydir = lldbtest.TestBase.compute_mydir(__file__)
 
     @decorators.swiftTest
-    @decorators.skipEmbeddedSwift
+    @decorators.requiresNonEmbeddedSwift
     @decorators.skipIfLinux
     @decorators.expectedFailureWindows
     def test_swift_runtime_reporting(self):
diff --git a/lldb/test/API/functionalities/tsan/swift-access-race/TestSwiftTsanAccessRace.py b/lldb/test/API/functionalities/tsan/swift-access-race/TestSwiftTsanAccessRace.py
index 0cf398ed9ecf6..b778cd8b455f9 100644
--- a/lldb/test/API/functionalities/tsan/swift-access-race/TestSwiftTsanAccessRace.py
+++ b/lldb/test/API/functionalities/tsan/swift-access-race/TestSwiftTsanAccessRace.py
@@ -25,7 +25,7 @@ class TsanSwiftAccessRaceTestCase(lldbtest.TestBase):
 
     mydir = lldbtest.TestBase.compute_mydir(__file__)
 
-    @skipEmbeddedSwift
+    @requiresNonEmbeddedSwift
     @swiftTest
     @skipIfWindows
     @skipIfLinux
diff --git a/lldb/test/API/functionalities/tsan/swift/TestSwiftTsan.py b/lldb/test/API/functionalities/tsan/swift/TestSwiftTsan.py
index 83178a72f6956..9795461d88cb7 100644
--- a/lldb/test/API/functionalities/tsan/swift/TestSwiftTsan.py
+++ b/lldb/test/API/functionalities/tsan/swift/TestSwiftTsan.py
@@ -24,7 +24,7 @@ class TsanSwiftTestCase(lldbtest.TestBase):
 
     mydir = lldbtest.TestBase.compute_mydir(__file__)
 
-    @skipEmbeddedSwift
+    @requiresNonEmbeddedSwift
     @swiftTest
     @skipIfWindows
     @skipIfLinux
diff --git a/lldb/test/API/lang/swift/accelerate_simd/TestAccelerateSIMD.py b/lldb/test/API/lang/swift/accelerate_simd/TestAccelerateSIMD.py
index 32b35cbff59b2..003a73de0bdfb 100644
--- a/lldb/test/API/lang/swift/accelerate_simd/TestAccelerateSIMD.py
+++ b/lldb/test/API/lang/swift/accelerate_simd/TestAccelerateSIMD.py
@@ -1,4 +1,4 @@
 import lldbsuite.test.lldbinline as lldbinline
 from lldbsuite.test.decorators import *
 
-lldbinline.MakeInlineTest(__file__, globals(), decorators=[skipEmbeddedSwift, swiftTest])
+lldbinline.MakeInlineTest(__file__, globals(), decorators=[requiresNonEmbeddedSwift, swiftTest])
diff --git a/lldb/test/API/lang/swift/address_of/TestSwiftAddressOf.py b/lldb/test/API/lang/swift/address_of/TestSwiftAddressOf.py
index 383933947ef98..f211bbec26c5f 100644
--- a/lldb/test/API/lang/swift/address_of/TestSwiftAddressOf.py
+++ b/lldb/test/API/lang/swift/address_of/TestSwiftAddressOf.py
@@ -44,7 +44,7 @@ def check_variable(self, name, is_reference, contents = 0):
         self.assertSuccess(error)
 
         
-    @skipEmbeddedSwift
+    @requiresNonEmbeddedSwift
     @swiftTest
     def test(self):
         self.build()
diff --git a/lldb/test/API/lang/swift/any/TestSwiftAnyType.py b/lldb/test/API/lang/swift/any/TestSwiftAnyType.py
index c5577cf520960..ae545a6666165 100644
--- a/lldb/test/API/lang/swift/any/TestSwiftAnyType.py
+++ b/lldb/test/API/lang/swift/any/TestSwiftAnyType.py
@@ -23,7 +23,7 @@ class TestSwiftAnyType(lldbtest.TestBase):
 
     mydir = lldbtest.TestBase.compute_mydir(__file__)
 
-    @skipEmbeddedSwift
+    @skipEmbeddedSwiftOnWindows
     @swiftTest
     def test_any_type(self):
         """Test the Any type"""
diff --git a/lldb/test/API/lang/swift/archetype_resolution/TestSwiftArchetypeResolution.py b/lldb/test/API/lang/swift/archetype_resolution/TestSwiftArchetypeResolution.py
index b265818761259..d78d1a279b604 100644
--- a/lldb/test/API/lang/swift/archetype_resolution/TestSwiftArchetypeResolution.py
+++ b/lldb/test/API/lang/swift/archetype_resolution/TestSwiftArchetypeResolution.py
@@ -20,7 +20,8 @@
 
 
 class TestSwiftArchetypeResolution(TestBase):
-    @skipEmbeddedSwift
+    @skipEmbeddedSwiftOnLinux # the embedded stdlib's hashing seed needs arc4random_buf, which does not link on Linux.
+    @skipEmbeddedSwiftOnWindows
     @swiftTest
     def test_swift_archetype_resolution(self):
         """Test that archetype-typed objects get resolved to their proper location in memory"""
diff --git a/lldb/test/API/lang/swift/archetype_resolution_subclass/TestArchetypeResolutionSubclass.py b/lldb/test/API/lang/swift/archetype_resolution_subclass/TestArchetypeResolutionSubclass.py
index 32b35cbff59b2..003a73de0bdfb 100644
--- a/lldb/test/API/lang/swift/archetype_resolution_subclass/TestArchetypeResolutionSubclass.py
+++ b/lldb/test/API/lang/swift/archetype_resolution_subclass/TestArchetypeResolutionSubclass.py
@@ -1,4 +1,4 @@
 import lldbsuite.test.lldbinline as lldbinline
 from lldbsuite.test.decorators import *
 
-lldbinline.MakeInlineTest(__file__, globals(), decorators=[skipEmbeddedSwift, swiftTest])
+lldbinline.MakeInlineTest(__file__, globals(), decorators=[requiresNonEmbeddedSwift, swiftTest])
diff --git a/lldb/test/API/lang/swift/array_bridged_enum/TestArrayBridgedEnum.py b/lldb/test/API/lang/swift/array_bridged_enum/TestArrayBridgedEnum.py
index 553b342ea706f..dbdac8957e15f 100644
--- a/lldb/test/API/lang/swift/array_bridged_enum/TestArrayBridgedEnum.py
+++ b/lldb/test/API/lang/swift/array_bridged_enum/TestArrayBridgedEnum.py
@@ -1,5 +1,5 @@
 import lldbsuite.test.lldbinline as lldbinline
 from lldbsuite.test.decorators import *
 
-lldbinline.MakeInlineTest(__file__, globals(), decorators=[skipEmbeddedSwift,
+lldbinline.MakeInlineTest(__file__, globals(), decorators=[requiresNonEmbeddedSwift,
         swiftTest, skipUnlessFoundation])
diff --git a/lldb/test/API/lang/swift/array_element/TestSwiftArrayElement.py b/lldb/test/API/lang/swift/array_element/TestSwiftArrayElement.py
index 32b35cbff59b2..003a73de0bdfb 100644
--- a/lldb/test/API/lang/swift/array_element/TestSwiftArrayElement.py
+++ b/lldb/test/API/lang/swift/array_element/TestSwiftArrayElement.py
@@ -1,4 +1,4 @@
 import lldbsuite.test.lldbinline as lldbinline
 from lldbsuite.test.decorators import *
 
-lldbinline.MakeInlineTest(__file__, globals(), decorators=[skipEmbeddedSwift, swiftTest])
+lldbinline.MakeInlineTest(__file__, globals(), decorators=[requiresNonEmbeddedSwift, swiftTest])
diff --git a/lldb/test/API/lang/swift/array_enum/TestArrayEnum.py b/lldb/test/API/lang/swift/array_enum/TestArrayEnum.py
index 32b35cbff59b2..003a73de0bdfb 100644
--- a/lldb/test/API/lang/swift/array_enum/TestArrayEnum.py
+++ b/lldb/test/API/lang/swift/array_enum/TestArrayEnum.py
@@ -1,4 +1,4 @@
 import lldbsuite.test.lldbinline as lldbinline
 from lldbsuite.test.decorators import *
 
-lldbinline.MakeInlineTest(__file__, globals(), decorators=[skipEmbeddedSwift, swiftTest])
+lldbinline.MakeInlineTest(__file__, globals(), decorators=[requiresNonEmbeddedSwift, swiftTest])
diff --git a/lldb/test/API/lang/swift/array_tuple_resilient/TestSwiftArrayTupleResilient.py b/lldb/test/API/lang/swift/array_tuple_resilient/TestSwiftArrayTupleResilient.py
index 2fc812fc1803d..d13f1724deabc 100644
--- a/lldb/test/API/lang/swift/array_tuple_resilient/TestSwiftArrayTupleResilient.py
+++ b/lldb/test/API/lang/swift/array_tuple_resilient/TestSwiftArrayTupleResilient.py
@@ -1,6 +1,6 @@
 import lldbsuite.test.lldbinline as lldbinline
 from lldbsuite.test.decorators import *
 
-lldbinline.MakeInlineTest(__file__, globals(), decorators=[skipEmbeddedSwift,
+lldbinline.MakeInlineTest(__file__, globals(), decorators=[requiresNonEmbeddedSwift,
         swiftTest, skipUnlessDarwin,
     expectedFailureAll(archs=['arm64_32'], bugnumber="<rdar://problem/58065423>")])
diff --git a/lldb/test/API/lang/swift/array_uninitialized/TestSwiftArrayUninitialized.py b/lldb/test/API/lang/swift/array_uninitialized/TestSwiftArrayUninitialized.py
index e45b5415509d5..fb73fd663aacf 100644
--- a/lldb/test/API/lang/swift/array_uninitialized/TestSwiftArrayUninitialized.py
+++ b/lldb/test/API/lang/swift/array_uninitialized/TestSwiftArrayUninitialized.py
@@ -5,7 +5,7 @@
 
 
 class TestSwiftArrayUninitialized(lldbtest.TestBase):
-    @skipEmbeddedSwift
+    @requiresNonEmbeddedSwift
     @swiftTest
     def test(self):
         """Test unitialized global arrays"""
diff --git a/lldb/test/API/lang/swift/artificial_subclass/TestSwiftArtificialSubclass.py b/lldb/test/API/lang/swift/artificial_subclass/TestSwiftArtificialSubclass.py
index 32a034e413a37..f81abb537e2f7 100644
--- a/lldb/test/API/lang/swift/artificial_subclass/TestSwiftArtificialSubclass.py
+++ b/lldb/test/API/lang/swift/artificial_subclass/TestSwiftArtificialSubclass.py
@@ -5,7 +5,7 @@
 
 
 class TestSwiftArtificialSubclass(TestBase):
-    @skipEmbeddedSwift
+    @requiresNonEmbeddedSwift
     @skipUnlessObjCInterop
     @swiftTest
     def test(self):
diff --git a/lldb/test/API/lang/swift/associated_self_type/TestSwiftAssociatedSelfType.py b/lldb/test/API/lang/swift/associated_self_type/TestSwiftAssociatedSelfType.py
index 7f810c5cd4448..6b5637980f216 100644
--- a/lldb/test/API/lang/swift/associated_self_type/TestSwiftAssociatedSelfType.py
+++ b/lldb/test/API/lang/swift/associated_self_type/TestSwiftAssociatedSelfType.py
@@ -12,4 +12,4 @@
 import lldbsuite.test.lldbinline as lldbinline
 from lldbsuite.test.decorators import *
 
-lldbinline.MakeInlineTest(__file__, globals(), decorators=[skipEmbeddedSwift, swiftTest])
+lldbinline.MakeInlineTest(__file__, globals(), decorators=[requiresNonEmbeddedSwift, swiftTest])
diff --git a/lldb/test/API/lang/swift/associated_type_resolution/TestSwiftAssociatedTypeResolution.py b/lldb/test/API/lang/swift/associated_type_resolution/TestSwiftAssociatedTypeResolution.py
index 2e1163c8f31fa..2b1a41b7f5a0e 100644
--- a/lldb/test/API/lang/swift/associated_type_resolution/TestSwiftAssociatedTypeResolution.py
+++ b/lldb/test/API/lang/swift/associated_type_resolution/TestSwiftAssociatedTypeResolution.py
@@ -20,7 +20,7 @@
 
 
 class TestSwiftArchetypeResolution(TestBase):
-    @skipEmbeddedSwift
+    @requiresNonEmbeddedSwift
     @swiftTest
     def test_swift_associated_type_resolution(self):
         """Test that archetype-typed objects get resolved to their proper location in memory"""
diff --git a/lldb/test/API/lang/swift/async/actors/unprioritised_jobs/TestSwiftActorUnprioritisedJobs.py b/lldb/test/API/lang/swift/async/actors/unprioritised_jobs/TestSwiftActorUnprioritisedJobs.py
index f76a9f52eb141..24fc35b751331 100644
--- a/lldb/test/API/lang/swift/async/actors/unprioritised_jobs/TestSwiftActorUnprioritisedJobs.py
+++ b/lldb/test/API/lang/swift/async/actors/unprioritised_jobs/TestSwiftActorUnprioritisedJobs.py
@@ -6,7 +6,7 @@
 
 class TestCase(TestBase):
 
-    @skipEmbeddedSwift
+    @requiresNonEmbeddedSwift
     @swiftTest
     def test_actor_unprioritised_jobs(self):
         """Verify that an actor exposes its unprioritised jobs (queue)."""
diff --git a/lldb/test/API/lang/swift/async/async_fnargs/TestSwiftAsyncFnArgs.py b/lldb/test/API/lang/swift/async/async_fnargs/TestSwiftAsyncFnArgs.py
index d9cbe047edb8a..a5158f93a9c1d 100644
--- a/lldb/test/API/lang/swift/async/async_fnargs/TestSwiftAsyncFnArgs.py
+++ b/lldb/test/API/lang/swift/async/async_fnargs/TestSwiftAsyncFnArgs.py
@@ -8,7 +8,7 @@ class TestSwiftAsyncFnArgs(lldbtest.TestBase):
 
     mydir = lldbtest.TestBase.compute_mydir(__file__)
 
-    @skipEmbeddedSwift
+    @requiresNonEmbeddedSwift
     @swiftTest
     @skipIf(oslist=['windows',])
     def test(self):
diff --git a/lldb/test/API/lang/swift/async/continuations/TestSwiftContinuationSynthetic.py b/lldb/test/API/lang/swift/async/continuations/TestSwiftContinuationSynthetic.py
index 45b1f212cda07..e4d9fd271e721 100644
--- a/lldb/test/API/lang/swift/async/continuations/TestSwiftContinuationSynthetic.py
+++ b/lldb/test/API/lang/swift/async/continuations/TestSwiftContinuationSynthetic.py
@@ -7,7 +7,7 @@
 
 class TestCase(TestBase):
 
-    @skipEmbeddedSwift
+    @requiresNonEmbeddedSwift
     @swiftTest
     def test_unsafe_continuation_printing(self):
         """Print an UnsafeContinuation and verify its children."""
@@ -34,7 +34,7 @@ def test_unsafe_continuation_printing(self):
             ],
         )
 
-    @skipEmbeddedSwift
+    @requiresNonEmbeddedSwift
     @swiftTest
     def test_checked_continuation_printing(self):
         """Print an CheckedContinuation and verify its children."""
diff --git a/lldb/test/API/lang/swift/async/expr/TestSwiftAsyncExpressions.py b/lldb/test/API/lang/swift/async/expr/TestSwiftAsyncExpressions.py
index d4dd74c3051d2..86be2e685ca0c 100644
--- a/lldb/test/API/lang/swift/async/expr/TestSwiftAsyncExpressions.py
+++ b/lldb/test/API/lang/swift/async/expr/TestSwiftAsyncExpressions.py
@@ -8,7 +8,7 @@ class TestSwiftAsyncExpressions(lldbtest.TestBase):
 
     mydir = lldbtest.TestBase.compute_mydir(__file__)
 
-    @skipEmbeddedSwift
+    @requiresNonEmbeddedSwift
     @swiftTest
     @skipIf(archs=no_match(["aarch", "arm64", "arm64e", "arm64_32", "x86_64"]))
     def test_actor(self):
diff --git a/lldb/test/API/lang/swift/async/formatters/task/TestSwiftTaskSyntheticProvider.py b/lldb/test/API/lang/swift/async/formatters/task/TestSwiftTaskSyntheticProvider.py
index 68f42b967cfcd..9583231c40f1e 100644
--- a/lldb/test/API/lang/swift/async/formatters/task/TestSwiftTaskSyntheticProvider.py
+++ b/lldb/test/API/lang/swift/async/formatters/task/TestSwiftTaskSyntheticProvider.py
@@ -7,7 +7,7 @@
 
 class TestCase(TestBase):
 
-    @skipEmbeddedSwift
+    @requiresNonEmbeddedSwift
     @swiftTest
     def test_top_level_task(self):
         """Test Task synthetic child provider for top-level Task."""
@@ -34,7 +34,7 @@ def test_top_level_task(self):
             ],
         )
 
-    @skipEmbeddedSwift
+    @requiresNonEmbeddedSwift
     @swiftTest
     def test_current_task(self):
         """Test Task synthetic child for UnsafeCurrentTask (from an async let)."""
diff --git a/lldb/test/API/lang/swift/async/formatters/task/children/TestSwiftSyntheticTaskChildren.py b/lldb/test/API/lang/swift/async/formatters/task/children/TestSwiftSyntheticTaskChildren.py
index e861828b29c6e..1cdea2ccda48c 100644
--- a/lldb/test/API/lang/swift/async/formatters/task/children/TestSwiftSyntheticTaskChildren.py
+++ b/lldb/test/API/lang/swift/async/formatters/task/children/TestSwiftSyntheticTaskChildren.py
@@ -7,7 +7,7 @@
 
 class TestCase(TestBase):
 
-    @skipEmbeddedSwift
+    @requiresNonEmbeddedSwift
     @skipUnlessDarwin
     @swiftTest
     def test(self):
diff --git a/lldb/test/API/lang/swift/async/formatters/task/complete/TestSwiftTaskComplete.py b/lldb/test/API/lang/swift/async/formatters/task/complete/TestSwiftTaskComplete.py
index 96727a620671a..1d2a32fa596b3 100644
--- a/lldb/test/API/lang/swift/async/formatters/task/complete/TestSwiftTaskComplete.py
+++ b/lldb/test/API/lang/swift/async/formatters/task/complete/TestSwiftTaskComplete.py
@@ -7,7 +7,7 @@
 
 class TestCase(TestBase):
 
-    @skipEmbeddedSwift
+    @requiresNonEmbeddedSwift
     @swiftTest
     def test(self):
         self.build()
diff --git a/lldb/test/API/lang/swift/async/formatters/task/name/TestSwiftTaskName.py b/lldb/test/API/lang/swift/async/formatters/task/name/TestSwiftTaskName.py
index 106ce623c5329..e597124e267d3 100644
--- a/lldb/test/API/lang/swift/async/formatters/task/name/TestSwiftTaskName.py
+++ b/lldb/test/API/lang/swift/async/formatters/task/name/TestSwiftTaskName.py
@@ -7,7 +7,7 @@
 
 class TestCase(TestBase):
 
-    @skipEmbeddedSwift
+    @requiresNonEmbeddedSwift
     @swiftTest
     def test_summary_contains_name(self):
         self.build()
@@ -16,7 +16,7 @@ def test_summary_contains_name(self):
         )
         self.expect("v task", patterns=[r'"Chore" id:[1-9]'])
 
-    @skipEmbeddedSwift
+    @requiresNonEmbeddedSwift
     @swiftTest
     @skipIfWindows # rdar://176009590
     def test_thread_contains_name(self):
diff --git a/lldb/test/API/lang/swift/async/formatters/task/parent/TestSwiftSyntheticTaskParent.py b/lldb/test/API/lang/swift/async/formatters/task/parent/TestSwiftSyntheticTaskParent.py
index ac96498e88a0f..fac11e4be9f97 100644
--- a/lldb/test/API/lang/swift/async/formatters/task/parent/TestSwiftSyntheticTaskParent.py
+++ b/lldb/test/API/lang/swift/async/formatters/task/parent/TestSwiftSyntheticTaskParent.py
@@ -9,7 +9,7 @@
 
 class TestCase(TestBase):
 
-    @skipEmbeddedSwift
+    @requiresNonEmbeddedSwift
     @skipUnlessDarwin
     @swiftTest
     def test(self):
diff --git a/lldb/test/API/lang/swift/async/formatters/task/suspended/TestSwiftTaskSuspended.py b/lldb/test/API/lang/swift/async/formatters/task/suspended/TestSwiftTaskSuspended.py
index fd53745d82890..26afb05c31095 100644
--- a/lldb/test/API/lang/swift/async/formatters/task/suspended/TestSwiftTaskSuspended.py
+++ b/lldb/test/API/lang/swift/async/formatters/task/suspended/TestSwiftTaskSuspended.py
@@ -7,7 +7,7 @@
 
 class TestCase(TestBase):
 
-    @skipEmbeddedSwift
+    @requiresNonEmbeddedSwift
     @swiftTest
     def test(self):
         self.build()
diff --git a/lldb/test/API/lang/swift/async/formatters/taskpriority/TestSwiftTaskPrioritySummary.py b/lldb/test/API/lang/swift/async/formatters/taskpriority/TestSwiftTaskPrioritySummary.py
index e8a20d7763342..09a8c3ecf5aa5 100644
--- a/lldb/test/API/lang/swift/async/formatters/taskpriority/TestSwiftTaskPrioritySummary.py
+++ b/lldb/test/API/lang/swift/async/formatters/taskpriority/TestSwiftTaskPrioritySummary.py
@@ -6,7 +6,7 @@
 
 class TestCase(TestBase):
 
-    @skipEmbeddedSwift
+    @requiresNonEmbeddedSwift
     @swiftTest
     def test(self):
         """Test summary formatter for TaskPriority."""
diff --git a/lldb/test/API/lang/swift/async/frame/variable/TestSwiftAsyncFrameVar.py b/lldb/test/API/lang/swift/async/frame/variable/TestSwiftAsyncFrameVar.py
index 261fb9e8a4f97..28503ef3205a6 100644
--- a/lldb/test/API/lang/swift/async/frame/variable/TestSwiftAsyncFrameVar.py
+++ b/lldb/test/API/lang/swift/async/frame/variable/TestSwiftAsyncFrameVar.py
@@ -7,7 +7,7 @@ class TestCase(lldbtest.TestBase):
 
     mydir = lldbtest.TestBase.compute_mydir(__file__)
 
-    @skipEmbeddedSwift
+    @requiresNonEmbeddedSwift
     @swiftTest
     @skipIf(oslist=['windows'])
     def test(self):
diff --git a/lldb/test/API/lang/swift/async/frame/variables_multiple_frames/TestSwiftAsyncFrameVarMultipleFrames.py b/lldb/test/API/lang/swift/async/frame/variables_multiple_frames/TestSwiftAsyncFrameVarMultipleFrames.py
index 990a7dbbd635f..0b375335f65fb 100644
--- a/lldb/test/API/lang/swift/async/frame/variables_multiple_frames/TestSwiftAsyncFrameVarMultipleFrames.py
+++ b/lldb/test/API/lang/swift/async/frame/variables_multiple_frames/TestSwiftAsyncFrameVarMultipleFrames.py
@@ -67,7 +67,7 @@ def check_variables(self, async_frames, expected_values):
             myvar = frame.FindVariable("myvar")
             lldbutil.check_variable(self, myvar, False, value=expected_value)
 
-    @skipEmbeddedSwift
+    @requiresNonEmbeddedSwift
     @swiftTest
     @skipIf(oslist=["windows"])
     def test(self):
diff --git a/lldb/test/API/lang/swift/async/queues/TestSwiftPluginQueues.py b/lldb/test/API/lang/swift/async/queues/TestSwiftPluginQueues.py
index 1d07bffcbcf38..b7481bb716c90 100644
--- a/lldb/test/API/lang/swift/async/queues/TestSwiftPluginQueues.py
+++ b/lldb/test/API/lang/swift/async/queues/TestSwiftPluginQueues.py
@@ -6,7 +6,7 @@
 
 
 class TestCase(lldbtest.TestBase):
-    @skipEmbeddedSwift
+    @requiresNonEmbeddedSwift
     @swiftTest
     @skipIf(oslist=["windows", "linux"])
     def test(self):
diff --git a/lldb/test/API/lang/swift/async/stepping/step-in/TestSwiftStepInAsync.py b/lldb/test/API/lang/swift/async/stepping/step-in/TestSwiftStepInAsync.py
index accaa2aec5d71..4d0749ff38d2b 100644
--- a/lldb/test/API/lang/swift/async/stepping/step-in/TestSwiftStepInAsync.py
+++ b/lldb/test/API/lang/swift/async/stepping/step-in/TestSwiftStepInAsync.py
@@ -8,7 +8,7 @@ class TestCase(lldbtest.TestBase):
 
     mydir = lldbtest.TestBase.compute_mydir(__file__)
 
-    @skipEmbeddedSwift
+    @requiresNonEmbeddedSwift
     @swiftTest
     @skipIf(oslist=['windows'])
     def test(self):
diff --git a/lldb/test/API/lang/swift/async/stepping/step-in/task-switch/TestSwiftTaskSwitch.py b/lldb/test/API/lang/swift/async/stepping/step-in/task-switch/TestSwiftTaskSwitch.py
index 01a6b78ae012b..7b1dbcbe16753 100644
--- a/lldb/test/API/lang/swift/async/stepping/step-in/task-switch/TestSwiftTaskSwitch.py
+++ b/lldb/test/API/lang/swift/async/stepping/step-in/task-switch/TestSwiftTaskSwitch.py
@@ -5,7 +5,7 @@
 
 
 class TestCase(lldbtest.TestBase):
-    @skipEmbeddedSwift
+    @requiresNonEmbeddedSwift
     @swiftTest
     @skipIf(oslist=["windows", "linux"])
     @skipIf(macos_version=["<", "26.0"], asan=True) # rdar://138777205
diff --git a/lldb/test/API/lang/swift/async/stepping/step_out/TestSteppingOutAsync.py b/lldb/test/API/lang/swift/async/stepping/step_out/TestSteppingOutAsync.py
index fdcb5d941dd2e..532f368ef1662 100644
--- a/lldb/test/API/lang/swift/async/stepping/step_out/TestSteppingOutAsync.py
+++ b/lldb/test/API/lang/swift/async/stepping/step_out/TestSteppingOutAsync.py
@@ -28,7 +28,7 @@ def step_out_checks(self, thread, expected_func_names):
             self.assertStopReason(stop_reason, lldb.eStopReasonPlanComplete)
             self.assertEqual(thread.frames[0].GetFunctionName(), expected_func_name)
 
-    @skipEmbeddedSwift
+    @requiresNonEmbeddedSwift
     @swiftTest
     @skipIf(oslist=["windows"])
     def test(self):
diff --git a/lldb/test/API/lang/swift/async/stepping/step_over/TestSwiftAsyncStepOver.py b/lldb/test/API/lang/swift/async/stepping/step_over/TestSwiftAsyncStepOver.py
index d442f8c499b3c..2198daeb57560 100644
--- a/lldb/test/API/lang/swift/async/stepping/step_over/TestSwiftAsyncStepOver.py
+++ b/lldb/test/API/lang/swift/async/stepping/step_over/TestSwiftAsyncStepOver.py
@@ -17,7 +17,7 @@ def check_is_in_line(self, thread, linenum):
         line_entry = frame.GetLineEntry()
         self.assertEqual(linenum, line_entry.GetLine())
 
-    @skipEmbeddedSwift
+    @requiresNonEmbeddedSwift
     @swiftTest
     @skipIf(oslist=["windows"])
     def test(self):
@@ -40,7 +40,7 @@ def test(self):
             self.check_is_in_line(thread, expected_line_num)
             self.check_x_is_available(thread.frames[0])
 
-    @skipEmbeddedSwift
+    @requiresNonEmbeddedSwift
     @skipIfOutOfTreeDebugserver
     @swiftTest
     @skipIf(oslist=["windows", "linux"])
diff --git a/lldb/test/API/lang/swift/async/stepping/step_over_asynclet/TestSwiftAsyncStepOverAsyncLet.py b/lldb/test/API/lang/swift/async/stepping/step_over_asynclet/TestSwiftAsyncStepOverAsyncLet.py
index 343a1be682c7d..40dc35d188332 100644
--- a/lldb/test/API/lang/swift/async/stepping/step_over_asynclet/TestSwiftAsyncStepOverAsyncLet.py
+++ b/lldb/test/API/lang/swift/async/stepping/step_over_asynclet/TestSwiftAsyncStepOverAsyncLet.py
@@ -12,7 +12,7 @@ def check_is_in_line(self, thread, linenum):
         line_entry = frame.GetLineEntry()
         self.assertEqual(linenum, line_entry.GetLine())
 
-    @skipEmbeddedSwift
+    @requiresNonEmbeddedSwift
     @swiftTest
     @skipIf(oslist=["windows"])
     def test_nothrow(self):
@@ -32,7 +32,7 @@ def test_nothrow(self):
             self.assertStopReason(stop_reason, lldb.eStopReasonPlanComplete)
             self.check_is_in_line(thread, expected_line_num)
 
-    @skipEmbeddedSwift
+    @requiresNonEmbeddedSwift
     @swiftTest
     @skipIf(oslist=["windows"])
     def test_throw(self):
diff --git a/lldb/test/API/lang/swift/async/taskgroups/TestSwiftTaskGroupSynthetic.py b/lldb/test/API/lang/swift/async/taskgroups/TestSwiftTaskGroupSynthetic.py
index bd4cba3356529..d5e585c585ebe 100644
--- a/lldb/test/API/lang/swift/async/taskgroups/TestSwiftTaskGroupSynthetic.py
+++ b/lldb/test/API/lang/swift/async/taskgroups/TestSwiftTaskGroupSynthetic.py
@@ -7,7 +7,7 @@
 
 class TestCase(TestBase):
 
-    @skipEmbeddedSwift
+    @requiresNonEmbeddedSwift
     @swiftTest
     def test_print_task_group(self):
         """Print a TaskGroup and verify its children."""
@@ -17,7 +17,7 @@ def test_print_task_group(self):
         )
         self.do_test_print()
 
-    @skipEmbeddedSwift
+    @requiresNonEmbeddedSwift
     @swiftTest
     def test_print_throwing_task_group(self):
         """Print a ThrowingTaskGroup and verify its children."""
@@ -61,7 +61,7 @@ def do_test_print(self):
             ],
         )
 
-    @skipEmbeddedSwift
+    @requiresNonEmbeddedSwift
     @swiftTest
     def test_api_task_group(self):
         """Verify a TaskGroup contains its expected children."""
@@ -71,7 +71,7 @@ def test_api_task_group(self):
         )
         self.do_test_api(process)
 
-    @skipEmbeddedSwift
+    @requiresNonEmbeddedSwift
     @swiftTest
     def test_api_throwing_task_group(self):
         """Verify a ThrowingTaskGroup contains its expected children."""
diff --git a/lldb/test/API/lang/swift/async/tasks/TestSwiftTaskBacktrace.py b/lldb/test/API/lang/swift/async/tasks/TestSwiftTaskBacktrace.py
index a8ab9a0e5e1c7..2b36c5794a1d0 100644
--- a/lldb/test/API/lang/swift/async/tasks/TestSwiftTaskBacktrace.py
+++ b/lldb/test/API/lang/swift/async/tasks/TestSwiftTaskBacktrace.py
@@ -5,7 +5,7 @@
 
 class TestCase(TestBase):
 
-    @skipEmbeddedSwift
+    @requiresNonEmbeddedSwift
     @swiftTest
     def test_backtrace_task_variable(self):
         self.build()
@@ -14,7 +14,7 @@ def test_backtrace_task_variable(self):
         )
         self.do_backtrace("task")
 
-    @skipEmbeddedSwift
+    @requiresNonEmbeddedSwift
     @swiftTest
     def test_backtrace_task_address(self):
         self.build()
diff --git a/lldb/test/API/lang/swift/async/tasks/TestSwiftTaskSelect.py b/lldb/test/API/lang/swift/async/tasks/TestSwiftTaskSelect.py
index 5fffa991aee91..f59e40c673167 100644
--- a/lldb/test/API/lang/swift/async/tasks/TestSwiftTaskSelect.py
+++ b/lldb/test/API/lang/swift/async/tasks/TestSwiftTaskSelect.py
@@ -5,7 +5,7 @@
 
 class TestCase(TestBase):
 
-    @skipEmbeddedSwift
+    @requiresNonEmbeddedSwift
     @swiftTest
     def test_backtrace_selected_task_variable(self):
         self.build()
@@ -14,7 +14,7 @@ def test_backtrace_selected_task_variable(self):
         )
         self.do_backtrace_selected_task("task")
 
-    @skipEmbeddedSwift
+    @requiresNonEmbeddedSwift
     @swiftTest
     def test_backtrace_selected_task_address(self):
         self.build()
@@ -38,7 +38,7 @@ def do_backtrace_selected_task(self, arg):
             ],
         )
 
-    @skipEmbeddedSwift
+    @requiresNonEmbeddedSwift
     @swiftTest
     def test_navigate_stack_of_selected_task_variable(self):
         self.build()
@@ -47,7 +47,7 @@ def test_navigate_stack_of_selected_task_variable(self):
         )
         self.do_test_navigate_selected_task_stack(process, "task")
 
-    @skipEmbeddedSwift
+    @requiresNonEmbeddedSwift
     @swiftTest
     def test_navigate_stack_of_selected_task_address(self):
         self.build()
diff --git a/lldb/test/API/lang/swift/async/tasks/info/TestSwiftTaskInfo.py b/lldb/test/API/lang/swift/async/tasks/info/TestSwiftTaskInfo.py
index 44ffb24cf0832..ce2f64f52dd92 100644
--- a/lldb/test/API/lang/swift/async/tasks/info/TestSwiftTaskInfo.py
+++ b/lldb/test/API/lang/swift/async/tasks/info/TestSwiftTaskInfo.py
@@ -13,7 +13,7 @@ def _tail(output):
 
 class TestCase(TestBase):
 
-    @skipEmbeddedSwift
+    @requiresNonEmbeddedSwift
     @skipUnlessPlatform(["macosx", "linux"])
     @swiftTest
     def test_compare_printed_task_variable_to_task_info(self):
@@ -28,7 +28,7 @@ def test_compare_printed_task_variable_to_task_info(self):
         task_info_output = self.res.GetOutput()
         self.assertEqual(_tail(task_info_output), _tail(frame_variable_output))
 
-    @skipEmbeddedSwift
+    @requiresNonEmbeddedSwift
     @skipUnlessPlatform(["macosx", "linux"])
     @swiftTest
     def test_compare_printed_task_variable_to_task_info_with_address(self):
diff --git a/lldb/test/API/lang/swift/async/tasks/list/TestSwiftTaskList.py b/lldb/test/API/lang/swift/async/tasks/list/TestSwiftTaskList.py
index d97740bb32daa..32ce219297a5b 100644
--- a/lldb/test/API/lang/swift/async/tasks/list/TestSwiftTaskList.py
+++ b/lldb/test/API/lang/swift/async/tasks/list/TestSwiftTaskList.py
@@ -5,7 +5,7 @@
 
 class TestCase(TestBase):
 
-    @skipEmbeddedSwift
+    @requiresNonEmbeddedSwift
     @skipUnlessPlatform(["macosx", "linux"])
     @swiftTest
     def test_task_list(self):
diff --git a/lldb/test/API/lang/swift/async/tasks/tree/TestSwiftTaskTree.py b/lldb/test/API/lang/swift/async/tasks/tree/TestSwiftTaskTree.py
index abe0edfb50804..9768927855d6d 100644
--- a/lldb/test/API/lang/swift/async/tasks/tree/TestSwiftTaskTree.py
+++ b/lldb/test/API/lang/swift/async/tasks/tree/TestSwiftTaskTree.py
@@ -5,7 +5,7 @@
 
 class TestCase(TestBase):
 
-    @skipEmbeddedSwift
+    @requiresNonEmbeddedSwift
     @skipUnlessPlatform(["macosx", "linux"])
     @swiftTest
     def test_task_tree(self):
diff --git a/lldb/test/API/lang/swift/async/unwind/disable_language_unwinder/TestDisableLanguageUnwinder.py b/lldb/test/API/lang/swift/async/unwind/disable_language_unwinder/TestDisableLanguageUnwinder.py
index f2a2a27f1c08b..102c1b884fb8d 100644
--- a/lldb/test/API/lang/swift/async/unwind/disable_language_unwinder/TestDisableLanguageUnwinder.py
+++ b/lldb/test/API/lang/swift/async/unwind/disable_language_unwinder/TestDisableLanguageUnwinder.py
@@ -5,7 +5,7 @@
 
 class TestDisableLanguageUnwinder(lldbtest.TestBase):
 
-    @skipEmbeddedSwift
+    @requiresNonEmbeddedSwift
     @swiftTest
     @skipIf(oslist=['windows',])
     def test(self):
diff --git a/lldb/test/API/lang/swift/async/unwind/hidden_frames/TestSwiftAsyncHiddenFrames.py b/lldb/test/API/lang/swift/async/unwind/hidden_frames/TestSwiftAsyncHiddenFrames.py
index 0a4d8a6df918a..ae9a97f15cf44 100644
--- a/lldb/test/API/lang/swift/async/unwind/hidden_frames/TestSwiftAsyncHiddenFrames.py
+++ b/lldb/test/API/lang/swift/async/unwind/hidden_frames/TestSwiftAsyncHiddenFrames.py
@@ -8,7 +8,7 @@ class TestSwiftAsyncHiddenFrames(lldbtest.TestBase):
 
     NO_DEBUG_INFO_TESTCASE = True
 
-    @skipEmbeddedSwift
+    @requiresNonEmbeddedSwift
     @swiftTest
     @skipIf(oslist=['windows',])
     def test(self):
diff --git a/lldb/test/API/lang/swift/async/unwind/sayhello/TestSwiftAsyncUnwind.py b/lldb/test/API/lang/swift/async/unwind/sayhello/TestSwiftAsyncUnwind.py
index a0e62bde14a9e..69ff6a5178c79 100644
--- a/lldb/test/API/lang/swift/async/unwind/sayhello/TestSwiftAsyncUnwind.py
+++ b/lldb/test/API/lang/swift/async/unwind/sayhello/TestSwiftAsyncUnwind.py
@@ -12,7 +12,7 @@ class TestSwiftAsyncUnwind(lldbtest.TestBase):
 
     mydir = lldbtest.TestBase.compute_mydir(__file__)
 
-    @skipEmbeddedSwift
+    @requiresNonEmbeddedSwift
     @swiftTest
     @skipIf(oslist=['windows',])
     def test(self):
diff --git a/lldb/test/API/lang/swift/async/unwind/short_unwind/TestSwiftShortAsyncUnwind.py b/lldb/test/API/lang/swift/async/unwind/short_unwind/TestSwiftShortAsyncUnwind.py
index 58d6c74bc2f25..af7d0803fd5e4 100644
--- a/lldb/test/API/lang/swift/async/unwind/short_unwind/TestSwiftShortAsyncUnwind.py
+++ b/lldb/test/API/lang/swift/async/unwind/short_unwind/TestSwiftShortAsyncUnwind.py
@@ -8,7 +8,7 @@ class TestSwiftAsyncUnwind(lldbtest.TestBase):
 
     mydir = lldbtest.TestBase.compute_mydir(__file__)
 
-    @skipEmbeddedSwift
+    @requiresNonEmbeddedSwift
     @swiftTest
     @skipIf(oslist=["windows",])
     def test(self):
diff --git a/lldb/test/API/lang/swift/async/unwind/unwind_in_all_instructions/TestSwiftAsyncUnwindAllInstructions.py b/lldb/test/API/lang/swift/async/unwind/unwind_in_all_instructions/TestSwiftAsyncUnwindAllInstructions.py
index e1f8e3f538637..4b9b09f422fdc 100644
--- a/lldb/test/API/lang/swift/async/unwind/unwind_in_all_instructions/TestSwiftAsyncUnwindAllInstructions.py
+++ b/lldb/test/API/lang/swift/async/unwind/unwind_in_all_instructions/TestSwiftAsyncUnwindAllInstructions.py
@@ -163,7 +163,7 @@ def find_stopped_thread(self, process, breakpoints):
                 return thread, bpid
         return None, None
 
-    @skipEmbeddedSwift
+    @requiresNonEmbeddedSwift
     @swiftTest
     @skipIf(oslist=["windows"])
     def test(self):
diff --git a/lldb/test/API/lang/swift/async/unwind/unwind_recursive_q_funclets/TestSwiftAsyncUnwindRecursiveQFunclets.py b/lldb/test/API/lang/swift/async/unwind/unwind_recursive_q_funclets/TestSwiftAsyncUnwindRecursiveQFunclets.py
index 2dc8b4676bd4f..0da344acc4a96 100644
--- a/lldb/test/API/lang/swift/async/unwind/unwind_recursive_q_funclets/TestSwiftAsyncUnwindRecursiveQFunclets.py
+++ b/lldb/test/API/lang/swift/async/unwind/unwind_recursive_q_funclets/TestSwiftAsyncUnwindRecursiveQFunclets.py
@@ -10,7 +10,7 @@ class TestCase(lldbtest.TestBase):
 
     unwind_fail_range_cache = dict()
 
-    @skipEmbeddedSwift
+    @requiresNonEmbeddedSwift
     @swiftTest
     @skipIf(oslist=["windows",])
     @skipIf(archs=["arm64e"])
diff --git a/lldb/test/API/lang/swift/async/unwind/unwind_register_pressure/TestSwiftAsyncUnwindRegisterPressure.py b/lldb/test/API/lang/swift/async/unwind/unwind_register_pressure/TestSwiftAsyncUnwindRegisterPressure.py
index a2265225677b9..ab6b2310a45c9 100644
--- a/lldb/test/API/lang/swift/async/unwind/unwind_register_pressure/TestSwiftAsyncUnwindRegisterPressure.py
+++ b/lldb/test/API/lang/swift/async/unwind/unwind_register_pressure/TestSwiftAsyncUnwindRegisterPressure.py
@@ -60,7 +60,7 @@ def find_stopped_thread(self, process, breakpoints):
                 return thread, bpid
         return None, None
 
-    @skipEmbeddedSwift
+    @requiresNonEmbeddedSwift
     @swiftTest
     @skipIf(oslist=["windows"])
     def test(self):
diff --git a/lldb/test/API/lang/swift/async/variables/TestSwiftAsyncVariables.py b/lldb/test/API/lang/swift/async/variables/TestSwiftAsyncVariables.py
index 57ab240b3e7f2..9c8bcb081696a 100644
--- a/lldb/test/API/lang/swift/async/variables/TestSwiftAsyncVariables.py
+++ b/lldb/test/API/lang/swift/async/variables/TestSwiftAsyncVariables.py
@@ -8,7 +8,7 @@ class TestSwiftAsyncVariables(lldbtest.TestBase):
 
     mydir = lldbtest.TestBase.compute_mydir(__file__)
 
-    @skipEmbeddedSwift
+    @requiresNonEmbeddedSwift
     @swiftTest
     @skipIf(oslist=['windows'])
     def test(self):
diff --git a/lldb/test/API/lang/swift/async_breakpoints/TestSwiftAsyncBreakpoints.py b/lldb/test/API/lang/swift/async_breakpoints/TestSwiftAsyncBreakpoints.py
index 477f84c53416b..6114c06b3f9ba 100644
--- a/lldb/test/API/lang/swift/async_breakpoints/TestSwiftAsyncBreakpoints.py
+++ b/lldb/test/API/lang/swift/async_breakpoints/TestSwiftAsyncBreakpoints.py
@@ -5,7 +5,7 @@
 
 
 class TestSwiftAsyncBreakpoints(lldbtest.TestBase):
-    @skipEmbeddedSwift
+    @requiresNonEmbeddedSwift
     @swiftTest
     @skipIfWindows
     @skipIfLinux
diff --git a/lldb/test/API/lang/swift/async_breakpoints_over_many_funclets/TestSwiftAsyncBreakpointsOverManyFunclets.py b/lldb/test/API/lang/swift/async_breakpoints_over_many_funclets/TestSwiftAsyncBreakpointsOverManyFunclets.py
index 7ac2e15287cce..5b9ba246ba814 100644
--- a/lldb/test/API/lang/swift/async_breakpoints_over_many_funclets/TestSwiftAsyncBreakpointsOverManyFunclets.py
+++ b/lldb/test/API/lang/swift/async_breakpoints_over_many_funclets/TestSwiftAsyncBreakpointsOverManyFunclets.py
@@ -5,7 +5,7 @@
 
 
 class TestSwiftAsyncBreakpoints(lldbtest.TestBase):
-    @skipEmbeddedSwift
+    @requiresNonEmbeddedSwift
     @swiftTest
     @expectedFailureWindows
     @skipIfLinux
diff --git a/lldb/test/API/lang/swift/availability/TestSwiftAvailability.py b/lldb/test/API/lang/swift/availability/TestSwiftAvailability.py
index 526eda1f1a1dd..ef489142fb844 100644
--- a/lldb/test/API/lang/swift/availability/TestSwiftAvailability.py
+++ b/lldb/test/API/lang/swift/availability/TestSwiftAvailability.py
@@ -34,7 +34,7 @@ def setUp(self):
         # Call super's setUp().
         TestBase.setUp(self)
 
-    @skipEmbeddedSwift
+    @requiresNonEmbeddedSwift # embedded Swift strips functions the program never calls, so f() is not in the binary to call
     @swiftTest
     @skipIf(oslist=['linux', 'windows'])
     def testAvailability(self):
diff --git a/lldb/test/API/lang/swift/bridged_metatype/TestSwiftBridgedMetatype.py b/lldb/test/API/lang/swift/bridged_metatype/TestSwiftBridgedMetatype.py
index f88b1c8206ddd..d7ceb524f056e 100644
--- a/lldb/test/API/lang/swift/bridged_metatype/TestSwiftBridgedMetatype.py
+++ b/lldb/test/API/lang/swift/bridged_metatype/TestSwiftBridgedMetatype.py
@@ -9,7 +9,7 @@
 
 
 class TestSwiftBridgedMetatype(TestBase):
-    @skipEmbeddedSwift
+    @requiresNonEmbeddedSwift
     @swiftTest
     @skipUnlessFoundation
     def test_swift_bridged_metatype(self):
diff --git a/lldb/test/API/lang/swift/bridged_url/TestSwiftBridgedURL.py b/lldb/test/API/lang/swift/bridged_url/TestSwiftBridgedURL.py
index 52981d2c0fea9..11a3c806dfb94 100644
--- a/lldb/test/API/lang/swift/bridged_url/TestSwiftBridgedURL.py
+++ b/lldb/test/API/lang/swift/bridged_url/TestSwiftBridgedURL.py
@@ -5,7 +5,7 @@
 
 
 class TestCase(TestBase):
-    @skipEmbeddedSwift
+    @requiresNonEmbeddedSwift
     @skipUnlessFoundationEssentials
     @skipIfLinux  # https://github.com/swiftlang/llvm-project/issues/13465
     @swiftTest
diff --git a/lldb/test/API/lang/swift/c_compat_enum/TestSwiftCCompatEnum.py b/lldb/test/API/lang/swift/c_compat_enum/TestSwiftCCompatEnum.py
index 4452fe846e856..18e6185cc27c6 100644
--- a/lldb/test/API/lang/swift/c_compat_enum/TestSwiftCCompatEnum.py
+++ b/lldb/test/API/lang/swift/c_compat_enum/TestSwiftCCompatEnum.py
@@ -5,7 +5,7 @@
 
 
 class TestSwiftCCompatEnum(TestBase):
-    @skipEmbeddedSwift
+    @skipEmbeddedSwiftOnWindows
     @swiftTest
     def test(self):
         self.build()
diff --git a/lldb/test/API/lang/swift/cf/uuid/TestCFUUID.py b/lldb/test/API/lang/swift/cf/uuid/TestCFUUID.py
index 169c4bcc70f2a..62ec74dff1028 100644
--- a/lldb/test/API/lang/swift/cf/uuid/TestCFUUID.py
+++ b/lldb/test/API/lang/swift/cf/uuid/TestCFUUID.py
@@ -9,7 +9,7 @@
 
 
 class TestCase(TestBase):
-    @skipEmbeddedSwift
+    @requiresNonEmbeddedSwift
     @swiftTest
     @skipUnlessFoundation
     def test(self):
diff --git a/lldb/test/API/lang/swift/clangimporter/bridging_header_headermap/TestSwiftBridgingHeaderHeadermap.py b/lldb/test/API/lang/swift/clangimporter/bridging_header_headermap/TestSwiftBridgingHeaderHeadermap.py
index c3129050239a5..5d703649c908b 100644
--- a/lldb/test/API/lang/swift/clangimporter/bridging_header_headermap/TestSwiftBridgingHeaderHeadermap.py
+++ b/lldb/test/API/lang/swift/clangimporter/bridging_header_headermap/TestSwiftBridgingHeaderHeadermap.py
@@ -21,7 +21,7 @@ class TestSwiftBridgingHeaderHeadermap(TestBase):
 
     NO_DEBUG_INFO_TESTCASE = True
 
-    @skipEmbeddedSwift
+    @requiresNonEmbeddedSwift
     # Don't run ClangImporter tests if Clangimporter is disabled.
     @skipIf(setting=('symbols.use-swift-clangimporter', 'false'))
     @skipUnlessDarwin
diff --git a/lldb/test/API/lang/swift/clangimporter/caching/TestSwiftClangImporterCaching.py b/lldb/test/API/lang/swift/clangimporter/caching/TestSwiftClangImporterCaching.py
index 0cd41541f35c0..5afa785bcca9c 100644
--- a/lldb/test/API/lang/swift/clangimporter/caching/TestSwiftClangImporterCaching.py
+++ b/lldb/test/API/lang/swift/clangimporter/caching/TestSwiftClangImporterCaching.py
@@ -5,7 +5,6 @@
 
 class TestSwiftClangImporterCaching(TestBase):
 
-    @skipEmbeddedSwift
     # Don't run ClangImporter tests if Clangimporter is disabled.
     @skipIf(swift_module_importer="noclang")
     @skipIf(setting=("symbols.swift-precise-compiler-invocation", "false"))
diff --git a/lldb/test/API/lang/swift/clangimporter/class_nsbaseclass/TestSwiftNSClassBaseClass.py b/lldb/test/API/lang/swift/clangimporter/class_nsbaseclass/TestSwiftNSClassBaseClass.py
index 1cda2b8cd46c4..6f7026f7dfa9e 100644
--- a/lldb/test/API/lang/swift/clangimporter/class_nsbaseclass/TestSwiftNSClassBaseClass.py
+++ b/lldb/test/API/lang/swift/clangimporter/class_nsbaseclass/TestSwiftNSClassBaseClass.py
@@ -6,7 +6,7 @@
 class TestSwiftNSClassBaseClass(TestBase):
 
     NO_DEBUG_INFO_TESTCASE = True
-    @skipEmbeddedSwift
+    @requiresNonEmbeddedSwift
     @swiftTest
     @skipUnlessDarwin
     def test(self):
diff --git a/lldb/test/API/lang/swift/clangimporter/config_macros/TestSwiftDedupMacros.py b/lldb/test/API/lang/swift/clangimporter/config_macros/TestSwiftDedupMacros.py
index aad8ee2bb73b2..6b171478b5560 100644
--- a/lldb/test/API/lang/swift/clangimporter/config_macros/TestSwiftDedupMacros.py
+++ b/lldb/test/API/lang/swift/clangimporter/config_macros/TestSwiftDedupMacros.py
@@ -17,7 +17,7 @@
 import os
 
 class TestSwiftDedupMacros(TestBase):
-    @skipEmbeddedSwift
+    @requiresNonEmbeddedSwift
     # Don't run ClangImporter tests if Clangimporter is disabled.
     @skipIf(setting=('symbols.use-swift-clangimporter', 'false'))
     # NOTE: rdar://44201206 - This test may sporadically segfault. It's likely
diff --git a/lldb/test/API/lang/swift/clangimporter/custom_alignment/TestSwiftClangImporterCustomAlignment.py b/lldb/test/API/lang/swift/clangimporter/custom_alignment/TestSwiftClangImporterCustomAlignment.py
index a09c72d77ac18..612b234f96b58 100644
--- a/lldb/test/API/lang/swift/clangimporter/custom_alignment/TestSwiftClangImporterCustomAlignment.py
+++ b/lldb/test/API/lang/swift/clangimporter/custom_alignment/TestSwiftClangImporterCustomAlignment.py
@@ -20,7 +20,7 @@ class TestSwiftClangImporterCustomAlignment(lldbtest.TestBase):
 
     mydir = lldbtest.TestBase.compute_mydir(__file__)
 
-    @skipEmbeddedSwift
+    @requiresNonEmbeddedSwift
     @swiftTest
     @skipIf(setting=('symbols.use-swift-clangimporter', 'false'))
     def test(self):
diff --git a/lldb/test/API/lang/swift/clangimporter/dynamic_type_resolution_import_conflict/TestSwiftDynamicTypeResolutionImportConflict.py b/lldb/test/API/lang/swift/clangimporter/dynamic_type_resolution_import_conflict/TestSwiftDynamicTypeResolutionImportConflict.py
index 41b06d3543b7b..1edadf831ff51 100644
--- a/lldb/test/API/lang/swift/clangimporter/dynamic_type_resolution_import_conflict/TestSwiftDynamicTypeResolutionImportConflict.py
+++ b/lldb/test/API/lang/swift/clangimporter/dynamic_type_resolution_import_conflict/TestSwiftDynamicTypeResolutionImportConflict.py
@@ -18,7 +18,7 @@
 import shutil
 
 class TestSwiftDynamicTypeResolutionImportConflict(TestBase):
-    @skipEmbeddedSwift
+    @requiresNonEmbeddedSwift
     # Don't run ClangImporter tests if Clangimporter is disabled.
     @skipIf(setting=('symbols.use-swift-clangimporter', 'false'))
     @skipUnlessDarwin
diff --git a/lldb/test/API/lang/swift/clangimporter/explict_noimplicit/TestSwiftClangImporterExplicitNoImplicit.py b/lldb/test/API/lang/swift/clangimporter/explict_noimplicit/TestSwiftClangImporterExplicitNoImplicit.py
index 6691fd83b404f..ded80cd7c749f 100644
--- a/lldb/test/API/lang/swift/clangimporter/explict_noimplicit/TestSwiftClangImporterExplicitNoImplicit.py
+++ b/lldb/test/API/lang/swift/clangimporter/explict_noimplicit/TestSwiftClangImporterExplicitNoImplicit.py
@@ -7,7 +7,7 @@ class TestSwiftClangImporterExplicitNoImplicit(TestBase):
 
     NO_DEBUG_INFO_TESTCASE = True
     
-    @skipEmbeddedSwift
+    @requiresNonEmbeddedSwift
     # Don't run ClangImporter tests if Clangimporter is disabled.
     @skipIf(setting=('symbols.use-swift-clangimporter', 'false'))
     @skipUnlessDarwin
diff --git a/lldb/test/API/lang/swift/clangimporter/extra_inhabitants/TestSwiftClangImporterExtraInhabitants.py b/lldb/test/API/lang/swift/clangimporter/extra_inhabitants/TestSwiftClangImporterExtraInhabitants.py
index c7cc365d0f853..95e37ce97148c 100644
--- a/lldb/test/API/lang/swift/clangimporter/extra_inhabitants/TestSwiftClangImporterExtraInhabitants.py
+++ b/lldb/test/API/lang/swift/clangimporter/extra_inhabitants/TestSwiftClangImporterExtraInhabitants.py
@@ -4,7 +4,7 @@
 import lldbsuite.test.lldbutil as lldbutil
 
 class TestSwiftClangImporterExtraInhabitants(TestBase):
-    @skipEmbeddedSwift
+    @requiresNonEmbeddedSwift
     @swiftTest
     @skipUnlessDarwin
     # Don't run ClangImporter tests if Clangimporter is disabled.
diff --git a/lldb/test/API/lang/swift/clangimporter/hard_macro_conflict/TestSwiftHardMacroConflict.py b/lldb/test/API/lang/swift/clangimporter/hard_macro_conflict/TestSwiftHardMacroConflict.py
index d0a69c932d10c..a1601890cfddb 100644
--- a/lldb/test/API/lang/swift/clangimporter/hard_macro_conflict/TestSwiftHardMacroConflict.py
+++ b/lldb/test/API/lang/swift/clangimporter/hard_macro_conflict/TestSwiftHardMacroConflict.py
@@ -9,7 +9,7 @@ class TestSwiftHardMacroConflict(TestBase):
 
     NO_DEBUG_INFO_TESTCASE = True
 
-    @skipEmbeddedSwift
+    @requiresNonEmbeddedSwift
     # Don't run ClangImporter tests if Clangimporter is disabled.
     @skipIf(setting=('symbols.use-swift-clangimporter', 'false'))
     @skipUnlessDarwin
diff --git a/lldb/test/API/lang/swift/clangimporter/headermap_conflict/TestSwiftHeadermapConflict.py b/lldb/test/API/lang/swift/clangimporter/headermap_conflict/TestSwiftHeadermapConflict.py
index dc84696e8addc..d901887cd17fc 100644
--- a/lldb/test/API/lang/swift/clangimporter/headermap_conflict/TestSwiftHeadermapConflict.py
+++ b/lldb/test/API/lang/swift/clangimporter/headermap_conflict/TestSwiftHeadermapConflict.py
@@ -22,7 +22,7 @@ class TestSwiftHeadermapConflict(TestBase):
         bugnumber="rdar://60396797",
         setting=("symbols.use-swift-clangimporter", "false"),
     )
-    @skipEmbeddedSwift
+    @requiresNonEmbeddedSwift
     @swiftTest
     def test(self):
         # To ensure we hit the rebuild problem remove the cache to avoid caching.
diff --git a/lldb/test/API/lang/swift/clangimporter/include_conflict/TestSwiftIncludeConflict.py b/lldb/test/API/lang/swift/clangimporter/include_conflict/TestSwiftIncludeConflict.py
index bb8ce4313b141..f7a1f3729502d 100644
--- a/lldb/test/API/lang/swift/clangimporter/include_conflict/TestSwiftIncludeConflict.py
+++ b/lldb/test/API/lang/swift/clangimporter/include_conflict/TestSwiftIncludeConflict.py
@@ -18,7 +18,7 @@
 import shutil
 
 class TestSwiftIncludeConflict(TestBase):
-    @skipEmbeddedSwift
+    @requiresNonEmbeddedSwift
     # Don't run ClangImporter tests if Clangimporter is disabled.
     @skipIf(setting=('symbols.use-swift-clangimporter', 'false'))
     @swiftTest
diff --git a/lldb/test/API/lang/swift/clangimporter/missing_pch/TestSwiftMissingPCH.py b/lldb/test/API/lang/swift/clangimporter/missing_pch/TestSwiftMissingPCH.py
index 8098885156c74..f0c62b0c3e555 100644
--- a/lldb/test/API/lang/swift/clangimporter/missing_pch/TestSwiftMissingPCH.py
+++ b/lldb/test/API/lang/swift/clangimporter/missing_pch/TestSwiftMissingPCH.py
@@ -11,7 +11,7 @@ class TestSwiftMissingVFSOverlay(TestBase):
     def setUp(self):
         TestBase.setUp(self)
 
-    @skipEmbeddedSwift
+    @requiresNonEmbeddedSwift
     # Don't run ClangImporter tests if Clangimporter is disabled.
     @skipIf(setting=("symbols.use-swift-clangimporter", "false"))
     @skipUnlessDarwin
diff --git a/lldb/test/API/lang/swift/clangimporter/nserror/TestNSError.py b/lldb/test/API/lang/swift/clangimporter/nserror/TestNSError.py
index 56ac7585e069e..dc7569cfb3bb4 100644
--- a/lldb/test/API/lang/swift/clangimporter/nserror/TestNSError.py
+++ b/lldb/test/API/lang/swift/clangimporter/nserror/TestNSError.py
@@ -19,7 +19,7 @@
 
 
 class SwiftNSErrorTest(TestBase):
-    @skipEmbeddedSwift
+    @requiresNonEmbeddedSwift
     @skipUnlessDarwin
     @swiftTest
     def test_swift_nserror(self):
diff --git a/lldb/test/API/lang/swift/clangimporter/nsinteger_nsenum/TestSwiftNSIntegerNSEnum.py b/lldb/test/API/lang/swift/clangimporter/nsinteger_nsenum/TestSwiftNSIntegerNSEnum.py
index ada3eb86ee49a..b8f60a8a763f3 100644
--- a/lldb/test/API/lang/swift/clangimporter/nsinteger_nsenum/TestSwiftNSIntegerNSEnum.py
+++ b/lldb/test/API/lang/swift/clangimporter/nsinteger_nsenum/TestSwiftNSIntegerNSEnum.py
@@ -21,14 +21,14 @@ def check(var, output):
         check(frame.FindVariable('e1'), 'eCase1')
         check(frame.FindVariable('e2'), 'eCase2')
 
-    @skipEmbeddedSwift
+    @requiresNonEmbeddedSwift
     @skipUnlessDarwin
     @swiftTest
     def test_reflection(self):
         self.expect("setting set symbols.swift-enable-ast-context false")
         self.do_test(use_summary=True)
 
-    @skipEmbeddedSwift
+    @requiresNonEmbeddedSwift
     # Don't run a clangimporter test without ClangImporter.
     @skipIf(setting=('symbols.use-swift-clangimporter', 'false'))
     @skipUnlessDarwin
diff --git a/lldb/test/API/lang/swift/clangimporter/objc/dynamic-swift-type/TestSwiftObjCDynamicType.py b/lldb/test/API/lang/swift/clangimporter/objc/dynamic-swift-type/TestSwiftObjCDynamicType.py
index caa1601d62307..67307d521e954 100644
--- a/lldb/test/API/lang/swift/clangimporter/objc/dynamic-swift-type/TestSwiftObjCDynamicType.py
+++ b/lldb/test/API/lang/swift/clangimporter/objc/dynamic-swift-type/TestSwiftObjCDynamicType.py
@@ -5,7 +5,7 @@
 
 
 class TestCase(TestBase):
-    @skipEmbeddedSwift
+    @requiresNonEmbeddedSwift
     @skipUnlessFoundation
     @swiftTest
     def test(self):
diff --git a/lldb/test/API/lang/swift/clangimporter/objc_baseclass/TestSwiftObjCBaseClassMemberLookup.py b/lldb/test/API/lang/swift/clangimporter/objc_baseclass/TestSwiftObjCBaseClassMemberLookup.py
index 585d2c19d0dfd..80c11641f0a11 100644
--- a/lldb/test/API/lang/swift/clangimporter/objc_baseclass/TestSwiftObjCBaseClassMemberLookup.py
+++ b/lldb/test/API/lang/swift/clangimporter/objc_baseclass/TestSwiftObjCBaseClassMemberLookup.py
@@ -5,7 +5,7 @@
 
 class TestSwiftObjCBaseClassMemberLookup(TestBase):
     NO_DEBUG_INFO_TESTCASE = True
-    @skipEmbeddedSwift
+    @requiresNonEmbeddedSwift
     @skipUnlessDarwin
     @swiftTest
     def test(self):
diff --git a/lldb/test/API/lang/swift/clangimporter/objc_inherited_ivars/TestSwiftAtObjCIvars.py b/lldb/test/API/lang/swift/clangimporter/objc_inherited_ivars/TestSwiftAtObjCIvars.py
index 1db5a85c9fb13..b79a5ff5018f6 100644
--- a/lldb/test/API/lang/swift/clangimporter/objc_inherited_ivars/TestSwiftAtObjCIvars.py
+++ b/lldb/test/API/lang/swift/clangimporter/objc_inherited_ivars/TestSwiftAtObjCIvars.py
@@ -26,7 +26,7 @@ def check_foo(self, theFoo):
         lldbutil.check_variable(self, x, False, value='12')
         lldbutil.check_variable(self, y, False, '"12"')
 
-    @skipEmbeddedSwift
+    @requiresNonEmbeddedSwift
     @skipUnlessDarwin
     @swiftTest
     def test_swift_at_objc_ivars(self):
diff --git a/lldb/test/API/lang/swift/clangimporter/objc_internal_property_redecl/TestObjCInternalPropertyRedecl.py b/lldb/test/API/lang/swift/clangimporter/objc_internal_property_redecl/TestObjCInternalPropertyRedecl.py
index d02731007534e..c9986e468c68c 100644
--- a/lldb/test/API/lang/swift/clangimporter/objc_internal_property_redecl/TestObjCInternalPropertyRedecl.py
+++ b/lldb/test/API/lang/swift/clangimporter/objc_internal_property_redecl/TestObjCInternalPropertyRedecl.py
@@ -8,7 +8,7 @@ class TestObjCInternalPropertyRedecl(TestBase):
 
     NO_DEBUG_INFO_TESTCASE = True
 
-    @skipEmbeddedSwift
+    @requiresNonEmbeddedSwift
     @skipUnlessDarwin
     @swiftTest
     @skipIf(setting=('symbols.use-swift-clangimporter', 'false'))
diff --git a/lldb/test/API/lang/swift/clangimporter/objc_optional_dict/TestSwiftObjCOptionalDict.py b/lldb/test/API/lang/swift/clangimporter/objc_optional_dict/TestSwiftObjCOptionalDict.py
index 0a7e896aed26f..bda8dccd63571 100644
--- a/lldb/test/API/lang/swift/clangimporter/objc_optional_dict/TestSwiftObjCOptionalDict.py
+++ b/lldb/test/API/lang/swift/clangimporter/objc_optional_dict/TestSwiftObjCOptionalDict.py
@@ -4,7 +4,7 @@
 import lldbsuite.test.lldbutil as lldbutil
 
 class TestSwiftObjCOptionalDict(TestBase):
-    @skipEmbeddedSwift
+    @requiresNonEmbeddedSwift
     @skipUnlessDarwin
     @swiftTest
     def test(self):
diff --git a/lldb/test/API/lang/swift/clangimporter/objc_protocol/TestSwiftObjCProtocol.py b/lldb/test/API/lang/swift/clangimporter/objc_protocol/TestSwiftObjCProtocol.py
index c862b1dac61fe..6bfe94a8273b5 100644
--- a/lldb/test/API/lang/swift/clangimporter/objc_protocol/TestSwiftObjCProtocol.py
+++ b/lldb/test/API/lang/swift/clangimporter/objc_protocol/TestSwiftObjCProtocol.py
@@ -4,7 +4,7 @@
 import lldbsuite.test.lldbutil as lldbutil
 
 class TestSwiftObjCProtocol(TestBase):
-    @skipEmbeddedSwift
+    @requiresNonEmbeddedSwift
     @skipUnlessDarwin
     @swiftTest
     def test(self):
diff --git a/lldb/test/API/lang/swift/clangimporter/objc_protocol_fields/TestSwiftObjCProtocolFields.py b/lldb/test/API/lang/swift/clangimporter/objc_protocol_fields/TestSwiftObjCProtocolFields.py
index c0a368ca13c5b..bf74030b334fe 100644
--- a/lldb/test/API/lang/swift/clangimporter/objc_protocol_fields/TestSwiftObjCProtocolFields.py
+++ b/lldb/test/API/lang/swift/clangimporter/objc_protocol_fields/TestSwiftObjCProtocolFields.py
@@ -5,7 +5,7 @@
 
 class TestSwiftObjCBaseClassMemberLookup(TestBase):
     NO_DEBUG_INFO_TESTCASE = True
-    @skipEmbeddedSwift
+    @requiresNonEmbeddedSwift
     @skipUnlessDarwin
     @swiftTest
     def test(self):
diff --git a/lldb/test/API/lang/swift/clangimporter/objc_runtime_ivars/TestObjCIvarDiscovery.py b/lldb/test/API/lang/swift/clangimporter/objc_runtime_ivars/TestObjCIvarDiscovery.py
index b384c0233e282..1bf726a29a171 100644
--- a/lldb/test/API/lang/swift/clangimporter/objc_runtime_ivars/TestObjCIvarDiscovery.py
+++ b/lldb/test/API/lang/swift/clangimporter/objc_runtime_ivars/TestObjCIvarDiscovery.py
@@ -22,7 +22,7 @@
 import shutil
 
 class TestObjCIVarDiscovery(TestBase):
-    @skipEmbeddedSwift
+    @requiresNonEmbeddedSwift
     @skipUnlessDarwin
     @skipIf(debug_info=no_match("dsym"))
     @swiftTest
@@ -31,7 +31,7 @@ def test_nodbg(self):
         shutil.rmtree(self.getBuildArtifact("aTestFramework.framework/Versions/A/aTestFramework.dSYM"))
         self.do_test(False)
 
-    @skipEmbeddedSwift
+    @requiresNonEmbeddedSwift
     @skipUnlessDarwin
     @skipIf(debug_info=no_match("dsym"))
     @swiftTest
diff --git a/lldb/test/API/lang/swift/clangimporter/objcmain_conflicting_dylibs_bridging_headers/TestSwiftObjCMainConflictingDylibsBridgingHeader.py b/lldb/test/API/lang/swift/clangimporter/objcmain_conflicting_dylibs_bridging_headers/TestSwiftObjCMainConflictingDylibsBridgingHeader.py
index 4da686bdec221..03ac8a8068a76 100644
--- a/lldb/test/API/lang/swift/clangimporter/objcmain_conflicting_dylibs_bridging_headers/TestSwiftObjCMainConflictingDylibsBridgingHeader.py
+++ b/lldb/test/API/lang/swift/clangimporter/objcmain_conflicting_dylibs_bridging_headers/TestSwiftObjCMainConflictingDylibsBridgingHeader.py
@@ -18,7 +18,7 @@
 import shutil
 
 class TestSwiftObjCMainConflictingDylibsBridgingHeader(TestBase):
-    @skipEmbeddedSwift
+    @requiresNonEmbeddedSwift
     # Don't run ClangImporter tests if Clangimporter is disabled.
     @skipIf(setting=('symbols.use-swift-clangimporter', 'false'))
     @skipUnlessDarwin
diff --git a/lldb/test/API/lang/swift/clangimporter/objcmain_conflicting_dylibs_failing_import/TestSwiftObjCMainConflictingDylibsFailingImport.py b/lldb/test/API/lang/swift/clangimporter/objcmain_conflicting_dylibs_failing_import/TestSwiftObjCMainConflictingDylibsFailingImport.py
index c60342860f9bc..8cd52e7a0b8df 100644
--- a/lldb/test/API/lang/swift/clangimporter/objcmain_conflicting_dylibs_failing_import/TestSwiftObjCMainConflictingDylibsFailingImport.py
+++ b/lldb/test/API/lang/swift/clangimporter/objcmain_conflicting_dylibs_failing_import/TestSwiftObjCMainConflictingDylibsFailingImport.py
@@ -21,7 +21,7 @@ class TestSwiftObjCMainConflictingDylibsFailingImport(TestBase):
 
     NO_DEBUG_INFO_TESTCASE = True
 
-    @skipEmbeddedSwift
+    @requiresNonEmbeddedSwift
     # Don't run ClangImporter tests if Clangimporter is disabled.
     @skipIf(setting=('symbols.use-swift-clangimporter', 'false'))
     @skipUnlessDarwin
diff --git a/lldb/test/API/lang/swift/clangimporter/override_options/TestSwiftClangOverrideOptions.py b/lldb/test/API/lang/swift/clangimporter/override_options/TestSwiftClangOverrideOptions.py
index 0a0ae7e5b4710..acad756e415e7 100644
--- a/lldb/test/API/lang/swift/clangimporter/override_options/TestSwiftClangOverrideOptions.py
+++ b/lldb/test/API/lang/swift/clangimporter/override_options/TestSwiftClangOverrideOptions.py
@@ -5,7 +5,7 @@
 
 
 class TestCase(lldbtest.TestBase):
-    @skipEmbeddedSwift
+    @requiresNonEmbeddedSwift
     @skipUnlessFoundationEssentials
     @skipIfLinux  # https://github.com/swiftlang/llvm-project/issues/13465
     @swiftTest
diff --git a/lldb/test/API/lang/swift/clangimporter/protocol_composition/TestSwiftClangImporterProtocolComposition.py b/lldb/test/API/lang/swift/clangimporter/protocol_composition/TestSwiftClangImporterProtocolComposition.py
index c7008dbfcd6fa..449fe48d46f5e 100644
--- a/lldb/test/API/lang/swift/clangimporter/protocol_composition/TestSwiftClangImporterProtocolComposition.py
+++ b/lldb/test/API/lang/swift/clangimporter/protocol_composition/TestSwiftClangImporterProtocolComposition.py
@@ -4,7 +4,7 @@
 import lldbsuite.test.lldbutil as lldbutil
 
 class TestSwiftClangImporterProtocolComposition(TestBase):
-    @skipEmbeddedSwift
+    @requiresNonEmbeddedSwift
     @skipUnlessDarwin
     @swiftTest
     def test(self):
diff --git a/lldb/test/API/lang/swift/clangimporter/remoteast_import/TestSwiftRemoteASTImport.py b/lldb/test/API/lang/swift/clangimporter/remoteast_import/TestSwiftRemoteASTImport.py
index 67db8af5c6553..d7f28f951632f 100644
--- a/lldb/test/API/lang/swift/clangimporter/remoteast_import/TestSwiftRemoteASTImport.py
+++ b/lldb/test/API/lang/swift/clangimporter/remoteast_import/TestSwiftRemoteASTImport.py
@@ -17,7 +17,7 @@
 import os
 
 class TestSwiftRemoteASTImport(TestBase):
-    @skipEmbeddedSwift
+    @requiresNonEmbeddedSwift
     # Don't run ClangImporter tests if Clangimporter is disabled.
     @skipIf(setting=('symbols.use-swift-clangimporter', 'false'))
     @skipUnlessDarwin
diff --git a/lldb/test/API/lang/swift/clangimporter/rewrite_clang_paths/TestSwiftRewriteClangPaths.py b/lldb/test/API/lang/swift/clangimporter/rewrite_clang_paths/TestSwiftRewriteClangPaths.py
index 2d140f1c9793d..1a869f32ffa58 100644
--- a/lldb/test/API/lang/swift/clangimporter/rewrite_clang_paths/TestSwiftRewriteClangPaths.py
+++ b/lldb/test/API/lang/swift/clangimporter/rewrite_clang_paths/TestSwiftRewriteClangPaths.py
@@ -18,7 +18,7 @@
 import shutil
 
 class TestSwiftRewriteClangPaths(TestBase):
-    @skipEmbeddedSwift
+    @requiresNonEmbeddedSwift
     # Don't run ClangImporter tests if Clangimporter is disabled.
     @skipIf(setting=('symbols.use-swift-clangimporter', 'false'))
     @skipUnlessDarwin
@@ -27,7 +27,7 @@ class TestSwiftRewriteClangPaths(TestBase):
     def testWithRemap(self):
         self.dotest(True)
 
-    @skipEmbeddedSwift
+    @requiresNonEmbeddedSwift
     # Don't run ClangImporter tests if Clangimporter is disabled.
     @skipIf(setting=('symbols.use-swift-clangimporter', 'false'))
     @skipUnlessDarwin
diff --git a/lldb/test/API/lang/swift/clangimporter/static_archive/TestSwiftStaticArchiveTwoSwiftmodules.py b/lldb/test/API/lang/swift/clangimporter/static_archive/TestSwiftStaticArchiveTwoSwiftmodules.py
index 175395b7c0c96..91c9f52bfbaee 100644
--- a/lldb/test/API/lang/swift/clangimporter/static_archive/TestSwiftStaticArchiveTwoSwiftmodules.py
+++ b/lldb/test/API/lang/swift/clangimporter/static_archive/TestSwiftStaticArchiveTwoSwiftmodules.py
@@ -17,7 +17,7 @@
 import os
 
 class TestSwiftStaticArchiveTwoSwiftmodules(TestBase):
-    @skipEmbeddedSwift
+    @requiresNonEmbeddedSwift
     # Don't run ClangImporter tests if Clangimporter is disabled.
     @skipIf(setting=('symbols.use-swift-clangimporter', 'false'))
     @skipUnlessDarwin
diff --git a/lldb/test/API/lang/swift/clangimporter/submodules/TestSwiftSubmoduleImport.py b/lldb/test/API/lang/swift/clangimporter/submodules/TestSwiftSubmoduleImport.py
index 369dde5404ad0..fb76335dbe0c7 100644
--- a/lldb/test/API/lang/swift/clangimporter/submodules/TestSwiftSubmoduleImport.py
+++ b/lldb/test/API/lang/swift/clangimporter/submodules/TestSwiftSubmoduleImport.py
@@ -4,7 +4,7 @@
 import lldbsuite.test.lldbutil as lldbutil
 
 class TestSwiftSubmoduleImport(lldbtest.TestBase):
-    @skipEmbeddedSwift
+    @requiresNonEmbeddedSwift
     @swiftTest
     def test(self):
         """Test imports of Clang submodules"""
diff --git a/lldb/test/API/lang/swift/clashing_abi_name/TestSwiftClashingABIName.py b/lldb/test/API/lang/swift/clashing_abi_name/TestSwiftClashingABIName.py
index 1714effb75cba..3d0c6ed39e2be 100644
--- a/lldb/test/API/lang/swift/clashing_abi_name/TestSwiftClashingABIName.py
+++ b/lldb/test/API/lang/swift/clashing_abi_name/TestSwiftClashingABIName.py
@@ -4,7 +4,7 @@
 import lldbsuite.test.lldbutil as lldbutil
 
 class TestSwiftClashingABIName(TestBase):
-    @skipEmbeddedSwift
+    @requiresNonEmbeddedSwift
     @swiftTest
     def test(self):
         """Test that expressions with types in modules with clashing abi names works"""
@@ -22,7 +22,7 @@ def test(self):
 
         self.expect('expr --bind-generic-types true -- generic3',
                     substrs=['a.Generic2<a.Generic<a.One>>', 't2 =', 't =', 'j = 98'])
-    @skipEmbeddedSwift
+    @requiresNonEmbeddedSwift
     @swiftTest
     def test_in_self(self):
         """Test a library with a private import for which there is no debug info"""
diff --git a/lldb/test/API/lang/swift/class_error/TestClassError.py b/lldb/test/API/lang/swift/class_error/TestClassError.py
index cc1c0f573b50c..64b903d494981 100644
--- a/lldb/test/API/lang/swift/class_error/TestClassError.py
+++ b/lldb/test/API/lang/swift/class_error/TestClassError.py
@@ -12,4 +12,4 @@
 import lldbsuite.test.lldbinline as lldbinline
 from lldbsuite.test.decorators import *
 
-lldbinline.MakeInlineTest(__file__, globals(), decorators=[skipEmbeddedSwift, swiftTest])
+lldbinline.MakeInlineTest(__file__, globals(), decorators=[skipEmbeddedSwiftOnWindows, swiftTest])
diff --git a/lldb/test/API/lang/swift/closure_shortcuts/TestClosureShortcuts.py b/lldb/test/API/lang/swift/closure_shortcuts/TestClosureShortcuts.py
index 577baecfadd6f..5fcd084bec07d 100644
--- a/lldb/test/API/lang/swift/closure_shortcuts/TestClosureShortcuts.py
+++ b/lldb/test/API/lang/swift/closure_shortcuts/TestClosureShortcuts.py
@@ -15,7 +15,7 @@
 
 
 class TestClosureShortcuts(TestBase):
-    @skipEmbeddedSwift
+    @requiresNonEmbeddedSwift
     @swiftTest
     def test(self):
         self.build()
diff --git a/lldb/test/API/lang/swift/closures_var_not_captured/TestSwiftClosureVarNotCaptured.py b/lldb/test/API/lang/swift/closures_var_not_captured/TestSwiftClosureVarNotCaptured.py
index ef96c219bd734..c28bc07b8f8f0 100644
--- a/lldb/test/API/lang/swift/closures_var_not_captured/TestSwiftClosureVarNotCaptured.py
+++ b/lldb/test/API/lang/swift/closures_var_not_captured/TestSwiftClosureVarNotCaptured.py
@@ -51,7 +51,7 @@ def get_to_bkpt(self, bkpt_name):
         target.BreakpointDelete(bkpt.GetID())
         return (target, process, thread)
 
-    @skipEmbeddedSwift
+    @requiresNonEmbeddedSwift
     @swiftTest
     def test_simple_closure(self):
         self.build()
@@ -60,7 +60,7 @@ def test_simple_closure(self):
         check_not_captured_error(self, thread.frames[0], "arg", "func_1(arg:)")
         check_no_enhanced_diagnostic(self, thread.frames[0], "dont_find_me")
 
-    @skipEmbeddedSwift
+    @requiresNonEmbeddedSwift
     @swiftTest
     def test_nested_closure(self):
         self.build()
@@ -85,7 +85,7 @@ def test_nested_closure(self):
         )
         check_no_enhanced_diagnostic(self, thread.frames[0], "dont_find_me")
 
-    @skipEmbeddedSwift
+    @requiresNonEmbeddedSwift
     @swiftTest
     # Async variable inspection on Linux/Windows are still problematic.
     @skipIf(oslist=["windows", "linux"])
@@ -109,7 +109,7 @@ def test_async_closure(self):
         )
         check_no_enhanced_diagnostic(self, thread.frames[0], "dont_find_me")
 
-    @skipEmbeddedSwift
+    @requiresNonEmbeddedSwift
     @swiftTest
     # Async variable inspection on Linux/Windows are still problematic.
     @skipIf(oslist=["windows", "linux"])
@@ -122,7 +122,7 @@ def test_task_inside_non_async_func(self):
             self, thread.frames[0], "x", "task_inside_non_async_function()"
         )
 
-    @skipEmbeddedSwift
+    @requiresNonEmbeddedSwift
     @swiftTest
     def test_ctor_class_closure(self):
         self.build()
@@ -180,7 +180,7 @@ def test_ctor_class_closure(self):
         )
         check_no_enhanced_diagnostic(self, thread.frames[0], "dont_find_me")
 
-    @skipEmbeddedSwift
+    @requiresNonEmbeddedSwift
     @swiftTest
     def test_ctor_struct_closure(self):
         self.build()
@@ -238,7 +238,7 @@ def test_ctor_struct_closure(self):
         )
         check_no_enhanced_diagnostic(self, thread.frames[0], "dont_find_me")
 
-    @skipEmbeddedSwift
+    @requiresNonEmbeddedSwift
     @swiftTest
     def test_ctor_enum_closure(self):
         self.build()
diff --git a/lldb/test/API/lang/swift/command_memory_find/TestSwiftCommandMemoryFind.py b/lldb/test/API/lang/swift/command_memory_find/TestSwiftCommandMemoryFind.py
index 55ff080577340..3b18892fb9ee2 100644
--- a/lldb/test/API/lang/swift/command_memory_find/TestSwiftCommandMemoryFind.py
+++ b/lldb/test/API/lang/swift/command_memory_find/TestSwiftCommandMemoryFind.py
@@ -18,7 +18,8 @@ def memory_find(self, name: str, expr: str, target):
         self.expect(f'memory find -e "{expr}" {hex(addr)} {hex(addr + 8)}',
                     substrs=["data found at location"])
 
-    @skipEmbeddedSwift
+    @skipEmbeddedSwiftOnLinux # `memory find -e` does not locate the value in embedded Swift on Linux.
+    @skipEmbeddedSwiftOnWindows
     @swiftTest
     def test(self):
         self.build()
diff --git a/lldb/test/API/lang/swift/command_memory_read/TestSwiftMemoryRead.py b/lldb/test/API/lang/swift/command_memory_read/TestSwiftMemoryRead.py
index 86164680f644f..75ffd83ea353b 100644
--- a/lldb/test/API/lang/swift/command_memory_read/TestSwiftMemoryRead.py
+++ b/lldb/test/API/lang/swift/command_memory_read/TestSwiftMemoryRead.py
@@ -5,7 +5,7 @@
 
 
 class TestCase(TestBase):
-    @skipEmbeddedSwift
+    @requiresNonEmbeddedSwift
     @swiftTest
     def test_scalar_types(self):
         self.build()
diff --git a/lldb/test/API/lang/swift/constrained_existential_metatype/TestSwiftConstrainedExistentialMetatypeFix.py b/lldb/test/API/lang/swift/constrained_existential_metatype/TestSwiftConstrainedExistentialMetatypeFix.py
index 6cc0b2e1fa344..0a0b2b3bda1be 100644
--- a/lldb/test/API/lang/swift/constrained_existential_metatype/TestSwiftConstrainedExistentialMetatypeFix.py
+++ b/lldb/test/API/lang/swift/constrained_existential_metatype/TestSwiftConstrainedExistentialMetatypeFix.py
@@ -6,7 +6,7 @@
 
 class TestSwiftConstrainedExistentialMetatypeFix(TestBase):
     @swiftTest
-    @skipEmbeddedSwift
+    @requiresNonEmbeddedSwift
     def test(self):
         self.build()
 
diff --git a/lldb/test/API/lang/swift/convention_c_function_pointer/TestSwiftConventionCFunctionPointer.py b/lldb/test/API/lang/swift/convention_c_function_pointer/TestSwiftConventionCFunctionPointer.py
index 3b04755508d35..335ad57af265a 100644
--- a/lldb/test/API/lang/swift/convention_c_function_pointer/TestSwiftConventionCFunctionPointer.py
+++ b/lldb/test/API/lang/swift/convention_c_function_pointer/TestSwiftConventionCFunctionPointer.py
@@ -6,7 +6,7 @@
 
 class TestSwiftConventionCFunctionPointer(TestBase):
     @swiftTest
-    @skipEmbeddedSwift
+    @skipEmbeddedSwiftOnWindows
     def test(self):
         self.build()
         self.runCmd("settings set symbols.swift-enable-ast-context false")
diff --git a/lldb/test/API/lang/swift/cxx_interop/backward/expressions/TestSwiftBackwardInteropExpressions.py b/lldb/test/API/lang/swift/cxx_interop/backward/expressions/TestSwiftBackwardInteropExpressions.py
index 22b24c69c531e..0a4229624c9ed 100644
--- a/lldb/test/API/lang/swift/cxx_interop/backward/expressions/TestSwiftBackwardInteropExpressions.py
+++ b/lldb/test/API/lang/swift/cxx_interop/backward/expressions/TestSwiftBackwardInteropExpressions.py
@@ -7,7 +7,7 @@
 
 class TestSwiftBackwardInteropExpressions(TestBase):
 
-    @skipEmbeddedSwift
+    @requiresNonEmbeddedSwift
     @swiftTest
     def test_func_step_in(self):
         self.build()
diff --git a/lldb/test/API/lang/swift/cxx_interop/backward/stepping/TestSwiftBackwardInteropSteppingClass_part01.py b/lldb/test/API/lang/swift/cxx_interop/backward/stepping/TestSwiftBackwardInteropSteppingClass_part01.py
index 21ee2e5295f9b..6a9fd95af8200 100644
--- a/lldb/test/API/lang/swift/cxx_interop/backward/stepping/TestSwiftBackwardInteropSteppingClass_part01.py
+++ b/lldb/test/API/lang/swift/cxx_interop/backward/stepping/TestSwiftBackwardInteropSteppingClass_part01.py
@@ -32,25 +32,25 @@ def check_step_over(self, thread, func):
         name = thread.frames[0].GetFunctionName()
         self.assertIn(func, name)
 
-    @skipEmbeddedSwift
+    @requiresNonEmbeddedSwift
     @swiftTest
     def test_method_step_in_class(self):
         thread = self.setup('Break here for method - class')
         self.check_step_in(thread, 'testMethod', 'SwiftClass.swiftMethod')
 
-    @skipEmbeddedSwift
+    @requiresNonEmbeddedSwift
     @swiftTest
     def test_method_step_over_class(self):
         thread = self.setup('Break here for method - class')
         self.check_step_over(thread, 'testMethod')
 
-    @skipEmbeddedSwift
+    @requiresNonEmbeddedSwift
     @swiftTest
     def test_init_step_in_class(self):
         thread = self.setup('Break here for constructor - class')
         self.check_step_in(thread, 'testConstructor', 'SwiftClass.init')
 
-    @skipEmbeddedSwift
+    @requiresNonEmbeddedSwift
     @swiftTest
     def test_init_step_over_class(self):
         thread = self.setup('Break here for constructor - class')
diff --git a/lldb/test/API/lang/swift/cxx_interop/backward/stepping/TestSwiftBackwardInteropSteppingClass_part02.py b/lldb/test/API/lang/swift/cxx_interop/backward/stepping/TestSwiftBackwardInteropSteppingClass_part02.py
index 0223e53913532..908f10b8650a7 100644
--- a/lldb/test/API/lang/swift/cxx_interop/backward/stepping/TestSwiftBackwardInteropSteppingClass_part02.py
+++ b/lldb/test/API/lang/swift/cxx_interop/backward/stepping/TestSwiftBackwardInteropSteppingClass_part02.py
@@ -32,25 +32,25 @@ def check_step_over(self, thread, func):
         name = thread.frames[0].GetFunctionName()
         self.assertIn(func, name)
 
-    @skipEmbeddedSwift
+    @requiresNonEmbeddedSwift
     @swiftTest
     def test_static_method_step_in_class(self):
         thread = self.setup('Break here for static method - class')
         self.check_step_in(thread, 'testStaticMethod', 'SwiftClass.swiftStaticMethod')
 
-    @skipEmbeddedSwift
+    @requiresNonEmbeddedSwift
     @swiftTest
     def test_static_method_step_over_class(self):
         thread = self.setup('Break here for static method - class')
         self.check_step_over(thread, 'testStaticMethod')
 
-    @skipEmbeddedSwift
+    @requiresNonEmbeddedSwift
     @swiftTest
     def test_getter_step_in_class(self):
         thread = self.setup('Break here for getter - class')
         self.check_step_in(thread, 'testGetter', 'SwiftClass.swiftProperty.getter')
 
-    @skipEmbeddedSwift
+    @requiresNonEmbeddedSwift
     @swiftTest
     def test_getter_step_over_class(self):
         thread = self.setup('Break here for getter - class')
diff --git a/lldb/test/API/lang/swift/cxx_interop/backward/stepping/TestSwiftBackwardInteropSteppingClass_part03.py b/lldb/test/API/lang/swift/cxx_interop/backward/stepping/TestSwiftBackwardInteropSteppingClass_part03.py
index ce85122337992..3965ac1d68fad 100644
--- a/lldb/test/API/lang/swift/cxx_interop/backward/stepping/TestSwiftBackwardInteropSteppingClass_part03.py
+++ b/lldb/test/API/lang/swift/cxx_interop/backward/stepping/TestSwiftBackwardInteropSteppingClass_part03.py
@@ -32,26 +32,26 @@ def check_step_over(self, thread, func):
         name = thread.frames[0].GetFunctionName()
         self.assertIn(func, name)
 
-    @skipEmbeddedSwift
+    @requiresNonEmbeddedSwift
     @swiftTest
     def test_setter_step_in_class(self):
         thread = self.setup('Break here for setter - class')
         self.check_step_in(thread, 'testSetter', 'SwiftClass.swiftProperty.setter')
 
-    @skipEmbeddedSwift
+    @requiresNonEmbeddedSwift
     @swiftTest
     def test_setter_step_over_class(self):
         thread = self.setup('Break here for setter - class')
         self.check_step_over(thread, 'testSetter')
 
 
-    @skipEmbeddedSwift
+    @requiresNonEmbeddedSwift
     @swiftTest
     def test_overriden_step_in_class(self):
         thread = self.setup('Break here for overridden - class')
         self.check_step_in(thread, 'testOverridenMethod', 'SwiftSubclass.overrideableMethod')
 
-    @skipEmbeddedSwift
+    @requiresNonEmbeddedSwift
     @swiftTest
     def test_overriden_step_over_class(self):
         thread = self.setup('Break here for overridden')
diff --git a/lldb/test/API/lang/swift/cxx_interop/backward/stepping/TestSwiftBackwardInteropSteppingFunc.py b/lldb/test/API/lang/swift/cxx_interop/backward/stepping/TestSwiftBackwardInteropSteppingFunc.py
index 6ea8cb32d47d7..4de244804eeec 100644
--- a/lldb/test/API/lang/swift/cxx_interop/backward/stepping/TestSwiftBackwardInteropSteppingFunc.py
+++ b/lldb/test/API/lang/swift/cxx_interop/backward/stepping/TestSwiftBackwardInteropSteppingFunc.py
@@ -33,13 +33,13 @@ def check_step_over(self, thread, func):
         name = thread.frames[0].GetFunctionName()
         self.assertIn(func, name)
 
-    @skipEmbeddedSwift
+    @requiresNonEmbeddedSwift
     @swiftTest
     def test_func_step_in(self):
         thread = self.setup("Break here for func")
         self.check_step_in(thread, "testFunc", "swiftFunc")
 
-    @skipEmbeddedSwift
+    @requiresNonEmbeddedSwift
     @swiftTest
     def test_func_step_over(self):
         thread = self.setup("Break here for func")
diff --git a/lldb/test/API/lang/swift/cxx_interop/backward/stepping/TestSwiftBackwardInteropSteppingStruct_part01.py b/lldb/test/API/lang/swift/cxx_interop/backward/stepping/TestSwiftBackwardInteropSteppingStruct_part01.py
index 3cb9191aceb43..0d5d8540e022a 100644
--- a/lldb/test/API/lang/swift/cxx_interop/backward/stepping/TestSwiftBackwardInteropSteppingStruct_part01.py
+++ b/lldb/test/API/lang/swift/cxx_interop/backward/stepping/TestSwiftBackwardInteropSteppingStruct_part01.py
@@ -33,25 +33,25 @@ def check_step_over(self, thread, func):
         name = thread.frames[0].GetFunctionName()
         self.assertIn(func, name)
 
-    @skipEmbeddedSwift
+    @requiresNonEmbeddedSwift
     @swiftTest
     def test_method_step_in_struct(self):
         thread = self.setup("Break here for method - struct")
         self.check_step_in(thread, "testMethod", "SwiftStruct.swiftMethod")
 
-    @skipEmbeddedSwift
+    @requiresNonEmbeddedSwift
     @swiftTest
     def test_method_step_over_struct(self):
         thread = self.setup("Break here for method - struct")
         self.check_step_over(thread, "testMethod")
 
-    @skipEmbeddedSwift
+    @requiresNonEmbeddedSwift
     @swiftTest
     def test_init_step_in_struct(self):
         thread = self.setup("Break here for constructor - struct")
         self.check_step_in(thread, "testConstructor", "SwiftStruct.init")
 
-    @skipEmbeddedSwift
+    @requiresNonEmbeddedSwift
     @swiftTest
     def test_init_step_over_struct(self):
         thread = self.setup("Break here for constructor - struct")
diff --git a/lldb/test/API/lang/swift/cxx_interop/backward/stepping/TestSwiftBackwardInteropSteppingStruct_part02.py b/lldb/test/API/lang/swift/cxx_interop/backward/stepping/TestSwiftBackwardInteropSteppingStruct_part02.py
index 290d03f1ff08d..9d5a2e192dea1 100644
--- a/lldb/test/API/lang/swift/cxx_interop/backward/stepping/TestSwiftBackwardInteropSteppingStruct_part02.py
+++ b/lldb/test/API/lang/swift/cxx_interop/backward/stepping/TestSwiftBackwardInteropSteppingStruct_part02.py
@@ -33,25 +33,25 @@ def check_step_over(self, thread, func):
         name = thread.frames[0].GetFunctionName()
         self.assertIn(func, name)
 
-    @skipEmbeddedSwift
+    @requiresNonEmbeddedSwift
     @swiftTest
     def test_static_method_step_in_struct(self):
         thread = self.setup("Break here for static method - struct")
         self.check_step_in(thread, "testStaticMethod", "SwiftStruct.swiftStaticMethod")
 
-    @skipEmbeddedSwift
+    @requiresNonEmbeddedSwift
     @swiftTest
     def test_static_method_step_over_struct(self):
         thread = self.setup("Break here for static method - struct")
         self.check_step_over(thread, "testStaticMethod")
 
-    @skipEmbeddedSwift
+    @requiresNonEmbeddedSwift
     @swiftTest
     def test_getter_step_in_struct(self):
         thread = self.setup("Break here for getter - struct")
         self.check_step_in(thread, "testGetter", "SwiftStruct.swiftProperty.getter")
 
-    @skipEmbeddedSwift
+    @requiresNonEmbeddedSwift
     @swiftTest
     def test_getter_step_over_struct(self):
         thread = self.setup("Break here for getter - struct")
diff --git a/lldb/test/API/lang/swift/cxx_interop/backward/stepping/TestSwiftBackwardInteropSteppingStruct_part03.py b/lldb/test/API/lang/swift/cxx_interop/backward/stepping/TestSwiftBackwardInteropSteppingStruct_part03.py
index d06170b84c4a6..3b690ef82cd22 100644
--- a/lldb/test/API/lang/swift/cxx_interop/backward/stepping/TestSwiftBackwardInteropSteppingStruct_part03.py
+++ b/lldb/test/API/lang/swift/cxx_interop/backward/stepping/TestSwiftBackwardInteropSteppingStruct_part03.py
@@ -33,13 +33,13 @@ def check_step_over(self, thread, func):
         name = thread.frames[0].GetFunctionName()
         self.assertIn(func, name)
 
-    @skipEmbeddedSwift
+    @requiresNonEmbeddedSwift
     @swiftTest
     def test_setter_step_in_struct(self):
         thread = self.setup("Break here for setter - struct")
         self.check_step_in(thread, "testSetter", "SwiftStruct.swiftProperty.setter")
 
-    @skipEmbeddedSwift
+    @requiresNonEmbeddedSwift
     @swiftTest
     def test_setter_step_over_struct(self):
         thread = self.setup("Break here for setter - struct")
diff --git a/lldb/test/API/lang/swift/cxx_interop/forward/cxx-class/TestSwiftForwardInteropCxxClass.py b/lldb/test/API/lang/swift/cxx_interop/forward/cxx-class/TestSwiftForwardInteropCxxClass.py
index 6c1f4d56bed28..cfd69567268a6 100644
--- a/lldb/test/API/lang/swift/cxx_interop/forward/cxx-class/TestSwiftForwardInteropCxxClass.py
+++ b/lldb/test/API/lang/swift/cxx_interop/forward/cxx-class/TestSwiftForwardInteropCxxClass.py
@@ -8,7 +8,7 @@
 
 class TestSwiftForwardInteropCxxClass(TestBase):
 
-    @skipEmbeddedSwift
+    @requiresNonEmbeddedSwift
     @swiftTest
     def test_class(self):
         self.build()
diff --git a/lldb/test/API/lang/swift/cxx_interop/forward/stl-types/TestSwiftForwardInteropSTLTypes.py b/lldb/test/API/lang/swift/cxx_interop/forward/stl-types/TestSwiftForwardInteropSTLTypes.py
index a0bf11d496b73..ab4da451a6189 100644
--- a/lldb/test/API/lang/swift/cxx_interop/forward/stl-types/TestSwiftForwardInteropSTLTypes.py
+++ b/lldb/test/API/lang/swift/cxx_interop/forward/stl-types/TestSwiftForwardInteropSTLTypes.py
@@ -12,7 +12,7 @@ class TestSwiftForwardInteropSTLTypes(TestBase):
     @skipIf(
         setting=("symbols.use-swift-clangimporter", "false")
     )  # rdar://106438227 (TestSTLTypes fails when clang importer is disabled)
-    @skipEmbeddedSwift
+    @requiresNonEmbeddedSwift
     @swiftTest
     @skipIfWindows
     def test(self):
diff --git a/lldb/test/API/lang/swift/deployment_target/TestSwiftDeploymentTarget.py b/lldb/test/API/lang/swift/deployment_target/TestSwiftDeploymentTarget.py
index 99b71b91c8757..71c58bf2b5b0f 100644
--- a/lldb/test/API/lang/swift/deployment_target/TestSwiftDeploymentTarget.py
+++ b/lldb/test/API/lang/swift/deployment_target/TestSwiftDeploymentTarget.py
@@ -22,7 +22,7 @@
 class TestSwiftDeploymentTarget(TestBase):
     NO_DEBUG_INFO_TESTCASE = True
 
-    @skipEmbeddedSwift
+    @requiresNonEmbeddedSwift
     @skipUnlessDarwin
     @skipIfDarwinEmbedded # This test uses macOS triples explicitly.
     @skipIf(macos_version=["<", "11.1"])
@@ -34,7 +34,7 @@ def test_swift_deployment_target(self):
                                           lldb.SBFileSpec('main.swift'))
         self.expect("expression f", substrs=['i = 23'])
 
-    @skipEmbeddedSwift
+    @requiresNonEmbeddedSwift
     @skipUnlessDarwin
     @skipIfDarwinEmbedded # This test uses macOS triples explicitly.
     @skipIf(macos_version=["<", "11.1"])
@@ -48,7 +48,7 @@ def test_swift_deployment_target_dlopen(self):
         lldbutil.continue_to_breakpoint(process, bkpt)
         self.expect("expression self", substrs=['i = 23'])
 
-    @skipEmbeddedSwift
+    @requiresNonEmbeddedSwift
     @skipUnlessDarwin
     @skipIfDarwinEmbedded # This test uses macOS triples explicitly.
     @skipIf(macos_version=["<", "11.1"])
@@ -69,7 +69,7 @@ def test_swift_deployment_target_from_macho(self):
 #       CHECK: SwiftASTContextForExpressions(module: "a", cu: "main.swift")::SetTriple({{.*}}apple-macosx11.0.0
 #       CHECK-NOT: SwiftASTContextForExpressions(module: "a", cu: "main.swift")::RegisterSectionModules("a.out"){{.*}} AST Data blobs
 
-    @skipEmbeddedSwift
+    @requiresNonEmbeddedSwift
     @skipUnlessDarwin  # This test uses macOS triples explicitly.
     @skipIfDarwinEmbedded
     @skipIf(macos_version=["<", "11.1"])
diff --git a/lldb/test/API/lang/swift/deserialization_failure/TestSwiftDeserializationFailure.py b/lldb/test/API/lang/swift/deserialization_failure/TestSwiftDeserializationFailure.py
index 41744b1c6a522..d6aea8934baf1 100644
--- a/lldb/test/API/lang/swift/deserialization_failure/TestSwiftDeserializationFailure.py
+++ b/lldb/test/API/lang/swift/deserialization_failure/TestSwiftDeserializationFailure.py
@@ -30,7 +30,7 @@ def run_tests(self, target, process):
         # FIXME: this is formatted incorrectly.
         self.expect("fr var -d no-dynamic t", substrs=["(T)"]) #, "world"])
 
-    @skipEmbeddedSwift
+    @requiresNonEmbeddedSwift # embedded Swift monomorphizes every generic, so the parameter is never typed (T)
     @swiftTest
     @skipIf(debug_info=no_match(["dwarf"]))
     def test_missing_module(self):
@@ -39,7 +39,7 @@ def test_missing_module(self):
         target, process, _, _ = lldbutil.run_to_name_breakpoint(self, 'main')
         self.run_tests(target, process)
 
-    @skipEmbeddedSwift
+    @requiresNonEmbeddedSwift # embedded Swift monomorphizes every generic, so the parameter is never typed (T)
     @swiftTest
     @skipIf(debug_info=no_match(["dwarf"]))
     def test_damaged_module(self):
diff --git a/lldb/test/API/lang/swift/different_abi_name/TestSwiftDifferentABIName.py b/lldb/test/API/lang/swift/different_abi_name/TestSwiftDifferentABIName.py
index e6298c0187f54..f919e311dab5e 100644
--- a/lldb/test/API/lang/swift/different_abi_name/TestSwiftDifferentABIName.py
+++ b/lldb/test/API/lang/swift/different_abi_name/TestSwiftDifferentABIName.py
@@ -5,7 +5,7 @@
 
 
 class TestSwiftDifferentABIName(TestBase):
-    @skipEmbeddedSwift
+    @requiresNonEmbeddedSwift
     @swiftTest
     def test(self):
         self.build()
diff --git a/lldb/test/API/lang/swift/dwarfimporter/Objective-C/TestSwiftDWARFImporterObjC.py b/lldb/test/API/lang/swift/dwarfimporter/Objective-C/TestSwiftDWARFImporterObjC.py
index 0a9efcb2a99c4..d30230b37594c 100644
--- a/lldb/test/API/lang/swift/dwarfimporter/Objective-C/TestSwiftDWARFImporterObjC.py
+++ b/lldb/test/API/lang/swift/dwarfimporter/Objective-C/TestSwiftDWARFImporterObjC.py
@@ -34,7 +34,7 @@ def build(self):
         self.assertTrue(os.path.isdir(include))
         shutil.rmtree(include)
 
-    @skipEmbeddedSwift
+    @requiresNonEmbeddedSwift
     @skipUnlessDarwin
     @swiftTest
     def test(self):
@@ -61,7 +61,7 @@ def test(self):
         #self.expect("target var -d run proto", substrs=["(ProtoImpl)", "proto"])
         #self.expect("target var -O proto", substrs=["<ProtoImpl"])
 
-    @skipEmbeddedSwift
+    @requiresNonEmbeddedSwift
     @skipUnlessDarwin
     @swiftTest
     def test_expr(self):
@@ -83,7 +83,7 @@ def test_expr(self):
                                                 "private_ivar", "42"])
 
 
-    @skipEmbeddedSwift
+    @requiresNonEmbeddedSwift
     @skipUnlessDarwin
     @swiftTest
     def test_eager_member_completion(self):
diff --git a/lldb/test/API/lang/swift/dwarfimporter/objc-header/TestSwiftDWARFImporter-Swift.py b/lldb/test/API/lang/swift/dwarfimporter/objc-header/TestSwiftDWARFImporter-Swift.py
index 74a6454ab1f93..b0afd4a940725 100644
--- a/lldb/test/API/lang/swift/dwarfimporter/objc-header/TestSwiftDWARFImporter-Swift.py
+++ b/lldb/test/API/lang/swift/dwarfimporter/objc-header/TestSwiftDWARFImporter-Swift.py
@@ -23,7 +23,7 @@ def build(self):
         self.assertTrue(os.path.isdir(include))
         shutil.rmtree(include)
 
-    @skipEmbeddedSwift
+    @requiresNonEmbeddedSwift # embedded Swift disables ObjC interop, so this test's Foundation import does not compile
     @skipUnlessDarwin
     @swiftTest
     def test(self):
diff --git a/lldb/test/API/lang/swift/enable_testing/TestSwiftEnableTesting.py b/lldb/test/API/lang/swift/enable_testing/TestSwiftEnableTesting.py
index 0595c4b4efa08..c5ee16c941da2 100644
--- a/lldb/test/API/lang/swift/enable_testing/TestSwiftEnableTesting.py
+++ b/lldb/test/API/lang/swift/enable_testing/TestSwiftEnableTesting.py
@@ -6,7 +6,7 @@
 
 class TestSwiftEnableTesting(TestBase):
 
-    @skipEmbeddedSwift
+    @requiresNonEmbeddedSwift
     @skipIfLinux
     @swiftTest
     def test(self):
diff --git a/lldb/test/API/lang/swift/enum_as_value/TestSwiftEnumAsValue.py b/lldb/test/API/lang/swift/enum_as_value/TestSwiftEnumAsValue.py
index 89834e0124cb3..d22b16b29e535 100644
--- a/lldb/test/API/lang/swift/enum_as_value/TestSwiftEnumAsValue.py
+++ b/lldb/test/API/lang/swift/enum_as_value/TestSwiftEnumAsValue.py
@@ -8,7 +8,7 @@ class TestSwiftAnyType(lldbtest.TestBase):
 
     mydir = lldbtest.TestBase.compute_mydir(__file__)
 
-    @skipEmbeddedSwift
+    @requiresNonEmbeddedSwift
     @swiftTest
     def test_any_type(self):
         self.build()
diff --git a/lldb/test/API/lang/swift/enum_objc/TestSwiftEnumObjC.py b/lldb/test/API/lang/swift/enum_objc/TestSwiftEnumObjC.py
index 57c72480553d5..8e48e88ea57fe 100644
--- a/lldb/test/API/lang/swift/enum_objc/TestSwiftEnumObjC.py
+++ b/lldb/test/API/lang/swift/enum_objc/TestSwiftEnumObjC.py
@@ -5,7 +5,7 @@
 
 class TestSwiftDWARFImporterC(lldbtest.TestBase):
 
-    @skipEmbeddedSwift
+    @requiresNonEmbeddedSwift
     @swiftTest
     @expectedFailureAll(oslist=["linux"], bugnumber="rdar://83444822")
     def test(self):
diff --git a/lldb/test/API/lang/swift/enums/decoding_error/TestSwiftDecodingErrorEnum.py b/lldb/test/API/lang/swift/enums/decoding_error/TestSwiftDecodingErrorEnum.py
index 68afb31477348..5832f5a428d00 100644
--- a/lldb/test/API/lang/swift/enums/decoding_error/TestSwiftDecodingErrorEnum.py
+++ b/lldb/test/API/lang/swift/enums/decoding_error/TestSwiftDecodingErrorEnum.py
@@ -6,7 +6,7 @@
 
 
 class TestCase(TestBase):
-    @skipEmbeddedSwift
+    @requiresNonEmbeddedSwift
     @skipIfLinux  # https://github.com/swiftlang/llvm-project/issues/13465
     @skipUnlessFoundationEssentials
     @swiftTest
diff --git a/lldb/test/API/lang/swift/error_handling_missing_type/TestSwiftErrorHandlingMissingType.py b/lldb/test/API/lang/swift/error_handling_missing_type/TestSwiftErrorHandlingMissingType.py
index 2bb12cf42462d..a82308212f199 100644
--- a/lldb/test/API/lang/swift/error_handling_missing_type/TestSwiftErrorHandlingMissingType.py
+++ b/lldb/test/API/lang/swift/error_handling_missing_type/TestSwiftErrorHandlingMissingType.py
@@ -6,7 +6,7 @@
 class TestSwiftErrorHandlingMissingTypes(TestBase):
     NO_DEBUG_INFO_TESTCASE = True
 
-    @skipEmbeddedSwift
+    @requiresNonEmbeddedSwift # the embedded variant is never crossed with noclang, so this test never runs as embedded
     @swiftTest
     @skipIf(setting=('symbols.use-swift-clangimporter', 'true'))
     def test(self):
diff --git a/lldb/test/API/lang/swift/explicit_modules/bridgingheader/TestSwiftExplicitModulesBridgingHeader.py b/lldb/test/API/lang/swift/explicit_modules/bridgingheader/TestSwiftExplicitModulesBridgingHeader.py
index e9ea54fd15cf5..5ebd893d34164 100644
--- a/lldb/test/API/lang/swift/explicit_modules/bridgingheader/TestSwiftExplicitModulesBridgingHeader.py
+++ b/lldb/test/API/lang/swift/explicit_modules/bridgingheader/TestSwiftExplicitModulesBridgingHeader.py
@@ -6,7 +6,7 @@
 
 class TestSwiftExplicitModules(lldbtest.TestBase):
     NO_DEBUG_INFO_TESTCASE = True
-    @skipEmbeddedSwift
+    @requiresNonEmbeddedSwift
     @swiftTest
     @skipIf(setting=('symbols.use-swift-clangimporter', 'false'), bugnumber='rdar://157258485')
     def test_with_deleted_header(self):
@@ -33,7 +33,7 @@ def test_with_deleted_header(self):
         # CHECK-NOT: secret
         # CHECK: Import 
 
-    @skipEmbeddedSwift
+    @requiresNonEmbeddedSwift
     @swiftTest
     @skipIf(setting=('symbols.use-swift-clangimporter', 'false'), bugnumber='rdar://157258485')
     def test(self):
diff --git a/lldb/test/API/lang/swift/explicit_modules/bridgingheader_caching/TestSwiftExplicitModulesBridgingHeaderCaching_part01.py b/lldb/test/API/lang/swift/explicit_modules/bridgingheader_caching/TestSwiftExplicitModulesBridgingHeaderCaching_part01.py
index 9326a004d8bcb..0f22d72039579 100644
--- a/lldb/test/API/lang/swift/explicit_modules/bridgingheader_caching/TestSwiftExplicitModulesBridgingHeaderCaching_part01.py
+++ b/lldb/test/API/lang/swift/explicit_modules/bridgingheader_caching/TestSwiftExplicitModulesBridgingHeaderCaching_part01.py
@@ -5,7 +5,7 @@
 
 
 class TestSwiftExplicitModules(lldbtest.TestBase):
-    @skipEmbeddedSwift
+    @requiresNonEmbeddedSwift
     @swiftTest
     @skipIf(setting=('symbols.use-swift-clangimporter', 'false'), bugnumber='rdar://157258485')
     @skipUnlessDarwin
diff --git a/lldb/test/API/lang/swift/explicit_modules/bridgingheader_caching/TestSwiftExplicitModulesBridgingHeaderCaching_part02.py b/lldb/test/API/lang/swift/explicit_modules/bridgingheader_caching/TestSwiftExplicitModulesBridgingHeaderCaching_part02.py
index c00965a12d20d..203dec74b8c1e 100644
--- a/lldb/test/API/lang/swift/explicit_modules/bridgingheader_caching/TestSwiftExplicitModulesBridgingHeaderCaching_part02.py
+++ b/lldb/test/API/lang/swift/explicit_modules/bridgingheader_caching/TestSwiftExplicitModulesBridgingHeaderCaching_part02.py
@@ -5,7 +5,7 @@
 
 
 class TestSwiftExplicitModules(lldbtest.TestBase):
-    @skipEmbeddedSwift
+    @requiresNonEmbeddedSwift
     @swiftTest
     @skipIf(setting=('symbols.use-swift-clangimporter', 'false'), bugnumber='rdar://157258485')
     @skipUnlessDarwin
diff --git a/lldb/test/API/lang/swift/explicit_modules/caching/TestSwiftExplicitModuleCaching.py b/lldb/test/API/lang/swift/explicit_modules/caching/TestSwiftExplicitModuleCaching.py
index 93562385f052f..877b43eca81a5 100644
--- a/lldb/test/API/lang/swift/explicit_modules/caching/TestSwiftExplicitModuleCaching.py
+++ b/lldb/test/API/lang/swift/explicit_modules/caching/TestSwiftExplicitModuleCaching.py
@@ -5,7 +5,6 @@
 
 class TestSwiftExplicitModuleCaching(TestBase):
 
-    @skipEmbeddedSwift
     # Don't run ClangImporter tests if Clangimporter is disabled.
     @skipIf(setting=('symbols.use-swift-clangimporter', 'false'))
     @skipIf(setting=('symbols.swift-precise-compiler-invocation', 'false'))
diff --git a/lldb/test/API/lang/swift/explicit_modules/chained_bridgingheader/TestSwiftExplicitModulesChainedBridgingHeader.py b/lldb/test/API/lang/swift/explicit_modules/chained_bridgingheader/TestSwiftExplicitModulesChainedBridgingHeader.py
index a8d250e770651..cc410a2b03a43 100644
--- a/lldb/test/API/lang/swift/explicit_modules/chained_bridgingheader/TestSwiftExplicitModulesChainedBridgingHeader.py
+++ b/lldb/test/API/lang/swift/explicit_modules/chained_bridgingheader/TestSwiftExplicitModulesChainedBridgingHeader.py
@@ -5,7 +5,7 @@
 
 
 class TestSwiftExplicitModulesChainedBridgingHeader(lldbtest.TestBase):
-    @skipEmbeddedSwift
+    @requiresNonEmbeddedSwift
     @swiftTest
     @skipUnlessDarwin # uses a framework, doesn't link with gold
     @skipIf(setting=('symbols.use-swift-clangimporter', 'false'))
diff --git a/lldb/test/API/lang/swift/explicit_modules/implicit_fallback/TestSwiftExplicitModulesImplicitFallback.py b/lldb/test/API/lang/swift/explicit_modules/implicit_fallback/TestSwiftExplicitModulesImplicitFallback.py
index 97555ad252ff0..17552b66adb0c 100644
--- a/lldb/test/API/lang/swift/explicit_modules/implicit_fallback/TestSwiftExplicitModulesImplicitFallback.py
+++ b/lldb/test/API/lang/swift/explicit_modules/implicit_fallback/TestSwiftExplicitModulesImplicitFallback.py
@@ -8,7 +8,7 @@
 @skipIfWindows
 class TestCase(lldbtest.TestBase):
     NO_DEBUG_INFO_TESTCASE = True
-    @skipEmbeddedSwift
+    @requiresNonEmbeddedSwift
     @swiftTest
     def test_missing(self):
         """Test missing explicit Swift modules and fallback to implicit modules."""
@@ -32,7 +32,7 @@ def test_missing(self):
         # CHECK: Nonexistent explicit module file
         # CHECK: Explicit modules : false (downgraded
 
-    @skipEmbeddedSwift
+    @requiresNonEmbeddedSwift
     @swiftTest
     def test_sanity(self):
         """Check the normal behavior."""
@@ -60,7 +60,7 @@ def test_sanity(self):
         # CHECK-SANITY: Turning off implicit modules
         # CHECK-SANITY: Turning on implicit modules
 
-    @skipEmbeddedSwift
+    @requiresNonEmbeddedSwift
     @swiftTest
     def test_setting(self):
         """Check the normal behavior."""
diff --git a/lldb/test/API/lang/swift/explicit_modules/private_type_generic/TestSwiftExplicitModulePrivateTypeGeneric.py b/lldb/test/API/lang/swift/explicit_modules/private_type_generic/TestSwiftExplicitModulePrivateTypeGeneric.py
index 5a0166629ea30..b7fbd4d100a3c 100644
--- a/lldb/test/API/lang/swift/explicit_modules/private_type_generic/TestSwiftExplicitModulePrivateTypeGeneric.py
+++ b/lldb/test/API/lang/swift/explicit_modules/private_type_generic/TestSwiftExplicitModulePrivateTypeGeneric.py
@@ -8,7 +8,7 @@ class TestSwiftExplicitModulePrivateTypeGeneric(lldbtest.TestBase):
     NO_DEBUG_INFO_TESTCASE = True
 
     @expectedFailureWindows  # https://github.com/swiftlang/llvm-project/issues/13444
-    @skipEmbeddedSwift
+    @requiresNonEmbeddedSwift
     @swiftTest
     def test(self):
         """Test frame variable of a generic struct specialized to a
diff --git a/lldb/test/API/lang/swift/explicit_modules/simple/TestSwiftExplicitModules_part01.py b/lldb/test/API/lang/swift/explicit_modules/simple/TestSwiftExplicitModules_part01.py
index a30d06b092a1c..18770a5acb787 100644
--- a/lldb/test/API/lang/swift/explicit_modules/simple/TestSwiftExplicitModules_part01.py
+++ b/lldb/test/API/lang/swift/explicit_modules/simple/TestSwiftExplicitModules_part01.py
@@ -6,7 +6,7 @@
 
 class TestSwiftExplicitModules(lldbtest.TestBase):
 
-    @skipEmbeddedSwift
+    @requiresNonEmbeddedSwift
     @swiftTest
     def test(self):
         """Test explicit Swift modules"""
@@ -21,7 +21,7 @@ def test(self):
         # CHECK: SwiftASTContextForExpressions(module: "a", cu: "main.swift"){{.*}} Discovered main module {{.*}}a.swiftmodule
         # CHECK: SwiftASTContextForExpressions(module: "a", cu: "main.swift"){{.*}} Module import remark: loaded module 'a'; source: '{{.*}}a.swiftmodule', loaded: '{{.*}}a.swiftmodule'
 
-    @skipEmbeddedSwift
+    @requiresNonEmbeddedSwift
     @swiftTest
     def test_disable_esml(self):
         """Test disabling the explicit Swift module loader"""
diff --git a/lldb/test/API/lang/swift/explicit_modules/simple/TestSwiftExplicitModules_part02.py b/lldb/test/API/lang/swift/explicit_modules/simple/TestSwiftExplicitModules_part02.py
index f0d0063f0718e..358da55764e6c 100644
--- a/lldb/test/API/lang/swift/explicit_modules/simple/TestSwiftExplicitModules_part02.py
+++ b/lldb/test/API/lang/swift/explicit_modules/simple/TestSwiftExplicitModules_part02.py
@@ -6,7 +6,7 @@
 
 class TestSwiftExplicitModules(lldbtest.TestBase):
 
-    @skipEmbeddedSwift
+    @requiresNonEmbeddedSwift
     @swiftTest
     @skipUnlessDarwin
     def test_import(self):
diff --git a/lldb/test/API/lang/swift/expression/actor/TestSwiftExpressionActor.py b/lldb/test/API/lang/swift/expression/actor/TestSwiftExpressionActor.py
index 60348a0998db3..8a7d3f37bb886 100644
--- a/lldb/test/API/lang/swift/expression/actor/TestSwiftExpressionActor.py
+++ b/lldb/test/API/lang/swift/expression/actor/TestSwiftExpressionActor.py
@@ -6,7 +6,7 @@
 
 
 class TestSwiftExpressionActor(TestBase):
-    @skipEmbeddedSwift
+    @requiresNonEmbeddedSwift
     @swiftTest
     def test_static_func(self):
         self.build()
@@ -16,7 +16,7 @@ def test_static_func(self):
 
         self.expect("expr self", substrs=["A.Type"])
 
-    @skipEmbeddedSwift
+    @requiresNonEmbeddedSwift
     @swiftTest
     def test_func(self):
         self.build()
diff --git a/lldb/test/API/lang/swift/expression/allocator/TestSwiftExprAllocator.py b/lldb/test/API/lang/swift/expression/allocator/TestSwiftExprAllocator.py
index 80632d5d17535..f8a42ea1ee4d5 100644
--- a/lldb/test/API/lang/swift/expression/allocator/TestSwiftExprAllocator.py
+++ b/lldb/test/API/lang/swift/expression/allocator/TestSwiftExprAllocator.py
@@ -9,7 +9,7 @@ class TestSwiftExprAllocator(lldbtest.TestBase):
 
     mydir = lldbtest.TestBase.compute_mydir(__file__)
 
-    @skipEmbeddedSwift
+    @requiresNonEmbeddedSwift
     @swiftTest
     def test_allocator_self(self):
         """Test expressions involving self in a allocating constructor. In an
diff --git a/lldb/test/API/lang/swift/expression/class_constrained_protocol/TestClassConstrainedProtocol.py b/lldb/test/API/lang/swift/expression/class_constrained_protocol/TestClassConstrainedProtocol.py
index 9305f944f9fed..773d0e9266e9c 100644
--- a/lldb/test/API/lang/swift/expression/class_constrained_protocol/TestClassConstrainedProtocol.py
+++ b/lldb/test/API/lang/swift/expression/class_constrained_protocol/TestClassConstrainedProtocol.py
@@ -14,28 +14,28 @@
 from lldbsuite.test.decorators import *
 
 class TestClassConstrainedProtocol(TestBase):
-    @skipEmbeddedSwift
+    @requiresNonEmbeddedSwift
     @swiftTest
     def test_extension_weak_self(self):
         """Test that we can reconstruct weak self captured in a class constrained protocol."""
         self.build()
         self.do_self_test("Break here for weak self", needs_dynamic=False)
 
-    @skipEmbeddedSwift
+    @requiresNonEmbeddedSwift
     @swiftTest
     def test_extension_self (self):
         """Test that we can reconstruct self in method of a class constrained protocol."""
         self.build()
         self.do_self_test("Break here in class protocol", needs_dynamic=False)
 
-    @skipEmbeddedSwift
+    @requiresNonEmbeddedSwift
     @swiftTest
     def test_method_weak_self(self):
         """Test that we can reconstruct weak self capture in method of a class conforming to a class constrained protocol."""
         self.build()
         self.do_self_test("Break here for method weak self", needs_dynamic=False)
 
-    @skipEmbeddedSwift
+    @requiresNonEmbeddedSwift
     @swiftTest
     def test_method_self(self):
         """Test that we can reconstruct self in method of a class conforming to a class constrained protocol."""
diff --git a/lldb/test/API/lang/swift/expression/classes/fromobjc/TestSwiftExpressionsInMethodsFromObjc.py b/lldb/test/API/lang/swift/expression/classes/fromobjc/TestSwiftExpressionsInMethodsFromObjc.py
index 56e3d60c01022..d50c8314124c3 100644
--- a/lldb/test/API/lang/swift/expression/classes/fromobjc/TestSwiftExpressionsInMethodsFromObjc.py
+++ b/lldb/test/API/lang/swift/expression/classes/fromobjc/TestSwiftExpressionsInMethodsFromObjc.py
@@ -20,7 +20,7 @@
 
 
 class TestExpressionsInSwiftMethodsFromObjC(TestBase):
-    @skipEmbeddedSwift
+    @requiresNonEmbeddedSwift
     @skipUnlessDarwin
     @swiftTest
     def test_swift_expressions_from_objc(self):
diff --git a/lldb/test/API/lang/swift/expression/classes/open_resilient/TestSwiftExpressionOpenResilientClass.py b/lldb/test/API/lang/swift/expression/classes/open_resilient/TestSwiftExpressionOpenResilientClass.py
index bdc59e67cc952..0dee3b8a658eb 100644
--- a/lldb/test/API/lang/swift/expression/classes/open_resilient/TestSwiftExpressionOpenResilientClass.py
+++ b/lldb/test/API/lang/swift/expression/classes/open_resilient/TestSwiftExpressionOpenResilientClass.py
@@ -5,7 +5,7 @@
 
 class TestExpressionOpenResilientClass(TestBase):
     NO_DEBUG_INFO_TEST = True
-    @skipEmbeddedSwift
+    @requiresNonEmbeddedSwift
     @swiftTest
     def test(self):
         """Tests calling an open resilient function"""
diff --git a/lldb/test/API/lang/swift/expression/equality_operators/TestEqualityOperators.py b/lldb/test/API/lang/swift/expression/equality_operators/TestEqualityOperators.py
index 5e297c32d3ee4..3310a9cfd2d42 100644
--- a/lldb/test/API/lang/swift/expression/equality_operators/TestEqualityOperators.py
+++ b/lldb/test/API/lang/swift/expression/equality_operators/TestEqualityOperators.py
@@ -36,7 +36,7 @@ class TestUnitTests(TestBase):
     @expectedFailureAll(
         oslist=["linux"],
         bugnumber="rdar://28180489")
-    @skipEmbeddedSwift
+    @requiresNonEmbeddedSwift
     def test_equality_operators_fileprivate(self):
         """Test that we resolve expression operators correctly"""
         self.build()
@@ -47,7 +47,7 @@ def test_equality_operators_fileprivate(self):
     @expectedFailureAll(
         oslist=["linux"],
         bugnumber="rdar://28180489")
-    @skipEmbeddedSwift
+    @requiresNonEmbeddedSwift
     def test_equality_operators_private(self):
         """Test that we resolve expression operators correctly"""
         self.build()
diff --git a/lldb/test/API/lang/swift/expression/error_reporting/TestSwiftExpressionErrorReporting.py b/lldb/test/API/lang/swift/expression/error_reporting/TestSwiftExpressionErrorReporting.py
index a69f24ffcba49..d87f680fbecd7 100644
--- a/lldb/test/API/lang/swift/expression/error_reporting/TestSwiftExpressionErrorReporting.py
+++ b/lldb/test/API/lang/swift/expression/error_reporting/TestSwiftExpressionErrorReporting.py
@@ -7,7 +7,7 @@ class TestSwiftExpressionErrorReporting(TestBase):
     NO_DEBUG_INFO_TESTCASE = True
 
     @swiftTest
-    @skipEmbeddedSwift
+    @skipEmbeddedSwiftOnWindows
     def test_missing_location(self):
         self.build()
         target, process, thread, bkpt = lldbutil.run_to_source_breakpoint(
@@ -32,7 +32,7 @@ def test_missing_location(self):
         self.assertIn("no location for 'self' in debug info", all_messages)
 
     @swiftTest
-    @skipEmbeddedSwift
+    @skipEmbeddedSwiftOnWindows
     def test_missing_var(self):
         """Test error reporting in expressions reports
         only diagnostics in user code"""
@@ -118,7 +118,7 @@ def check(value):
                     substrs=['self', 'not', 'found'])
 
     @swiftTest
-    @skipEmbeddedSwift
+    @requiresNonEmbeddedSwift # embedded Swift monomorphizes every generic, so there is no archetype T left to diagnose
     def test_syntax(self):
         """Test syntax errors are being diagnosed"""
         self.build()
diff --git a/lldb/test/API/lang/swift/expression/generic_protocol_extension/TestGenericProtocolExtension.py b/lldb/test/API/lang/swift/expression/generic_protocol_extension/TestGenericProtocolExtension.py
index 59cf05f99f99f..1a9ad7ab476ec 100644
--- a/lldb/test/API/lang/swift/expression/generic_protocol_extension/TestGenericProtocolExtension.py
+++ b/lldb/test/API/lang/swift/expression/generic_protocol_extension/TestGenericProtocolExtension.py
@@ -12,4 +12,4 @@
 import lldbsuite.test.lldbinline as lldbinline
 from lldbsuite.test.decorators import *
 
-lldbinline.MakeInlineTest(__file__, globals(), decorators=[skipEmbeddedSwift, swiftTest])
+lldbinline.MakeInlineTest(__file__, globals(), decorators=[skipEmbeddedSwiftOnWindows, swiftTest])
diff --git a/lldb/test/API/lang/swift/expression/objc_context/TestSwiftExpressionObjCContext.py b/lldb/test/API/lang/swift/expression/objc_context/TestSwiftExpressionObjCContext.py
index b8b4c7327a67b..fea02b5430611 100644
--- a/lldb/test/API/lang/swift/expression/objc_context/TestSwiftExpressionObjCContext.py
+++ b/lldb/test/API/lang/swift/expression/objc_context/TestSwiftExpressionObjCContext.py
@@ -17,7 +17,7 @@
 import os
 
 class TestSwiftExpressionObjCContext(TestBase):
-    @skipEmbeddedSwift
+    @requiresNonEmbeddedSwift
     @skipUnlessDarwin
     @swiftTest
     def test(self):
diff --git a/lldb/test/API/lang/swift/expression/optional_amibiguity/TestOptionalAmbiguity.py b/lldb/test/API/lang/swift/expression/optional_amibiguity/TestOptionalAmbiguity.py
index 66cedd329e5d9..e932863bef6f0 100644
--- a/lldb/test/API/lang/swift/expression/optional_amibiguity/TestOptionalAmbiguity.py
+++ b/lldb/test/API/lang/swift/expression/optional_amibiguity/TestOptionalAmbiguity.py
@@ -15,7 +15,7 @@
 
 
 class TestOptionalAmbiguity(TestBase):
-    @skipEmbeddedSwift
+    @requiresNonEmbeddedSwift
     @swiftTest
     def test_sample_rename_this(self):
         self.build()
diff --git a/lldb/test/API/lang/swift/expression/protocol_extension_self/TestSwiftProtocolExtensionSelf.py b/lldb/test/API/lang/swift/expression/protocol_extension_self/TestSwiftProtocolExtensionSelf.py
index e90d4d26dbd22..630202557c46d 100644
--- a/lldb/test/API/lang/swift/expression/protocol_extension_self/TestSwiftProtocolExtensionSelf.py
+++ b/lldb/test/API/lang/swift/expression/protocol_extension_self/TestSwiftProtocolExtensionSelf.py
@@ -4,7 +4,7 @@
 
 
 class TestSwiftProtocolExtensionSelf(TestBase):
-    @skipEmbeddedSwift
+    @requiresNonEmbeddedSwift
     @swiftTest
     def test(self):
         """Test that the generic self in a protocol extension works in the expression evaluator.
diff --git a/lldb/test/API/lang/swift/expression/scopes/TestExpressionScopes.py b/lldb/test/API/lang/swift/expression/scopes/TestExpressionScopes.py
index a9b4e6c77b640..27c1329b7e400 100644
--- a/lldb/test/API/lang/swift/expression/scopes/TestExpressionScopes.py
+++ b/lldb/test/API/lang/swift/expression/scopes/TestExpressionScopes.py
@@ -20,7 +20,7 @@
 
 
 class TestSwiftExpressionScopes(TestBase):
-    @skipEmbeddedSwift
+    @requiresNonEmbeddedSwift
     @swiftTest
     def test_expression_scopes(self):
         """Tests that swift expressions resolve scoped variables correctly"""
diff --git a/lldb/test/API/lang/swift/expression/simple/TestSwiftSimpleExpressions.py b/lldb/test/API/lang/swift/expression/simple/TestSwiftSimpleExpressions.py
index fc0e6bca0f231..cafd0f193d681 100644
--- a/lldb/test/API/lang/swift/expression/simple/TestSwiftSimpleExpressions.py
+++ b/lldb/test/API/lang/swift/expression/simple/TestSwiftSimpleExpressions.py
@@ -21,7 +21,7 @@
 
 
 class TestSwiftSimpleExpressions(TestBase):
-    @skipEmbeddedSwift
+    @requiresNonEmbeddedSwift
     @swiftTest
     def test_simple_swift_expressions(self):
         """Tests that we can run simple Swift expressions correctly"""
diff --git a/lldb/test/API/lang/swift/expression/weak_generic_self/TestSwiftWeakGenericSelf.py b/lldb/test/API/lang/swift/expression/weak_generic_self/TestSwiftWeakGenericSelf.py
index 4f74ba9cb8129..79554b1347f9c 100644
--- a/lldb/test/API/lang/swift/expression/weak_generic_self/TestSwiftWeakGenericSelf.py
+++ b/lldb/test/API/lang/swift/expression/weak_generic_self/TestSwiftWeakGenericSelf.py
@@ -5,7 +5,7 @@
 
 
 class TestSwiftWeakGenericSelf(TestBase):
-    @skipEmbeddedSwift
+    @requiresNonEmbeddedSwift
     @swiftTest
     def test(self):
         """Confirms that expression evaluation works with a generic class
diff --git a/lldb/test/API/lang/swift/expression/weak_self/TestWeakSelf.py b/lldb/test/API/lang/swift/expression/weak_self/TestWeakSelf.py
index 9487f065d08b3..18183f43f0140 100644
--- a/lldb/test/API/lang/swift/expression/weak_self/TestWeakSelf.py
+++ b/lldb/test/API/lang/swift/expression/weak_self/TestWeakSelf.py
@@ -18,7 +18,7 @@
 
 
 class TestSwiftGenericExtension(TestBase):
-     @skipEmbeddedSwift
+     @requiresNonEmbeddedSwift
      @swiftTest
      def test(self):
         self.build()
diff --git a/lldb/test/API/lang/swift/file_private/TestFilePrivate.py b/lldb/test/API/lang/swift/file_private/TestFilePrivate.py
index faa0d3cec3e65..aa69a305d9d14 100644
--- a/lldb/test/API/lang/swift/file_private/TestFilePrivate.py
+++ b/lldb/test/API/lang/swift/file_private/TestFilePrivate.py
@@ -29,7 +29,7 @@ def setUp(self):
         self.main_source = "main.swift"
         self.main_source_spec = lldb.SBFileSpec(self.main_source)
 
-    @skipEmbeddedSwift
+    @requiresNonEmbeddedSwift
     @swiftTest
     def test(self):
         """Test that we find the right file-local private decls using the discriminator"""
diff --git a/lldb/test/API/lang/swift/first_expr_module_load/TestSwiftFirstExprModuleLoad.py b/lldb/test/API/lang/swift/first_expr_module_load/TestSwiftFirstExprModuleLoad.py
index 8301656aa6353..9ef771bb52d7a 100644
--- a/lldb/test/API/lang/swift/first_expr_module_load/TestSwiftFirstExprModuleLoad.py
+++ b/lldb/test/API/lang/swift/first_expr_module_load/TestSwiftFirstExprModuleLoad.py
@@ -5,7 +5,7 @@
 
 class TestSwiftFirstExprModuleLoad(lldbtest.TestBase):
 
-    @skipEmbeddedSwift
+    @requiresNonEmbeddedSwift
     @skipIf(oslist='windows')
     @swiftTest
     @skipUnlessFoundation
diff --git a/lldb/test/API/lang/swift/foundation/TestSwiftFoundation.py b/lldb/test/API/lang/swift/foundation/TestSwiftFoundation.py
index e53b5fbcbf5f3..81af222ff19ab 100644
--- a/lldb/test/API/lang/swift/foundation/TestSwiftFoundation.py
+++ b/lldb/test/API/lang/swift/foundation/TestSwiftFoundation.py
@@ -16,7 +16,7 @@
     __file__,
     globals(),
     decorators=[
-        skipEmbeddedSwift,
+        requiresNonEmbeddedSwift,
         skipUnlessFoundationEssentials,
         skipIfLinux,  # https://github.com/swiftlang/llvm-project/issues/13465
         swiftTest,
diff --git a/lldb/test/API/lang/swift/foundation_value_types/cfstringref/TestSwiftFoundationTypeCFStringRef.py b/lldb/test/API/lang/swift/foundation_value_types/cfstringref/TestSwiftFoundationTypeCFStringRef.py
index 4945d2ca8f373..9ca8de3816a89 100644
--- a/lldb/test/API/lang/swift/foundation_value_types/cfstringref/TestSwiftFoundationTypeCFStringRef.py
+++ b/lldb/test/API/lang/swift/foundation_value_types/cfstringref/TestSwiftFoundationTypeCFStringRef.py
@@ -5,7 +5,7 @@
 
 class TestSwiftFoundationTypeCFStringRef(TestBase):
     NO_DEBUG_INFO_TESTCASE = True
-    @skipEmbeddedSwift
+    @requiresNonEmbeddedSwift
     @swiftTest
     @skipUnlessFoundation
     def test(self):
diff --git a/lldb/test/API/lang/swift/foundation_value_types/data/TestSwiftFoundationTypeData.py b/lldb/test/API/lang/swift/foundation_value_types/data/TestSwiftFoundationTypeData.py
index 855227f204b5d..e1fc6220d216e 100644
--- a/lldb/test/API/lang/swift/foundation_value_types/data/TestSwiftFoundationTypeData.py
+++ b/lldb/test/API/lang/swift/foundation_value_types/data/TestSwiftFoundationTypeData.py
@@ -15,7 +15,7 @@
 lldbinline.MakeInlineTest(
     __file__,
     globals(),
-    decorators=[skipEmbeddedSwift,
+    decorators=[requiresNonEmbeddedSwift,
         swiftTest,
         skipIf(oslist=["linux"]),
         skipIf(
diff --git a/lldb/test/API/lang/swift/foundation_value_types/date/TestSwiftFoundationTypeDate.py b/lldb/test/API/lang/swift/foundation_value_types/date/TestSwiftFoundationTypeDate.py
index 37e0a51831eb8..d510da09be6f1 100644
--- a/lldb/test/API/lang/swift/foundation_value_types/date/TestSwiftFoundationTypeDate.py
+++ b/lldb/test/API/lang/swift/foundation_value_types/date/TestSwiftFoundationTypeDate.py
@@ -13,5 +13,5 @@
 from lldbsuite.test.decorators import *
 
 lldbinline.MakeInlineTest(__file__, globals(),
-                          decorators=[skipEmbeddedSwift,
+                          decorators=[requiresNonEmbeddedSwift,
         swiftTest,skipIf(oslist=["linux"])])
diff --git a/lldb/test/API/lang/swift/foundation_value_types/decimal/TestSwiftFoundationTypeDecimal.py b/lldb/test/API/lang/swift/foundation_value_types/decimal/TestSwiftFoundationTypeDecimal.py
index 9787de3439a89..26464be32d116 100644
--- a/lldb/test/API/lang/swift/foundation_value_types/decimal/TestSwiftFoundationTypeDecimal.py
+++ b/lldb/test/API/lang/swift/foundation_value_types/decimal/TestSwiftFoundationTypeDecimal.py
@@ -5,7 +5,7 @@
 
 
 class TestCase(TestBase):
-    @skipEmbeddedSwift
+    @requiresNonEmbeddedSwift
     @swiftTest
     @skipIf(oslist=["linux", "windows"])
     def test_decimal(self):
diff --git a/lldb/test/API/lang/swift/foundation_value_types/global/TestSwiftFoundationTypeGlobal.py b/lldb/test/API/lang/swift/foundation_value_types/global/TestSwiftFoundationTypeGlobal.py
index 1d51635f3cf41..427c29e5230d9 100644
--- a/lldb/test/API/lang/swift/foundation_value_types/global/TestSwiftFoundationTypeGlobal.py
+++ b/lldb/test/API/lang/swift/foundation_value_types/global/TestSwiftFoundationTypeGlobal.py
@@ -5,7 +5,7 @@
 import os
 
 class TestSwiftFoundationValueTypeGlobal(TestBase):
-    @skipEmbeddedSwift
+    @requiresNonEmbeddedSwift
     @skipUnlessFoundationEssentials
     @skipIfLinux  # https://github.com/swiftlang/llvm-project/issues/13465
     @swiftTest
diff --git a/lldb/test/API/lang/swift/foundation_value_types/indexpath/TestSwiftFoundationTypeIndexPath.py b/lldb/test/API/lang/swift/foundation_value_types/indexpath/TestSwiftFoundationTypeIndexPath.py
index 7d136211a4c00..5976df7fc1af4 100644
--- a/lldb/test/API/lang/swift/foundation_value_types/indexpath/TestSwiftFoundationTypeIndexPath.py
+++ b/lldb/test/API/lang/swift/foundation_value_types/indexpath/TestSwiftFoundationTypeIndexPath.py
@@ -13,5 +13,5 @@
 from lldbsuite.test.decorators import *
 
 lldbinline.MakeInlineTest(__file__, globals(),
-                          decorators=[skipEmbeddedSwift,
+                          decorators=[requiresNonEmbeddedSwift,
         swiftTest,skipIf(oslist=['windows', 'linux'])])
diff --git a/lldb/test/API/lang/swift/foundation_value_types/measurement/TestSwiftFoundationTypeMeasurement.py b/lldb/test/API/lang/swift/foundation_value_types/measurement/TestSwiftFoundationTypeMeasurement.py
index af1affa613a58..62660a2750bbd 100644
--- a/lldb/test/API/lang/swift/foundation_value_types/measurement/TestSwiftFoundationTypeMeasurement.py
+++ b/lldb/test/API/lang/swift/foundation_value_types/measurement/TestSwiftFoundationTypeMeasurement.py
@@ -23,7 +23,7 @@ class TestCase(TestBase):
         bugnumber="rdar://60396797",
         setting=("symbols.use-swift-clangimporter", "false"),
     )
-    @skipEmbeddedSwift
+    @requiresNonEmbeddedSwift
     def test_measurement(self):
         self.build()
         lldbutil.run_to_source_breakpoint(
@@ -31,7 +31,7 @@ def test_measurement(self):
         )
         self.expect("expr -- measurement", substrs=["1.25 m"])
 
-    @skipEmbeddedSwift
+    @requiresNonEmbeddedSwift
     @swiftTest
     @skipUnlessDarwin
     def test_measurement_without_swift_ast_context(self):
diff --git a/lldb/test/API/lang/swift/foundation_value_types/shared_string_storage/TestSwiftSharedStringStorage.py b/lldb/test/API/lang/swift/foundation_value_types/shared_string_storage/TestSwiftSharedStringStorage.py
index a2562acaf55ec..6114bc930fce4 100644
--- a/lldb/test/API/lang/swift/foundation_value_types/shared_string_storage/TestSwiftSharedStringStorage.py
+++ b/lldb/test/API/lang/swift/foundation_value_types/shared_string_storage/TestSwiftSharedStringStorage.py
@@ -6,7 +6,7 @@
 class TestSwiftSharedStringStorage(TestBase):
     NO_DEBUG_INFO_TESTCASE = True
 
-    @skipEmbeddedSwift
+    @requiresNonEmbeddedSwift
     @swiftTest
     @skipUnlessFoundation
     def test(self):
diff --git a/lldb/test/API/lang/swift/foundation_value_types/url/TestSwiftFoundationTypeURL.py b/lldb/test/API/lang/swift/foundation_value_types/url/TestSwiftFoundationTypeURL.py
index 652c4b4e89a8b..4eee714a28f87 100644
--- a/lldb/test/API/lang/swift/foundation_value_types/url/TestSwiftFoundationTypeURL.py
+++ b/lldb/test/API/lang/swift/foundation_value_types/url/TestSwiftFoundationTypeURL.py
@@ -22,7 +22,7 @@
 
 
 class TestCase(TestBase):
-    @skipEmbeddedSwift
+    @requiresNonEmbeddedSwift
     @expectedFailureAll(archs=["arm64_32"], bugnumber="<rdar://problem/58065423>")
     @skipUnlessFoundationEssentials
     @skipIfLinux  # https://github.com/swiftlang/llvm-project/issues/13465
diff --git a/lldb/test/API/lang/swift/foundation_value_types/uuid/TestSwiftFoundationTypeUUID.py b/lldb/test/API/lang/swift/foundation_value_types/uuid/TestSwiftFoundationTypeUUID.py
index 74e3dc31d6c63..eda796acc6523 100644
--- a/lldb/test/API/lang/swift/foundation_value_types/uuid/TestSwiftFoundationTypeUUID.py
+++ b/lldb/test/API/lang/swift/foundation_value_types/uuid/TestSwiftFoundationTypeUUID.py
@@ -13,5 +13,5 @@
 from lldbsuite.test.decorators import *
 
 lldbinline.MakeInlineTest(__file__, globals(),
-                          decorators=[skipEmbeddedSwift,
+                          decorators=[requiresNonEmbeddedSwift,
         swiftTest,skipIf(oslist=["linux"])])
diff --git a/lldb/test/API/lang/swift/framework_paths/TestSwiftFrameworkPaths.py b/lldb/test/API/lang/swift/framework_paths/TestSwiftFrameworkPaths.py
index c31575ec42d38..3fc44f0288344 100644
--- a/lldb/test/API/lang/swift/framework_paths/TestSwiftFrameworkPaths.py
+++ b/lldb/test/API/lang/swift/framework_paths/TestSwiftFrameworkPaths.py
@@ -6,7 +6,7 @@
 
 class TestSwiftFrameworkPaths(lldbtest.TestBase):
 
-    @skipEmbeddedSwift
+    @requiresNonEmbeddedSwift
     @swiftTest
     # Don't run ClangImporter tests if Clangimporter is disabled.
     @skipIf(setting=('symbols.use-swift-clangimporter', 'false'))
diff --git a/lldb/test/API/lang/swift/generic_arg_in_extension/TestSwiftGenericArgInExtension.py b/lldb/test/API/lang/swift/generic_arg_in_extension/TestSwiftGenericArgInExtension.py
index b27775aef288c..1e3fea19b3bd0 100644
--- a/lldb/test/API/lang/swift/generic_arg_in_extension/TestSwiftGenericArgInExtension.py
+++ b/lldb/test/API/lang/swift/generic_arg_in_extension/TestSwiftGenericArgInExtension.py
@@ -12,4 +12,4 @@
 import lldbsuite.test.lldbinline as lldbinline
 from lldbsuite.test.decorators import *
 
-lldbinline.MakeInlineTest(__file__, globals(), decorators=[skipEmbeddedSwift, swiftTest])
+lldbinline.MakeInlineTest(__file__, globals(), decorators=[requiresNonEmbeddedSwift, swiftTest])
diff --git a/lldb/test/API/lang/swift/generic_arguments/TestSwiftGenericArgumentTypes.py b/lldb/test/API/lang/swift/generic_arguments/TestSwiftGenericArgumentTypes.py
index f0260c37a8557..e25202f25950f 100644
--- a/lldb/test/API/lang/swift/generic_arguments/TestSwiftGenericArgumentTypes.py
+++ b/lldb/test/API/lang/swift/generic_arguments/TestSwiftGenericArgumentTypes.py
@@ -6,7 +6,7 @@
 
 class TestCase(TestBase):
 
-    @skipEmbeddedSwift
+    @requiresNonEmbeddedSwift
     @swiftTest
     def test(self):
         self.build()
diff --git a/lldb/test/API/lang/swift/generic_class/TestSwiftGenericClass.py b/lldb/test/API/lang/swift/generic_class/TestSwiftGenericClass.py
index 9eccf276c28f3..bd7252655a97b 100644
--- a/lldb/test/API/lang/swift/generic_class/TestSwiftGenericClass.py
+++ b/lldb/test/API/lang/swift/generic_class/TestSwiftGenericClass.py
@@ -5,7 +5,7 @@
 
 
 class SwiftGenericClassTest(TestBase):
-    @skipEmbeddedSwift
+    @skipEmbeddedSwiftOnWindows
     @swiftTest
     def test(self):
         """Tests that a generic class type can be resolved from the instance metadata alone"""
diff --git a/lldb/test/API/lang/swift/generic_objcclasswrapper/TestGenericObjcClassWrapper.py b/lldb/test/API/lang/swift/generic_objcclasswrapper/TestGenericObjcClassWrapper.py
index 3a5c0d374ee2b..e4d2ef4b584d3 100644
--- a/lldb/test/API/lang/swift/generic_objcclasswrapper/TestGenericObjcClassWrapper.py
+++ b/lldb/test/API/lang/swift/generic_objcclasswrapper/TestGenericObjcClassWrapper.py
@@ -1,5 +1,5 @@
 import lldbsuite.test.lldbinline as lldbinline
 from lldbsuite.test.decorators import *
 
-lldbinline.MakeInlineTest(__file__, globals(), decorators=[skipEmbeddedSwift,
+lldbinline.MakeInlineTest(__file__, globals(), decorators=[requiresNonEmbeddedSwift,
         swiftTest, skipUnlessDarwin])
diff --git a/lldb/test/API/lang/swift/generic_struct_with_optional/TestGenericStructWithOptional.py b/lldb/test/API/lang/swift/generic_struct_with_optional/TestGenericStructWithOptional.py
index e997dc0a87189..69d5f0a10cb9e 100644
--- a/lldb/test/API/lang/swift/generic_struct_with_optional/TestGenericStructWithOptional.py
+++ b/lldb/test/API/lang/swift/generic_struct_with_optional/TestGenericStructWithOptional.py
@@ -1,6 +1,6 @@
 import lldbsuite.test.lldbinline as lldbinline
 from lldbsuite.test.decorators import *
 
-lldbinline.MakeInlineTest(__file__, globals(), decorators=[skipEmbeddedSwift,
+lldbinline.MakeInlineTest(__file__, globals(), decorators=[requiresNonEmbeddedSwift,
         swiftTest,
     skipUnlessDarwin])
diff --git a/lldb/test/API/lang/swift/generic_type_of_nested_archetype/TestSwiftGenericTypeOfNestedArchetype.py b/lldb/test/API/lang/swift/generic_type_of_nested_archetype/TestSwiftGenericTypeOfNestedArchetype.py
index 0d4c8870f4f9f..4568d9241ed1c 100644
--- a/lldb/test/API/lang/swift/generic_type_of_nested_archetype/TestSwiftGenericTypeOfNestedArchetype.py
+++ b/lldb/test/API/lang/swift/generic_type_of_nested_archetype/TestSwiftGenericTypeOfNestedArchetype.py
@@ -12,4 +12,4 @@
 import lldbsuite.test.lldbinline as lldbinline
 from lldbsuite.test.decorators import *
 
-lldbinline.MakeInlineTest(__file__, globals(), decorators=[skipEmbeddedSwift, swiftTest])
+lldbinline.MakeInlineTest(__file__, globals(), decorators=[requiresNonEmbeddedSwift, swiftTest])
diff --git a/lldb/test/API/lang/swift/generics/TestSwiftGenericsResolution.py b/lldb/test/API/lang/swift/generics/TestSwiftGenericsResolution.py
index 96c6e76d72689..185f85d06d982 100644
--- a/lldb/test/API/lang/swift/generics/TestSwiftGenericsResolution.py
+++ b/lldb/test/API/lang/swift/generics/TestSwiftGenericsResolution.py
@@ -19,7 +19,7 @@
 
 
 class SwiftDynamicTypeGenericsTest(TestBase):
-    @skipEmbeddedSwift
+    @requiresNonEmbeddedSwift
     @swiftTest
     def test_genericresolution_commands(self):
         """Check that we can correctly figure out the dynamic type of generic things"""
diff --git a/lldb/test/API/lang/swift/hashed_container_storing_nested_generic/TestHashedContainerStoringNestedGeneric.py b/lldb/test/API/lang/swift/hashed_container_storing_nested_generic/TestHashedContainerStoringNestedGeneric.py
index 76d09697e05fd..1905a0529481c 100644
--- a/lldb/test/API/lang/swift/hashed_container_storing_nested_generic/TestHashedContainerStoringNestedGeneric.py
+++ b/lldb/test/API/lang/swift/hashed_container_storing_nested_generic/TestHashedContainerStoringNestedGeneric.py
@@ -6,7 +6,7 @@
 
 class SwiftGenericClassInHashedContainerTest(TestBase):
 
-    @skipEmbeddedSwift
+    @requiresNonEmbeddedSwift
     @swiftTest
     def test(self):
         """Tests that the type of hashed container whose value type is a non-generic class declared inside a generic class can be read from instance metadata"""
diff --git a/lldb/test/API/lang/swift/hashed_containers_enums/TestSwiftHashedContainerEnum.py b/lldb/test/API/lang/swift/hashed_containers_enums/TestSwiftHashedContainerEnum.py
index a676c9e3d9d9b..c05fbf82290fc 100644
--- a/lldb/test/API/lang/swift/hashed_containers_enums/TestSwiftHashedContainerEnum.py
+++ b/lldb/test/API/lang/swift/hashed_containers_enums/TestSwiftHashedContainerEnum.py
@@ -11,7 +11,7 @@
 import os
 
 class TestSwiftHashedContainerEnum(TestBase):
-    @skipEmbeddedSwift
+    @requiresNonEmbeddedSwift
     @swiftTest
     def test_any_object_type(self):
         """Test combinations of hashed swift containers with enums"""
diff --git a/lldb/test/API/lang/swift/hide_runtimesupport/TestSwiftHideRuntimeSupport.py b/lldb/test/API/lang/swift/hide_runtimesupport/TestSwiftHideRuntimeSupport.py
index 7d1ab8c8d6ee0..bd77efe60616f 100644
--- a/lldb/test/API/lang/swift/hide_runtimesupport/TestSwiftHideRuntimeSupport.py
+++ b/lldb/test/API/lang/swift/hide_runtimesupport/TestSwiftHideRuntimeSupport.py
@@ -20,7 +20,7 @@
 
 
 class TestSwiftHideRuntimeSupport(TestBase):
-    @skipEmbeddedSwift
+    @requiresNonEmbeddedSwift # embedded Swift passes no type metadata, so there are no runtime support values to unhide
     @swiftTest
     def test_swift_hide_runtime_support(self):
         """Test that we hide runtime support values"""
diff --git a/lldb/test/API/lang/swift/implementation_only_imports/library_indirect/TestLibraryIndirect.py b/lldb/test/API/lang/swift/implementation_only_imports/library_indirect/TestLibraryIndirect.py
index 15489e271fdbf..6d36d608637a7 100644
--- a/lldb/test/API/lang/swift/implementation_only_imports/library_indirect/TestLibraryIndirect.py
+++ b/lldb/test/API/lang/swift/implementation_only_imports/library_indirect/TestLibraryIndirect.py
@@ -36,7 +36,7 @@ def launch_info(self):
 
         return info
 
-    @skipEmbeddedSwift
+    @requiresNonEmbeddedSwift
     @swiftTest
     def test_implementation_only_import_library(self):
         """Test `@_implementationOnly import` behind some indirection in a library used by the main executable
@@ -70,7 +70,7 @@ def test_implementation_only_import_library(self):
         self.expect("expr container.wrapped", substrs=["(SomeLibrary.BoxedTwoInts)", "0x", "value = (first = 2, second = 3)"])
         self.expect("expr container.wrapped.value", substrs=["(SomeLibraryCore.TwoInts)", "(first = 2, second = 3)"])
 
-    @skipEmbeddedSwift
+    @requiresNonEmbeddedSwift
     @swiftTest
     def test_impl_only_import_lib_no_lib_module(self):
         """Test `@_implementationOnly import` behind some indirection in a library used by the main executable, after removing the implementation-only library's swiftmodule
diff --git a/lldb/test/API/lang/swift/implementation_only_imports/library_resilient/TestLibraryResilient.py b/lldb/test/API/lang/swift/implementation_only_imports/library_resilient/TestLibraryResilient.py
index 4fb6056d0abeb..8049e860541cd 100644
--- a/lldb/test/API/lang/swift/implementation_only_imports/library_resilient/TestLibraryResilient.py
+++ b/lldb/test/API/lang/swift/implementation_only_imports/library_resilient/TestLibraryResilient.py
@@ -37,7 +37,7 @@ def launch_info(self):
 
         return info
 
-    @skipEmbeddedSwift
+    @requiresNonEmbeddedSwift
     @swiftTest
     @expectedFailureAll(oslist=["windows"]) # Requires Remote Mirrors support
     def test_implementation_only_import_library(self):
@@ -58,7 +58,7 @@ def test_implementation_only_import_library(self):
         self.expect("expr container", substrs=["(SomeLibrary.ContainsTwoInts)", "other = 10"])
         self.expect("expr container.wrapped", substrs=["(SomeLibraryCore.TwoInts)", "(first = 2, second = 3)"])
 
-    @skipEmbeddedSwift
+    @requiresNonEmbeddedSwift
     @swiftTest
     @expectedFailureAll(oslist=["windows"]) # Requires Remote Mirrors support
     def test_implementation_only_import_library_no_library_module(self):
diff --git a/lldb/test/API/lang/swift/implementation_only_imports/main_executable/TestMainExecutable.py b/lldb/test/API/lang/swift/implementation_only_imports/main_executable/TestMainExecutable.py
index 3aa16795644eb..15466fe784f4a 100644
--- a/lldb/test/API/lang/swift/implementation_only_imports/main_executable/TestMainExecutable.py
+++ b/lldb/test/API/lang/swift/implementation_only_imports/main_executable/TestMainExecutable.py
@@ -115,7 +115,7 @@ def test_implementation_only_import_main_executable_no_library_module(self):
         self.runCmd("settings set symbols.use-swift-dwarfimporter true")
 
     @swiftTest
-    @skipEmbeddedSwift
+    @requiresNonEmbeddedSwift # library evolution cannot be enabled with embedded Swift
     def test_implementation_only_import_main_executable_resilient(self):
         """Test `@_implementationOnly import` in the main executable with a resilient library
 
@@ -142,7 +142,7 @@ def test_implementation_only_import_main_executable_resilient(self):
         self.expect("expr TwoInts(4, 5)", substrs=["(SomeLibrary.TwoInts)", "= (first = 4, second = 5)"])
 
     @swiftTest
-    @skipEmbeddedSwift
+    @requiresNonEmbeddedSwift # library evolution cannot be enabled with embedded Swift
     @expectedFailureOS(no_match(["macosx"])) # Requires Remote Mirrors support
     def test_implementation_only_import_main_executable_resilient_no_library_module(self):
         """Test `@_implementationOnly import` in the main executable with a resilient library, after removing the library's swiftmodule
diff --git a/lldb/test/API/lang/swift/imported_types/cgtypes/TestCGImportedTypes.py b/lldb/test/API/lang/swift/imported_types/cgtypes/TestCGImportedTypes.py
index f964b431f457f..80a1596aff146 100644
--- a/lldb/test/API/lang/swift/imported_types/cgtypes/TestCGImportedTypes.py
+++ b/lldb/test/API/lang/swift/imported_types/cgtypes/TestCGImportedTypes.py
@@ -20,7 +20,7 @@
 
 
 class TestSwiftCGImportedTypes(TestBase):
-    @skipEmbeddedSwift
+    @requiresNonEmbeddedSwift
     @skipUnlessDarwin
     @swiftTest
     def test_swift_cg_imported_types(self):
diff --git a/lldb/test/API/lang/swift/instance_pointer_set_sp/TestSwiftInstancePointerSetSP.py b/lldb/test/API/lang/swift/instance_pointer_set_sp/TestSwiftInstancePointerSetSP.py
index 07b495766d926..48d8664615517 100644
--- a/lldb/test/API/lang/swift/instance_pointer_set_sp/TestSwiftInstancePointerSetSP.py
+++ b/lldb/test/API/lang/swift/instance_pointer_set_sp/TestSwiftInstancePointerSetSP.py
@@ -23,7 +23,7 @@ class TestSwiftInstancePointerSetSP(lldbtest.TestBase):
 
     mydir = lldbtest.TestBase.compute_mydir(__file__)
 
-    @skipEmbeddedSwift
+    @requiresNonEmbeddedSwift
     @swiftTest
     def test_instancepointerset_sp(self):
         """Test that we correctly track instance pointers in ValueObjectPrinter"""
diff --git a/lldb/test/API/lang/swift/late_dylib/TestSwiftLateDylib.py b/lldb/test/API/lang/swift/late_dylib/TestSwiftLateDylib.py
index 625f036040b5a..4f1c84eec71f8 100644
--- a/lldb/test/API/lang/swift/late_dylib/TestSwiftLateDylib.py
+++ b/lldb/test/API/lang/swift/late_dylib/TestSwiftLateDylib.py
@@ -3,7 +3,7 @@
 import lldbsuite.test.lldbutil as lldbutil
 
 class TestSwiftLateDylib(TestBase):
-    @skipEmbeddedSwift
+    @requiresNonEmbeddedSwift
     @skipUnlessDarwin
     @swiftTest
     @skipIfDarwinEmbedded 
diff --git a/lldb/test/API/lang/swift/late_dylib_clangdeps/TestSwiftLateDylibClangDeps.py b/lldb/test/API/lang/swift/late_dylib_clangdeps/TestSwiftLateDylibClangDeps.py
index edbfba5202943..2f22b71a32668 100644
--- a/lldb/test/API/lang/swift/late_dylib_clangdeps/TestSwiftLateDylibClangDeps.py
+++ b/lldb/test/API/lang/swift/late_dylib_clangdeps/TestSwiftLateDylibClangDeps.py
@@ -3,7 +3,7 @@
 import lldbsuite.test.lldbutil as lldbutil
 
 class TestSwiftLateDylibClangDeps(TestBase):
-    @skipEmbeddedSwift
+    @requiresNonEmbeddedSwift
     @skipUnlessDarwin
     @swiftTest
     @skipIfDarwinEmbedded 
diff --git a/lldb/test/API/lang/swift/late_expr_dylib/TestSwiftLateExprDylib.py b/lldb/test/API/lang/swift/late_expr_dylib/TestSwiftLateExprDylib.py
index 0986eba1a9245..decd06f0127da 100644
--- a/lldb/test/API/lang/swift/late_expr_dylib/TestSwiftLateExprDylib.py
+++ b/lldb/test/API/lang/swift/late_expr_dylib/TestSwiftLateExprDylib.py
@@ -4,7 +4,7 @@
 
 
 class TestSwiftLateDylib(TestBase):
-    @skipEmbeddedSwift
+    @requiresNonEmbeddedSwift # the embedded test harness appends its own -target, overriding the deployment targets under test
     @skipUnlessDarwin
     @swiftTest
     @skipIfDarwinEmbedded
diff --git a/lldb/test/API/lang/swift/late_swift_dylib_clangdeps/TestSwiftLateSwiftDylibClangDeps.py b/lldb/test/API/lang/swift/late_swift_dylib_clangdeps/TestSwiftLateSwiftDylibClangDeps.py
index 33caacae7e35b..44279734ee36e 100644
--- a/lldb/test/API/lang/swift/late_swift_dylib_clangdeps/TestSwiftLateSwiftDylibClangDeps.py
+++ b/lldb/test/API/lang/swift/late_swift_dylib_clangdeps/TestSwiftLateSwiftDylibClangDeps.py
@@ -3,7 +3,7 @@
 import lldbsuite.test.lldbutil as lldbutil
 
 class TestSwiftLateSwiftDylibClangDeps(TestBase):
-    @skipEmbeddedSwift
+    @requiresNonEmbeddedSwift
     @skipIf(macos_version=["<", "14.0"])
     @skipUnlessDarwin
     @swiftTest
diff --git a/lldb/test/API/lang/swift/late_symbols/TestSwiftLateSymbols.py b/lldb/test/API/lang/swift/late_symbols/TestSwiftLateSymbols.py
index 5806dd2520adf..4f363756a1a6e 100644
--- a/lldb/test/API/lang/swift/late_symbols/TestSwiftLateSymbols.py
+++ b/lldb/test/API/lang/swift/late_symbols/TestSwiftLateSymbols.py
@@ -6,7 +6,6 @@
 import os
 
 class TestSwiftLateSymbols(TestBase):
-    @skipEmbeddedSwift
     @swiftTest
     @skipUnlessDarwin
     @skipIf(debug_info=no_match(["dsym"]))
diff --git a/lldb/test/API/lang/swift/macro/TestSwiftMacro.py b/lldb/test/API/lang/swift/macro/TestSwiftMacro.py
index 9d8268e17201a..b32de0b4a31b2 100644
--- a/lldb/test/API/lang/swift/macro/TestSwiftMacro.py
+++ b/lldb/test/API/lang/swift/macro/TestSwiftMacro.py
@@ -26,7 +26,7 @@ def replace_last(old, new, string):
             'settings set target.experimental.swift-plugin-server-for-path %s=%s'
             % (self.getBuildDir(), swift_plugin_server))
 
-    @skipEmbeddedSwift
+    @requiresNonEmbeddedSwift
     @swiftTest
     @skipIfWindows
     # At the time of writing swift/test/Macros/macro_expand.swift is also disabled.
@@ -91,7 +91,7 @@ def testDebugging(self):
         b = target.BreakpointCreateByName("stringify")
         self.assertGreaterEqual(b.GetNumLocations(), 1)
 
-    @skipEmbeddedSwift
+    @requiresNonEmbeddedSwift
     @swiftTest
     @skipIfWindows
     # At the time of writing swift/test/Macros/macro_expand.swift is also disabled.
diff --git a/lldb/test/API/lang/swift/marker_protocol_existential/TestMarkerProtocolExistential.py b/lldb/test/API/lang/swift/marker_protocol_existential/TestMarkerProtocolExistential.py
index 24549caeec6ae..13b3f5bb5bac8 100644
--- a/lldb/test/API/lang/swift/marker_protocol_existential/TestMarkerProtocolExistential.py
+++ b/lldb/test/API/lang/swift/marker_protocol_existential/TestMarkerProtocolExistential.py
@@ -5,7 +5,7 @@
 
 
 class TestMarkerProtocolExistential(lldbtest.TestBase):
-    @skipEmbeddedSwift
+    @requiresNonEmbeddedSwift
     @swiftTest
     def test_marker_only(self):
         self.build()
@@ -18,7 +18,7 @@ def test_marker_only(self):
         x = s.GetChildMemberWithName("x")
         lldbutil.check_variable(self, x, value="42")
 
-    @skipEmbeddedSwift
+    @requiresNonEmbeddedSwift
     @swiftTest
     def test_marker_composition(self):
         self.build()
@@ -30,7 +30,7 @@ def test_marker_composition(self):
         a = t.GetChildMemberWithName("a")
         lldbutil.check_variable(self, a, value="10")
 
-    @skipEmbeddedSwift
+    @requiresNonEmbeddedSwift
     @swiftTest
     def test_two_markers(self):
         self.build()
@@ -43,7 +43,7 @@ def test_two_markers(self):
         b = u.GetChildMemberWithName("b")
         lldbutil.check_variable(self, b, value="20")
 
-    @skipEmbeddedSwift
+    @requiresNonEmbeddedSwift
     @swiftTest
     def test_any_and_marker(self):
         self.build()
@@ -56,7 +56,7 @@ def test_any_and_marker(self):
         x = s.GetChildMemberWithName("x")
         lldbutil.check_variable(self, x, value="42")
 
-    @skipEmbeddedSwift
+    @requiresNonEmbeddedSwift
     @swiftTest
     def test_any_marker_and_non_marker(self):
         self.build()
diff --git a/lldb/test/API/lang/swift/materializer_archetype_binding/TestSwiftMaterializerArchetypeBinding.py b/lldb/test/API/lang/swift/materializer_archetype_binding/TestSwiftMaterializerArchetypeBinding.py
index b699ddcf68094..1fa9844898d21 100644
--- a/lldb/test/API/lang/swift/materializer_archetype_binding/TestSwiftMaterializerArchetypeBinding.py
+++ b/lldb/test/API/lang/swift/materializer_archetype_binding/TestSwiftMaterializerArchetypeBinding.py
@@ -12,4 +12,4 @@
 import lldbsuite.test.lldbinline as lldbinline
 from lldbsuite.test.decorators import *
 
-lldbinline.MakeInlineTest(__file__, globals(), decorators=[skipEmbeddedSwift, swiftTest])
+lldbinline.MakeInlineTest(__file__, globals(), decorators=[requiresNonEmbeddedSwift, swiftTest])
diff --git a/lldb/test/API/lang/swift/meta/TestSwiftMeta.py b/lldb/test/API/lang/swift/meta/TestSwiftMeta.py
index eb490342d1bc1..0e7773bdaf68f 100644
--- a/lldb/test/API/lang/swift/meta/TestSwiftMeta.py
+++ b/lldb/test/API/lang/swift/meta/TestSwiftMeta.py
@@ -24,7 +24,7 @@ class TestSwiftMeta(lldbtest.TestBase):
     def test_swiftDecorator(self):
         self.assertTrue(self.getDebugInfo() != "gmodules")
 
-    @skipEmbeddedSwift
+    @skipEmbeddedSwiftOnWindows
     @swiftTest
     def test_swiftBuild(self):
         self.build()
diff --git a/lldb/test/API/lang/swift/metadata_cache/TestSwiftMetadataCache.py b/lldb/test/API/lang/swift/metadata_cache/TestSwiftMetadataCache.py
index 24e344bbceb97..e859246fbae8b 100644
--- a/lldb/test/API/lang/swift/metadata_cache/TestSwiftMetadataCache.py
+++ b/lldb/test/API/lang/swift/metadata_cache/TestSwiftMetadataCache.py
@@ -40,7 +40,7 @@ def check_strings_in_log(self, log_path, strings):
         return False
             
         
-    @skipEmbeddedSwift
+    @requiresNonEmbeddedSwift
     @swiftTest
     def test_swift_metadata_cache(self):
         """Test the swift metadata cache."""
diff --git a/lldb/test/API/lang/swift/metatype/TestSwiftMetatype.py b/lldb/test/API/lang/swift/metatype/TestSwiftMetatype.py
index a655a0b9e388c..e808b07b90fe1 100644
--- a/lldb/test/API/lang/swift/metatype/TestSwiftMetatype.py
+++ b/lldb/test/API/lang/swift/metatype/TestSwiftMetatype.py
@@ -20,7 +20,7 @@
 
 
 class TestSwiftMetatype(TestBase):
-    @skipEmbeddedSwift
+    @requiresNonEmbeddedSwift # embedded Swift monomorphizes every generic, so T.self is already concrete and never resolves dynamically
     @swiftTest
     def test_metatype(self):
         """Test the formatting of Swift metatypes"""
diff --git a/lldb/test/API/lang/swift/mix_any_object/TestSwiftMixAnyObjectType.py b/lldb/test/API/lang/swift/mix_any_object/TestSwiftMixAnyObjectType.py
index dd2fef546a82e..fb80ece80023d 100644
--- a/lldb/test/API/lang/swift/mix_any_object/TestSwiftMixAnyObjectType.py
+++ b/lldb/test/API/lang/swift/mix_any_object/TestSwiftMixAnyObjectType.py
@@ -20,7 +20,7 @@
 
 
 class TestSwiftMixAnyObjectType(TestBase):
-    @skipEmbeddedSwift
+    @requiresNonEmbeddedSwift
     @skipUnlessDarwin
     @swiftTest
     def test_any_object_type(self):
diff --git a/lldb/test/API/lang/swift/multi_optionals/TestMultiOptionals.py b/lldb/test/API/lang/swift/multi_optionals/TestMultiOptionals.py
index 735d01968949b..b20b03435817e 100644
--- a/lldb/test/API/lang/swift/multi_optionals/TestMultiOptionals.py
+++ b/lldb/test/API/lang/swift/multi_optionals/TestMultiOptionals.py
@@ -12,4 +12,4 @@
 import lldbsuite.test.lldbinline as lldbinline
 from lldbsuite.test.decorators import *
 
-lldbinline.MakeInlineTest(__file__, globals(), decorators=[skipEmbeddedSwift, swiftTest])
+lldbinline.MakeInlineTest(__file__, globals(), decorators=[requiresNonEmbeddedSwift, swiftTest])
diff --git a/lldb/test/API/lang/swift/multilang_category/TestMultilangFormatterCategories.py b/lldb/test/API/lang/swift/multilang_category/TestMultilangFormatterCategories.py
index 39a87529f2e8d..6894132bc90ed 100644
--- a/lldb/test/API/lang/swift/multilang_category/TestMultilangFormatterCategories.py
+++ b/lldb/test/API/lang/swift/multilang_category/TestMultilangFormatterCategories.py
@@ -9,7 +9,7 @@
 
 
 class TestMultilangFormatterCategories(TestBase):
-    @skipEmbeddedSwift
+    @requiresNonEmbeddedSwift
     @swiftTest
     @skipUnlessDarwin
     def test_multilang_formatter_categories(self):
diff --git a/lldb/test/API/lang/swift/nested_c_enums/TestSwiftNestedCEnums.py b/lldb/test/API/lang/swift/nested_c_enums/TestSwiftNestedCEnums.py
index 32b35cbff59b2..003a73de0bdfb 100644
--- a/lldb/test/API/lang/swift/nested_c_enums/TestSwiftNestedCEnums.py
+++ b/lldb/test/API/lang/swift/nested_c_enums/TestSwiftNestedCEnums.py
@@ -1,4 +1,4 @@
 import lldbsuite.test.lldbinline as lldbinline
 from lldbsuite.test.decorators import *
 
-lldbinline.MakeInlineTest(__file__, globals(), decorators=[skipEmbeddedSwift, swiftTest])
+lldbinline.MakeInlineTest(__file__, globals(), decorators=[requiresNonEmbeddedSwift, swiftTest])
diff --git a/lldb/test/API/lang/swift/nested_generic/TestSwiftNestedGeneric.py b/lldb/test/API/lang/swift/nested_generic/TestSwiftNestedGeneric.py
index 747e0786adbcd..eb199276831f5 100644
--- a/lldb/test/API/lang/swift/nested_generic/TestSwiftNestedGeneric.py
+++ b/lldb/test/API/lang/swift/nested_generic/TestSwiftNestedGeneric.py
@@ -5,7 +5,7 @@
 
 
 class TestSwiftNestedGeneric(lldbtest.TestBase):
-    @skipEmbeddedSwift
+    @requiresNonEmbeddedSwift
     @swiftTest
     def test(self):
         """Test the inline array synthetic child provider and summary"""
diff --git a/lldb/test/API/lang/swift/nested_marker_protocol_existential/TestNestedMarkerProtocolExistential.py b/lldb/test/API/lang/swift/nested_marker_protocol_existential/TestNestedMarkerProtocolExistential.py
index 2e30aa7480a27..4d9f7635d82ed 100644
--- a/lldb/test/API/lang/swift/nested_marker_protocol_existential/TestNestedMarkerProtocolExistential.py
+++ b/lldb/test/API/lang/swift/nested_marker_protocol_existential/TestNestedMarkerProtocolExistential.py
@@ -6,7 +6,7 @@
 
 class TestNestedMarkerProtocolExistential(TestBase):
     @swiftTest
-    @skipEmbeddedSwift
+    @requiresNonEmbeddedSwift
     def test(self):
         self.build()
         self.runCmd("settings set symbols.swift-enable-ast-context false")
diff --git a/lldb/test/API/lang/swift/no_runtime/TestSwiftNoRuntime.py b/lldb/test/API/lang/swift/no_runtime/TestSwiftNoRuntime.py
index a142d9a6f810d..a80bf09a9981e 100644
--- a/lldb/test/API/lang/swift/no_runtime/TestSwiftNoRuntime.py
+++ b/lldb/test/API/lang/swift/no_runtime/TestSwiftNoRuntime.py
@@ -6,7 +6,7 @@
 class TestSwiftNoRuntime(TestBase):
     NO_DEBUG_INFO_TESTCASE = True
 
-    @skipEmbeddedSwift
+    @requiresNonEmbeddedSwift # embedded Swift strips functions the program never calls, so test() is not in the binary to call
     @swiftTest
     def test(self):
         """Test running a Swift expression in a C program"""
diff --git a/lldb/test/API/lang/swift/nsarray_code_running_formatter/TestSwiftNSArrayCodeRunningFormatter.py b/lldb/test/API/lang/swift/nsarray_code_running_formatter/TestSwiftNSArrayCodeRunningFormatter.py
index 6cb0923c88786..8d26223b939bf 100644
--- a/lldb/test/API/lang/swift/nsarray_code_running_formatter/TestSwiftNSArrayCodeRunningFormatter.py
+++ b/lldb/test/API/lang/swift/nsarray_code_running_formatter/TestSwiftNSArrayCodeRunningFormatter.py
@@ -15,6 +15,6 @@
 lldbinline.MakeInlineTest(
     __file__,
     globals(),
-    decorators=[skipEmbeddedSwift,
+    decorators=[requiresNonEmbeddedSwift,
         swiftTest, skipUnlessDarwin, skipIf(macos_version=["=", "15.0"])],
 )
diff --git a/lldb/test/API/lang/swift/objc_implementation/TestSwiftObjCImplementation.py b/lldb/test/API/lang/swift/objc_implementation/TestSwiftObjCImplementation.py
index 7f12a967f670a..187472ec2bd2e 100644
--- a/lldb/test/API/lang/swift/objc_implementation/TestSwiftObjCImplementation.py
+++ b/lldb/test/API/lang/swift/objc_implementation/TestSwiftObjCImplementation.py
@@ -6,7 +6,7 @@
 
 class TestCase(TestBase):
 
-    @skipEmbeddedSwift
+    @requiresNonEmbeddedSwift
     @swiftTest
     @skipUnlessFoundation
     def test(self):
diff --git a/lldb/test/API/lang/swift/objc_obj_field/TestSwiftObjCObjField.py b/lldb/test/API/lang/swift/objc_obj_field/TestSwiftObjCObjField.py
index caed1938f257a..c7ff8475c97f3 100644
--- a/lldb/test/API/lang/swift/objc_obj_field/TestSwiftObjCObjField.py
+++ b/lldb/test/API/lang/swift/objc_obj_field/TestSwiftObjCObjField.py
@@ -7,7 +7,7 @@
 class TestCase(TestBase):
     NO_DEBUG_INFO_TESTCASE = True
 
-    @skipEmbeddedSwift
+    @requiresNonEmbeddedSwift
     @swiftTest
     @skipUnlessDarwin
     def test(self):
diff --git a/lldb/test/API/lang/swift/objc_protocol/TestSwiftObjcProtocol.py b/lldb/test/API/lang/swift/objc_protocol/TestSwiftObjcProtocol.py
index 0d07ef47aaf85..87ef7698608f4 100644
--- a/lldb/test/API/lang/swift/objc_protocol/TestSwiftObjcProtocol.py
+++ b/lldb/test/API/lang/swift/objc_protocol/TestSwiftObjcProtocol.py
@@ -5,7 +5,7 @@
 
 
 class TestSwiftObjcProtocol(TestBase):
-    @skipEmbeddedSwift
+    @requiresNonEmbeddedSwift
     @skipUnlessDarwin
     @swiftTest
     def test(self):
diff --git a/lldb/test/API/lang/swift/objc_superclass_no_debug_info/TestSwiftObjCSuperClassNoDebugInfo.py b/lldb/test/API/lang/swift/objc_superclass_no_debug_info/TestSwiftObjCSuperClassNoDebugInfo.py
index 93b0edcf76639..7c3fea076f180 100644
--- a/lldb/test/API/lang/swift/objc_superclass_no_debug_info/TestSwiftObjCSuperClassNoDebugInfo.py
+++ b/lldb/test/API/lang/swift/objc_superclass_no_debug_info/TestSwiftObjCSuperClassNoDebugInfo.py
@@ -7,7 +7,7 @@
 class TestSwiftObjCSuperClassNoDebugInfo(TestBase):
     @swiftTest
     @skipUnlessDarwin
-    @skipEmbeddedSwift
+    @requiresNonEmbeddedSwift
     def test(self):
         self.build()
         self.runCmd("settings set symbols.swift-enable-ast-context false")
diff --git a/lldb/test/API/lang/swift/observation/TestSwiftObservation.py b/lldb/test/API/lang/swift/observation/TestSwiftObservation.py
index e769603b480a5..1e4304212713c 100644
--- a/lldb/test/API/lang/swift/observation/TestSwiftObservation.py
+++ b/lldb/test/API/lang/swift/observation/TestSwiftObservation.py
@@ -7,7 +7,7 @@
 class TestSwiftObservation(TestBase):
     NO_DEBUG_INFO_TESTCASE = True
 
-    @skipEmbeddedSwift
+    @requiresNonEmbeddedSwift
     @swiftTest
     def test(self):
         """Test that types with private discriminators read from the file cache work"""
diff --git a/lldb/test/API/lang/swift/one_case_enum/TestSwiftOneCaseEnum.py b/lldb/test/API/lang/swift/one_case_enum/TestSwiftOneCaseEnum.py
index 7e46be72bc5b1..f45164bba5796 100644
--- a/lldb/test/API/lang/swift/one_case_enum/TestSwiftOneCaseEnum.py
+++ b/lldb/test/API/lang/swift/one_case_enum/TestSwiftOneCaseEnum.py
@@ -20,7 +20,7 @@
 
 
 class TestSwiftOneCaseEnum(TestBase):
-    @skipEmbeddedSwift
+    @requiresNonEmbeddedSwift
     @swiftTest
     def test_swift_one_case_enum(self):
         """Test that an enum with only one case does not crash LLDB"""
diff --git a/lldb/test/API/lang/swift/opaque_existentials/TestOpaqueExistentials.py b/lldb/test/API/lang/swift/opaque_existentials/TestOpaqueExistentials.py
index 32b35cbff59b2..003a73de0bdfb 100644
--- a/lldb/test/API/lang/swift/opaque_existentials/TestOpaqueExistentials.py
+++ b/lldb/test/API/lang/swift/opaque_existentials/TestOpaqueExistentials.py
@@ -1,4 +1,4 @@
 import lldbsuite.test.lldbinline as lldbinline
 from lldbsuite.test.decorators import *
 
-lldbinline.MakeInlineTest(__file__, globals(), decorators=[skipEmbeddedSwift, swiftTest])
+lldbinline.MakeInlineTest(__file__, globals(), decorators=[requiresNonEmbeddedSwift, swiftTest])
diff --git a/lldb/test/API/lang/swift/opaque_return/TestBoundOpaqueArchetype.py b/lldb/test/API/lang/swift/opaque_return/TestBoundOpaqueArchetype.py
index 42a28ae048642..9b8ab0738c617 100644
--- a/lldb/test/API/lang/swift/opaque_return/TestBoundOpaqueArchetype.py
+++ b/lldb/test/API/lang/swift/opaque_return/TestBoundOpaqueArchetype.py
@@ -6,7 +6,7 @@
 
 class TestBoundOpaqueArchetype(TestBase):
 
-    @skipEmbeddedSwift
+    @requiresNonEmbeddedSwift
     @swiftTest
     def test(self):
         """Tests that a type bound to an opaque archetype can be resolved correctly"""         
diff --git a/lldb/test/API/lang/swift/opaque_return_frame_var/TestSwiftGlobalOpaque.py b/lldb/test/API/lang/swift/opaque_return_frame_var/TestSwiftGlobalOpaque.py
index 079c9c827feaf..f143bc4f973f8 100644
--- a/lldb/test/API/lang/swift/opaque_return_frame_var/TestSwiftGlobalOpaque.py
+++ b/lldb/test/API/lang/swift/opaque_return_frame_var/TestSwiftGlobalOpaque.py
@@ -6,7 +6,7 @@
 
 class TestSwiftGlobalOpaque(TestBase):
 
-    @skipEmbeddedSwift
+    @requiresNonEmbeddedSwift
     @swiftTest
     def test(self):
         """Tests that a type bound to an opaque archetype can be resolved correctly"""         
diff --git a/lldb/test/API/lang/swift/opaque_return_resilient/TestSwiftOpaqueReturnResilient.py b/lldb/test/API/lang/swift/opaque_return_resilient/TestSwiftOpaqueReturnResilient.py
index 5b4ffe9cc9d12..5d69a3ad7d86d 100644
--- a/lldb/test/API/lang/swift/opaque_return_resilient/TestSwiftOpaqueReturnResilient.py
+++ b/lldb/test/API/lang/swift/opaque_return_resilient/TestSwiftOpaqueReturnResilient.py
@@ -6,7 +6,7 @@
 
 class TestSwiftOpaqueReturnResilient(TestBase):
     @swiftTest
-    @skipEmbeddedSwift
+    @requiresNonEmbeddedSwift
     def test(self):
         self.build()
         self.runCmd("settings set symbols.swift-enable-ast-context false")
diff --git a/lldb/test/API/lang/swift/opaque_return_resilient_collection/TestSwiftOpaqueReturnResilientCollection.py b/lldb/test/API/lang/swift/opaque_return_resilient_collection/TestSwiftOpaqueReturnResilientCollection.py
index d04f2731262a0..8dc0b51a768cc 100644
--- a/lldb/test/API/lang/swift/opaque_return_resilient_collection/TestSwiftOpaqueReturnResilientCollection.py
+++ b/lldb/test/API/lang/swift/opaque_return_resilient_collection/TestSwiftOpaqueReturnResilientCollection.py
@@ -6,7 +6,7 @@
 
 class TestSwiftOpaqueReturnResilientCollection(TestBase):
     @swiftTest
-    @skipEmbeddedSwift
+    @requiresNonEmbeddedSwift
     def test(self):
         self.build()
         self.runCmd("settings set symbols.swift-enable-ast-context false")
diff --git a/lldb/test/API/lang/swift/opaque_return_types/TestOpaqueReturnTypes.py b/lldb/test/API/lang/swift/opaque_return_types/TestOpaqueReturnTypes.py
index f45b5e7eb879a..3067b1fbe0761 100644
--- a/lldb/test/API/lang/swift/opaque_return_types/TestOpaqueReturnTypes.py
+++ b/lldb/test/API/lang/swift/opaque_return_types/TestOpaqueReturnTypes.py
@@ -4,7 +4,7 @@
 lldbinline.MakeInlineTest(
     __file__,
     globals(),
-    decorators=[skipEmbeddedSwift,
+    decorators=[requiresNonEmbeddedSwift,
         swiftTest,
         skipIf(macos_version=["<", "10.15"]),
     ],
diff --git a/lldb/test/API/lang/swift/opaque_type/TestSwiftOpaqueType.py b/lldb/test/API/lang/swift/opaque_type/TestSwiftOpaqueType.py
index 6639da9196962..ef1e9d9b4273b 100644
--- a/lldb/test/API/lang/swift/opaque_type/TestSwiftOpaqueType.py
+++ b/lldb/test/API/lang/swift/opaque_type/TestSwiftOpaqueType.py
@@ -6,7 +6,7 @@
 
 class TestSwiftOpaque(TestBase):
 
-    @skipEmbeddedSwift
+    @skipEmbeddedSwiftOnWindows
     @swiftTest
     def test(self):
         """Test opaque types in parameter positions"""         
diff --git a/lldb/test/API/lang/swift/optional_error_handling/TestSwiftOptionalErrorHandling.py b/lldb/test/API/lang/swift/optional_error_handling/TestSwiftOptionalErrorHandling.py
index b29ec8a1a93fe..fd64f2c718628 100644
--- a/lldb/test/API/lang/swift/optional_error_handling/TestSwiftOptionalErrorHandling.py
+++ b/lldb/test/API/lang/swift/optional_error_handling/TestSwiftOptionalErrorHandling.py
@@ -6,7 +6,7 @@
 class TestSwiftOptionalErrorHandling(TestBase):
     NO_DEBUG_INFO_TESTCASE = True
 
-    @skipEmbeddedSwift
+    @requiresNonEmbeddedSwift
     @swiftTest
     def test(self):
         """Test that errors are surfaced"""
diff --git a/lldb/test/API/lang/swift/optional_of_resilient/TestResilientObjectInOptional.py b/lldb/test/API/lang/swift/optional_of_resilient/TestResilientObjectInOptional.py
index ffef6375311f0..745b9037c8888 100644
--- a/lldb/test/API/lang/swift/optional_of_resilient/TestResilientObjectInOptional.py
+++ b/lldb/test/API/lang/swift/optional_of_resilient/TestResilientObjectInOptional.py
@@ -18,7 +18,7 @@
 import lldbsuite.test.lldbutil as lldbutil
 
 class TestResilientObjectInOptional(TestBase):
-    @skipEmbeddedSwift
+    @requiresNonEmbeddedSwift
     @swiftTest
     def test_optional_of_resilient(self):
         """Test that can extract resilient objects from an Optional"""
diff --git a/lldb/test/API/lang/swift/optional_url/TestOptionalURL.py b/lldb/test/API/lang/swift/optional_url/TestOptionalURL.py
index e6e84ec5a9a95..0f996610c50d0 100644
--- a/lldb/test/API/lang/swift/optional_url/TestOptionalURL.py
+++ b/lldb/test/API/lang/swift/optional_url/TestOptionalURL.py
@@ -5,7 +5,7 @@
     __file__,
     globals(),
     decorators=[
-        skipEmbeddedSwift,
+        requiresNonEmbeddedSwift,
         skipIfLinux,  # https://github.com/swiftlang/llvm-project/issues/13465
         skipUnlessFoundationEssentials,
         swiftTest,
diff --git a/lldb/test/API/lang/swift/optionset/TestSwiftOptionSetType.py b/lldb/test/API/lang/swift/optionset/TestSwiftOptionSetType.py
index d40d101dc7a91..97fa61c9c376b 100644
--- a/lldb/test/API/lang/swift/optionset/TestSwiftOptionSetType.py
+++ b/lldb/test/API/lang/swift/optionset/TestSwiftOptionSetType.py
@@ -13,5 +13,5 @@
 from lldbsuite.test.decorators import *
 
 lldbinline.MakeInlineTest(__file__, globals(),
-                          decorators=[skipEmbeddedSwift,
+                          decorators=[requiresNonEmbeddedSwift,
         swiftTest,skipUnlessDarwin])
diff --git a/lldb/test/API/lang/swift/orig_defined_payload/TestSwiftOriginallyDefinedInPayload.py b/lldb/test/API/lang/swift/orig_defined_payload/TestSwiftOriginallyDefinedInPayload.py
index 9477a67da1593..15828289788d8 100644
--- a/lldb/test/API/lang/swift/orig_defined_payload/TestSwiftOriginallyDefinedInPayload.py
+++ b/lldb/test/API/lang/swift/orig_defined_payload/TestSwiftOriginallyDefinedInPayload.py
@@ -6,7 +6,7 @@
 
 
 class TestSwiftOriginallyDefinedInPayload(TestBase):
-    @skipEmbeddedSwift
+    @requiresNonEmbeddedSwift
     @swiftTest
     def test(self):
         self.build()
diff --git a/lldb/test/API/lang/swift/other_arch_dylib/TestSwiftOtherArchDylib.py b/lldb/test/API/lang/swift/other_arch_dylib/TestSwiftOtherArchDylib.py
index bd878789cbfc5..db758e394e49c 100644
--- a/lldb/test/API/lang/swift/other_arch_dylib/TestSwiftOtherArchDylib.py
+++ b/lldb/test/API/lang/swift/other_arch_dylib/TestSwiftOtherArchDylib.py
@@ -9,7 +9,7 @@ class TestSwiftOtherArchDylib(TestBase):
 
     NO_DEBUG_INFO_TESTCASE = True
 
-    @skipEmbeddedSwift
+    @requiresNonEmbeddedSwift # the embedded test harness appends its own -target, so the other-arch dylib is never built
     @swiftTest
     @skipUnlessDarwin
     @skipIfDarwinEmbedded
diff --git a/lldb/test/API/lang/swift/parseable_interfaces/dsym/TestSwiftInterfaceDsym.py b/lldb/test/API/lang/swift/parseable_interfaces/dsym/TestSwiftInterfaceDsym.py
index 3542c6690a8f5..afd83bf719ced 100644
--- a/lldb/test/API/lang/swift/parseable_interfaces/dsym/TestSwiftInterfaceDsym.py
+++ b/lldb/test/API/lang/swift/parseable_interfaces/dsym/TestSwiftInterfaceDsym.py
@@ -19,7 +19,7 @@
 
 class TestSwiftInterfaceDSYM(TestBase):
     @swiftTest
-    @skipEmbeddedSwift
+    @requiresNonEmbeddedSwift # library evolution cannot be enabled with embedded Swift
     @skipIf(archs=no_match("x86_64"))
     @skipIf(debug_info=no_match(["dsym"]))
     def test_dsym_swiftinterface(self):
@@ -80,7 +80,7 @@ def test_dsym_swiftinterface(self):
         self.assertEqual(len(a_modules), 1)
 
     @swiftTest
-    @skipEmbeddedSwift
+    @requiresNonEmbeddedSwift # library evolution cannot be enabled with embedded Swift
     @skipIf(archs=no_match("x86_64"))
     @skipIf(debug_info=no_match(["dsym"]))
     def test_sanity_negative(self):
@@ -116,7 +116,7 @@ def test_sanity_negative(self):
         self.expect("expression x", error=1)
 
     @swiftTest
-    @skipEmbeddedSwift
+    @requiresNonEmbeddedSwift # embedded Swift cannot load a module from a .swiftinterface
     @skipIf(archs=no_match("x86_64"))
     @skipIf(debug_info=no_match(["dsym"]))
     def test_sanity_positive(self):
diff --git a/lldb/test/API/lang/swift/parseable_interfaces/shared/TestSwiftInterfaceNoDebugInfo_part01.py b/lldb/test/API/lang/swift/parseable_interfaces/shared/TestSwiftInterfaceNoDebugInfo_part01.py
index 11fbaa109790f..b247829e9c715 100644
--- a/lldb/test/API/lang/swift/parseable_interfaces/shared/TestSwiftInterfaceNoDebugInfo_part01.py
+++ b/lldb/test/API/lang/swift/parseable_interfaces/shared/TestSwiftInterfaceNoDebugInfo_part01.py
@@ -133,7 +133,7 @@ def do_test(self):
                             "Swiftmodule file was regenerated rather than reused")
 
 
-    @skipEmbeddedSwift
+    @requiresNonEmbeddedSwift
     @swiftTest
     def test_swift_interface(self):
         """Test that we load and handle modules that only have textual .swiftinterface files"""
diff --git a/lldb/test/API/lang/swift/parseable_interfaces/shared/TestSwiftInterfaceNoDebugInfo_part02.py b/lldb/test/API/lang/swift/parseable_interfaces/shared/TestSwiftInterfaceNoDebugInfo_part02.py
index a84ea95618941..a5d18e306aca3 100644
--- a/lldb/test/API/lang/swift/parseable_interfaces/shared/TestSwiftInterfaceNoDebugInfo_part02.py
+++ b/lldb/test/API/lang/swift/parseable_interfaces/shared/TestSwiftInterfaceNoDebugInfo_part02.py
@@ -133,7 +133,7 @@ def do_test(self):
                             "Swiftmodule file was regenerated rather than reused")
 
 
-    @skipEmbeddedSwift
+    @requiresNonEmbeddedSwift
     @swiftTest
     def test_swift_interface_fallback(self):
         """Test that we fall back to load from the .swiftinterface file if the .swiftmodule is invalid"""
diff --git a/lldb/test/API/lang/swift/parseable_interfaces/shared/TestSwiftInterfaceNoDebugInfo_part03.py b/lldb/test/API/lang/swift/parseable_interfaces/shared/TestSwiftInterfaceNoDebugInfo_part03.py
index dc56ce49ca4b3..9cf86bf44796e 100644
--- a/lldb/test/API/lang/swift/parseable_interfaces/shared/TestSwiftInterfaceNoDebugInfo_part03.py
+++ b/lldb/test/API/lang/swift/parseable_interfaces/shared/TestSwiftInterfaceNoDebugInfo_part03.py
@@ -133,7 +133,7 @@ def do_test(self):
                             "Swiftmodule file was regenerated rather than reused")
 
 
-    @skipEmbeddedSwift
+    @requiresNonEmbeddedSwift
     @swiftTest
     @skipUnlessPlatform(["macosx"])
     def test_prebuilt_cache_location(self):
diff --git a/lldb/test/API/lang/swift/parseable_interfaces/static/TestSwiftInterfaceStaticNoDebugInfo_part01.py b/lldb/test/API/lang/swift/parseable_interfaces/static/TestSwiftInterfaceStaticNoDebugInfo_part01.py
index 7f3d99ff2d42b..79bec9086b860 100644
--- a/lldb/test/API/lang/swift/parseable_interfaces/static/TestSwiftInterfaceStaticNoDebugInfo_part01.py
+++ b/lldb/test/API/lang/swift/parseable_interfaces/static/TestSwiftInterfaceStaticNoDebugInfo_part01.py
@@ -101,7 +101,7 @@ def do_test(self):
             self.assertTrue(is_old(file), "Swiftmodule file was regenerated rather than reused")
 
 
-    @skipEmbeddedSwift
+    @requiresNonEmbeddedSwift
     @swiftTest
     @skipIfWindows
     def test_swift_interface(self):
diff --git a/lldb/test/API/lang/swift/parseable_interfaces/static/TestSwiftInterfaceStaticNoDebugInfo_part02.py b/lldb/test/API/lang/swift/parseable_interfaces/static/TestSwiftInterfaceStaticNoDebugInfo_part02.py
index 371fcb87607cd..af0a2863c36d2 100644
--- a/lldb/test/API/lang/swift/parseable_interfaces/static/TestSwiftInterfaceStaticNoDebugInfo_part02.py
+++ b/lldb/test/API/lang/swift/parseable_interfaces/static/TestSwiftInterfaceStaticNoDebugInfo_part02.py
@@ -101,7 +101,7 @@ def do_test(self):
             self.assertTrue(is_old(file), "Swiftmodule file was regenerated rather than reused")
 
 
-    @skipEmbeddedSwift
+    @requiresNonEmbeddedSwift
     @swiftTest
     @skipIfWindows
     def test_swift_interface_fallback(self):
diff --git a/lldb/test/API/lang/swift/partially_generic_func/class/TestSwiftPartiallyGenericFuncClass.py b/lldb/test/API/lang/swift/partially_generic_func/class/TestSwiftPartiallyGenericFuncClass.py
index b49380595c2d5..661ba5321c59d 100644
--- a/lldb/test/API/lang/swift/partially_generic_func/class/TestSwiftPartiallyGenericFuncClass.py
+++ b/lldb/test/API/lang/swift/partially_generic_func/class/TestSwiftPartiallyGenericFuncClass.py
@@ -12,4 +12,4 @@
 import lldbsuite.test.lldbinline as lldbinline
 from lldbsuite.test.decorators import *
 
-lldbinline.MakeInlineTest(__file__, globals(), decorators=[skipEmbeddedSwift, swiftTest])
+lldbinline.MakeInlineTest(__file__, globals(), decorators=[requiresNonEmbeddedSwift, swiftTest])
diff --git a/lldb/test/API/lang/swift/partially_generic_func/continuations/TestSwiftPartiallyGenericFuncContinuation.py b/lldb/test/API/lang/swift/partially_generic_func/continuations/TestSwiftPartiallyGenericFuncContinuation.py
index c79f01a00abeb..74cc3f56c60d9 100644
--- a/lldb/test/API/lang/swift/partially_generic_func/continuations/TestSwiftPartiallyGenericFuncContinuation.py
+++ b/lldb/test/API/lang/swift/partially_generic_func/continuations/TestSwiftPartiallyGenericFuncContinuation.py
@@ -12,4 +12,4 @@
 import lldbsuite.test.lldbinline as lldbinline
 from lldbsuite.test.decorators import *
 
-lldbinline.MakeInlineTest(__file__, globals(), decorators=[skipEmbeddedSwift, swiftTest])
+lldbinline.MakeInlineTest(__file__, globals(), decorators=[requiresNonEmbeddedSwift, swiftTest])
diff --git a/lldb/test/API/lang/swift/partially_generic_func/enum/TestSwiftPartiallyGenericFuncEnum.py b/lldb/test/API/lang/swift/partially_generic_func/enum/TestSwiftPartiallyGenericFuncEnum.py
index 67563a2fcc4b9..999d1cc5f8de7 100644
--- a/lldb/test/API/lang/swift/partially_generic_func/enum/TestSwiftPartiallyGenericFuncEnum.py
+++ b/lldb/test/API/lang/swift/partially_generic_func/enum/TestSwiftPartiallyGenericFuncEnum.py
@@ -12,4 +12,4 @@
 import lldbsuite.test.lldbinline as lldbinline
 from lldbsuite.test.decorators import *
 
-lldbinline.MakeInlineTest(__file__, globals(), decorators=[skipEmbeddedSwift, swiftTest])
+lldbinline.MakeInlineTest(__file__, globals(), decorators=[requiresNonEmbeddedSwift, swiftTest])
diff --git a/lldb/test/API/lang/swift/partially_generic_func/struct/TestSwiftPartiallyGenericFuncStruct.py b/lldb/test/API/lang/swift/partially_generic_func/struct/TestSwiftPartiallyGenericFuncStruct.py
index bfbbf56cc4741..d492e4f005ade 100644
--- a/lldb/test/API/lang/swift/partially_generic_func/struct/TestSwiftPartiallyGenericFuncStruct.py
+++ b/lldb/test/API/lang/swift/partially_generic_func/struct/TestSwiftPartiallyGenericFuncStruct.py
@@ -12,4 +12,4 @@
 import lldbsuite.test.lldbinline as lldbinline
 from lldbsuite.test.decorators import *
 
-lldbinline.MakeInlineTest(__file__, globals(), decorators=[skipEmbeddedSwift, swiftTest])
+lldbinline.MakeInlineTest(__file__, globals(), decorators=[requiresNonEmbeddedSwift, swiftTest])
diff --git a/lldb/test/API/lang/swift/playgrounds-repl/old_playground/TestNonREPLPlayground.py b/lldb/test/API/lang/swift/playgrounds-repl/old_playground/TestNonREPLPlayground.py
index 1bfd8b87e1aab..1c1199127c0e7 100644
--- a/lldb/test/API/lang/swift/playgrounds-repl/old_playground/TestNonREPLPlayground.py
+++ b/lldb/test/API/lang/swift/playgrounds-repl/old_playground/TestNonREPLPlayground.py
@@ -36,7 +36,7 @@ class TestNonREPLPlayground(TestBase):
     @skipIf(
         debug_info=decorators.no_match("dsym"),
         bugnumber="This test only builds one way")
-    @skipEmbeddedSwift
+    @requiresNonEmbeddedSwift
     def test_playgrounds(self):
         """Test that playgrounds work"""
         self.build()
diff --git a/lldb/test/API/lang/swift/playgrounds/TestSwiftPlaygrounds.py b/lldb/test/API/lang/swift/playgrounds/TestSwiftPlaygrounds.py
index a27229e2aa361..2bee3603eb062 100644
--- a/lldb/test/API/lang/swift/playgrounds/TestSwiftPlaygrounds.py
+++ b/lldb/test/API/lang/swift/playgrounds/TestSwiftPlaygrounds.py
@@ -63,7 +63,7 @@ def get_run_triple(self):
             triple = '{}-apple-macosx{}'.format(machine, version)
         return triple
 
-    @skipEmbeddedSwift
+    @requiresNonEmbeddedSwift
     @skipUnlessDarwin
     @swiftTest
     @skipIf(setting=('symbols.use-swift-clangimporter', 'false'))
@@ -73,7 +73,7 @@ def test_force_target(self):
         self.launch(True)
         self.do_basic_test(True)
 
-    @skipEmbeddedSwift
+    @requiresNonEmbeddedSwift
     @skipUnlessDarwin
     @swiftTest
     @skipIf(setting=('symbols.use-swift-clangimporter', 'false'))
@@ -83,7 +83,7 @@ def test_no_force_target(self):
         self.launch(False)
         self.do_basic_test(False)
 
-    @skipEmbeddedSwift
+    @requiresNonEmbeddedSwift
     @skipUnlessDarwin
     @swiftTest
     @skipIf(setting=('symbols.use-swift-clangimporter', 'false'))
@@ -94,7 +94,7 @@ def test_concurrency(self):
         self.launch(True)
         self.do_concurrency_test()
 
-    @skipEmbeddedSwift
+    @requiresNonEmbeddedSwift
     @skipUnlessDarwin
     @swiftTest
     @skipIf(setting=('symbols.use-swift-clangimporter', 'false'))
diff --git a/lldb/test/API/lang/swift/po/nested_nsdict/TestSwiftPONestedNSDictionary.py b/lldb/test/API/lang/swift/po/nested_nsdict/TestSwiftPONestedNSDictionary.py
index 6b3cdac555b1b..39de40eca2d84 100644
--- a/lldb/test/API/lang/swift/po/nested_nsdict/TestSwiftPONestedNSDictionary.py
+++ b/lldb/test/API/lang/swift/po/nested_nsdict/TestSwiftPONestedNSDictionary.py
@@ -13,5 +13,5 @@
 from lldbsuite.test.decorators import *
 
 lldbinline.MakeInlineTest(__file__, globals(),
-                          decorators=[skipEmbeddedSwift,
+                          decorators=[requiresNonEmbeddedSwift,
         swiftTest,skipUnlessFoundation,skipIf(oslist=['windows'])])
diff --git a/lldb/test/API/lang/swift/po/objc/TestSwiftPOObjC.py b/lldb/test/API/lang/swift/po/objc/TestSwiftPOObjC.py
index e348c82ceb0d9..c830a3a509db1 100644
--- a/lldb/test/API/lang/swift/po/objc/TestSwiftPOObjC.py
+++ b/lldb/test/API/lang/swift/po/objc/TestSwiftPOObjC.py
@@ -4,7 +4,7 @@
 import lldbsuite.test.lldbutil as lldbutil
 
 class TestSwiftPOObjC(TestBase):
-    @skipEmbeddedSwift
+    @requiresNonEmbeddedSwift
     #NO_DEBUG_INFO_TESTCASE = True
     @skipUnlessDarwin
     @swiftTest
diff --git a/lldb/test/API/lang/swift/po/pointer_and_mangled_typename/TestSwiftPrintObjectPointerAndTypeName_part01.py b/lldb/test/API/lang/swift/po/pointer_and_mangled_typename/TestSwiftPrintObjectPointerAndTypeName_part01.py
index bf65fb20e917a..01fce19d3b24a 100644
--- a/lldb/test/API/lang/swift/po/pointer_and_mangled_typename/TestSwiftPrintObjectPointerAndTypeName_part01.py
+++ b/lldb/test/API/lang/swift/po/pointer_and_mangled_typename/TestSwiftPrintObjectPointerAndTypeName_part01.py
@@ -16,7 +16,7 @@ def _filecheck(self, key):
         self.filecheck_log(self.log, __file__, f"-check-prefix=CHECK-{key}")
 
     @swiftTest
-    @skipEmbeddedSwift
+    @skipEmbeddedSwiftOnWindows
     def test_int(self):
         self.build()
         lldbutil.run_to_source_breakpoint(
@@ -27,7 +27,7 @@ def test_int(self):
         # CHECK-INT: stringForPrintObject(UnsafeRawPointer(bitPattern: {{[0-9]+}}), mangledTypeName: "SiD")
 
     @swiftTest
-    @skipEmbeddedSwift
+    @skipEmbeddedSwiftOnWindows
     def test_string(self):
         self.build()
         lldbutil.run_to_source_breakpoint(
diff --git a/lldb/test/API/lang/swift/po/pointer_and_mangled_typename/TestSwiftPrintObjectPointerAndTypeName_part03.py b/lldb/test/API/lang/swift/po/pointer_and_mangled_typename/TestSwiftPrintObjectPointerAndTypeName_part03.py
index ba31a1c538f41..672d30a68b286 100644
--- a/lldb/test/API/lang/swift/po/pointer_and_mangled_typename/TestSwiftPrintObjectPointerAndTypeName_part03.py
+++ b/lldb/test/API/lang/swift/po/pointer_and_mangled_typename/TestSwiftPrintObjectPointerAndTypeName_part03.py
@@ -16,7 +16,7 @@ def _filecheck(self, key):
         self.filecheck_log(self.log, __file__, f"-check-prefix=CHECK-{key}")
 
     @swiftTest
-    @skipEmbeddedSwift
+    @skipEmbeddedSwiftOnWindows
     def test_described_struct(self):
         self.build()
         lldbutil.run_to_source_breakpoint(
@@ -27,7 +27,7 @@ def test_described_struct(self):
         # CHECK-DESC-STRUCT: stringForPrintObject(UnsafeRawPointer(bitPattern: {{[0-9]+}}), mangledTypeName: "1a15DescribedStructVD")
 
     @swiftTest
-    @skipEmbeddedSwift
+    @skipEmbeddedSwiftOnWindows
     def test_described_class(self):
         self.build()
         lldbutil.run_to_source_breakpoint(
@@ -38,7 +38,7 @@ def test_described_class(self):
         # CHECK-DESC-CLASS: stringForPrintObject(UnsafeRawPointer(bitPattern: {{[0-9]+}}), mangledTypeName: "1a14DescribedClassCD")
 
     @swiftTest
-    @skipEmbeddedSwift
+    @skipEmbeddedSwiftOnWindows
     def test_described_enum(self):
         self.build()
         lldbutil.run_to_source_breakpoint(
@@ -49,7 +49,7 @@ def test_described_enum(self):
         # CHECK-DESC-ENUM: stringForPrintObject(UnsafeRawPointer(bitPattern: {{.*}}), mangledTypeName: "1a13DescribedEnumOD")
 
     @swiftTest
-    @skipEmbeddedSwift
+    @skipEmbeddedSwiftOnWindows
     def test_class_only_protocol(self):
         self.build()
         lldbutil.run_to_source_breakpoint(
diff --git a/lldb/test/API/lang/swift/po/recursive/TestSwiftPORecursiveBehavior.py b/lldb/test/API/lang/swift/po/recursive/TestSwiftPORecursiveBehavior.py
index 18087b7500cb3..7097719428148 100644
--- a/lldb/test/API/lang/swift/po/recursive/TestSwiftPORecursiveBehavior.py
+++ b/lldb/test/API/lang/swift/po/recursive/TestSwiftPORecursiveBehavior.py
@@ -12,4 +12,4 @@
 import lldbsuite.test.lldbinline as lldbinline
 from lldbsuite.test.decorators import *
 
-lldbinline.MakeInlineTest(__file__, globals(), decorators=[skipEmbeddedSwift, swiftTest])
+lldbinline.MakeInlineTest(__file__, globals(), decorators=[requiresNonEmbeddedSwift, swiftTest])
diff --git a/lldb/test/API/lang/swift/po/ref_types/TestSwiftPORefTypes.py b/lldb/test/API/lang/swift/po/ref_types/TestSwiftPORefTypes.py
index 55ce849b94844..955129e7baa35 100644
--- a/lldb/test/API/lang/swift/po/ref_types/TestSwiftPORefTypes.py
+++ b/lldb/test/API/lang/swift/po/ref_types/TestSwiftPORefTypes.py
@@ -12,4 +12,4 @@
 import lldbsuite.test.lldbinline as lldbinline
 from lldbsuite.test.decorators import *
 
-lldbinline.MakeInlineTest(__file__, globals(), decorators=[skipEmbeddedSwift, swiftTest])
+lldbinline.MakeInlineTest(__file__, globals(), decorators=[requiresNonEmbeddedSwift, swiftTest])
diff --git a/lldb/test/API/lang/swift/po/static_method/TestSwiftPoInClassMethod.py b/lldb/test/API/lang/swift/po/static_method/TestSwiftPoInClassMethod.py
index e5fa03a61431d..c66bd7a754b6d 100644
--- a/lldb/test/API/lang/swift/po/static_method/TestSwiftPoInClassMethod.py
+++ b/lldb/test/API/lang/swift/po/static_method/TestSwiftPoInClassMethod.py
@@ -10,7 +10,7 @@
 
 class TestCase(TestBase):
     @swiftTest
-    @skipEmbeddedSwift
+    @requiresNonEmbeddedSwift
     def test(self):
         """Context-free po should not emit extension $__lldb_context when
         stopped in a static method, since the frame's method context is
diff --git a/lldb/test/API/lang/swift/po/sys_types/TestSwiftPOSysTypes.py b/lldb/test/API/lang/swift/po/sys_types/TestSwiftPOSysTypes.py
index 18996ae5f95bc..e2fcb2f614c4c 100644
--- a/lldb/test/API/lang/swift/po/sys_types/TestSwiftPOSysTypes.py
+++ b/lldb/test/API/lang/swift/po/sys_types/TestSwiftPOSysTypes.py
@@ -14,7 +14,7 @@
 
 lldbinline.MakeInlineTest(__file__,
                           globals(),
-                          decorators=[skipEmbeddedSwift,
+                          decorators=[requiresNonEmbeddedSwift,
         swiftTest,
                               skipIf(oslist=['windows']),
                               expectedFailureAll(oslist=["linux"],
diff --git a/lldb/test/API/lang/swift/po/val_types/TestSwiftPOValTypes.py b/lldb/test/API/lang/swift/po/val_types/TestSwiftPOValTypes.py
index 7feb1eb404f6b..92cd8752c85df 100644
--- a/lldb/test/API/lang/swift/po/val_types/TestSwiftPOValTypes.py
+++ b/lldb/test/API/lang/swift/po/val_types/TestSwiftPOValTypes.py
@@ -17,7 +17,7 @@
 
 class TestSwiftPOValueTypes(TestBase):
 
-    @skipEmbeddedSwift
+    @requiresNonEmbeddedSwift
     @swiftTest
     def test_value_types(self):
         """Test 'po' on a variety of value types with and without custom descriptions."""
@@ -39,7 +39,7 @@ def test_value_types(self):
         self.expect("po (dm as Any, cm as Any,48 as Any)", substrs=['12', '24', '36', '48'])
         self.expect("po patatino", substrs=['foo'])
 
-    @skipEmbeddedSwift
+    @requiresNonEmbeddedSwift
     @swiftTest
     def test_ignore_bkpts_in_po(self):
         """Run a po expression with a breakpoint in the debugDescription, make sure we don't hit it."""
diff --git a/lldb/test/API/lang/swift/private_decl_name/TestSwiftPrivateDeclName.py b/lldb/test/API/lang/swift/private_decl_name/TestSwiftPrivateDeclName.py
index c6c33483194d7..073b794e8de7b 100644
--- a/lldb/test/API/lang/swift/private_decl_name/TestSwiftPrivateDeclName.py
+++ b/lldb/test/API/lang/swift/private_decl_name/TestSwiftPrivateDeclName.py
@@ -27,7 +27,7 @@ def setUp(self):
         self.b_source = "b.swift"
         self.b_source_spec = lldb.SBFileSpec(self.b_source)
 
-    @skipEmbeddedSwift
+    @requiresNonEmbeddedSwift
     @swiftTest
     def test_swift_private_decl_name(self):
         """Test that we correctly find private decls"""
diff --git a/lldb/test/API/lang/swift/private_discriminator/TestSwiftPrivateDiscriminator.py b/lldb/test/API/lang/swift/private_discriminator/TestSwiftPrivateDiscriminator.py
index 059c4555570c8..dcbad6e1774a7 100644
--- a/lldb/test/API/lang/swift/private_discriminator/TestSwiftPrivateDiscriminator.py
+++ b/lldb/test/API/lang/swift/private_discriminator/TestSwiftPrivateDiscriminator.py
@@ -9,7 +9,7 @@ class TestSwiftPrivateDiscriminator(lldbtest.TestBase):
     NO_DEBUG_INFO_TESTCASE = True
     mydir = lldbtest.TestBase.compute_mydir(__file__)
 
-    @skipEmbeddedSwift
+    @requiresNonEmbeddedSwift
     @swiftTest
     # FIXME: The only reason this doesn't work on Linux is because the
     # dylib hasn't been loaded when run_to_source_breakpoint wants to
diff --git a/lldb/test/API/lang/swift/private_generic_self/TestSwiftPrivateGenericSelf.py b/lldb/test/API/lang/swift/private_generic_self/TestSwiftPrivateGenericSelf.py
index b25d6ae0793f5..b75525237dfbb 100644
--- a/lldb/test/API/lang/swift/private_generic_self/TestSwiftPrivateGenericSelf.py
+++ b/lldb/test/API/lang/swift/private_generic_self/TestSwiftPrivateGenericSelf.py
@@ -12,4 +12,4 @@
 import lldbsuite.test.lldbinline as lldbinline
 from lldbsuite.test.decorators import *
 
-lldbinline.MakeInlineTest(__file__, globals(), decorators=[skipEmbeddedSwift, swiftTest])
+lldbinline.MakeInlineTest(__file__, globals(), decorators=[requiresNonEmbeddedSwift, swiftTest])
diff --git a/lldb/test/API/lang/swift/private_generic_type/TestSwiftPrivateGenericType.py b/lldb/test/API/lang/swift/private_generic_type/TestSwiftPrivateGenericType.py
index 4f912564e202f..1656eaabef14d 100644
--- a/lldb/test/API/lang/swift/private_generic_type/TestSwiftPrivateGenericType.py
+++ b/lldb/test/API/lang/swift/private_generic_type/TestSwiftPrivateGenericType.py
@@ -8,7 +8,7 @@ class TestSwiftPrivateGenericType(TestBase):
     def setUp(self):
         TestBase.setUp(self)
 
-    @skipEmbeddedSwift
+    @requiresNonEmbeddedSwift
     @skipUnlessDarwin
     @swiftTest
     def test_private_generic_type(self):
diff --git a/lldb/test/API/lang/swift/private_import/TestSwiftPrivateImport.py b/lldb/test/API/lang/swift/private_import/TestSwiftPrivateImport.py
index 591cc5397345d..a2ec7c912aee2 100644
--- a/lldb/test/API/lang/swift/private_import/TestSwiftPrivateImport.py
+++ b/lldb/test/API/lang/swift/private_import/TestSwiftPrivateImport.py
@@ -4,7 +4,7 @@
 import lldbsuite.test.lldbutil as lldbutil
 
 class TestSwiftPrivateImport(TestBase):
-    @skipEmbeddedSwift
+    @requiresNonEmbeddedSwift
     @swiftTest
     def test_private_import(self):
         """Test a library with a private import for which there is no debug info"""
diff --git a/lldb/test/API/lang/swift/private_member/TestSwiftPrivateMember.py b/lldb/test/API/lang/swift/private_member/TestSwiftPrivateMember.py
index 4d91b4794d2d5..ff5d31d8f8f4c 100644
--- a/lldb/test/API/lang/swift/private_member/TestSwiftPrivateMember.py
+++ b/lldb/test/API/lang/swift/private_member/TestSwiftPrivateMember.py
@@ -5,7 +5,7 @@
 
 class TestSwiftPrivateMember(TestBase):
 
-    @skipEmbeddedSwift
+    @requiresNonEmbeddedSwift
     @swiftTest
     def test(self):
         self.build()
diff --git a/lldb/test/API/lang/swift/private_self/TestSwiftPrivateSelf.py b/lldb/test/API/lang/swift/private_self/TestSwiftPrivateSelf.py
index 89d08ad05d161..37fee374c8217 100644
--- a/lldb/test/API/lang/swift/private_self/TestSwiftPrivateSelf.py
+++ b/lldb/test/API/lang/swift/private_self/TestSwiftPrivateSelf.py
@@ -13,5 +13,5 @@
 from lldbsuite.test.decorators import *
 
 lldbinline.MakeInlineTest(
-    __file__, globals(), decorators=[skipEmbeddedSwift, swiftTest]
+    __file__, globals(), decorators=[requiresNonEmbeddedSwift, swiftTest]
 )
diff --git a/lldb/test/API/lang/swift/private_typealias/TestSwiftPrivateTypeAlias.py b/lldb/test/API/lang/swift/private_typealias/TestSwiftPrivateTypeAlias.py
index 40804cfc1bb47..47a9c5bd26b75 100755
--- a/lldb/test/API/lang/swift/private_typealias/TestSwiftPrivateTypeAlias.py
+++ b/lldb/test/API/lang/swift/private_typealias/TestSwiftPrivateTypeAlias.py
@@ -20,7 +20,7 @@
 
 
 class TestSwiftPrivateTypeAlias(TestBase):
-    @skipEmbeddedSwift
+    @requiresNonEmbeddedSwift
     @swiftTest
     def test_swift_private_typealias(self):
         """Test that we can correctly print variables whose types are private type aliases"""
diff --git a/lldb/test/API/lang/swift/protocol_extension_computed_property/TestProtocolExtensionComputerProperty.py b/lldb/test/API/lang/swift/protocol_extension_computed_property/TestProtocolExtensionComputerProperty.py
index 10641d1a7a86b..999b0fa2c9f42 100644
--- a/lldb/test/API/lang/swift/protocol_extension_computed_property/TestProtocolExtensionComputerProperty.py
+++ b/lldb/test/API/lang/swift/protocol_extension_computed_property/TestProtocolExtensionComputerProperty.py
@@ -4,7 +4,7 @@
 lldbinline.MakeInlineTest(
     __file__,
     globals(),
-    decorators=[skipEmbeddedSwift,
+    decorators=[requiresNonEmbeddedSwift,
         swiftTest,
         skipUnlessDarwin,
         expectedFailureAll(
diff --git a/lldb/test/API/lang/swift/protocol_optional/TestSwiftProtocolOptional.py b/lldb/test/API/lang/swift/protocol_optional/TestSwiftProtocolOptional.py
index 5e152d221536d..9415c756b6724 100644
--- a/lldb/test/API/lang/swift/protocol_optional/TestSwiftProtocolOptional.py
+++ b/lldb/test/API/lang/swift/protocol_optional/TestSwiftProtocolOptional.py
@@ -12,4 +12,4 @@
 import lldbsuite.test.lldbinline as lldbinline
 from lldbsuite.test.decorators import *
 
-lldbinline.MakeInlineTest(__file__, globals(), decorators=[skipEmbeddedSwift, swiftTest])
+lldbinline.MakeInlineTest(__file__, globals(), decorators=[requiresNonEmbeddedSwift, swiftTest])
diff --git a/lldb/test/API/lang/swift/protocols/class_protocol/TestSwiftClassConstrainedProtocolArgument.py b/lldb/test/API/lang/swift/protocols/class_protocol/TestSwiftClassConstrainedProtocolArgument.py
index 4456803aae49f..c6bd5db09653b 100644
--- a/lldb/test/API/lang/swift/protocols/class_protocol/TestSwiftClassConstrainedProtocolArgument.py
+++ b/lldb/test/API/lang/swift/protocols/class_protocol/TestSwiftClassConstrainedProtocolArgument.py
@@ -7,5 +7,5 @@
 
 lldbinline.MakeInlineTest(
     __file__, globals(),
-            decorators=[skipEmbeddedSwift,
+            decorators=[requiresNonEmbeddedSwift,
         swiftTest,skipUnlessDarwin])
diff --git a/lldb/test/API/lang/swift/protocols/stepping_through_witness/TestSwiftSteppingThroughWitness.py b/lldb/test/API/lang/swift/protocols/stepping_through_witness/TestSwiftSteppingThroughWitness.py
index 010728786a197..2e6191744264b 100644
--- a/lldb/test/API/lang/swift/protocols/stepping_through_witness/TestSwiftSteppingThroughWitness.py
+++ b/lldb/test/API/lang/swift/protocols/stepping_through_witness/TestSwiftSteppingThroughWitness.py
@@ -14,7 +14,7 @@ def setUp(self):
             "settings set target.process.thread.step-avoid-libraries libswift_Concurrency.dylib"
         )
 
-    @skipEmbeddedSwift
+    @requiresNonEmbeddedSwift
     @swiftTest
     def test_step_in_and_out(self):
         """Test that stepping in and out of protocol methods work"""
@@ -44,7 +44,7 @@ def test_step_in_and_out(self):
         frame0 = thread.frames[0]
         self.assertIn("doMath", frame0.GetFunctionName())
 
-    @skipEmbeddedSwift
+    @requiresNonEmbeddedSwift
     @swiftTest
     def test_step_over(self):
         """Test that stepping over protocol methods work"""
diff --git a/lldb/test/API/lang/swift/reference_storage_types/TestSwiftReferenceStorageTypes.py b/lldb/test/API/lang/swift/reference_storage_types/TestSwiftReferenceStorageTypes.py
index 0a54c1a62fa21..56c9fa583be2c 100644
--- a/lldb/test/API/lang/swift/reference_storage_types/TestSwiftReferenceStorageTypes.py
+++ b/lldb/test/API/lang/swift/reference_storage_types/TestSwiftReferenceStorageTypes.py
@@ -20,7 +20,7 @@
 
 
 class TestSwiftReferenceStorageTypes(TestBase):
-    @skipEmbeddedSwift
+    @requiresNonEmbeddedSwift
     @decorators.skipIf(archs=['ppc64le']) #SR-10215
     @swiftTest
     def test_swift_reference_storage_types(self):
diff --git a/lldb/test/API/lang/swift/reflection_loading/TestSwiftReflectionLoading.py b/lldb/test/API/lang/swift/reflection_loading/TestSwiftReflectionLoading.py
index 21634ddcca884..d00896941d916 100644
--- a/lldb/test/API/lang/swift/reflection_loading/TestSwiftReflectionLoading.py
+++ b/lldb/test/API/lang/swift/reflection_loading/TestSwiftReflectionLoading.py
@@ -9,7 +9,7 @@ class TestSwiftReflectionLoading(lldbtest.TestBase):
 
     mydir = lldbtest.TestBase.compute_mydir(__file__)
 
-    @skipEmbeddedSwift
+    @requiresNonEmbeddedSwift
     @swiftTest
     def test(self):
         """Test that reflection metadata is imported"""
diff --git a/lldb/test/API/lang/swift/reflection_only/TestSwiftReflectionOnly.py b/lldb/test/API/lang/swift/reflection_only/TestSwiftReflectionOnly.py
index efacfe8eb0fa5..5d27775ae80ca 100644
--- a/lldb/test/API/lang/swift/reflection_only/TestSwiftReflectionOnly.py
+++ b/lldb/test/API/lang/swift/reflection_only/TestSwiftReflectionOnly.py
@@ -9,7 +9,7 @@ class TestSwiftReflectionOnly(lldbtest.TestBase):
 
     mydir = lldbtest.TestBase.compute_mydir(__file__)
 
-    @skipEmbeddedSwift
+    @requiresNonEmbeddedSwift
     @swiftTest
     def test(self):
         """Test debugging a program without swiftmodules is functional"""
diff --git a/lldb/test/API/lang/swift/regex/TestSwiftRegexExpr.py b/lldb/test/API/lang/swift/regex/TestSwiftRegexExpr.py
index e0146e98dbd1c..956f813751501 100644
--- a/lldb/test/API/lang/swift/regex/TestSwiftRegexExpr.py
+++ b/lldb/test/API/lang/swift/regex/TestSwiftRegexExpr.py
@@ -12,7 +12,7 @@ def setUp(self):
         TestBase.setUp(self)
         self.main_source_spec = lldb.SBFileSpec("main.swift")
 
-    @skipEmbeddedSwift
+    @requiresNonEmbeddedSwift
     @swiftTest
     @skipIf(debug_info=no_match("dsym"))
     def test_swift_regex_expr(self):
diff --git a/lldb/test/API/lang/swift/regex/TestSwiftRegexExprDesc.py b/lldb/test/API/lang/swift/regex/TestSwiftRegexExprDesc.py
index f2d7983b00602..82bfbcd8a4551 100644
--- a/lldb/test/API/lang/swift/regex/TestSwiftRegexExprDesc.py
+++ b/lldb/test/API/lang/swift/regex/TestSwiftRegexExprDesc.py
@@ -12,7 +12,7 @@ def setUp(self):
         TestBase.setUp(self)
         self.main_source_spec = lldb.SBFileSpec("main.swift")
 
-    @skipEmbeddedSwift
+    @requiresNonEmbeddedSwift
     @swiftTest
     @skipIf(debug_info=no_match("dsym"))
     def test_swift_regex_expr_desc(self):
diff --git a/lldb/test/API/lang/swift/regex/TestSwiftRegexFrameVar.py b/lldb/test/API/lang/swift/regex/TestSwiftRegexFrameVar.py
index 5f245c023b358..f4527e09ccc3c 100644
--- a/lldb/test/API/lang/swift/regex/TestSwiftRegexFrameVar.py
+++ b/lldb/test/API/lang/swift/regex/TestSwiftRegexFrameVar.py
@@ -12,7 +12,7 @@ def setUp(self):
         TestBase.setUp(self)
         self.main_source_spec = lldb.SBFileSpec("main.swift")
 
-    @skipEmbeddedSwift
+    @requiresNonEmbeddedSwift
     @swiftTest
     @skipIf(debug_info=no_match("dsym"))
     def test_swift_regex_frame_var(self):
diff --git a/lldb/test/API/lang/swift/regex/TestSwiftRegexFrameVarDesc.py b/lldb/test/API/lang/swift/regex/TestSwiftRegexFrameVarDesc.py
index 4f0b0131e1db4..036a8669394d9 100644
--- a/lldb/test/API/lang/swift/regex/TestSwiftRegexFrameVarDesc.py
+++ b/lldb/test/API/lang/swift/regex/TestSwiftRegexFrameVarDesc.py
@@ -12,7 +12,7 @@ def setUp(self):
         TestBase.setUp(self)
         self.main_source_spec = lldb.SBFileSpec("main.swift")
 
-    @skipEmbeddedSwift
+    @requiresNonEmbeddedSwift
     @swiftTest
     @skipIf(debug_info=no_match("dsym"))
     def test_swift_regex_frame_var_desc(self):
diff --git a/lldb/test/API/lang/swift/regex/TestSwiftRegexInExp.py b/lldb/test/API/lang/swift/regex/TestSwiftRegexInExp.py
index 5b4c9f30b67b3..6b683d8dcb42f 100644
--- a/lldb/test/API/lang/swift/regex/TestSwiftRegexInExp.py
+++ b/lldb/test/API/lang/swift/regex/TestSwiftRegexInExp.py
@@ -12,7 +12,7 @@ def setUp(self):
         TestBase.setUp(self)
         self.main_source_spec = lldb.SBFileSpec("main.swift")
 
-    @skipEmbeddedSwift
+    @requiresNonEmbeddedSwift
     @swiftTest
     @skipIf(debug_info=no_match("dsym"))
     def test_swift_regex_in_exp(self):
diff --git a/lldb/test/API/lang/swift/resilience/TestSwiftResilience.py b/lldb/test/API/lang/swift/resilience/TestSwiftResilience.py
index 80dcb1b76a8a2..11c88c4c449ab 100644
--- a/lldb/test/API/lang/swift/resilience/TestSwiftResilience.py
+++ b/lldb/test/API/lang/swift/resilience/TestSwiftResilience.py
@@ -22,7 +22,7 @@ def execute_command(command):
 
 
 class TestSwiftResilience(TestBase):
-    @skipEmbeddedSwift
+    @requiresNonEmbeddedSwift
     @skipUnlessDarwin
     @swiftTest
     # Because we rename the .swiftmodule files after building the
@@ -34,7 +34,7 @@ def test_cross_module_extension_a_a(self):
         self.build()
         self.doTestWithFlavor("a", "a")
 
-    @skipEmbeddedSwift
+    @requiresNonEmbeddedSwift
     @skipUnlessDarwin
     @swiftTest
     @skipIf(debug_info=no_match(["dsym"]))
@@ -43,7 +43,7 @@ def test_cross_module_extension_a_b(self):
         self.build()
         self.doTestWithFlavor("a", "b")
 
-    @skipEmbeddedSwift
+    @requiresNonEmbeddedSwift
     @skipUnlessDarwin
     @swiftTest
     @skipIf(debug_info=no_match(["dsym"]))
@@ -52,7 +52,7 @@ def test_cross_module_extension_b_a(self):
         self.build()
         self.doTestWithFlavor("b", "a")
 
-    @skipEmbeddedSwift
+    @requiresNonEmbeddedSwift
     @skipUnlessDarwin
     @swiftTest
     @skipIf(debug_info=no_match(["dsym"]))
diff --git a/lldb/test/API/lang/swift/resilience_other_module/TestSwiftResilienceOtherModule.py b/lldb/test/API/lang/swift/resilience_other_module/TestSwiftResilienceOtherModule.py
index 69fb6ad6314ac..edaf72f493b43 100644
--- a/lldb/test/API/lang/swift/resilience_other_module/TestSwiftResilienceOtherModule.py
+++ b/lldb/test/API/lang/swift/resilience_other_module/TestSwiftResilienceOtherModule.py
@@ -6,12 +6,12 @@
 
 class TestSwiftResilienceOtherModule(TestBase):
 
-    @skipEmbeddedSwift
+    @requiresNonEmbeddedSwift
     @swiftTest
     def test_with_debug_info(self):
         self.impl('break here with debug info')
 
-    @skipEmbeddedSwift
+    @requiresNonEmbeddedSwift
     @swiftTest
     def test_without_debug_info(self):
         self.impl('break here without debug info')
diff --git a/lldb/test/API/lang/swift/resilience_private_field/TestSwiftResiliencePrivateField.py b/lldb/test/API/lang/swift/resilience_private_field/TestSwiftResiliencePrivateField.py
index 63f6653e17ba2..17ff938d5f95b 100644
--- a/lldb/test/API/lang/swift/resilience_private_field/TestSwiftResiliencePrivateField.py
+++ b/lldb/test/API/lang/swift/resilience_private_field/TestSwiftResiliencePrivateField.py
@@ -8,7 +8,7 @@ class TestSwiftResiliencePrivateField(lldbtest.TestBase):
 
     mydir = lldbtest.TestBase.compute_mydir(__file__)
 
-    @skipEmbeddedSwift
+    @requiresNonEmbeddedSwift
     @swiftTest
     def test(self):
         self.build()
diff --git a/lldb/test/API/lang/swift/resilience_private_method/TestSwiftResiliencePrivateMethod.py b/lldb/test/API/lang/swift/resilience_private_method/TestSwiftResiliencePrivateMethod.py
index 9b1a5cfe0e259..4ae863146befb 100644
--- a/lldb/test/API/lang/swift/resilience_private_method/TestSwiftResiliencePrivateMethod.py
+++ b/lldb/test/API/lang/swift/resilience_private_method/TestSwiftResiliencePrivateMethod.py
@@ -5,7 +5,7 @@
 
 
 class TestSwiftResiliencePrivateMethod(TestBase):
-    @skipEmbeddedSwift
+    @requiresNonEmbeddedSwift
     @skipUnlessDarwin
     @swiftTest
     def test(self):
diff --git a/lldb/test/API/lang/swift/resilience_superclass/TestSwiftResilienceSuperclass.py b/lldb/test/API/lang/swift/resilience_superclass/TestSwiftResilienceSuperclass.py
index 37bd05e57eb13..94514ba62a8d7 100644
--- a/lldb/test/API/lang/swift/resilience_superclass/TestSwiftResilienceSuperclass.py
+++ b/lldb/test/API/lang/swift/resilience_superclass/TestSwiftResilienceSuperclass.py
@@ -5,7 +5,7 @@
 
 
 class TestSwiftResilienceSuperclass(TestBase):
-    @skipEmbeddedSwift
+    @requiresNonEmbeddedSwift
     @skipUnlessDarwin
     @swiftTest
     def test(self):
diff --git a/lldb/test/API/lang/swift/resilience_superclass_mod/TestSwiftResilienceSuperclassMod.py b/lldb/test/API/lang/swift/resilience_superclass_mod/TestSwiftResilienceSuperclassMod.py
index 93f628cebba4b..601a29fa5a198 100644
--- a/lldb/test/API/lang/swift/resilience_superclass_mod/TestSwiftResilienceSuperclassMod.py
+++ b/lldb/test/API/lang/swift/resilience_superclass_mod/TestSwiftResilienceSuperclassMod.py
@@ -5,7 +5,7 @@
 
 
 class TestSwiftResilienceSuperclassMod(TestBase):
-    @skipEmbeddedSwift
+    @requiresNonEmbeddedSwift
     @skipUnlessDarwin
     @swiftTest
     def test(self):
diff --git a/lldb/test/API/lang/swift/resilience_superclass_other_mod/TestSwiftResilienceSuperclassOtherMod.py b/lldb/test/API/lang/swift/resilience_superclass_other_mod/TestSwiftResilienceSuperclassOtherMod.py
index 316ab56f85de2..27dace103e390 100644
--- a/lldb/test/API/lang/swift/resilience_superclass_other_mod/TestSwiftResilienceSuperclassOtherMod.py
+++ b/lldb/test/API/lang/swift/resilience_superclass_other_mod/TestSwiftResilienceSuperclassOtherMod.py
@@ -5,7 +5,7 @@
 
 
 class TestSwiftResilienceSuperclassOtherMod(TestBase):
-    @skipEmbeddedSwift
+    @requiresNonEmbeddedSwift
     @skipUnlessDarwin
     @swiftTest
     def test(self):
diff --git a/lldb/test/API/lang/swift/resilience_swiftinterface/TestSwiftResilienceSwiftInterface.py b/lldb/test/API/lang/swift/resilience_swiftinterface/TestSwiftResilienceSwiftInterface.py
index 8191300d63b31..41b24f0588c1a 100644
--- a/lldb/test/API/lang/swift/resilience_swiftinterface/TestSwiftResilienceSwiftInterface.py
+++ b/lldb/test/API/lang/swift/resilience_swiftinterface/TestSwiftResilienceSwiftInterface.py
@@ -6,7 +6,7 @@
 
 class TestSwiftResilienceSwiftInterface(TestBase):
 
-    @skipEmbeddedSwift
+    @requiresNonEmbeddedSwift
     @skipUnlessDarwin
     @swiftTest
     def test(self):
diff --git a/lldb/test/API/lang/swift/static_linking/macOS/TestSwiftStaticLinkingMacOS.py b/lldb/test/API/lang/swift/static_linking/macOS/TestSwiftStaticLinkingMacOS.py
index 26221da7f8691..8ef2864c7f8de 100644
--- a/lldb/test/API/lang/swift/static_linking/macOS/TestSwiftStaticLinkingMacOS.py
+++ b/lldb/test/API/lang/swift/static_linking/macOS/TestSwiftStaticLinkingMacOS.py
@@ -32,7 +32,7 @@ def expect_self_var_available_at_breakpoint(
         self.expect("expr self", patterns=patterns,
                     substrs=substrs)
 
-    @skipEmbeddedSwift
+    @requiresNonEmbeddedSwift
     @skipUnlessDarwin
     @swiftTest
     def test_variables_print_from_both_swift_modules(self):
diff --git a/lldb/test/API/lang/swift/step_into_objc_interop_init/TestStepIntoObjCInteropInit.py b/lldb/test/API/lang/swift/step_into_objc_interop_init/TestStepIntoObjCInteropInit.py
index 7ea141e54236b..346f5ca391003 100644
--- a/lldb/test/API/lang/swift/step_into_objc_interop_init/TestStepIntoObjCInteropInit.py
+++ b/lldb/test/API/lang/swift/step_into_objc_interop_init/TestStepIntoObjCInteropInit.py
@@ -4,7 +4,7 @@
 import lldbsuite.test.lldbutil as lldbutil
 
 class TestSwiftObjcProtocol(TestBase):
-    @skipEmbeddedSwift
+    @requiresNonEmbeddedSwift
     @skipUnlessDarwin
     @swiftTest
     def test(self):
diff --git a/lldb/test/API/lang/swift/step_into_swift_override/TestStepFromObjCToSwiftOverride.py b/lldb/test/API/lang/swift/step_into_swift_override/TestStepFromObjCToSwiftOverride.py
index ac32d0f05970b..a58db6b7942a1 100644
--- a/lldb/test/API/lang/swift/step_into_swift_override/TestStepFromObjCToSwiftOverride.py
+++ b/lldb/test/API/lang/swift/step_into_swift_override/TestStepFromObjCToSwiftOverride.py
@@ -9,7 +9,7 @@ class TestStepFromObjCToSwiftOverride(TestBase):
 
     @skipUnlessDarwin
     @swiftTest
-    @skipEmbeddedSwift
+    @requiresNonEmbeddedSwift
     def test(self):
         self.build()
         (target, process, thread, breakpoint) = lldbutil.run_to_source_breakpoint(
diff --git a/lldb/test/API/lang/swift/stepping/TestSwiftStepping.py b/lldb/test/API/lang/swift/stepping/TestSwiftStepping.py
index f057f5b55faba..e5ff7399e75e3 100644
--- a/lldb/test/API/lang/swift/stepping/TestSwiftStepping.py
+++ b/lldb/test/API/lang/swift/stepping/TestSwiftStepping.py
@@ -24,7 +24,7 @@ class TestSwiftStepping(lldbtest.TestBase):
     mydir = lldbtest.TestBase.compute_mydir(__file__)
 
     @swiftTest
-    @skipEmbeddedSwift
+    @skipEmbeddedSwift # embedded Swift steps to the wrong line on x86_64, and the inferior does not link on Linux.
     @skipIf(oslist=["linux"], archs=no_match("x86_64"))
     def test_swift_stepping(self):
         """Tests that we can step reliably in swift code."""
diff --git a/lldb/test/API/lang/swift/substituted_typealias/TestSwiftSubstitutedTypeAlias.py b/lldb/test/API/lang/swift/substituted_typealias/TestSwiftSubstitutedTypeAlias.py
index fddb8c31c5da8..d59d1140fe5d9 100644
--- a/lldb/test/API/lang/swift/substituted_typealias/TestSwiftSubstitutedTypeAlias.py
+++ b/lldb/test/API/lang/swift/substituted_typealias/TestSwiftSubstitutedTypeAlias.py
@@ -12,4 +12,4 @@
 import lldbsuite.test.lldbinline as lldbinline
 from lldbsuite.test.decorators import *
 
-lldbinline.MakeInlineTest(__file__, globals(), decorators=[skipEmbeddedSwift, swiftTest])
+lldbinline.MakeInlineTest(__file__, globals(), decorators=[skipEmbeddedSwiftOnWindows, swiftTest])
diff --git a/lldb/test/API/lang/swift/swift_array_of_objc_items/TestSwiftArrayOfObjCItems.py b/lldb/test/API/lang/swift/swift_array_of_objc_items/TestSwiftArrayOfObjCItems.py
index 048cdcf0e6dbc..84cc9ad454073 100644
--- a/lldb/test/API/lang/swift/swift_array_of_objc_items/TestSwiftArrayOfObjCItems.py
+++ b/lldb/test/API/lang/swift/swift_array_of_objc_items/TestSwiftArrayOfObjCItems.py
@@ -7,7 +7,7 @@
 class TestCase(TestBase):
 
     @swiftTest
-    @skipEmbeddedSwift
+    @requiresNonEmbeddedSwift
     @skipUnlessDarwin
     def test(self):
         """Test that a Swift array of ObjC items prints correctly."""
diff --git a/lldb/test/API/lang/swift/swiftieformatting/TestSwiftieFormatting.py b/lldb/test/API/lang/swift/swiftieformatting/TestSwiftieFormatting.py
index 57f20feaa81b9..63fab9c82a737 100644
--- a/lldb/test/API/lang/swift/swiftieformatting/TestSwiftieFormatting.py
+++ b/lldb/test/API/lang/swift/swiftieformatting/TestSwiftieFormatting.py
@@ -20,7 +20,7 @@
 
 
 class TestSwiftieFormatting(TestBase):
-    @skipEmbeddedSwift
+    @requiresNonEmbeddedSwift
     @skipUnlessDarwin
     @swiftTest
     def test_swiftie_formatting(self):
diff --git a/lldb/test/API/lang/swift/swiftui_formatters/TestSwiftUIFormatters.py b/lldb/test/API/lang/swift/swiftui_formatters/TestSwiftUIFormatters.py
index cd445934bf224..b5e7e1d8afa38 100644
--- a/lldb/test/API/lang/swift/swiftui_formatters/TestSwiftUIFormatters.py
+++ b/lldb/test/API/lang/swift/swiftui_formatters/TestSwiftUIFormatters.py
@@ -8,7 +8,7 @@
 @skipIfDarwinEmbedded
 class TestCase(TestBase):
 
-    @skipEmbeddedSwift
+    @requiresNonEmbeddedSwift
     @skipUnlessDarwin
     @swiftTest
     def test_body(self):
@@ -18,7 +18,7 @@ def test_body(self):
         )
         self._do_test("self._count", 41, is_graph_update=True)
 
-    @skipEmbeddedSwift
+    @requiresNonEmbeddedSwift
     @skipUnlessDarwin
     @swiftTest
     def test_appear(self):
@@ -30,7 +30,7 @@ def test_appear(self):
         )
         self._do_test("self._count", 41, is_graph_update=False)
 
-    @skipEmbeddedSwift
+    @requiresNonEmbeddedSwift
     @skipUnlessDarwin
     @swiftTest
     def test_change(self):
diff --git a/lldb/test/API/lang/swift/symbolic_extended_existential/TestSwiftSymbolicExtendedExistential.py b/lldb/test/API/lang/swift/symbolic_extended_existential/TestSwiftSymbolicExtendedExistential.py
index e8d53101a3ca9..0b52fac8a810c 100644
--- a/lldb/test/API/lang/swift/symbolic_extended_existential/TestSwiftSymbolicExtendedExistential.py
+++ b/lldb/test/API/lang/swift/symbolic_extended_existential/TestSwiftSymbolicExtendedExistential.py
@@ -6,7 +6,7 @@
 
 class TestSwiftSymbolicExtendedExistential(lldbtest.TestBase):
 
-    @skipEmbeddedSwift
+    @requiresNonEmbeddedSwift
     @swiftTest
     def test(self):
         """Test symbolic extended existentials"""
diff --git a/lldb/test/API/lang/swift/system/TestSwiftSystemFilePath.py b/lldb/test/API/lang/swift/system/TestSwiftSystemFilePath.py
index 38309186e3722..ddba247eb3a7c 100644
--- a/lldb/test/API/lang/swift/system/TestSwiftSystemFilePath.py
+++ b/lldb/test/API/lang/swift/system/TestSwiftSystemFilePath.py
@@ -9,7 +9,7 @@
 from lldbsuite.test import lldbutil
 
 class TestSwiftSystemFilePath(TestBase):
-    @skipEmbeddedSwift
+    @requiresNonEmbeddedSwift
     @swiftTest
     @skipUnlessDarwin
     def test(self):
diff --git a/lldb/test/API/lang/swift/system_framework/TestSwiftSystemFramework.py b/lldb/test/API/lang/swift/system_framework/TestSwiftSystemFramework.py
index 3bfe3a58ceb4d..140b775fcfda9 100644
--- a/lldb/test/API/lang/swift/system_framework/TestSwiftSystemFramework.py
+++ b/lldb/test/API/lang/swift/system_framework/TestSwiftSystemFramework.py
@@ -8,7 +8,7 @@ class TestSwiftSystemFramework(lldbtest.TestBase):
     mydir = lldbtest.TestBase.compute_mydir(__file__)
     NO_DEBUG_INFO_TESTCASE = True
 
-    @skipEmbeddedSwift
+    @requiresNonEmbeddedSwift
     @swiftTest
     @skipIf(oslist=no_match(["macosx"]))
     def test_system_framework(self):
diff --git a/lldb/test/API/lang/swift/tagged_pointer/TestSwiftTaggedPointer.py b/lldb/test/API/lang/swift/tagged_pointer/TestSwiftTaggedPointer.py
index 4b662e363f3bf..63d8da7b98395 100644
--- a/lldb/test/API/lang/swift/tagged_pointer/TestSwiftTaggedPointer.py
+++ b/lldb/test/API/lang/swift/tagged_pointer/TestSwiftTaggedPointer.py
@@ -7,7 +7,7 @@ class TestSwiftTaggedPointer(lldbtest.TestBase):
 
     mydir = lldbtest.TestBase.compute_mydir(__file__)
 
-    @skipEmbeddedSwift
+    @requiresNonEmbeddedSwift
     @swiftTest
     # This test depends on NSObject, so it is not available on non-Darwin
     # platforms.
diff --git a/lldb/test/API/lang/swift/type_metadata/TestSwiftTypeMetadata.py b/lldb/test/API/lang/swift/type_metadata/TestSwiftTypeMetadata.py
index 16e46238a1a42..729e128d63dd7 100644
--- a/lldb/test/API/lang/swift/type_metadata/TestSwiftTypeMetadata.py
+++ b/lldb/test/API/lang/swift/type_metadata/TestSwiftTypeMetadata.py
@@ -19,7 +19,7 @@
 
 
 class SwiftTypeMetadataTest(TestBase):
-    @skipEmbeddedSwift
+    @requiresNonEmbeddedSwift # embedded Swift never emits an uncalled generic function, so the breakpoint slides to the next line
     @swiftTest
     def test_swift_type_metadata(self):
         """Test that LLDB can effectively use the type metadata to reconstruct dynamic types for Swift"""
diff --git a/lldb/test/API/lang/swift/typealias_othermodule/TestSwiftTypeAliasOthermodule.py b/lldb/test/API/lang/swift/typealias_othermodule/TestSwiftTypeAliasOthermodule.py
index aac84a98a8542..3f0c24a761f07 100644
--- a/lldb/test/API/lang/swift/typealias_othermodule/TestSwiftTypeAliasOthermodule.py
+++ b/lldb/test/API/lang/swift/typealias_othermodule/TestSwiftTypeAliasOthermodule.py
@@ -7,7 +7,7 @@
 class TestSwiftTypeAliasOtherModule(TestBase):
     NO_DEBUG_INFO_TESTCASE = True
 
-    @skipEmbeddedSwift
+    @requiresNonEmbeddedSwift
     @swiftTest
     def test_frame_variable(self):
         """Test that type aliases can be imported from reflection metadata"""
@@ -19,7 +19,7 @@ def test_frame_variable(self):
         self.expect("continue")
         self.expect("frame variable -- payload", substrs=["Bool", "true"])
 
-    @skipEmbeddedSwift
+    @requiresNonEmbeddedSwift
     @swiftTest
     def test_expression(self):
         """Test that type aliases can be imported into expressions from reflection metadata"""
diff --git a/lldb/test/API/lang/swift/typerefs/objc-descendent/TestSwiftObjCDescendantClassWithoutASTContext.py b/lldb/test/API/lang/swift/typerefs/objc-descendent/TestSwiftObjCDescendantClassWithoutASTContext.py
index 1b219253fbffc..15fd3ab18ecfe 100644
--- a/lldb/test/API/lang/swift/typerefs/objc-descendent/TestSwiftObjCDescendantClassWithoutASTContext.py
+++ b/lldb/test/API/lang/swift/typerefs/objc-descendent/TestSwiftObjCDescendantClassWithoutASTContext.py
@@ -5,7 +5,7 @@
 
 
 class TestCase(TestBase):
-    @skipEmbeddedSwift
+    @requiresNonEmbeddedSwift
     @skipUnlessFoundationEssentials
     @skipIfLinux  # https://github.com/swiftlang/llvm-project/issues/13465
     @swiftTest
diff --git a/lldb/test/API/lang/swift/union/TestSwiftCUnion.py b/lldb/test/API/lang/swift/union/TestSwiftCUnion.py
index 1e0f60bae4b9c..8d8b302e1eec8 100644
--- a/lldb/test/API/lang/swift/union/TestSwiftCUnion.py
+++ b/lldb/test/API/lang/swift/union/TestSwiftCUnion.py
@@ -9,7 +9,7 @@ class TestSwiftCUnion(lldbtest.TestBase):
 
     mydir = lldbtest.TestBase.compute_mydir(__file__)
 
-    @skipEmbeddedSwift
+    @skipEmbeddedSwiftOnWindows
     @swiftTest
     def test_c_unions(self):
         self.build()
diff --git a/lldb/test/API/lang/swift/unknown_reference/TestSwiftUnknownReference.py b/lldb/test/API/lang/swift/unknown_reference/TestSwiftUnknownReference.py
index 4f6cb5ad42463..24990b238ca5d 100644
--- a/lldb/test/API/lang/swift/unknown_reference/TestSwiftUnknownReference.py
+++ b/lldb/test/API/lang/swift/unknown_reference/TestSwiftUnknownReference.py
@@ -28,7 +28,7 @@ def check_class(self, var_self):
         lldbutil.check_variable(self, m_string, summary='"world"')
 
     
-    @skipEmbeddedSwift
+    @requiresNonEmbeddedSwift
     @skipIfLinux  # https://github.com/swiftlang/llvm-project/issues/13465
     @skipUnlessFoundationEssentials
     @swiftTest
diff --git a/lldb/test/API/lang/swift/unknown_self/TestSwiftUnknownSelf.py b/lldb/test/API/lang/swift/unknown_self/TestSwiftUnknownSelf.py
index 136460541c3a9..ca4c8cd73fbf4 100644
--- a/lldb/test/API/lang/swift/unknown_self/TestSwiftUnknownSelf.py
+++ b/lldb/test/API/lang/swift/unknown_self/TestSwiftUnknownSelf.py
@@ -33,7 +33,7 @@ def check_class(self, var_self, weak):
                     substrs=["hello"])
 
 
-    @skipEmbeddedSwift
+    @requiresNonEmbeddedSwift
     @skipIf(bugnumber="SR-10216", archs=['ppc64le'])
     @skipUnlessFoundationEssentials
     @skipIfLinux  # https://github.com/swiftlang/llvm-project/issues/13465
diff --git a/lldb/test/API/lang/swift/variables/actor/TestSwiftActorTypes.py b/lldb/test/API/lang/swift/variables/actor/TestSwiftActorTypes.py
index cdc2469b9278b..f4a1e7e470459 100644
--- a/lldb/test/API/lang/swift/variables/actor/TestSwiftActorTypes.py
+++ b/lldb/test/API/lang/swift/variables/actor/TestSwiftActorTypes.py
@@ -9,7 +9,7 @@
 
 
 class TestSwiftActorTypes(TestBase):
-    @skipEmbeddedSwift
+    @requiresNonEmbeddedSwift
     @swiftTest
     def test_swift_class_types(self):
         """Test swift Actor types"""
diff --git a/lldb/test/API/lang/swift/variables/bridged_string/TestSwiftBridgedStringVariables.py b/lldb/test/API/lang/swift/variables/bridged_string/TestSwiftBridgedStringVariables.py
index 27aea658b6bcd..2dda08bbbaaab 100644
--- a/lldb/test/API/lang/swift/variables/bridged_string/TestSwiftBridgedStringVariables.py
+++ b/lldb/test/API/lang/swift/variables/bridged_string/TestSwiftBridgedStringVariables.py
@@ -23,7 +23,7 @@
 
 
 class TestSwiftBridgedStringVariables(TestBase):
-    @skipEmbeddedSwift
+    @requiresNonEmbeddedSwift
     @skipUnlessDarwin
     @swiftTest
     def test_swift_bridged_string_variables(self):
diff --git a/lldb/test/API/lang/swift/variables/bulky_enums/TestBulkyEnumsVariables.py b/lldb/test/API/lang/swift/variables/bulky_enums/TestBulkyEnumsVariables.py
index 53b2e457975a7..1a528a69d911b 100644
--- a/lldb/test/API/lang/swift/variables/bulky_enums/TestBulkyEnumsVariables.py
+++ b/lldb/test/API/lang/swift/variables/bulky_enums/TestBulkyEnumsVariables.py
@@ -20,7 +20,7 @@
 
 
 class TestBulkyEnumVariables(TestBase):
-    @skipEmbeddedSwift
+    @requiresNonEmbeddedSwift
     @swiftTest
     def test_bulky_enum_variables(self):
         """Tests that large-size Enum variables display correctly"""
diff --git a/lldb/test/API/lang/swift/variables/cgtypes/TestCGTypes.py b/lldb/test/API/lang/swift/variables/cgtypes/TestCGTypes.py
index bd76fd10ef688..b0c38be64bedb 100644
--- a/lldb/test/API/lang/swift/variables/cgtypes/TestCGTypes.py
+++ b/lldb/test/API/lang/swift/variables/cgtypes/TestCGTypes.py
@@ -20,7 +20,7 @@
 
 
 class TestSwiftCoreGraphicsTypes(TestBase):
-    @skipEmbeddedSwift
+    @requiresNonEmbeddedSwift
     @swiftTest
     @skipUnlessDarwin
     def test_swift_coregraphics_types(self):
diff --git a/lldb/test/API/lang/swift/variables/consume_operator_async/TestSwiftConsumeOperatorAsync.py b/lldb/test/API/lang/swift/variables/consume_operator_async/TestSwiftConsumeOperatorAsync.py
index fdd125017e470..5eb3bbd8df4aa 100644
--- a/lldb/test/API/lang/swift/variables/consume_operator_async/TestSwiftConsumeOperatorAsync.py
+++ b/lldb/test/API/lang/swift/variables/consume_operator_async/TestSwiftConsumeOperatorAsync.py
@@ -24,7 +24,7 @@ def stderr_print(line):
     sys.stderr.write(line + "\n")
 
 class TestSwiftConsumeOperatorAsyncType(TestBase):
-    @skipEmbeddedSwift
+    @requiresNonEmbeddedSwift
     @swiftTest
     def test_swift_consume_operator_async(self):
         """Check that we properly show variables at various points of the CFG while
diff --git a/lldb/test/API/lang/swift/variables/dict_nsobj_anyobj/TestSwiftDictionaryNSObjectAnyObject.py b/lldb/test/API/lang/swift/variables/dict_nsobj_anyobj/TestSwiftDictionaryNSObjectAnyObject.py
index b6cfed9a12226..d622599a06472 100644
--- a/lldb/test/API/lang/swift/variables/dict_nsobj_anyobj/TestSwiftDictionaryNSObjectAnyObject.py
+++ b/lldb/test/API/lang/swift/variables/dict_nsobj_anyobj/TestSwiftDictionaryNSObjectAnyObject.py
@@ -20,7 +20,7 @@
 
 
 class TestDictionaryNSObjectAnyObject(TestBase):
-    @skipEmbeddedSwift
+    @requiresNonEmbeddedSwift
     @skipUnlessDarwin
     @swiftTest
     def test_dictionary_nsobject_any_object(self):
diff --git a/lldb/test/API/lang/swift/variables/dictionary/TestSwiftStdlibDictionary.py b/lldb/test/API/lang/swift/variables/dictionary/TestSwiftStdlibDictionary.py
index 65d6eccf75974..6ba15456ef9b9 100644
--- a/lldb/test/API/lang/swift/variables/dictionary/TestSwiftStdlibDictionary.py
+++ b/lldb/test/API/lang/swift/variables/dictionary/TestSwiftStdlibDictionary.py
@@ -83,7 +83,7 @@ def find_dictionary_entry(
                 found, ("found a not expected child for '%s':'%s'" %
                         (key_str, value_str)))
 
-    @skipEmbeddedSwift
+    @requiresNonEmbeddedSwift
     @swiftTest
     # @skipIfLinux  # bugs.swift.org/SR-844
     def test_swift_stdlib_dictionary(self):
diff --git a/lldb/test/API/lang/swift/variables/generic_enums/TestSwiftGenericEnums.py b/lldb/test/API/lang/swift/variables/generic_enums/TestSwiftGenericEnums.py
index 745846c7f499f..04e7380756a49 100644
--- a/lldb/test/API/lang/swift/variables/generic_enums/TestSwiftGenericEnums.py
+++ b/lldb/test/API/lang/swift/variables/generic_enums/TestSwiftGenericEnums.py
@@ -26,7 +26,7 @@ def get_variable(self, name):
         var.SetPreferSyntheticValue(True)
         return var
 
-    @skipEmbeddedSwift
+    @requiresNonEmbeddedSwift # embedded Swift monomorphizes every generic, so the static type is never an unbound Optional<U>
     @swiftTest
     def test_swift_generic_enum_types(self):
         """Test that we handle reasonably generically-typed enums"""
diff --git a/lldb/test/API/lang/swift/variables/generic_struct_debug_info/generic_array/TestSwiftGenericStructDebugInfoGenericArray.py b/lldb/test/API/lang/swift/variables/generic_struct_debug_info/generic_array/TestSwiftGenericStructDebugInfoGenericArray.py
index ab7978469873a..3eba995b0f52c 100644
--- a/lldb/test/API/lang/swift/variables/generic_struct_debug_info/generic_array/TestSwiftGenericStructDebugInfoGenericArray.py
+++ b/lldb/test/API/lang/swift/variables/generic_struct_debug_info/generic_array/TestSwiftGenericStructDebugInfoGenericArray.py
@@ -12,4 +12,4 @@
 import lldbsuite.test.lldbinline as lldbinline
 from lldbsuite.test.decorators import *
 
-lldbinline.MakeInlineTest(__file__, globals(), decorators=[skipEmbeddedSwift, swiftTest])
+lldbinline.MakeInlineTest(__file__, globals(), decorators=[requiresNonEmbeddedSwift, swiftTest])
diff --git a/lldb/test/API/lang/swift/variables/generic_struct_debug_info/generic_flatmap/TestSwiftGenericStructDebugInfoGenericFlatMap.py b/lldb/test/API/lang/swift/variables/generic_struct_debug_info/generic_flatmap/TestSwiftGenericStructDebugInfoGenericFlatMap.py
index 18087b7500cb3..7097719428148 100644
--- a/lldb/test/API/lang/swift/variables/generic_struct_debug_info/generic_flatmap/TestSwiftGenericStructDebugInfoGenericFlatMap.py
+++ b/lldb/test/API/lang/swift/variables/generic_struct_debug_info/generic_flatmap/TestSwiftGenericStructDebugInfoGenericFlatMap.py
@@ -12,4 +12,4 @@
 import lldbsuite.test.lldbinline as lldbinline
 from lldbsuite.test.decorators import *
 
-lldbinline.MakeInlineTest(__file__, globals(), decorators=[skipEmbeddedSwift, swiftTest])
+lldbinline.MakeInlineTest(__file__, globals(), decorators=[requiresNonEmbeddedSwift, swiftTest])
diff --git a/lldb/test/API/lang/swift/variables/generic_tuple_labels/TestSwiftGenericTupleLabels.py b/lldb/test/API/lang/swift/variables/generic_tuple_labels/TestSwiftGenericTupleLabels.py
index 4c72291c47ca2..b5f783d018c0c 100644
--- a/lldb/test/API/lang/swift/variables/generic_tuple_labels/TestSwiftGenericTupleLabels.py
+++ b/lldb/test/API/lang/swift/variables/generic_tuple_labels/TestSwiftGenericTupleLabels.py
@@ -26,7 +26,7 @@ class TestSwiftGenericTupleLabels(lldbtest.TestBase):
     def setUp(self):
         lldbtest.TestBase.setUp(self)
 
-    @skipEmbeddedSwift
+    @requiresNonEmbeddedSwift
     @swiftTest
     def test_generic_tuple_labels(self):
         """Test that LLDB can reconstruct tuple labels from metadata"""
diff --git a/lldb/test/API/lang/swift/variables/generics/TestSwiftGenericTypes.py b/lldb/test/API/lang/swift/variables/generics/TestSwiftGenericTypes.py
index 5cb0382329a0e..e31af1d65e8db 100644
--- a/lldb/test/API/lang/swift/variables/generics/TestSwiftGenericTypes.py
+++ b/lldb/test/API/lang/swift/variables/generics/TestSwiftGenericTypes.py
@@ -20,7 +20,7 @@
 
 
 class TestSwiftGenericTypes(TestBase):
-    @skipEmbeddedSwift
+    @requiresNonEmbeddedSwift # embedded Swift monomorphizes every generic, so there is no unresolved static type to show
     @swiftTest
     def test_swift_generic_types(self):
         """Test support for generic types"""
diff --git a/lldb/test/API/lang/swift/variables/inout/TestInOutVariables.py b/lldb/test/API/lang/swift/variables/inout/TestInOutVariables.py
index 5ebd9c123e75c..55c4991cfc785 100644
--- a/lldb/test/API/lang/swift/variables/inout/TestInOutVariables.py
+++ b/lldb/test/API/lang/swift/variables/inout/TestInOutVariables.py
@@ -18,7 +18,7 @@
 
 
 class TestInOutVariables(TestBase):
-    @skipEmbeddedSwift
+    @requiresNonEmbeddedSwift # embedded Swift strips initializers the program never calls, so Other(in1:in2:) is not in the binary
     @swiftTest
     def test_in_out_variables(self):
         """Test that @inout variables display reasonably"""
diff --git a/lldb/test/API/lang/swift/variables/objc/TestSwiftObjCImportedTypes.py b/lldb/test/API/lang/swift/variables/objc/TestSwiftObjCImportedTypes.py
index 6d3ddef097f1f..6667a15abc4d0 100644
--- a/lldb/test/API/lang/swift/variables/objc/TestSwiftObjCImportedTypes.py
+++ b/lldb/test/API/lang/swift/variables/objc/TestSwiftObjCImportedTypes.py
@@ -20,7 +20,7 @@
 
 
 class TestSwiftObjCImportedTypes(TestBase):
-    @skipEmbeddedSwift
+    @requiresNonEmbeddedSwift
     @swiftTest
     @skipUnlessDarwin
     def test_swift_objc_imported_types(self):
diff --git a/lldb/test/API/lang/swift/variables/objc_optionals/TestSwiftObjCOptionals.py b/lldb/test/API/lang/swift/variables/objc_optionals/TestSwiftObjCOptionals.py
index bcd35743dd955..ebcfe40bf3486 100644
--- a/lldb/test/API/lang/swift/variables/objc_optionals/TestSwiftObjCOptionals.py
+++ b/lldb/test/API/lang/swift/variables/objc_optionals/TestSwiftObjCOptionals.py
@@ -20,7 +20,7 @@
 
 
 class TestSwiftObjCOptionalType(TestBase):
-    @skipEmbeddedSwift
+    @requiresNonEmbeddedSwift
     @swiftTest
     @skipUnlessDarwin
     def test_swift_objc_optional_type(self):
diff --git a/lldb/test/API/lang/swift/variables/swift/TestSwiftTypes.py b/lldb/test/API/lang/swift/variables/swift/TestSwiftTypes.py
index 41a55afacda0c..7212848485f65 100644
--- a/lldb/test/API/lang/swift/variables/swift/TestSwiftTypes.py
+++ b/lldb/test/API/lang/swift/variables/swift/TestSwiftTypes.py
@@ -21,7 +21,7 @@
 
 class TestSwiftTypes(TestBase):
     @swiftTest
-    @skipEmbeddedSwift
+    @skipEmbeddedSwift # printing the x86_64-only Float80 crashes LLDB in embedded Swift.
     def test_swift_types(self):
         """Test that we can inspect basic Swift types"""
         self.build()
diff --git a/lldb/test/API/lang/swift/variables/uninitialized/TestSwiftUninitializedVariable.py b/lldb/test/API/lang/swift/variables/uninitialized/TestSwiftUninitializedVariable.py
index d2af20255f573..8b712812c090c 100644
--- a/lldb/test/API/lang/swift/variables/uninitialized/TestSwiftUninitializedVariable.py
+++ b/lldb/test/API/lang/swift/variables/uninitialized/TestSwiftUninitializedVariable.py
@@ -4,5 +4,5 @@
 lldbinline.MakeInlineTest(
     __file__,
     globals(),
-    decorators=[skipEmbeddedSwift, swiftTest],
+    decorators=[requiresNonEmbeddedSwift, swiftTest],
 )
diff --git a/lldb/test/API/lang/swift/variables/value_of_optionals/TestSwiftValueOfOptionals.py b/lldb/test/API/lang/swift/variables/value_of_optionals/TestSwiftValueOfOptionals.py
index 56b87d9bd5ccd..865957636f571 100644
--- a/lldb/test/API/lang/swift/variables/value_of_optionals/TestSwiftValueOfOptionals.py
+++ b/lldb/test/API/lang/swift/variables/value_of_optionals/TestSwiftValueOfOptionals.py
@@ -22,7 +22,7 @@
 class TestSwiftValueOfOptionalType(TestBase):
     TEST_WITH_PDB_DEBUG_INFO = True
 
-    @skipEmbeddedSwift
+    @requiresNonEmbeddedSwift
     @swiftTest
     def test_swift_value_optional_type(self):
         """Check that trying to read an optional's numeric value doesn't crash LLDB"""
diff --git a/lldb/test/API/lang/swift/variadic_generics/TestSwiftVariadicGenerics.py b/lldb/test/API/lang/swift/variadic_generics/TestSwiftVariadicGenerics.py
index 9989cc1d5005c..6fe3c7c1704ea 100644
--- a/lldb/test/API/lang/swift/variadic_generics/TestSwiftVariadicGenerics.py
+++ b/lldb/test/API/lang/swift/variadic_generics/TestSwiftVariadicGenerics.py
@@ -6,7 +6,7 @@
 class TestSwiftVariadicGenerics(TestBase):
 
     NO_DEBUG_INFO_TESTCASE = True
-    @skipEmbeddedSwift
+    @requiresNonEmbeddedSwift
     @swiftTest
     @skipIfAsan # rdar://152465885 Address Sanitizer assert doing `expr --bind-generic-types=false -- 0`
     def test(self):
diff --git a/lldb/test/API/repl/cpp_exceptions/TestSwiftCPPExceptionsInREPL.py b/lldb/test/API/repl/cpp_exceptions/TestSwiftCPPExceptionsInREPL.py
index 8daedb51ad3e9..45e9821283b83 100644
--- a/lldb/test/API/repl/cpp_exceptions/TestSwiftCPPExceptionsInREPL.py
+++ b/lldb/test/API/repl/cpp_exceptions/TestSwiftCPPExceptionsInREPL.py
@@ -31,7 +31,7 @@ def DISABLED_test_set_repl_mode_exceptions(self):
         self.main_source_file = lldb.SBFileSpec("main.swift")
         self.do_repl_mode_test()
 
-    @skipEmbeddedSwift
+    @requiresNonEmbeddedSwift
     @skipUnlessDarwin
     @swiftTest
     def test_repl_exceptions(self):