diff --git a/tests/Terminal/AndroidTest.xml b/tests/Terminal/AndroidTest.xml
index eeb7146..262421c 100644
--- a/tests/Terminal/AndroidTest.xml
+++ b/tests/Terminal/AndroidTest.xml
@@ -30,14 +30,6 @@
         <option name="script-file" value="TerminalAppTests-preparer.sh" />
     </target_preparer>
 
-    <target_preparer class="com.android.tradefed.targetprep.RunCommandTargetPreparer">
-        <option name="throw-if-cmd-fail" value="true" />
-        <option name="run-command"
-            value="pm enable com.google.android.virtualization.terminal/com.android.virtualization.terminal.MainActivity" />
-        <option name="teardown-command"
-            value="pm disable com.google.android.virtualization.terminal/com.android.virtualization.terminal.MainActivity" />
-    </target_preparer>
-
     <test class="com.android.tradefed.testtype.AndroidJUnitTest">
         <option name="package" value="com.android.virtualization.terminal.test"/>
         <option name="runner" value="androidx.test.runner.AndroidJUnitRunner"/>
diff --git a/tests/Terminal/TerminalAppTests-preparer.sh b/tests/Terminal/TerminalAppTests-preparer.sh
index de25af3..6022d7d 100644
--- a/tests/Terminal/TerminalAppTests-preparer.sh
+++ b/tests/Terminal/TerminalAppTests-preparer.sh
@@ -17,6 +17,11 @@
 set -e
 
 serial=${ANDROID_SERIAL}
+user=$(adb -s ${serial} shell am get-current-user)
+
+# Enable the terminal app
+package_name=$(adb -s ${serial} shell pm list package virtualization.terminal | cut -d ':' -f 2)
+adb -s ${serial} shell pm enable --user ${user} ${package_name}
 
 # Identify file to download
 arch=$(adb -s ${serial} shell getprop ro.bionic.arch)
@@ -31,7 +36,6 @@
 wget ${src} -O ${downloaded}
 
 # Push the file to the device
-user=$(adb -s ${serial} shell am get-current-user)
 dst=/data/media/${user}/linux
 adb -s ${serial} shell mkdir -p ${dst}
 adb -s ${serial} push ${downloaded} ${dst}/images.tar.gz