Merge "Revert "Enable pKVM before running tests""
diff --git a/authfs/tests/AndroidTest.xml b/authfs/tests/AndroidTest.xml
index edfec78..6100ab9 100644
--- a/authfs/tests/AndroidTest.xml
+++ b/authfs/tests/AndroidTest.xml
@@ -15,9 +15,6 @@
-->
<configuration description="Config for authfs tests">
- <!-- Make sure pKVM is available on the device -->
- <target_preparer class="com.android.tradefed.targetprep.PkvmPreparer"/>
-
<!-- Need root to start virtualizationservice -->
<target_preparer class="com.android.tradefed.targetprep.RootTargetPreparer"/>
diff --git a/compos/tests/AndroidTest.xml b/compos/tests/AndroidTest.xml
index 3331705..61b6d47 100644
--- a/compos/tests/AndroidTest.xml
+++ b/compos/tests/AndroidTest.xml
@@ -14,9 +14,6 @@
limitations under the License.
-->
<configuration description="Tests for CompOS">
- <!-- Make sure pKVM is available on the device -->
- <target_preparer class="com.android.tradefed.targetprep.PkvmPreparer"/>
-
<target_preparer class="com.android.tradefed.targetprep.RootTargetPreparer">
<option name="force-root" value="true" />
</target_preparer>
diff --git a/tests/hostside/AndroidTest.xml b/tests/hostside/AndroidTest.xml
index 99157e0..e8aced6 100644
--- a/tests/hostside/AndroidTest.xml
+++ b/tests/hostside/AndroidTest.xml
@@ -14,9 +14,6 @@
limitations under the License.
-->
<configuration description="Tests for microdroid">
- <!-- Make sure pKVM is available on the device -->
- <target_preparer class="com.android.tradefed.targetprep.PkvmPreparer"/>
-
<test class="com.android.compatibility.common.tradefed.testtype.JarHostTest" >
<option name="jar" value="MicrodroidHostTestCases.jar" />
</test>