diff --git a/AndroidTestTemplate.xml b/AndroidTestTemplate.xml
index 601be93108..4fb4bf9f76 100644
--- a/AndroidTestTemplate.xml
+++ b/AndroidTestTemplate.xml
@@ -17,10 +17,11 @@
   <option name="test-suite-tag" value="apct" />
   <option name="test-suite-tag" value="apct-native" />
   <target_preparer class="com.android.tradefed.targetprep.RootTargetPreparer" />
-  <target_preparer class="com.android.tradefed.targetprep.PushFilePreparer">
-    <option name="cleanup" value="true" />
-    <option name="push" value="{MODULE}->/data/local/tmp/{MODULE}" />
-  </target_preparer>
+  <target_preparer class="com.android.compatibility.common.tradefed.targetprep.FilePusher">
+        <option name="cleanup" value="true" />
+        <option name="push" value="{MODULE}->/data/local/tmp/{MODULE}" />
+        <option name="append-bitness" value="true" />
+    </target_preparer>
   <target_preparer class="com.android.tradefed.targetprep.RunCommandTargetPreparer">
     <option name="run-command" value="settings put global ble_scan_always_enabled 0" />
     <option name="run-command" value="svc bluetooth disable" />
@@ -33,4 +34,10 @@
     <option name="module-name" value="{MODULE}" />
     <option name="run-test-as" value="0" />
   </test>
+
+  <!-- Only run tests in MTS if the Bluetooth Mainline module is installed. -->
+  <object type="module_controller"
+          class="com.android.tradefed.testtype.suite.module.MainlineTestModuleController">
+      <option name="mainline-module-package-name" value="com.google.android.bluetooth" />
+  </object>
 </configuration>
diff --git a/system/gd/AndroidTestTemplate.xml b/system/gd/AndroidTestTemplate.xml
index 601be93108..4fb4bf9f76 100644
--- a/system/gd/AndroidTestTemplate.xml
+++ b/system/gd/AndroidTestTemplate.xml
@@ -17,10 +17,11 @@
   <option name="test-suite-tag" value="apct" />
   <option name="test-suite-tag" value="apct-native" />
   <target_preparer class="com.android.tradefed.targetprep.RootTargetPreparer" />
-  <target_preparer class="com.android.tradefed.targetprep.PushFilePreparer">
-    <option name="cleanup" value="true" />
-    <option name="push" value="{MODULE}->/data/local/tmp/{MODULE}" />
-  </target_preparer>
+  <target_preparer class="com.android.compatibility.common.tradefed.targetprep.FilePusher">
+        <option name="cleanup" value="true" />
+        <option name="push" value="{MODULE}->/data/local/tmp/{MODULE}" />
+        <option name="append-bitness" value="true" />
+    </target_preparer>
   <target_preparer class="com.android.tradefed.targetprep.RunCommandTargetPreparer">
     <option name="run-command" value="settings put global ble_scan_always_enabled 0" />
     <option name="run-command" value="svc bluetooth disable" />
@@ -33,4 +34,10 @@
     <option name="module-name" value="{MODULE}" />
     <option name="run-test-as" value="0" />
   </test>
+
+  <!-- Only run tests in MTS if the Bluetooth Mainline module is installed. -->
+  <object type="module_controller"
+          class="com.android.tradefed.testtype.suite.module.MainlineTestModuleController">
+      <option name="mainline-module-package-name" value="com.google.android.bluetooth" />
+  </object>
 </configuration>
diff --git a/system/test/Android.bp b/system/test/Android.bp
index f99db16f61..8c93ff5255 100644
--- a/system/test/Android.bp
+++ b/system/test/Android.bp
@@ -456,6 +456,7 @@ cc_defaults {
     name: "mts_defaults",
     target: {
         android: {
+            test_config_template: ":BluetoothTestConfigTemplate",
             test_suites: ["mts-bluetooth",],
         },
     },