diff --git a/eng/testing/AndroidRunnerTemplate.sh b/eng/testing/AndroidRunnerTemplate.sh
index dfb90ecaa156bc..1a683aa348986c 100644
--- a/eng/testing/AndroidRunnerTemplate.sh
+++ b/eng/testing/AndroidRunnerTemplate.sh
@@ -4,7 +4,7 @@ EXECUTION_DIR=$(dirname $0)
 TEST_NAME=$1
 TARGET_ARCH=$2
 
-APK=$EXECUTION_DIR/Bundle/bin/$TEST_NAME.apk
+APK=$EXECUTION_DIR/bin/$TEST_NAME.apk
 
 # it doesn't support parallel execution yet, so, here is a hand-made semaphore:
 LOCKDIR=/tmp/androidtests.lock
@@ -20,4 +20,4 @@ done
 
 dotnet xharness android test -i="net.dot.MonoRunner" \
     --package-name="net.dot.$TEST_NAME" \
-    --app=$APK -o=$EXECUTION_DIR/Bundle/TestResults -v
+    --app=$APK -o=$EXECUTION_DIR/TestResults -v
diff --git a/eng/testing/AppleRunnerTemplate.sh b/eng/testing/AppleRunnerTemplate.sh
index 11b5675fab77fb..809580e5d73eb3 100644
--- a/eng/testing/AppleRunnerTemplate.sh
+++ b/eng/testing/AppleRunnerTemplate.sh
@@ -25,7 +25,7 @@ fi
 
 # "Release" in SCHEME_SDK is what xcode produces (see "bool Optimized" property in AppleAppBuilderTask)
 
-APP_BUNDLE=$EXECUTION_DIR/Bundle/$TEST_NAME/$SCHEME_SDK/$TEST_NAME.app
+APP_BUNDLE=$EXECUTION_DIR/$TEST_NAME/$SCHEME_SDK/$TEST_NAME.app
 
 # it doesn't support parallel execution yet, so, here is a hand-made semaphore:
 LOCKDIR=/tmp/runonsim.lock
@@ -39,7 +39,7 @@ while true; do
     fi
 done
 
-XHARNESS_OUT="$EXECUTION_DIR/Bundle/xharness-output"
+XHARNESS_OUT="$EXECUTION_DIR/xharness-output"
 
 dotnet xharness ios test --app="$APP_BUNDLE" \
     --targets=$TARGET \
diff --git a/eng/testing/tests.mobile.targets b/eng/testing/tests.mobile.targets
new file mode 100644
index 00000000000000..aa0f1450faef72
--- /dev/null
+++ b/eng/testing/tests.mobile.targets
@@ -0,0 +1,114 @@
+<Project>
+  <PropertyGroup>
+    <!-- OutDir is not set early enough to set this property in .props file. -->
+    <BundleDir>$([MSBuild]::NormalizeDirectory('$(OutDir)', 'AppBundle'))</BundleDir>
+    <RunScriptOutputPath>$([MSBuild]::NormalizePath('$(BundleDir)', '$(RunScriptOutputName)'))</RunScriptOutputPath>
+  </PropertyGroup>
+
+  <!-- Generate a self-contained app bundle for Android with tests. -->
+  <UsingTask TaskName="AndroidAppBuilderTask" 
+             AssemblyFile="$(AndroidAppBuilderDir)AndroidAppBuilder.dll" />
+  <Target Condition="'$(TargetOS)' == 'Android'" Name="BundleTestAndroidApp">
+    <PropertyGroup>
+      <AndroidAbi Condition="'$(TargetArchitecture)'=='arm64'">arm64-v8a</AndroidAbi>
+      <AndroidAbi Condition="'$(TargetArchitecture)'=='arm'">armeabi</AndroidAbi>
+      <AndroidAbi Condition="'$(TargetArchitecture)'=='x64'">x86_64</AndroidAbi>
+      <AndroidAbi Condition="'$(AndroidAbi)'==''">$(TargetArchitecture)</AndroidAbi>
+    </PropertyGroup>
+    <ItemGroup>
+      <AndroidTestRunnerBinaries Include="$(AndroidTestRunnerDir)*.*" />
+    </ItemGroup>
+
+    <Error Condition="'@(AndroidTestRunnerBinaries)' == ''" Text="Could not find AndroidTestRunner in $(AndroidTestRunnerDir)" />
+    <Error Condition="!Exists('$(RuntimePackRidDir)')" Text="RuntimePackRidDir=$(RuntimePackRidDir) doesn't exist" />
+
+    <RemoveDir Directories="$(BundleDir)" />
+    <Copy SourceFiles="@(AndroidTestRunnerBinaries)" DestinationFolder="$(OutDir)%(RecursiveDir)" SkipUnchangedFiles="true"/>
+
+    <!-- TEMP: consume OpenSSL binaries from external sources via env. variables -->
+    <Copy Condition="'$(AndroidOpenSslCryptoLib)' != ''"
+          SourceFiles="$(AndroidOpenSslCryptoLib)"
+          DestinationFolder="$(OutDir)" SkipUnchangedFiles="true"/>
+    <Copy Condition="'$(AndroidOpenSslLib)' != ''"
+          SourceFiles="$(AndroidOpenSslLib)"
+          DestinationFolder="$(OutDir)" SkipUnchangedFiles="true"/>
+
+    <WriteLinesToFile File="$(OutDir)xunit-excludes.txt" Lines="$(_withoutCategories.Replace(';', '%0dcategory='))" />
+
+    <AndroidAppBuilderTask 
+        Abi="$(AndroidAbi)"
+        ProjectName="$(AssemblyName)"
+        MonoRuntimeHeaders="$(RuntimePackNativeDir)\include\mono-2.0"
+        MainLibraryFileName="AndroidTestRunner.dll"
+        OutputDir="$(BundleDir)"
+        SourceDir="$(OutDir)">
+        <Output TaskParameter="ApkPackageId"  PropertyName="ApkPackageId" />
+        <Output TaskParameter="ApkBundlePath" PropertyName="ApkBundlePath" />
+    </AndroidAppBuilderTask>
+    <Message Importance="High" Text="PackageId:       $(ApkPackageId)"/>
+    <Message Importance="High" Text="Instrumentation: net.dot.MonoRunner"/>
+    <Message Importance="High" Text="Apk:             $(ApkBundlePath)"/>
+  </Target>
+
+  <!-- Generate a self-contained app bundle for iOS with tests. -->
+  <UsingTask TaskName="AppleAppBuilderTask" 
+             AssemblyFile="$(AppleAppBuilderDir)AppleAppBuilder.dll" />
+  <Target Condition="'$(TargetOS)' == 'iOS'" Name="BundleTestAppleApp">
+    <ItemGroup>
+      <AppleTestRunnerBinaries Include="$(AppleTestRunnerDir)*.*" />
+    </ItemGroup>
+
+    <Error Condition="'@(AppleTestRunnerBinaries)' == ''" Text="Could not find AppleTestRunner in $(AppleTestRunnerDir) doesn't exist" />
+    <Error Condition="!Exists('$(RuntimePackRidDir)')" Text="RuntimePackRidDir=$(RuntimePackRidDir) doesn't exist" />
+
+    <RemoveDir Directories="$(BundleDir)" />
+    <Copy SourceFiles="@(AppleTestRunnerBinaries)" DestinationFolder="$(OutDir)%(RecursiveDir)" SkipUnchangedFiles="true"/>
+
+    <WriteLinesToFile File="$(OutDir)xunit-excludes.txt" Lines="$(_withoutCategories.Replace(';', '%0dcategory='))" />
+    <!-- Run App bundler, it should AOT libs (if needed), link all native bits, compile simple UI (written in ObjC)
+         and produce an app bundle (with xcode project) -->
+    <AppleAppBuilderTask 
+        Arch="$(TargetArchitecture)"
+        ProjectName="$(AssemblyName)"
+        MonoRuntimeHeaders="$(RuntimePackNativeDir)\include\mono-2.0"
+        CrossCompiler="$(RuntimePackNativeDir)\cross\mono-aot-cross"
+        MainLibraryFileName="AppleTestRunner.dll"
+        UseConsoleUITemplate="True"
+        GenerateXcodeProject="True"
+        BuildAppBundle="True"
+        Optimized="True"
+        UseLlvm="$(MonoEnableLLVM)"
+        LlvmPath="$(RuntimePackNativeDir)\cross"
+        DevTeamProvisioning="$(DevTeamProvisioning)"
+        OutputDirectory="$(BundleDir)"
+        AppDir="$(OutDir)">
+        <Output TaskParameter="AppBundlePath" PropertyName="AppBundlePath" />
+        <Output TaskParameter="XcodeProjectPath" PropertyName="XcodeProjectPath" />
+    </AppleAppBuilderTask>
+    <Message Importance="High" Text="Xcode: $(XcodeProjectPath)"/>
+    <Message Importance="High" Text="App: $(AppBundlePath)"/>
+    <Error Condition="$(TargetArchitecture.StartsWith('arm')) and '$(DevTeamProvisioning)' == ''" 
+           Text="'DevTeamProvisioning' shouldn't be empty for arm64" />
+    <!-- This app is now can be consumed by xharness CLI to deploy on a device or simulator -->
+  </Target>
+
+  <Target Name="AddFrameworkReference">
+    <ItemGroup>
+      <FrameworkReference Include="$(SharedFrameworkName)" />
+    </ItemGroup>
+  </Target>
+
+  <Target Name="UpdateRuntimePack"
+          Condition="'$(IsCrossTargetingBuild)' != 'true'"
+          AfterTargets="BeforeBuild"
+          DependsOnTargets="AddFrameworkReference;ResolveFrameworkReferences">
+    <ItemGroup>
+      <ResolvedRuntimePack Update="@(ResolvedRuntimePack)" PackageDirectory="$(RuntimePackDir)" />
+    </ItemGroup>
+  </Target>
+
+  <Target Name="PublishTestAsSelfContained"
+          Condition="'$(IsCrossTargetingBuild)' != 'true'"
+          AfterTargets="PrepareForRun"
+          DependsOnTargets="BundleTestAppleApp;BundleTestAndroidApp" />
+</Project>
diff --git a/eng/testing/tests.props b/eng/testing/tests.props
index f736c75d4279fe..09b51e3163a7d4 100644
--- a/eng/testing/tests.props
+++ b/eng/testing/tests.props
@@ -20,12 +20,17 @@
     <_withoutCategories Condition="!$(_withCategories.Contains('failing'))">$(_withoutCategories);failing</_withoutCategories>
   </PropertyGroup>
 
-  <PropertyGroup>
+  <PropertyGroup Condition="'$(TargetsMobile)' == 'true'">
     <MobileHelpersDirSuffix>$(NetCoreAppCurrent)-$(MonoConfiguration)</MobileHelpersDirSuffix>
     <AppleAppBuilderDir>$([MSBuild]::NormalizeDirectory('$(ArtifactsBinDir)', 'AppleAppBuilder', '$(MobileHelpersDirSuffix)'))</AppleAppBuilderDir>
     <AppleTestRunnerDir>$([MSBuild]::NormalizeDirectory('$(ArtifactsBinDir)', 'AppleTestRunner', '$(MobileHelpersDirSuffix)'))</AppleTestRunnerDir>
     <AndroidAppBuilderDir>$([MSBuild]::NormalizeDirectory('$(ArtifactsBinDir)', 'AndroidAppBuilder', '$(MobileHelpersDirSuffix)'))</AndroidAppBuilderDir>
     <AndroidTestRunnerDir>$([MSBuild]::NormalizeDirectory('$(ArtifactsBinDir)', 'AndroidTestRunner', '$(MobileHelpersDirSuffix)'))</AndroidTestRunnerDir>
+
+    <RuntimeIdentifier>$(PackageRID)</RuntimeIdentifier>
+    <SelfContained>true</SelfContained>
+    <EnableTargetingPackDownload>false</EnableTargetingPackDownload>
+    <PlatformManifestFile />
   </PropertyGroup>
 
   <!--
diff --git a/eng/testing/tests.targets b/eng/testing/tests.targets
index e8ba7225cb8035..8abd2532274d09 100644
--- a/eng/testing/tests.targets
+++ b/eng/testing/tests.targets
@@ -101,122 +101,7 @@
     <Error Condition="'$(TestRunExitCode)' != '0'" Text="$(TestRunErrorMessage)" />
   </Target>
 
- <!-- Generate a self-contained app bundle for Android with tests.
-       This target is executed once build is done for a test lib (after CopyFilesToOutputDirectory target) -->
-  <UsingTask TaskName="AndroidAppBuilderTask" 
-             AssemblyFile="$(AndroidAppBuilderDir)AndroidAppBuilder.dll" />
-  <Target Condition="'$(TargetOS)' == 'Android'" Name="BundleTestAndroidApp" AfterTargets="CopyFilesToOutputDirectory">
-    <PropertyGroup>
-      <BundleDir>$(OutDir)\Bundle</BundleDir>
-      <AndroidAbi Condition="'$(TargetArchitecture)'=='arm64'">arm64-v8a</AndroidAbi>
-      <AndroidAbi Condition="'$(TargetArchitecture)'=='arm'">armeabi</AndroidAbi>
-      <AndroidAbi Condition="'$(TargetArchitecture)'=='x64'">x86_64</AndroidAbi>
-      <AndroidAbi Condition="'$(AndroidAbi)'==''">$(TargetArchitecture)</AndroidAbi>
-    </PropertyGroup>
-    <!-- TEMP: We need to copy additional stuff into $(OutDir)\Bundle
-         1) The whole BCL
-         2) Test Runner (with xharness client-side lib)
-      -->
-    <ItemGroup>
-      <TestBinaries Include="$(OutDir)\*.*"/>
-      <AndroidTestRunnerBinaries Include="$(AndroidTestRunnerDir)*.*" />
-      <BclBinaries Include="$(RuntimePackLibDir)\*.*"
-                   Exclude="$(RuntimePackLibDir)\System.Runtime.WindowsRuntime.dll" />
-      <BclBinaries Include="$(RuntimePackNativeDir)\*.*" Exclude="$(RuntimePackNativeDir)\libmono.dylib" />
-      
-      <!-- remove PDBs and DBGs to save some space until we integrate ILLink -->
-      <BclBinaries Remove="$(RuntimePackLibDir)\*.pdb" />
-      <BclBinaries Remove="$(RuntimePackLibDir)\*.dbg" />
-    </ItemGroup>
-
-    <Error Condition="'@(AndroidTestRunnerBinaries)' == ''" Text="Could not find AndroidTestRunner in $(AndroidTestRunnerDir)" />
-    <Error Condition="!Exists('$(RuntimePackRidDir)')" Text="RuntimePackRidDir=$(RuntimePackRidDir) doesn't exist" />
-    <RemoveDir Directories="$(BundleDir)" />
-    <Copy SourceFiles="@(TestBinaries)" DestinationFolder="$(BundleDir)" SkipUnchangedFiles="true"/>
-    <Copy SourceFiles="@(AndroidTestRunnerBinaries)" DestinationFolder="$(BundleDir)\%(RecursiveDir)" SkipUnchangedFiles="true"/>
-    <Copy SourceFiles="@(BclBinaries)" DestinationFolder="$(BundleDir)\%(RecursiveDir)" SkipUnchangedFiles="true"/>
-
-    <!-- TEMP: consume OpenSSL binaries from external sources via env. variables -->
-    <Copy Condition="'$(AndroidOpenSslCryptoLib)' != ''"
-          SourceFiles="$(AndroidOpenSslCryptoLib)"
-          DestinationFolder="$(BundleDir)" SkipUnchangedFiles="true"/>
-    <Copy Condition="'$(AndroidOpenSslLib)' != ''"
-          SourceFiles="$(AndroidOpenSslLib)"
-          DestinationFolder="$(BundleDir)" SkipUnchangedFiles="true"/>
-
-    <WriteLinesToFile File="$(BundleDir)\xunit-excludes.txt" Lines="$(_withoutCategories.Replace(';', '%0dcategory='))" />
-
-    <AndroidAppBuilderTask 
-        Abi="$(AndroidAbi)"
-        ProjectName="$(AssemblyName)"
-        MonoRuntimeHeaders="$(RuntimePackNativeDir)\include\mono-2.0"
-        MainLibraryFileName="AndroidTestRunner.dll"
-        OutputDir="$(BundleDir)"
-        SourceDir="$(BundleDir)">
-        <Output TaskParameter="ApkPackageId"  PropertyName="ApkPackageId" />
-        <Output TaskParameter="ApkBundlePath" PropertyName="ApkBundlePath" />
-    </AndroidAppBuilderTask>
-    <Message Importance="High" Text="PackageId:       $(ApkPackageId)"/>
-    <Message Importance="High" Text="Instrumentation: net.dot.MonoRunner"/>
-    <Message Importance="High" Text="Apk:             $(ApkBundlePath)"/>
-  </Target>
-
-  <!-- Generate a self-contained app bundle for iOS with tests.
-       This target is executed once build is done for a test lib (after CopyFilesToOutputDirectory target) -->
-  <UsingTask TaskName="AppleAppBuilderTask" 
-             AssemblyFile="$(AppleAppBuilderDir)AppleAppBuilder.dll" />
-  <Target Condition="'$(TargetOS)' == 'iOS'" Name="BundleTestAppleApp" AfterTargets="CopyFilesToOutputDirectory">
-    <PropertyGroup>
-      <BundleDir>$(OutDir)\Bundle</BundleDir>
-    </PropertyGroup>
-    <!-- We need to copy additional stuff into $(OutDir)\Bundle
-         1) The whole BCL
-         2) Test Runner (with xharness client-side lib)
-      -->
-    <ItemGroup>
-      <TestBinaries Include="$(OutDir)*.*"/>
-      <AppleTestRunnerBinaries Include="$(AppleTestRunnerDir)*.*" />
-      <BclBinaries Include="$(RuntimePackLibDir)*.*" Exclude="$(RuntimePackLibDir)\System.Runtime.WindowsRuntime.dll" />
-      <BclBinaries Include="$(RuntimePackNativeDir)*.*" Exclude="$(RuntimePackNativeDir)\libmono.dylib" /> <!-- we use static libmono.a -->
-      
-      <!-- remove PDBs to save some space until we integrate ILLink -->
-      <BclBinaries Remove="$(RuntimePackLibDir)\*.pdb" />
-    </ItemGroup>
-    <Error Condition="'@(AppleTestRunnerBinaries)' == ''" Text="Could not find AppleTestRunner in $(AppleTestRunnerDir) doesn't exist" />
-    <Error Condition="!Exists('$(RuntimePackRidDir)')" Text="RuntimePackRidDir=$(RuntimePackRidDir) doesn't exist" />
-    <RemoveDir Directories="$(BundleDir)" />
-    <Copy SourceFiles="@(TestBinaries)" DestinationFolder="$(BundleDir)" SkipUnchangedFiles="true"/>
-    <Copy SourceFiles="@(AppleTestRunnerBinaries)" DestinationFolder="$(BundleDir)\%(RecursiveDir)" SkipUnchangedFiles="true"/>
-    <Copy SourceFiles="@(BclBinaries)" DestinationFolder="$(BundleDir)\%(RecursiveDir)" SkipUnchangedFiles="true"/>
-
-    <WriteLinesToFile File="$(BundleDir)\xunit-excludes.txt" Lines="$(_withoutCategories.Replace(';', '%0dcategory='))" />
-    <!-- Run App bundler, it should AOT libs (if needed), link all native bits, compile simple UI (written in ObjC)
-         and produce an app bundle (with xcode project) -->
-    <AppleAppBuilderTask 
-        Arch="$(TargetArchitecture)"
-        ProjectName="$(AssemblyName)"
-        MonoRuntimeHeaders="$(RuntimePackNativeDir)\include\mono-2.0"
-        CrossCompiler="$(RuntimePackNativeDir)\cross\mono-aot-cross"
-        MainLibraryFileName="AppleTestRunner.dll"
-        UseConsoleUITemplate="True"
-        GenerateXcodeProject="True"
-        BuildAppBundle="True"
-        Optimized="True"
-        UseLlvm="$(MonoEnableLLVM)"
-        LlvmPath="$(RuntimePackNativeDir)\cross"
-        DevTeamProvisioning="$(DevTeamProvisioning)"
-        OutputDirectory="$(BundleDir)"
-        AppDir="$(BundleDir)">
-        <Output TaskParameter="AppBundlePath" PropertyName="AppBundlePath" />
-        <Output TaskParameter="XcodeProjectPath" PropertyName="XcodeProjectPath" />
-    </AppleAppBuilderTask>
-    <Message Importance="High" Text="Xcode: $(XcodeProjectPath)"/>
-    <Message Importance="High" Text="App: $(AppBundlePath)"/>
-    <Error Condition="$(TargetArchitecture.StartsWith('arm')) and '$(DevTeamProvisioning)' == ''" 
-           Text="'DevTeamProvisioning' shouldn't be empty for arm64" />
-    <!-- This app is now can be consumed by xharness CLI to deploy on a device or simulator -->
-  </Target>
-
+  <Import Project="$(MSBuildThisFileDirectory)tests.mobile.targets" Condition="'$(TargetsMobile)' == 'true'" />
   <Import Project="$(MSBuildThisFileDirectory)xunit\xunit.targets" Condition="'$(TestFramework)' == 'xunit'" />
 
   <!-- Main test targets -->