diff --git a/tests/test/build/readme.md b/tests/lpc18xx_43xx/build/readme.md
similarity index 100%
rename from tests/test/build/readme.md
rename to tests/lpc18xx_43xx/build/readme.md
diff --git a/tests/test/project.yml b/tests/lpc18xx_43xx/project.yml
similarity index 100%
rename from tests/test/project.yml
rename to tests/lpc18xx_43xx/project.yml
diff --git a/tests/test/rakefile.rb b/tests/lpc18xx_43xx/rakefile.rb
similarity index 100%
rename from tests/test/rakefile.rb
rename to tests/lpc18xx_43xx/rakefile.rb
diff --git a/tests/test/test/device/usbd/test_usbd.c b/tests/lpc18xx_43xx/test/device/usbd/test_usbd.c
similarity index 100%
rename from tests/test/test/device/usbd/test_usbd.c
rename to tests/lpc18xx_43xx/test/device/usbd/test_usbd.c
diff --git a/tests/test/test/host/ehci/test_ehci_init.c b/tests/lpc18xx_43xx/test/host/ehci/test_ehci_init.c
similarity index 100%
rename from tests/test/test/host/ehci/test_ehci_init.c
rename to tests/lpc18xx_43xx/test/host/ehci/test_ehci_init.c
diff --git a/tests/test/test/host/ehci/test_ehci_isr.c b/tests/lpc18xx_43xx/test/host/ehci/test_ehci_isr.c
similarity index 100%
rename from tests/test/test/host/ehci/test_ehci_isr.c
rename to tests/lpc18xx_43xx/test/host/ehci/test_ehci_isr.c
diff --git a/tests/test/test/host/ehci/test_ehci_structure.c b/tests/lpc18xx_43xx/test/host/ehci/test_ehci_structure.c
similarity index 100%
rename from tests/test/test/host/ehci/test_ehci_structure.c
rename to tests/lpc18xx_43xx/test/host/ehci/test_ehci_structure.c
diff --git a/tests/test/test/host/ehci/test_ehci_usbh_hcd_integration.c b/tests/lpc18xx_43xx/test/host/ehci/test_ehci_usbh_hcd_integration.c
similarity index 100%
rename from tests/test/test/host/ehci/test_ehci_usbh_hcd_integration.c
rename to tests/lpc18xx_43xx/test/host/ehci/test_ehci_usbh_hcd_integration.c
diff --git a/tests/test/test/host/ehci/test_pipe_bulk_open.c b/tests/lpc18xx_43xx/test/host/ehci/test_pipe_bulk_open.c
similarity index 100%
rename from tests/test/test/host/ehci/test_pipe_bulk_open.c
rename to tests/lpc18xx_43xx/test/host/ehci/test_pipe_bulk_open.c
diff --git a/tests/test/test/host/ehci/test_pipe_bulk_xfer.c b/tests/lpc18xx_43xx/test/host/ehci/test_pipe_bulk_xfer.c
similarity index 100%
rename from tests/test/test/host/ehci/test_pipe_bulk_xfer.c
rename to tests/lpc18xx_43xx/test/host/ehci/test_pipe_bulk_xfer.c
diff --git a/tests/test/test/host/ehci/test_pipe_control_open.c b/tests/lpc18xx_43xx/test/host/ehci/test_pipe_control_open.c
similarity index 100%
rename from tests/test/test/host/ehci/test_pipe_control_open.c
rename to tests/lpc18xx_43xx/test/host/ehci/test_pipe_control_open.c
diff --git a/tests/test/test/host/ehci/test_pipe_control_xfer.c b/tests/lpc18xx_43xx/test/host/ehci/test_pipe_control_xfer.c
similarity index 100%
rename from tests/test/test/host/ehci/test_pipe_control_xfer.c
rename to tests/lpc18xx_43xx/test/host/ehci/test_pipe_control_xfer.c
diff --git a/tests/test/test/host/ehci/test_pipe_interrupt_open.c b/tests/lpc18xx_43xx/test/host/ehci/test_pipe_interrupt_open.c
similarity index 100%
rename from tests/test/test/host/ehci/test_pipe_interrupt_open.c
rename to tests/lpc18xx_43xx/test/host/ehci/test_pipe_interrupt_open.c
diff --git a/tests/test/test/host/ehci/test_pipe_interrupt_xfer.c b/tests/lpc18xx_43xx/test/host/ehci/test_pipe_interrupt_xfer.c
similarity index 100%
rename from tests/test/test/host/ehci/test_pipe_interrupt_xfer.c
rename to tests/lpc18xx_43xx/test/host/ehci/test_pipe_interrupt_xfer.c
diff --git a/tests/test/test/host/ehci/test_pipe_isochronous_open.c b/tests/lpc18xx_43xx/test/host/ehci/test_pipe_isochronous_open.c
similarity index 100%
rename from tests/test/test/host/ehci/test_pipe_isochronous_open.c
rename to tests/lpc18xx_43xx/test/host/ehci/test_pipe_isochronous_open.c
diff --git a/tests/test/test/host/hid/hidh_callback.h b/tests/lpc18xx_43xx/test/host/hid/hidh_callback.h
similarity index 100%
rename from tests/test/test/host/hid/hidh_callback.h
rename to tests/lpc18xx_43xx/test/host/hid/hidh_callback.h
diff --git a/tests/test/test/host/hid/test_hid_host.c b/tests/lpc18xx_43xx/test/host/hid/test_hid_host.c
similarity index 100%
rename from tests/test/test/host/hid/test_hid_host.c
rename to tests/lpc18xx_43xx/test/host/hid/test_hid_host.c
diff --git a/tests/test/test/host/hid/test_hidh_keyboard.c b/tests/lpc18xx_43xx/test/host/hid/test_hidh_keyboard.c
similarity index 100%
rename from tests/test/test/host/hid/test_hidh_keyboard.c
rename to tests/lpc18xx_43xx/test/host/hid/test_hidh_keyboard.c
diff --git a/tests/test/test/host/hid/test_hidh_mouse.c b/tests/lpc18xx_43xx/test/host/hid/test_hidh_mouse.c
similarity index 100%
rename from tests/test/test/host/hid/test_hidh_mouse.c
rename to tests/lpc18xx_43xx/test/host/hid/test_hidh_mouse.c
diff --git a/tests/test/test/host/host_helper.h b/tests/lpc18xx_43xx/test/host/host_helper.h
similarity index 100%
rename from tests/test/test/host/host_helper.h
rename to tests/lpc18xx_43xx/test/host/host_helper.h
diff --git a/tests/test/test/host/hub/test_hub.c b/tests/lpc18xx_43xx/test/host/hub/test_hub.c
similarity index 100%
rename from tests/test/test/host/hub/test_hub.c
rename to tests/lpc18xx_43xx/test/host/hub/test_hub.c
diff --git a/tests/test/test/host/integration/test_hidh_keyboard_integrate.c b/tests/lpc18xx_43xx/test/host/integration/test_hidh_keyboard_integrate.c
similarity index 100%
rename from tests/test/test/host/integration/test_hidh_keyboard_integrate.c
rename to tests/lpc18xx_43xx/test/host/integration/test_hidh_keyboard_integrate.c
diff --git a/tests/test/test/host/msc/test_msc_host.c b/tests/lpc18xx_43xx/test/host/msc/test_msc_host.c
similarity index 100%
rename from tests/test/test/host/msc/test_msc_host.c
rename to tests/lpc18xx_43xx/test/host/msc/test_msc_host.c
diff --git a/tests/test/test/host/usbh/test_enum_task.c b/tests/lpc18xx_43xx/test/host/usbh/test_enum_task.c
similarity index 100%
rename from tests/test/test/host/usbh/test_enum_task.c
rename to tests/lpc18xx_43xx/test/host/usbh/test_enum_task.c
diff --git a/tests/test/test/host/usbh/test_usbh.c b/tests/lpc18xx_43xx/test/host/usbh/test_usbh.c
similarity index 100%
rename from tests/test/test/host/usbh/test_usbh.c
rename to tests/lpc18xx_43xx/test/host/usbh/test_usbh.c
diff --git a/tests/test/test/test_assertion.c b/tests/lpc18xx_43xx/test/test_assertion.c
similarity index 100%
rename from tests/test/test/test_assertion.c
rename to tests/lpc18xx_43xx/test/test_assertion.c
diff --git a/tests/test/test/test_binary_const.c b/tests/lpc18xx_43xx/test/test_binary_const.c
similarity index 100%
rename from tests/test/test/test_binary_const.c
rename to tests/lpc18xx_43xx/test/test_binary_const.c
diff --git a/tests/test/test/test_fifo.c b/tests/lpc18xx_43xx/test/test_fifo.c
similarity index 100%
rename from tests/test/test/test_fifo.c
rename to tests/lpc18xx_43xx/test/test_fifo.c
diff --git a/tests/test/test/test_osal_freeRTOS.c b/tests/lpc18xx_43xx/test/test_osal_freeRTOS.c
similarity index 100%
rename from tests/test/test/test_osal_freeRTOS.c
rename to tests/lpc18xx_43xx/test/test_osal_freeRTOS.c
diff --git a/tests/test/test/test_osal_none.c b/tests/lpc18xx_43xx/test/test_osal_none.c
similarity index 100%
rename from tests/test/test/test_osal_none.c
rename to tests/lpc18xx_43xx/test/test_osal_none.c
diff --git a/tests/test/test/test_project_settings.c b/tests/lpc18xx_43xx/test/test_project_settings.c
similarity index 100%
rename from tests/test/test/test_project_settings.c
rename to tests/lpc18xx_43xx/test/test_project_settings.c