diff --git a/test/Serialization/module_defining_interface.swift b/test/Serialization/module_defining_interface.swift
index fee71bb39c61f..4d33ccb551741 100644
--- a/test/Serialization/module_defining_interface.swift
+++ b/test/Serialization/module_defining_interface.swift
@@ -2,7 +2,6 @@
 // RUN: %empty-directory(%t/inputs)
 // RUN: %empty-directory(%t/test-sdk)
 // RUN: %empty-directory(%t/test-sdk/usr/lib/swift)
-// RUN: cp -r %platform-module-dir/Swift.swiftmodule %t/test-sdk/usr/lib/swift/Swift.swiftmodule
 
 // RUN: %empty-directory(%t/test-sdk/usr/lib/Foo.swiftmodule)
 // RUN: split-file %s %t
diff --git a/test/Serialization/module_defining_interface_client.swift b/test/Serialization/module_defining_interface_client.swift
index 6f075677be096..b6f626c7fd04a 100644
--- a/test/Serialization/module_defining_interface_client.swift
+++ b/test/Serialization/module_defining_interface_client.swift
@@ -6,7 +6,6 @@
 // RUN: %empty-directory(%t/test-sdk/usr/lib/Bar.swiftmodule)
 // RUN: %empty-directory(%t/test-sdk/usr/lib/_Foo_Bar.swiftmodule)
 // RUN: %empty-directory(%t/test-sdk/usr/lib/Foo.swiftcrossimport)
-// RUN: cp -r %platform-module-dir/Swift.swiftmodule %t/test-sdk/usr/lib/swift/Swift.swiftmodule
 
 // RUN: split-file %s %t
 
diff --git a/test/Serialization/runtime-import-from-sdk.swift b/test/Serialization/runtime-import-from-sdk.swift
index d57b42501ba1e..657700b748f85 100644
--- a/test/Serialization/runtime-import-from-sdk.swift
+++ b/test/Serialization/runtime-import-from-sdk.swift
@@ -6,13 +6,16 @@
 
 // %t/good-sdk contains a loadable standard library.
 // RUN: %empty-directory(%t/good-sdk)
-// RUN: %empty-directory(%t/good-sdk/usr/lib/swift)
+// RUN: %empty-directory(%t/good-sdk/usr/lib/swift/%target-sdk-name)
 // RUN: cp -r %platform-module-dir/Swift.swiftmodule %t/good-sdk/usr/lib/swift/Swift.swiftmodule
+// RUN: cp -r %platform-module-dir/Swift.swiftmodule %t/good-sdk/usr/lib/swift/%target-sdk-name/Swift.swiftmodule
 
 // %t/bad-sdk contains an invalid standard library that cannot be loaded.
 // RUN: %empty-directory(%t/bad-sdk)
 // RUN: %empty-directory(%t/bad-sdk/usr/lib/swift/Swift.swiftmodule)
+// RUN: %empty-directory(%t/bad-sdk/usr/lib/swift/%target-sdk-name/Swift.swiftmodule)
 // RUN: touch %t/bad-sdk/usr/lib/swift/Swift.swiftmodule/garbage-garbage-garbage.swiftmodule
+// RUN: touch %t/bad-sdk/usr/lib/swift/%target-sdk-name/Swift.swiftmodule/garbage-garbage-garbage.swiftmodule
 
 // %t/empty-toolchain does not contain a standard library.
 // RUN: %empty-directory(%t/empty-toolchain)
@@ -45,22 +48,17 @@
 // We also check that ClangImporter noticed SwiftShims in the toolchain and
 // didn't add a -isystem flag to look in the SDK.
 
-// FIXME: We can't properly test this on a non-Darwin platform because we'll get
-// the same error message for "unloadable standard library" and "no standard
-// library" (https://github.com/apple/swift/issues/52499).
-// REQUIRES: objc_interop
-
 // RUN: %empty-directory(%t/mcp)
 // RUN: not %target-swift-frontend(mock-sdk: -sdk %t/bad-sdk) -resource-dir %t/empty-toolchain/usr/lib/swift -module-cache-path %t/mcp -typecheck %s -dump-clang-diagnostics -disable-implicit-concurrency-module-import -disable-implicit-string-processing-module-import 2>&1 | %FileCheck --check-prefix CHECK-EMPTY %s
-// CHECK-EMPTY-NOT: '-isystem' '{{.*}}/bad-sdk/usr/lib/swift/shims'
-// CHECK-EMPTY: error: could not find module 'Swift' for target '{{.*}}'; found: garbage-garbage-garbage, at: {{.*}}/Swift.swiftmodule
+// CHECK-EMPTY-NOT: '-isystem' '{{.*(\\|/)}}bad-sdk{{\\|/}}usr{{\\|/}}lib{{\\|/}}swift{{\\|/}}shims'
+// CHECK-EMPTY: error: could not find module 'Swift' for target '{{.*}}'; found: garbage-garbage-garbage, at: {{.*(\\|/)}}Swift.swiftmodule
 
 // Check that, when the toolchain *doesn't* have SwiftShims in it, ClagImporter
 // *does* add a -I flag to look in the SDK.
 
 // RUN: %empty-directory(%t/mcp)
 // RUN: not %target-swift-frontend(mock-sdk: -sdk %t/bad-sdk) -resource-dir %t/really-empty-toolchain/usr/lib/swift -module-cache-path %t/mcp -typecheck %s -dump-clang-diagnostics -disable-implicit-concurrency-module-import -disable-implicit-string-processing-module-import 2>&1 | %FileCheck --check-prefix CHECK-REALLY-EMPTY %s
-// CHECK-REALLY-EMPTY: '-isystem' '{{.*}}/bad-sdk/usr/lib/swift/shims'
-// CHECK-REALLY-EMPTY: error: could not find module 'Swift' for target '{{.*}}'; found: garbage-garbage-garbage, at: {{.*}}/Swift.swiftmodule
+// CHECK-REALLY-EMPTY: '-isystem' '{{.*(\\|/)}}bad-sdk{{\\|/}}usr{{\\|/}}lib{{\\|/}}swift{{\\|/}}shims'
+// CHECK-REALLY-EMPTY: error: could not find module 'Swift' for target '{{.*}}'; found: garbage-garbage-garbage, at: {{.*(\\|/)}}Swift.swiftmodule
 
 let x: Int = 1