diff --git a/drivers/tests/TESTS/host_tests/device_echo.py b/drivers/tests/TESTS/host_tests/device_echo.py
index 0be5750ae5..a14cf6f8c4 100644
--- a/drivers/tests/TESTS/host_tests/device_echo.py
+++ b/drivers/tests/TESTS/host_tests/device_echo.py
@@ -17,7 +17,7 @@ limitations under the License.
 
 
 import uuid
-from mbed_host_tests import BaseHostTest
+from htrun import BaseHostTest
 
 class Device_Echo(BaseHostTest):
 
diff --git a/drivers/tests/TESTS/host_tests/reset_reason.py b/drivers/tests/TESTS/host_tests/reset_reason.py
index 4e33606767..f9f71bd69d 100644
--- a/drivers/tests/TESTS/host_tests/reset_reason.py
+++ b/drivers/tests/TESTS/host_tests/reset_reason.py
@@ -15,7 +15,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 """
 import time
-from mbed_host_tests import BaseHostTest
+from htrun import BaseHostTest
 
 DEFAULT_SYNC_DELAY = 4.0
 
diff --git a/drivers/tests/TESTS/host_tests/serial_comms.py b/drivers/tests/TESTS/host_tests/serial_comms.py
index f51ac7d60f..ad67cacf03 100644
--- a/drivers/tests/TESTS/host_tests/serial_comms.py
+++ b/drivers/tests/TESTS/host_tests/serial_comms.py
@@ -16,7 +16,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 """
 
-from mbed_host_tests import BaseHostTest
+from htrun import BaseHostTest
 
 
 MSG_KEY_ECHO_MESSAGE = "echo_message"
diff --git a/drivers/tests/TESTS/host_tests/sync_on_reset.py b/drivers/tests/TESTS/host_tests/sync_on_reset.py
index 1d509cad4e..b3307fee14 100644
--- a/drivers/tests/TESTS/host_tests/sync_on_reset.py
+++ b/drivers/tests/TESTS/host_tests/sync_on_reset.py
@@ -16,7 +16,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 """
 import time
-from mbed_host_tests import BaseHostTest
+from htrun import BaseHostTest
 
 DEFAULT_SYNC_DELAY = 4.0
 
diff --git a/drivers/tests/TESTS/host_tests/timing_drift_auto.py b/drivers/tests/TESTS/host_tests/timing_drift_auto.py
index 65ac90a160..912cb3452b 100644
--- a/drivers/tests/TESTS/host_tests/timing_drift_auto.py
+++ b/drivers/tests/TESTS/host_tests/timing_drift_auto.py
@@ -16,7 +16,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 """
 
-from mbed_host_tests import BaseHostTest
+from htrun import BaseHostTest
 import time
 
 
diff --git a/drivers/tests/TESTS/host_tests/watchdog_reset.py b/drivers/tests/TESTS/host_tests/watchdog_reset.py
index 3f791882b9..fd3aeed1d0 100644
--- a/drivers/tests/TESTS/host_tests/watchdog_reset.py
+++ b/drivers/tests/TESTS/host_tests/watchdog_reset.py
@@ -16,7 +16,7 @@ limitations under the License.
 """
 import collections
 import threading
-from mbed_host_tests import BaseHostTest
+from htrun import BaseHostTest
 
 TestCaseData = collections.namedtuple('TestCaseData', ['index', 'data_to_send'])
 
diff --git a/drivers/usb/tests/TESTS/host_tests/pyusb_basic.py b/drivers/usb/tests/TESTS/host_tests/pyusb_basic.py
index e3675fd55c..b3c2549cf6 100644
--- a/drivers/usb/tests/TESTS/host_tests/pyusb_basic.py
+++ b/drivers/usb/tests/TESTS/host_tests/pyusb_basic.py
@@ -17,7 +17,7 @@ limitations under the License.
 """
 from __future__ import print_function
 
-from mbed_host_tests import BaseHostTest
+from htrun import BaseHostTest
 from argparse import ArgumentParser
 import time
 import sys
diff --git a/drivers/usb/tests/TESTS/host_tests/pyusb_msd.py b/drivers/usb/tests/TESTS/host_tests/pyusb_msd.py
index 27e43a2ce2..a2e2b40cc2 100644
--- a/drivers/usb/tests/TESTS/host_tests/pyusb_msd.py
+++ b/drivers/usb/tests/TESTS/host_tests/pyusb_msd.py
@@ -15,7 +15,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 """
 
-from mbed_host_tests import BaseHostTest
+from htrun import BaseHostTest
 import time
 import psutil
 import tempfile
diff --git a/drivers/usb/tests/TESTS/host_tests/usb_device_hid.py b/drivers/usb/tests/TESTS/host_tests/usb_device_hid.py
index 3b166bf9c5..5c474cbf40 100644
--- a/drivers/usb/tests/TESTS/host_tests/usb_device_hid.py
+++ b/drivers/usb/tests/TESTS/host_tests/usb_device_hid.py
@@ -21,7 +21,7 @@ import time
 import threading
 import uuid
 import sys
-import mbed_host_tests
+import htrun
 import usb.core
 from usb.util import (
     CTRL_IN,
@@ -218,7 +218,7 @@ def raise_if_false(expression, text):
         raise RuntimeError(text)
 
 
-class USBHIDTest(mbed_host_tests.BaseHostTest):
+class USBHIDTest(htrun.BaseHostTest):
     """Host side test for USB device HID class."""
 
     @staticmethod
diff --git a/drivers/usb/tests/TESTS/host_tests/usb_device_serial.py b/drivers/usb/tests/TESTS/host_tests/usb_device_serial.py
index d462d761e9..f617539ed3 100644
--- a/drivers/usb/tests/TESTS/host_tests/usb_device_serial.py
+++ b/drivers/usb/tests/TESTS/host_tests/usb_device_serial.py
@@ -25,7 +25,7 @@ import sys
 import serial
 import serial.tools.list_ports as stlp
 import six
-import mbed_host_tests
+import htrun
 
 
 MSG_KEY_DEVICE_READY = 'ready'
@@ -90,7 +90,7 @@ def retry_fun_call(fun, num_retries=3, retry_delay=0.0):
     raise RetryError(err_msg.format(final_err, num_retries))
 
 
-class USBSerialTest(mbed_host_tests.BaseHostTest):
+class USBSerialTest(htrun.BaseHostTest):
     """Host side test for USB CDC & Serial classes."""
 
     _BYTESIZES = {