diff --git a/drivers/tests/TESTS/host_tests/pyusb_basic.py b/drivers/usb/tests/TESTS/host_tests/pyusb_basic.py
similarity index 100%
rename from drivers/tests/TESTS/host_tests/pyusb_basic.py
rename to drivers/usb/tests/TESTS/host_tests/pyusb_basic.py
diff --git a/drivers/tests/TESTS/host_tests/pyusb_msd.py b/drivers/usb/tests/TESTS/host_tests/pyusb_msd.py
similarity index 99%
rename from drivers/tests/TESTS/host_tests/pyusb_msd.py
rename to drivers/usb/tests/TESTS/host_tests/pyusb_msd.py
index 107efd941b..27e43a2ce2 100644
--- a/drivers/tests/TESTS/host_tests/pyusb_msd.py
+++ b/drivers/usb/tests/TESTS/host_tests/pyusb_msd.py
@@ -185,7 +185,7 @@ class MSDUtils(object):
         return False
 
     @staticmethod
-    def _disk_path_windows(serial):        
+    def _disk_path_windows(serial):
         c = wmi.WMI()
         for physical_disk in c.Win32_DiskDrive():
             if serial == physical_disk.SerialNumber:
diff --git a/drivers/tests/TESTS/host_tests/usb_device_hid.py b/drivers/usb/tests/TESTS/host_tests/usb_device_hid.py
similarity index 100%
rename from drivers/tests/TESTS/host_tests/usb_device_hid.py
rename to drivers/usb/tests/TESTS/host_tests/usb_device_hid.py
diff --git a/drivers/tests/TESTS/host_tests/usb_device_serial.py b/drivers/usb/tests/TESTS/host_tests/usb_device_serial.py
similarity index 100%
rename from drivers/tests/TESTS/host_tests/usb_device_serial.py
rename to drivers/usb/tests/TESTS/host_tests/usb_device_serial.py
diff --git a/drivers/tests/TESTS/usb_device/README.md b/drivers/usb/tests/TESTS/usb_device/README.md
similarity index 99%
rename from drivers/tests/TESTS/usb_device/README.md
rename to drivers/usb/tests/TESTS/usb_device/README.md
index 04a48f8706..d38e7c76c8 100644
--- a/drivers/tests/TESTS/usb_device/README.md
+++ b/drivers/usb/tests/TESTS/usb_device/README.md
@@ -163,4 +163,3 @@ You may want to connect the device directly to the host machine with no hubs on
 [LN-linux_xhci_patch]: https://github.com/torvalds/linux/commit/f5249461b504d35aa1a40140983b7ec415807d9e
 [LN-xhci_lkml_discussion]: https://lkml.org/lkml/2016/12/15/388
 [LN-xhci_setpci]: https://linuxmusicians.com/viewtopic.php?t=16901
-
diff --git a/drivers/tests/TESTS/usb_device/basic/USBEndpointTester.cpp b/drivers/usb/tests/TESTS/usb_device/basic/USBEndpointTester.cpp
similarity index 100%
rename from drivers/tests/TESTS/usb_device/basic/USBEndpointTester.cpp
rename to drivers/usb/tests/TESTS/usb_device/basic/USBEndpointTester.cpp
diff --git a/drivers/tests/TESTS/usb_device/basic/USBEndpointTester.h b/drivers/usb/tests/TESTS/usb_device/basic/USBEndpointTester.h
similarity index 100%
rename from drivers/tests/TESTS/usb_device/basic/USBEndpointTester.h
rename to drivers/usb/tests/TESTS/usb_device/basic/USBEndpointTester.h
diff --git a/drivers/tests/TESTS/usb_device/basic/USBTester.cpp b/drivers/usb/tests/TESTS/usb_device/basic/USBTester.cpp
similarity index 100%
rename from drivers/tests/TESTS/usb_device/basic/USBTester.cpp
rename to drivers/usb/tests/TESTS/usb_device/basic/USBTester.cpp
diff --git a/drivers/tests/TESTS/usb_device/basic/USBTester.h b/drivers/usb/tests/TESTS/usb_device/basic/USBTester.h
similarity index 100%
rename from drivers/tests/TESTS/usb_device/basic/USBTester.h
rename to drivers/usb/tests/TESTS/usb_device/basic/USBTester.h
diff --git a/drivers/tests/TESTS/usb_device/basic/main.cpp b/drivers/usb/tests/TESTS/usb_device/basic/main.cpp
similarity index 100%
rename from drivers/tests/TESTS/usb_device/basic/main.cpp
rename to drivers/usb/tests/TESTS/usb_device/basic/main.cpp
diff --git a/drivers/tests/TESTS/usb_device/basic/zadig_conf/mbed_os-usb_test_device1.cfg b/drivers/usb/tests/TESTS/usb_device/basic/zadig_conf/mbed_os-usb_test_device1.cfg
similarity index 100%
rename from drivers/tests/TESTS/usb_device/basic/zadig_conf/mbed_os-usb_test_device1.cfg
rename to drivers/usb/tests/TESTS/usb_device/basic/zadig_conf/mbed_os-usb_test_device1.cfg
diff --git a/drivers/tests/TESTS/usb_device/basic/zadig_conf/mbed_os-usb_test_device2.cfg b/drivers/usb/tests/TESTS/usb_device/basic/zadig_conf/mbed_os-usb_test_device2.cfg
similarity index 100%
rename from drivers/tests/TESTS/usb_device/basic/zadig_conf/mbed_os-usb_test_device2.cfg
rename to drivers/usb/tests/TESTS/usb_device/basic/zadig_conf/mbed_os-usb_test_device2.cfg
diff --git a/drivers/tests/TESTS/usb_device/hid/main.cpp b/drivers/usb/tests/TESTS/usb_device/hid/main.cpp
similarity index 100%
rename from drivers/tests/TESTS/usb_device/hid/main.cpp
rename to drivers/usb/tests/TESTS/usb_device/hid/main.cpp
diff --git a/drivers/tests/TESTS/usb_device/hid/requirements.txt b/drivers/usb/tests/TESTS/usb_device/hid/requirements.txt
similarity index 100%
rename from drivers/tests/TESTS/usb_device/hid/requirements.txt
rename to drivers/usb/tests/TESTS/usb_device/hid/requirements.txt
diff --git a/drivers/tests/TESTS/usb_device/msd/TestUSBMSD.h b/drivers/usb/tests/TESTS/usb_device/msd/TestUSBMSD.h
similarity index 100%
rename from drivers/tests/TESTS/usb_device/msd/TestUSBMSD.h
rename to drivers/usb/tests/TESTS/usb_device/msd/TestUSBMSD.h
diff --git a/drivers/tests/TESTS/usb_device/msd/main.cpp b/drivers/usb/tests/TESTS/usb_device/msd/main.cpp
similarity index 100%
rename from drivers/tests/TESTS/usb_device/msd/main.cpp
rename to drivers/usb/tests/TESTS/usb_device/msd/main.cpp
diff --git a/drivers/tests/TESTS/usb_device/serial/main.cpp b/drivers/usb/tests/TESTS/usb_device/serial/main.cpp
similarity index 100%
rename from drivers/tests/TESTS/usb_device/serial/main.cpp
rename to drivers/usb/tests/TESTS/usb_device/serial/main.cpp