diff --git a/platforms/Windows/platforms/android/android.wxs b/platforms/Windows/platforms/android/android.wxs
index 741a8c25..ec206e0d 100644
--- a/platforms/Windows/platforms/android/android.wxs
+++ b/platforms/Windows/platforms/android/android.wxs
@@ -78,6 +78,7 @@
                 <Directory Name="lib">
                   <Directory Name="swift">
                     <Directory Name="android">
+                      <Directory Id="_Testing_Foundation.swiftmodule" Name="_Testing_Foundation.swiftmodule" />
                       <?if $(IncludeARM64) = True?>
                         <Directory Id="Testing_usr_lib_swift_android_arm64" Name="aarch64" DiskId="2" />
                       <?endif?>
@@ -90,6 +91,7 @@
                       <?if $(IncludeX86) = True?>
                         <Directory Id="Testing_usr_lib_swift_android_x86" Name="i686" DiskId="5" />
                       <?endif?>
+                      <Directory Id="Testing.swiftcrossimport" Name="Testing.swiftcrossimport" />
                       <Directory Id="Testing.swiftmodule" Name="Testing.swiftmodule" />
                     </Directory>
                   </Directory>
@@ -230,6 +232,11 @@
     <?endif?>
 
     <!-- Testing -->
+    <ComponentGroup Id="Testing">
+      <Component Directory="Testing.swiftcrossimport">
+        <File Source="$(PlatformRoot)\Developer\Library\Testing-$(ProductVersion)\usr\lib\swift\android\Testing.swiftcrossimport\Foundation.swiftoverlay" />
+      </Component>
+    </ComponentGroup>
     <?if $(IncludeARM64) = True?>
       <ComponentGroup Id="Testing.arm64">
         <Component Directory="Testing.swiftmodule" DiskId="2">
@@ -239,9 +246,19 @@
           <File Source="$(PlatformRoot)\Developer\Library\Testing-$(ProductVersion)\usr\lib\swift\android\Testing.swiftmodule\aarch64-unknown-linux-android.swiftinterface" />
         </Component>
 
+        <Component Directory="_Testing_Foundation.swiftmodule" DiskId="2">
+          <File Source="$(PlatformRoot)\Developer\Library\Testing-$(ProductVersion)\usr\lib\swift\android\_Testing_Foundation.swiftmodule\aarch64-unknown-linux-android.swiftdoc" />
+        </Component>
+        <Component Directory="_Testing_Foundation.swiftmodule" DiskId="2">
+          <File Source="$(PlatformRoot)\Developer\Library\Testing-$(ProductVersion)\usr\lib\swift\android\_Testing_Foundation.swiftmodule\aarch64-unknown-linux-android.swiftinterface" />
+        </Component>
+
         <Component Directory="Testing_usr_lib_swift_android_arm64" DiskId="2">
           <File Source="$(PlatformRoot)\Developer\Library\Testing-$(ProductVersion)\usr\lib\swift\android\aarch64\libTesting.so" />
         </Component>
+        <Component Directory="Testing_usr_lib_swift_android_arm64" DiskId="2">
+          <File Source="$(PlatformRoot)\Developer\Library\Testing-$(ProductVersion)\usr\lib\swift\android\aarch64\lib_Testing_Foundation.so" />
+        </Component>
       </ComponentGroup>
     <?endif?>
     <?if $(IncludeARM) = True?>
@@ -253,9 +270,19 @@
           <File Source="$(PlatformRoot)\Developer\Library\Testing-$(ProductVersion)\usr\lib\swift\android\Testing.swiftmodule\armv7-unknown-linux-android.swiftinterface" />
         </Component>
 
+        <Component Directory="_Testing_Foundation.swiftmodule" DiskId="3">
+          <File Source="$(PlatformRoot)\Developer\Library\Testing-$(ProductVersion)\usr\lib\swift\android\_Testing_Foundation.swiftmodule\armv7-unknown-linux-android.swiftdoc" />
+        </Component>
+        <Component Directory="_Testing_Foundation.swiftmodule" DiskId="3">
+          <File Source="$(PlatformRoot)\Developer\Library\Testing-$(ProductVersion)\usr\lib\swift\android\_Testing_Foundation.swiftmodule\armv7-unknown-linux-android.swiftinterface" />
+        </Component>
+
         <Component Directory="Testing_usr_lib_swift_android_arm" DiskId="3">
           <File Source="$(PlatformRoot)\Developer\Library\Testing-$(ProductVersion)\usr\lib\swift\android\armv7\libTesting.so" />
         </Component>
+        <Component Directory="Testing_usr_lib_swift_android_arm" DiskId="3">
+          <File Source="$(PlatformRoot)\Developer\Library\Testing-$(ProductVersion)\usr\lib\swift\android\armv7\lib_Testing_Foundation.so" />
+        </Component>
       </ComponentGroup>
     <?endif?>
     <?if $(IncludeX64) = True?>
@@ -267,9 +294,19 @@
           <File Source="$(PlatformRoot)\Developer\Library\Testing-$(ProductVersion)\usr\lib\swift\android\Testing.swiftmodule\x86_64-unknown-linux-android.swiftinterface" />
         </Component>
 
+        <Component Directory="_Testing_Foundation.swiftmodule" DiskId="4">
+          <File Source="$(PlatformRoot)\Developer\Library\Testing-$(ProductVersion)\usr\lib\swift\android\_Testing_Foundation.swiftmodule\x86_64-unknown-linux-android.swiftdoc" />
+        </Component>
+        <Component Directory="_Testing_Foundation.swiftmodule" DiskId="4">
+          <File Source="$(PlatformRoot)\Developer\Library\Testing-$(ProductVersion)\usr\lib\swift\android\_Testing_Foundation.swiftmodule\x86_64-unknown-linux-android.swiftinterface" />
+        </Component>
+
         <Component Directory="Testing_usr_lib_swift_android_x64" DiskId="4">
           <File Source="$(PlatformRoot)\Developer\Library\Testing-$(ProductVersion)\usr\lib\swift\android\x86_64\libTesting.so" />
         </Component>
+        <Component Directory="Testing_usr_lib_swift_android_x64" DiskId="4">
+          <File Source="$(PlatformRoot)\Developer\Library\Testing-$(ProductVersion)\usr\lib\swift\android\x86_64\lib_Testing_Foundation.so" />
+        </Component>
       </ComponentGroup>
     <?endif?>
     <?if $(IncludeX86) = True?>
@@ -281,9 +318,19 @@
           <File Source="$(PlatformRoot)\Developer\Library\Testing-$(ProductVersion)\usr\lib\swift\android\Testing.swiftmodule\i686-unknown-linux-android.swiftinterface" />
         </Component>
 
-        <Component Directory="Testing.swiftmodule" DiskId="5">
+        <Component Directory="_Testing_Foundation.swiftmodule" DiskId="5">
+          <File Source="$(PlatformRoot)\Developer\Library\Testing-$(ProductVersion)\usr\lib\swift\android\_Testing_Foundation.swiftmodule\i686-unknown-linux-android.swiftdoc" />
+        </Component>
+        <Component Directory="_Testing_Foundation.swiftmodule" DiskId="5">
+          <File Source="$(PlatformRoot)\Developer\Library\Testing-$(ProductVersion)\usr\lib\swift\android\_Testing_Foundation.swiftmodule\i686-unknown-linux-android.swiftinterface" />
+        </Component>
+
+        <Component Directory="Testing_usr_lib_swift_android_x86" DiskId="5">
           <File Source="$(PlatformRoot)\Developer\Library\Testing-$(ProductVersion)\usr\lib\swift\android\i686\libTesting.so" />
         </Component>
+        <Component Directory="Testing_usr_lib_swift_android_x86" DiskId="5">
+          <File Source="$(PlatformRoot)\Developer\Library\Testing-$(ProductVersion)\usr\lib\swift\android\i686\lib_Testing_Foundation.so" />
+        </Component>
       </ComponentGroup>
     <?endif?>
 
@@ -2092,6 +2139,8 @@
       <ComponentGroupRef Id="_FoundationUnicode" />
       <ComponentGroupRef Id="_FoundationCShims" />
 
+      <ComponentGroupRef Id="Testing" />
+
       <ComponentGroupRef Id="Configuration" />
       <ComponentGroupRef Id="SwiftShims" />
       <ComponentGroupRef Id="apinotes" />
diff --git a/platforms/Windows/platforms/windows/windows.wxs b/platforms/Windows/platforms/windows/windows.wxs
index 2cc4f38e..c044d02d 100644
--- a/platforms/Windows/platforms/windows/windows.wxs
+++ b/platforms/Windows/platforms/windows/windows.wxs
@@ -89,6 +89,7 @@
                 <Directory Name="lib">
                   <Directory Name="swift">
                     <Directory Name="windows">
+                      <Directory Id="_Testing_Foundation.swiftmodule" Name="_Testing_Foundation.swiftmodule" />
                       <?if $(IncludeARM64) = True?>
                         <Directory DiskId="2" Id="Testing_usr_lib_swift_windows_arm64" Name="aarch64" />
                       <?endif?>
@@ -98,6 +99,7 @@
                       <?if $(IncludeX86) = True?>
                         <Directory DiskId="4" Id="Testing_usr_lib_swift_windows_x86" Name="i686" />
                       <?endif?>
+                      <Directory Id="Testing.swiftcrossimport" Name="Testing.swiftcrossimport" />
                       <Directory Id="Testing.swiftmodule" Name="Testing.swiftmodule" />
                     </Directory>
                   </Directory>
@@ -222,20 +224,40 @@
     <?endif?>
 
     <!-- Testing -->
+    <ComponentGroup Id="Testing">
+      <Component Directory="Testing.swiftcrossimport">
+        <File Source="$(PlatformRoot)\Developer\Library\Testing-$(ProductVersion)\usr\lib\swift\windows\Testing.swiftcrossimport\Foundation.swiftoverlay" />
+      </Component>
+    </ComponentGroup>
     <?if $(IncludeARM64) = True?>
       <ComponentGroup Id="Testing.arm64">
         <Component Directory="Testing_usr_bin64a" DiskId="2">
           <File Source="$(PlatformRoot)\Developer\Library\Testing-$(ProductVersion)\usr\bin64a\Testing.dll" />
         </Component>
+        <Component Directory="Testing_usr_bin64a" DiskId="2">
+          <File Source="$(PlatformRoot)\Developer\Library\Testing-$(ProductVersion)\usr\bin64a\_Testing_Foundation.dll" />
+        </Component>
+
         <Component Directory="Testing_usr_lib_swift_windows_arm64" DiskId="2">
           <File Source="$(PlatformRoot)\Developer\Library\Testing-$(ProductVersion)\usr\lib\swift\windows\aarch64\Testing.lib" />
         </Component>
+        <Component Directory="Testing_usr_lib_swift_windows_arm64" DiskId="2">
+          <File Source="$(PlatformRoot)\Developer\Library\Testing-$(ProductVersion)\usr\lib\swift\windows\aarch64\_Testing_Foundation.lib" />
+        </Component>
+
         <Component Directory="Testing.swiftmodule" DiskId="2">
           <File Source="$(PlatformRoot)\Developer\Library\Testing-$(ProductVersion)\usr\lib\swift\windows\Testing.swiftmodule\aarch64-unknown-windows-msvc.swiftdoc" />
         </Component>
         <Component Directory="Testing.swiftmodule" DiskId="2">
           <File Source="$(PlatformRoot)\Developer\Library\Testing-$(ProductVersion)\usr\lib\swift\windows\Testing.swiftmodule\aarch64-unknown-windows-msvc.swiftinterface" />
         </Component>
+
+        <Component Directory="_Testing_Foundation.swiftmodule" DiskId="2">
+          <File Source="$(PlatformRoot)\Developer\Library\Testing-$(ProductVersion)\usr\lib\swift\windows\_Testing_Foundation.swiftmodule\aarch64-unknown-windows-msvc.swiftdoc" />
+        </Component>
+        <Component Directory="_Testing_Foundation.swiftmodule" DiskId="2">
+          <File Source="$(PlatformRoot)\Developer\Library\Testing-$(ProductVersion)\usr\lib\swift\windows\_Testing_Foundation.swiftmodule\aarch64-unknown-windows-msvc.swiftinterface" />
+        </Component>
       </ComponentGroup>
     <?endif?>
     <?if $(IncludeX64) = True?>
@@ -243,15 +265,30 @@
         <Component Directory="Testing_usr_bin64" DiskId="3">
           <File Source="$(PlatformRoot)\Developer\Library\Testing-$(ProductVersion)\usr\bin64\Testing.dll" />
         </Component>
+        <Component Directory="Testing_usr_bin64" DiskId="3">
+          <File Source="$(PlatformRoot)\Developer\Library\Testing-$(ProductVersion)\usr\bin64\_Testing_Foundation.dll" />
+        </Component>
+
         <Component Directory="Testing_usr_lib_swift_windows_x64" DiskId="3">
           <File Source="$(PlatformRoot)\Developer\Library\Testing-$(ProductVersion)\usr\lib\swift\windows\x86_64\Testing.lib" />
         </Component>
+        <Component Directory="Testing_usr_lib_swift_windows_x64" DiskId="3">
+          <File Source="$(PlatformRoot)\Developer\Library\Testing-$(ProductVersion)\usr\lib\swift\windows\x86_64\_Testing_Foundation.lib" />
+        </Component>
+
         <Component Directory="Testing.swiftmodule" DiskId="3">
           <File Source="$(PlatformRoot)\Developer\Library\Testing-$(ProductVersion)\usr\lib\swift\windows\Testing.swiftmodule\x86_64-unknown-windows-msvc.swiftdoc" />
         </Component>
         <Component Directory="Testing.swiftmodule" DiskId="3">
           <File Source="$(PlatformRoot)\Developer\Library\Testing-$(ProductVersion)\usr\lib\swift\windows\Testing.swiftmodule\x86_64-unknown-windows-msvc.swiftinterface" />
         </Component>
+
+        <Component Directory="_Testing_Foundation.swiftmodule" DiskId="3">
+          <File Source="$(PlatformRoot)\Developer\Library\Testing-$(ProductVersion)\usr\lib\swift\windows\_Testing_Foundation.swiftmodule\x86_64-unknown-windows-msvc.swiftdoc" />
+        </Component>
+        <Component Directory="_Testing_Foundation.swiftmodule" DiskId="3">
+          <File Source="$(PlatformRoot)\Developer\Library\Testing-$(ProductVersion)\usr\lib\swift\windows\_Testing_Foundation.swiftmodule\x86_64-unknown-windows-msvc.swiftinterface" />
+        </Component>
       </ComponentGroup>
     <?endif?>
     <?if $(IncludeX86) = True?>
@@ -259,15 +296,30 @@
         <Component Directory="Testing_usr_bin32" DiskId="4">
           <File Source="$(PlatformRoot)\Developer\Library\Testing-$(ProductVersion)\usr\bin32\Testing.dll" />
         </Component>
+        <Component Directory="Testing_usr_bin32" DiskId="4">
+          <File Source="$(PlatformRoot)\Developer\Library\Testing-$(ProductVersion)\usr\bin32\_Testing_Foundation.dll" />
+        </Component>
+
         <Component Directory="Testing_usr_lib_swift_windows_x86" DiskId="4">
           <File Source="$(PlatformRoot)\Developer\Library\Testing-$(ProductVersion)\usr\lib\swift\windows\i686\Testing.lib" />
         </Component>
+        <Component Directory="Testing_usr_lib_swift_windows_x86" DiskId="4">
+          <File Source="$(PlatformRoot)\Developer\Library\Testing-$(ProductVersion)\usr\lib\swift\windows\i686\_Testing_Foundation.lib" />
+        </Component>
+
         <Component Directory="Testing.swiftmodule" DiskId="4">
           <File Source="$(PlatformRoot)\Developer\Library\Testing-$(ProductVersion)\usr\lib\swift\windows\Testing.swiftmodule\i686-unknown-windows-msvc.swiftdoc" />
         </Component>
         <Component Directory="Testing.swiftmodule" DiskId="4">
           <File Source="$(PlatformRoot)\Developer\Library\Testing-$(ProductVersion)\usr\lib\swift\windows\Testing.swiftmodule\i686-unknown-windows-msvc.swiftinterface" />
         </Component>
+
+        <Component Directory="_Testing_Foundation.swiftmodule" DiskId="4">
+          <File Source="$(PlatformRoot)\Developer\Library\Testing-$(ProductVersion)\usr\lib\swift\windows\_Testing_Foundation.swiftmodule\i686-unknown-windows-msvc.swiftdoc" />
+        </Component>
+        <Component Directory="_Testing_Foundation.swiftmodule" DiskId="4">
+          <File Source="$(PlatformRoot)\Developer\Library\Testing-$(ProductVersion)\usr\lib\swift\windows\_Testing_Foundation.swiftmodule\i686-unknown-windows-msvc.swiftinterface" />
+        </Component>
       </ComponentGroup>
     <?endif?>
 
@@ -1666,6 +1718,8 @@
       <ComponentGroupRef Id="_FoundationUnicode" />
       <ComponentGroupRef Id="_FoundationCShims" />
 
+      <ComponentGroupRef Id="Testing" />
+
       <ComponentGroupRef Id="AuxiliaryFiles" />
       <ComponentGroupRef Id="Configuration" />
       <ComponentGroupRef Id="SwiftShims" />