diff --git a/script/configure/test_case_creator.py b/script/configure/test_case_creator.py
index 8741d3a..3e68771 100755
--- a/script/configure/test_case_creator.py
+++ b/script/configure/test_case_creator.py
@@ -211,7 +211,6 @@
     def CreateAndroidTestXml(self):
         """Create AndroidTest.xml."""
         VTS_FILE_PUSHER = 'com.android.compatibility.common.tradefed.targetprep.VtsFilePusher'
-        VTS_PYTHON_PREPARER = 'com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer'
         VTS_TEST_CLASS = 'com.android.tradefed.testtype.VtsMultiDeviceTest'
 
         configuration = ET.Element('configuration', {
@@ -221,8 +220,6 @@
                                     {'class': VTS_FILE_PUSHER})
 
         self.GeneratePushFileConfigure(file_pusher)
-        python_preparer = ET.SubElement(configuration, 'multi_target_preparer',
-                                        {'class': VTS_PYTHON_PREPARER})
         test = ET.SubElement(configuration, 'test', {'class': VTS_TEST_CLASS})
 
         self.GenerateTestOptionConfigure(test)
diff --git a/usb/gadget/V1_0/host/VtsHalUsbGadgetV1_0HostTest.py b/usb/gadget/V1_0/host/VtsHalUsbGadgetV1_0HostTest.py
index 3e38829..22a955f 100644
--- a/usb/gadget/V1_0/host/VtsHalUsbGadgetV1_0HostTest.py
+++ b/usb/gadget/V1_0/host/VtsHalUsbGadgetV1_0HostTest.py
@@ -31,7 +31,7 @@
     def setUpClass(self):
         self.dut = self.android_devices[0]
         self.shell = self.dut.shell
-        self.adb = adb.AdbProxy()
+        self.adb = self.dut.adb
         try:
             self.adb.root()
             self.adb.wait_for_device()