tests: Move port-specific test directories into tests/ports/ directory.

To keep them all together, mirroring the top-level directory structure.

Signed-off-by: Damien George <damien@micropython.org>

135 files changed, 7 insertions, 7 deletions

diff --git a/tests/wipy/adc.py b/tests/ports/cc3200/adc.py
index 73264113f..73264113f 100644
--- a/tests/wipy/adc.py
+++ b/tests/ports/cc3200/adc.py
diff --git a/tests/wipy/adc.py.exp b/tests/ports/cc3200/adc.py.exp
index a65cf4963..a65cf4963 100644
--- a/tests/wipy/adc.py.exp
+++ b/tests/ports/cc3200/adc.py.exp
diff --git a/tests/wipy/i2c.py b/tests/ports/cc3200/i2c.py
index c7d32f663..c7d32f663 100644
--- a/tests/wipy/i2c.py
+++ b/tests/ports/cc3200/i2c.py
diff --git a/tests/wipy/i2c.py.exp b/tests/ports/cc3200/i2c.py.exp
index 083da9be7..083da9be7 100644
--- a/tests/wipy/i2c.py.exp
+++ b/tests/ports/cc3200/i2c.py.exp
diff --git a/tests/wipy/modwipy.py b/tests/ports/cc3200/modwipy.py
index 59df3ae90..59df3ae90 100644
--- a/tests/wipy/modwipy.py
+++ b/tests/ports/cc3200/modwipy.py
diff --git a/tests/wipy/modwipy.py.exp b/tests/ports/cc3200/modwipy.py.exp
index 52eeb534e..52eeb534e 100644
--- a/tests/wipy/modwipy.py.exp
+++ b/tests/ports/cc3200/modwipy.py.exp
diff --git a/tests/wipy/os.py b/tests/ports/cc3200/os.py
index 1f4debcad..1f4debcad 100644
--- a/tests/wipy/os.py
+++ b/tests/ports/cc3200/os.py
diff --git a/tests/wipy/os.py.exp b/tests/ports/cc3200/os.py.exp
index a0f01e35e..a0f01e35e 100644
--- a/tests/wipy/os.py.exp
+++ b/tests/ports/cc3200/os.py.exp
diff --git a/tests/wipy/pin.py b/tests/ports/cc3200/pin.py
index 9ffd152e9..9ffd152e9 100644
--- a/tests/wipy/pin.py
+++ b/tests/ports/cc3200/pin.py
diff --git a/tests/wipy/pin.py.exp b/tests/ports/cc3200/pin.py.exp
index 0e3dddcf2..0e3dddcf2 100644
--- a/tests/wipy/pin.py.exp
+++ b/tests/ports/cc3200/pin.py.exp
diff --git a/tests/wipy/pin_irq.py b/tests/ports/cc3200/pin_irq.py
index be5e1f426..be5e1f426 100644
--- a/tests/wipy/pin_irq.py
+++ b/tests/ports/cc3200/pin_irq.py
diff --git a/tests/wipy/pin_irq.py.exp b/tests/ports/cc3200/pin_irq.py.exp
index 458bd9566..458bd9566 100644
--- a/tests/wipy/pin_irq.py.exp
+++ b/tests/ports/cc3200/pin_irq.py.exp
diff --git a/tests/wipy/reset/reset.py b/tests/ports/cc3200/reset/reset.py
index 8d314f3b4..8d314f3b4 100644
--- a/tests/wipy/reset/reset.py
+++ b/tests/ports/cc3200/reset/reset.py
diff --git a/tests/wipy/reset/reset.py.exp b/tests/ports/cc3200/reset/reset.py.exp
index 4b6cc11e0..4b6cc11e0 100644
--- a/tests/wipy/reset/reset.py.exp
+++ b/tests/ports/cc3200/reset/reset.py.exp
diff --git a/tests/wipy/rtc.py b/tests/ports/cc3200/rtc.py
index c62e400fe..c62e400fe 100644
--- a/tests/wipy/rtc.py
+++ b/tests/ports/cc3200/rtc.py
diff --git a/tests/wipy/rtc.py.exp b/tests/ports/cc3200/rtc.py.exp
index 44f8f8b81..44f8f8b81 100644
--- a/tests/wipy/rtc.py.exp
+++ b/tests/ports/cc3200/rtc.py.exp
diff --git a/tests/wipy/sd.py b/tests/ports/cc3200/sd.py
index 381d46f30..381d46f30 100644
--- a/tests/wipy/sd.py
+++ b/tests/ports/cc3200/sd.py
diff --git a/tests/wipy/sd.py.exp b/tests/ports/cc3200/sd.py.exp
index eaa5f08ef..eaa5f08ef 100644
--- a/tests/wipy/sd.py.exp
+++ b/tests/ports/cc3200/sd.py.exp
diff --git a/tests/wipy/skipped/rtc_irq.py b/tests/ports/cc3200/skipped/rtc_irq.py
index 99712f8d1..99712f8d1 100644
--- a/tests/wipy/skipped/rtc_irq.py
+++ b/tests/ports/cc3200/skipped/rtc_irq.py
diff --git a/tests/wipy/skipped/rtc_irq.py.exp b/tests/ports/cc3200/skipped/rtc_irq.py.exp
index a3eebc2d1..a3eebc2d1 100644
--- a/tests/wipy/skipped/rtc_irq.py.exp
+++ b/tests/ports/cc3200/skipped/rtc_irq.py.exp
diff --git a/tests/wipy/spi.py b/tests/ports/cc3200/spi.py
index a3509d854..a3509d854 100644
--- a/tests/wipy/spi.py
+++ b/tests/ports/cc3200/spi.py
diff --git a/tests/wipy/spi.py.exp b/tests/ports/cc3200/spi.py.exp
index cc4ff4022..cc4ff4022 100644
--- a/tests/wipy/spi.py.exp
+++ b/tests/ports/cc3200/spi.py.exp
diff --git a/tests/wipy/time.py b/tests/ports/cc3200/time.py
index 4a550b949..4a550b949 100644
--- a/tests/wipy/time.py
+++ b/tests/ports/cc3200/time.py
diff --git a/tests/wipy/time.py.exp b/tests/ports/cc3200/time.py.exp
index 24d798f92..24d798f92 100644
--- a/tests/wipy/time.py.exp
+++ b/tests/ports/cc3200/time.py.exp
diff --git a/tests/wipy/timer.py b/tests/ports/cc3200/timer.py
index db25870db..db25870db 100644
--- a/tests/wipy/timer.py
+++ b/tests/ports/cc3200/timer.py
diff --git a/tests/wipy/timer.py.exp b/tests/ports/cc3200/timer.py.exp
index 972d8198c..972d8198c 100644
--- a/tests/wipy/timer.py.exp
+++ b/tests/ports/cc3200/timer.py.exp
diff --git a/tests/wipy/uart.py b/tests/ports/cc3200/uart.py
index 94ac9051b..94ac9051b 100644
--- a/tests/wipy/uart.py
+++ b/tests/ports/cc3200/uart.py
diff --git a/tests/wipy/uart.py.exp b/tests/ports/cc3200/uart.py.exp
index c8aeb77ef..c8aeb77ef 100644
--- a/tests/wipy/uart.py.exp
+++ b/tests/ports/cc3200/uart.py.exp
diff --git a/tests/wipy/uart_irq.py b/tests/ports/cc3200/uart_irq.py
index e631e46a9..e631e46a9 100644
--- a/tests/wipy/uart_irq.py
+++ b/tests/ports/cc3200/uart_irq.py
diff --git a/tests/wipy/uart_irq.py.exp b/tests/ports/cc3200/uart_irq.py.exp
index b165e824a..b165e824a 100644
--- a/tests/wipy/uart_irq.py.exp
+++ b/tests/ports/cc3200/uart_irq.py.exp
diff --git a/tests/wipy/wdt.py b/tests/ports/cc3200/wdt.py
index 56f6ea8d9..56f6ea8d9 100644
--- a/tests/wipy/wdt.py
+++ b/tests/ports/cc3200/wdt.py
diff --git a/tests/wipy/wdt.py.exp b/tests/ports/cc3200/wdt.py.exp
index 71f5e13b5..71f5e13b5 100644
--- a/tests/wipy/wdt.py.exp
+++ b/tests/ports/cc3200/wdt.py.exp
diff --git a/tests/wipy/wlan/machine.py b/tests/ports/cc3200/wlan/machine.py
index f69b117b7..f69b117b7 100644
--- a/tests/wipy/wlan/machine.py
+++ b/tests/ports/cc3200/wlan/machine.py
diff --git a/tests/wipy/wlan/machine.py.exp b/tests/ports/cc3200/wlan/machine.py.exp
index 303a0633a..303a0633a 100644
--- a/tests/wipy/wlan/machine.py.exp
+++ b/tests/ports/cc3200/wlan/machine.py.exp
diff --git a/tests/wipy/wlan/server.py b/tests/ports/cc3200/wlan/server.py
index 40f56745c..40f56745c 100644
--- a/tests/wipy/wlan/server.py
+++ b/tests/ports/cc3200/wlan/server.py
diff --git a/tests/wipy/wlan/server.py.exp b/tests/ports/cc3200/wlan/server.py.exp
index a125ec934..a125ec934 100644
--- a/tests/wipy/wlan/server.py.exp
+++ b/tests/ports/cc3200/wlan/server.py.exp
diff --git a/tests/wipy/wlan/wlan.py b/tests/ports/cc3200/wlan/wlan.py
index dd85c8696..dd85c8696 100644
--- a/tests/wipy/wlan/wlan.py
+++ b/tests/ports/cc3200/wlan/wlan.py
diff --git a/tests/wipy/wlan/wlan.py.exp b/tests/ports/cc3200/wlan/wlan.py.exp
index 2bb3537a2..2bb3537a2 100644
--- a/tests/wipy/wlan/wlan.py.exp
+++ b/tests/ports/cc3200/wlan/wlan.py.exp
diff --git a/tests/esp32/check_err_str.py b/tests/ports/esp32/check_err_str.py
index 055eecf74..055eecf74 100644
--- a/tests/esp32/check_err_str.py
+++ b/tests/ports/esp32/check_err_str.py
diff --git a/tests/esp32/check_err_str.py.exp b/tests/ports/esp32/check_err_str.py.exp
index d4162d1be..d4162d1be 100644
--- a/tests/esp32/check_err_str.py.exp
+++ b/tests/ports/esp32/check_err_str.py.exp
diff --git a/tests/esp32/esp32_idf_heap_info.py b/tests/ports/esp32/esp32_idf_heap_info.py
index fdd89161f..fdd89161f 100644
--- a/tests/esp32/esp32_idf_heap_info.py
+++ b/tests/ports/esp32/esp32_idf_heap_info.py
diff --git a/tests/esp32/esp32_idf_heap_info.py.exp b/tests/ports/esp32/esp32_idf_heap_info.py.exp
index 2b63bf325..2b63bf325 100644
--- a/tests/esp32/esp32_idf_heap_info.py.exp
+++ b/tests/ports/esp32/esp32_idf_heap_info.py.exp
diff --git a/tests/esp32/esp32_nvs.py b/tests/ports/esp32/esp32_nvs.py
index fd8b152ca..fd8b152ca 100644
--- a/tests/esp32/esp32_nvs.py
+++ b/tests/ports/esp32/esp32_nvs.py
diff --git a/tests/esp32/esp32_nvs.py.exp b/tests/ports/esp32/esp32_nvs.py.exp
index 33cdfd6df..33cdfd6df 100644
--- a/tests/esp32/esp32_nvs.py.exp
+++ b/tests/ports/esp32/esp32_nvs.py.exp
diff --git a/tests/esp32/partition_ota.py b/tests/ports/esp32/partition_ota.py
index 65e2742eb..65e2742eb 100644
--- a/tests/esp32/partition_ota.py
+++ b/tests/ports/esp32/partition_ota.py
diff --git a/tests/esp32/partition_ota.py.exp b/tests/ports/esp32/partition_ota.py.exp
index 9fc2618a1..9fc2618a1 100644
--- a/tests/esp32/partition_ota.py.exp
+++ b/tests/ports/esp32/partition_ota.py.exp
diff --git a/tests/esp32/resolve_on_connect.py b/tests/ports/esp32/resolve_on_connect.py
index e604ce9ca..e604ce9ca 100644
--- a/tests/esp32/resolve_on_connect.py
+++ b/tests/ports/esp32/resolve_on_connect.py
diff --git a/tests/qemu-arm/asm_test.py b/tests/ports/qemu-arm/asm_test.py
index 26c7efe42..26c7efe42 100644
--- a/tests/qemu-arm/asm_test.py
+++ b/tests/ports/qemu-arm/asm_test.py
diff --git a/tests/qemu-arm/asm_test.py.exp b/tests/ports/qemu-arm/asm_test.py.exp
index b4be8b40e..b4be8b40e 100644
--- a/tests/qemu-arm/asm_test.py.exp
+++ b/tests/ports/qemu-arm/asm_test.py.exp
diff --git a/tests/qemu-arm/native_test.py b/tests/ports/qemu-arm/native_test.py
index 0b58433d9..0b58433d9 100644
--- a/tests/qemu-arm/native_test.py
+++ b/tests/ports/qemu-arm/native_test.py
diff --git a/tests/qemu-arm/native_test.py.exp b/tests/ports/qemu-arm/native_test.py.exp
index dcf37cd5e..dcf37cd5e 100644
--- a/tests/qemu-arm/native_test.py.exp
+++ b/tests/ports/qemu-arm/native_test.py.exp
diff --git a/tests/qemu-arm/viper_test.py b/tests/ports/qemu-arm/viper_test.py
index 8e38a2b92..8e38a2b92 100644
--- a/tests/qemu-arm/viper_test.py
+++ b/tests/ports/qemu-arm/viper_test.py
diff --git a/tests/qemu-arm/viper_test.py.exp b/tests/ports/qemu-arm/viper_test.py.exp
index 00750edc0..00750edc0 100644
--- a/tests/qemu-arm/viper_test.py.exp
+++ b/tests/ports/qemu-arm/viper_test.py.exp
diff --git a/tests/renesas-ra/freq.py b/tests/ports/renesas-ra/freq.py
index 97fe946b7..97fe946b7 100644
--- a/tests/renesas-ra/freq.py
+++ b/tests/ports/renesas-ra/freq.py
diff --git a/tests/renesas-ra/freq.py.exp b/tests/ports/renesas-ra/freq.py.exp
index 7f4b843ee..7f4b843ee 100644
--- a/tests/renesas-ra/freq.py.exp
+++ b/tests/ports/renesas-ra/freq.py.exp
diff --git a/tests/renesas-ra/i2c.py b/tests/ports/renesas-ra/i2c.py
index 3991f7175..3991f7175 100644
--- a/tests/renesas-ra/i2c.py
+++ b/tests/ports/renesas-ra/i2c.py
diff --git a/tests/renesas-ra/i2c.py.exp b/tests/ports/renesas-ra/i2c.py.exp
index e69de29bb..e69de29bb 100644
--- a/tests/renesas-ra/i2c.py.exp
+++ b/tests/ports/renesas-ra/i2c.py.exp
diff --git a/tests/pyb/modtime.py b/tests/ports/renesas-ra/modtime.py
index 396f83266..396f83266 100644
--- a/tests/pyb/modtime.py
+++ b/tests/ports/renesas-ra/modtime.py
diff --git a/tests/pyb/modtime.py.exp b/tests/ports/renesas-ra/modtime.py.exp
index 3e1f6e920..3e1f6e920 100644
--- a/tests/pyb/modtime.py.exp
+++ b/tests/ports/renesas-ra/modtime.py.exp
diff --git a/tests/renesas-ra/pin.py b/tests/ports/renesas-ra/pin.py
index 4617cce11..4617cce11 100644
--- a/tests/renesas-ra/pin.py
+++ b/tests/ports/renesas-ra/pin.py
diff --git a/tests/renesas-ra/pin.py.exp b/tests/ports/renesas-ra/pin.py.exp
index 0c34cd7a3..0c34cd7a3 100644
--- a/tests/renesas-ra/pin.py.exp
+++ b/tests/ports/renesas-ra/pin.py.exp
diff --git a/tests/renesas-ra/rtc_init.py b/tests/ports/renesas-ra/rtc_init.py
index 08e36f535..08e36f535 100644
--- a/tests/renesas-ra/rtc_init.py
+++ b/tests/ports/renesas-ra/rtc_init.py
diff --git a/tests/renesas-ra/rtc_init.py.exp b/tests/ports/renesas-ra/rtc_init.py.exp
index d1ea2d959..d1ea2d959 100644
--- a/tests/renesas-ra/rtc_init.py.exp
+++ b/tests/ports/renesas-ra/rtc_init.py.exp
diff --git a/tests/renesas-ra/spi.py b/tests/ports/renesas-ra/spi.py
index 52b908efb..52b908efb 100644
--- a/tests/renesas-ra/spi.py
+++ b/tests/ports/renesas-ra/spi.py
diff --git a/tests/renesas-ra/spi.py.exp b/tests/ports/renesas-ra/spi.py.exp
index b2dd2b0fa..b2dd2b0fa 100644
--- a/tests/renesas-ra/spi.py.exp
+++ b/tests/ports/renesas-ra/spi.py.exp
diff --git a/tests/renesas-ra/uart1.py b/tests/ports/renesas-ra/uart1.py
index ba329fb85..ba329fb85 100644
--- a/tests/renesas-ra/uart1.py
+++ b/tests/ports/renesas-ra/uart1.py
diff --git a/tests/renesas-ra/uart1.py.exp b/tests/ports/renesas-ra/uart1.py.exp
index d86bac9de..d86bac9de 100644
--- a/tests/renesas-ra/uart1.py.exp
+++ b/tests/ports/renesas-ra/uart1.py.exp
diff --git a/tests/pyb/accel.py b/tests/ports/stm32/accel.py
index 7a5e072be..7a5e072be 100644
--- a/tests/pyb/accel.py
+++ b/tests/ports/stm32/accel.py
diff --git a/tests/pyb/accel.py.exp b/tests/ports/stm32/accel.py.exp
index 28070be17..28070be17 100644
--- a/tests/pyb/accel.py.exp
+++ b/tests/ports/stm32/accel.py.exp
diff --git a/tests/pyb/adc.py b/tests/ports/stm32/adc.py
index 875d31d73..875d31d73 100644
--- a/tests/pyb/adc.py
+++ b/tests/ports/stm32/adc.py
diff --git a/tests/pyb/adc.py.exp b/tests/ports/stm32/adc.py.exp
index 381329cdd..381329cdd 100644
--- a/tests/pyb/adc.py.exp
+++ b/tests/ports/stm32/adc.py.exp
diff --git a/tests/pyb/adcall.py b/tests/ports/stm32/adcall.py
index cfe179a97..cfe179a97 100644
--- a/tests/pyb/adcall.py
+++ b/tests/ports/stm32/adcall.py
diff --git a/tests/pyb/adcall.py.exp b/tests/ports/stm32/adcall.py.exp
index 5a85ba770..5a85ba770 100644
--- a/tests/pyb/adcall.py.exp
+++ b/tests/ports/stm32/adcall.py.exp
diff --git a/tests/pyb/board_pybv1x.py b/tests/ports/stm32/board_pybv1x.py
index ea66270b2..ea66270b2 100644
--- a/tests/pyb/board_pybv1x.py
+++ b/tests/ports/stm32/board_pybv1x.py
diff --git a/tests/pyb/board_pybv1x.py.exp b/tests/ports/stm32/board_pybv1x.py.exp
index 6d4a6f63c..6d4a6f63c 100644
--- a/tests/pyb/board_pybv1x.py.exp
+++ b/tests/ports/stm32/board_pybv1x.py.exp
diff --git a/tests/pyb/can.py b/tests/ports/stm32/can.py
index 020efae05..020efae05 100644
--- a/tests/pyb/can.py
+++ b/tests/ports/stm32/can.py
diff --git a/tests/pyb/can.py.exp b/tests/ports/stm32/can.py.exp
index bd8f6d60b..bd8f6d60b 100644
--- a/tests/pyb/can.py.exp
+++ b/tests/ports/stm32/can.py.exp
diff --git a/tests/pyb/can2.py b/tests/ports/stm32/can2.py
index 2ce438f1a..2ce438f1a 100644
--- a/tests/pyb/can2.py
+++ b/tests/ports/stm32/can2.py
diff --git a/tests/pyb/can2.py.exp b/tests/ports/stm32/can2.py.exp
index 3339e5cbe..3339e5cbe 100644
--- a/tests/pyb/can2.py.exp
+++ b/tests/ports/stm32/can2.py.exp
diff --git a/tests/pyb/dac.py b/tests/ports/stm32/dac.py
index 506cf272b..506cf272b 100644
--- a/tests/pyb/dac.py
+++ b/tests/ports/stm32/dac.py
diff --git a/tests/pyb/dac.py.exp b/tests/ports/stm32/dac.py.exp
index 7ee99652a..7ee99652a 100644
--- a/tests/pyb/dac.py.exp
+++ b/tests/ports/stm32/dac.py.exp
diff --git a/tests/pyb/extint.py b/tests/ports/stm32/extint.py
index 551060002..551060002 100644
--- a/tests/pyb/extint.py
+++ b/tests/ports/stm32/extint.py
diff --git a/tests/pyb/extint.py.exp b/tests/ports/stm32/extint.py.exp
index fbd820ed4..fbd820ed4 100644
--- a/tests/pyb/extint.py.exp
+++ b/tests/ports/stm32/extint.py.exp
diff --git a/tests/pyb/i2c.py b/tests/ports/stm32/i2c.py
index c96884327..c96884327 100644
--- a/tests/pyb/i2c.py
+++ b/tests/ports/stm32/i2c.py
diff --git a/tests/pyb/i2c.py.exp b/tests/ports/stm32/i2c.py.exp
index bd896ea74..bd896ea74 100644
--- a/tests/pyb/i2c.py.exp
+++ b/tests/ports/stm32/i2c.py.exp
diff --git a/tests/pyb/i2c_accel.py b/tests/ports/stm32/i2c_accel.py
index 8b87d406d..8b87d406d 100644
--- a/tests/pyb/i2c_accel.py
+++ b/tests/ports/stm32/i2c_accel.py
diff --git a/tests/pyb/i2c_accel.py.exp b/tests/ports/stm32/i2c_accel.py.exp
index 206a2eb4c..206a2eb4c 100644
--- a/tests/pyb/i2c_accel.py.exp
+++ b/tests/ports/stm32/i2c_accel.py.exp
diff --git a/tests/pyb/i2c_error.py b/tests/ports/stm32/i2c_error.py
index 1228962f5..1228962f5 100644
--- a/tests/pyb/i2c_error.py
+++ b/tests/ports/stm32/i2c_error.py
diff --git a/tests/pyb/i2c_error.py.exp b/tests/ports/stm32/i2c_error.py.exp
index bd403f7f4..bd403f7f4 100644
--- a/tests/pyb/i2c_error.py.exp
+++ b/tests/ports/stm32/i2c_error.py.exp
diff --git a/tests/pyb/irq.py b/tests/ports/stm32/irq.py
index 04e70a7b7..04e70a7b7 100644
--- a/tests/pyb/irq.py
+++ b/tests/ports/stm32/irq.py
diff --git a/tests/pyb/irq.py.exp b/tests/ports/stm32/irq.py.exp
index aea065f04..aea065f04 100644
--- a/tests/pyb/irq.py.exp
+++ b/tests/ports/stm32/irq.py.exp
diff --git a/tests/pyb/led.py b/tests/ports/stm32/led.py
index 1702c189e..1702c189e 100644
--- a/tests/pyb/led.py
+++ b/tests/ports/stm32/led.py
diff --git a/tests/pyb/led.py.exp b/tests/ports/stm32/led.py.exp
index b4170c41e..b4170c41e 100644
--- a/tests/pyb/led.py.exp
+++ b/tests/ports/stm32/led.py.exp
diff --git a/tests/pyb/modstm.py b/tests/ports/stm32/modstm.py
index f1e147c05..f1e147c05 100644
--- a/tests/pyb/modstm.py
+++ b/tests/ports/stm32/modstm.py
diff --git a/tests/pyb/modstm.py.exp b/tests/ports/stm32/modstm.py.exp
index a24c9f865..a24c9f865 100644
--- a/tests/pyb/modstm.py.exp
+++ b/tests/ports/stm32/modstm.py.exp
diff --git a/tests/renesas-ra/modtime.py b/tests/ports/stm32/modtime.py
index 396f83266..396f83266 100644
--- a/tests/renesas-ra/modtime.py
+++ b/tests/ports/stm32/modtime.py
diff --git a/tests/renesas-ra/modtime.py.exp b/tests/ports/stm32/modtime.py.exp
index 3e1f6e920..3e1f6e920 100644
--- a/tests/renesas-ra/modtime.py.exp
+++ b/tests/ports/stm32/modtime.py.exp
diff --git a/tests/pyb/pin.py b/tests/ports/stm32/pin.py
index 3d2bef97e..3d2bef97e 100644
--- a/tests/pyb/pin.py
+++ b/tests/ports/stm32/pin.py
diff --git a/tests/pyb/pin.py.exp b/tests/ports/stm32/pin.py.exp
index a2a7e42d9..a2a7e42d9 100644
--- a/tests/pyb/pin.py.exp
+++ b/tests/ports/stm32/pin.py.exp
diff --git a/tests/pyb/pyb1.py b/tests/ports/stm32/pyb1.py
index e9626ecf4..e9626ecf4 100644
--- a/tests/pyb/pyb1.py
+++ b/tests/ports/stm32/pyb1.py
diff --git a/tests/pyb/pyb1.py.exp b/tests/ports/stm32/pyb1.py.exp
index 5816ea967..5816ea967 100644
--- a/tests/pyb/pyb1.py.exp
+++ b/tests/ports/stm32/pyb1.py.exp
diff --git a/tests/pyb/pyb_f405.py b/tests/ports/stm32/pyb_f405.py
index d7431a11a..d7431a11a 100644
--- a/tests/pyb/pyb_f405.py
+++ b/tests/ports/stm32/pyb_f405.py
diff --git a/tests/pyb/pyb_f405.py.exp b/tests/ports/stm32/pyb_f405.py.exp
index a52f40920..a52f40920 100644
--- a/tests/pyb/pyb_f405.py.exp
+++ b/tests/ports/stm32/pyb_f405.py.exp
diff --git a/tests/pyb/pyb_f411.py b/tests/ports/stm32/pyb_f411.py
index 58d5fa2d4..58d5fa2d4 100644
--- a/tests/pyb/pyb_f411.py
+++ b/tests/ports/stm32/pyb_f411.py
diff --git a/tests/pyb/pyb_f411.py.exp b/tests/ports/stm32/pyb_f411.py.exp
index 79e0a1062..79e0a1062 100644
--- a/tests/pyb/pyb_f411.py.exp
+++ b/tests/ports/stm32/pyb_f411.py.exp
diff --git a/tests/pyb/rtc.py b/tests/ports/stm32/rtc.py
index 013b2f331..013b2f331 100644
--- a/tests/pyb/rtc.py
+++ b/tests/ports/stm32/rtc.py
diff --git a/tests/pyb/rtc.py.exp b/tests/ports/stm32/rtc.py.exp
index 7d3aaf6af..7d3aaf6af 100644
--- a/tests/pyb/rtc.py.exp
+++ b/tests/ports/stm32/rtc.py.exp
diff --git a/tests/pyb/servo.py b/tests/ports/stm32/servo.py
index d15cafe48..d15cafe48 100644
--- a/tests/pyb/servo.py
+++ b/tests/ports/stm32/servo.py
diff --git a/tests/pyb/servo.py.exp b/tests/ports/stm32/servo.py.exp
index ac6032ba5..ac6032ba5 100644
--- a/tests/pyb/servo.py.exp
+++ b/tests/ports/stm32/servo.py.exp
diff --git a/tests/pyb/spi.py b/tests/ports/stm32/spi.py
index 7df6aeb45..7df6aeb45 100644
--- a/tests/pyb/spi.py
+++ b/tests/ports/stm32/spi.py
diff --git a/tests/pyb/spi.py.exp b/tests/ports/stm32/spi.py.exp
index 661bace90..661bace90 100644
--- a/tests/pyb/spi.py.exp
+++ b/tests/ports/stm32/spi.py.exp
diff --git a/tests/pyb/switch.py b/tests/ports/stm32/switch.py
index 7c44adb13..7c44adb13 100644
--- a/tests/pyb/switch.py
+++ b/tests/ports/stm32/switch.py
diff --git a/tests/pyb/switch.py.exp b/tests/ports/stm32/switch.py.exp
index bc59c12aa..bc59c12aa 100644
--- a/tests/pyb/switch.py.exp
+++ b/tests/ports/stm32/switch.py.exp
diff --git a/tests/pyb/timer.py b/tests/ports/stm32/timer.py
index 251a06c08..251a06c08 100644
--- a/tests/pyb/timer.py
+++ b/tests/ports/stm32/timer.py
diff --git a/tests/pyb/timer.py.exp b/tests/ports/stm32/timer.py.exp
index 7602bbd70..7602bbd70 100644
--- a/tests/pyb/timer.py.exp
+++ b/tests/ports/stm32/timer.py.exp
diff --git a/tests/pyb/timer_callback.py b/tests/ports/stm32/timer_callback.py
index 5f170ccde..5f170ccde 100644
--- a/tests/pyb/timer_callback.py
+++ b/tests/ports/stm32/timer_callback.py
diff --git a/tests/pyb/timer_callback.py.exp b/tests/ports/stm32/timer_callback.py.exp
index 9be7cf5b9..9be7cf5b9 100644
--- a/tests/pyb/timer_callback.py.exp
+++ b/tests/ports/stm32/timer_callback.py.exp
diff --git a/tests/pyb/uart.py b/tests/ports/stm32/uart.py
index 53b0ea6ad..53b0ea6ad 100644
--- a/tests/pyb/uart.py
+++ b/tests/ports/stm32/uart.py
diff --git a/tests/pyb/uart.py.exp b/tests/ports/stm32/uart.py.exp
index 70e4ab850..70e4ab850 100644
--- a/tests/pyb/uart.py.exp
+++ b/tests/ports/stm32/uart.py.exp
diff --git a/tests/unix/extra_coverage.py b/tests/ports/unix/extra_coverage.py
index 0ea8f7886..0ea8f7886 100644
--- a/tests/unix/extra_coverage.py
+++ b/tests/ports/unix/extra_coverage.py
diff --git a/tests/unix/extra_coverage.py.exp b/tests/ports/unix/extra_coverage.py.exp
index b7e4c0d76..b7e4c0d76 100644
--- a/tests/unix/extra_coverage.py.exp
+++ b/tests/ports/unix/extra_coverage.py.exp
diff --git a/tests/unix/ffi_callback.py b/tests/ports/unix/ffi_callback.py
index 21bfccf25..21bfccf25 100644
--- a/tests/unix/ffi_callback.py
+++ b/tests/ports/unix/ffi_callback.py
diff --git a/tests/unix/ffi_callback.py.exp b/tests/ports/unix/ffi_callback.py.exp
index d06fec52f..d06fec52f 100644
--- a/tests/unix/ffi_callback.py.exp
+++ b/tests/ports/unix/ffi_callback.py.exp
diff --git a/tests/unix/ffi_float.py b/tests/ports/unix/ffi_float.py
index 03bd9f7f1..03bd9f7f1 100644
--- a/tests/unix/ffi_float.py
+++ b/tests/ports/unix/ffi_float.py
diff --git a/tests/unix/ffi_float.py.exp b/tests/ports/unix/ffi_float.py.exp
index 3d9091431..3d9091431 100644
--- a/tests/unix/ffi_float.py.exp
+++ b/tests/ports/unix/ffi_float.py.exp
diff --git a/tests/unix/ffi_float2.py b/tests/ports/unix/ffi_float2.py
index bbed69666..bbed69666 100644
--- a/tests/unix/ffi_float2.py
+++ b/tests/ports/unix/ffi_float2.py
diff --git a/tests/unix/ffi_float2.py.exp b/tests/ports/unix/ffi_float2.py.exp
index 58fc6a01a..58fc6a01a 100644
--- a/tests/unix/ffi_float2.py.exp
+++ b/tests/ports/unix/ffi_float2.py.exp
diff --git a/tests/unix/ffi_lib.c b/tests/ports/unix/ffi_lib.c
index 35340536a..35340536a 100644
--- a/tests/unix/ffi_lib.c
+++ b/tests/ports/unix/ffi_lib.c
diff --git a/tests/unix/ffi_types.py b/tests/ports/unix/ffi_types.py
index 06e9b89d3..06e9b89d3 100644
--- a/tests/unix/ffi_types.py
+++ b/tests/ports/unix/ffi_types.py
diff --git a/tests/unix/ffi_types.py.exp b/tests/ports/unix/ffi_types.py.exp
index d6324477d..d6324477d 100644
--- a/tests/unix/ffi_types.py.exp
+++ b/tests/ports/unix/ffi_types.py.exp
diff --git a/tests/unix/mod_os.py b/tests/ports/unix/mod_os.py
index f69fa45b2..f69fa45b2 100644
--- a/tests/unix/mod_os.py
+++ b/tests/ports/unix/mod_os.py
diff --git a/tests/unix/mod_os.py.exp b/tests/ports/unix/mod_os.py.exp
index 465163085..465163085 100644
--- a/tests/unix/mod_os.py.exp
+++ b/tests/ports/unix/mod_os.py.exp
diff --git a/tests/unix/time_mktime_localtime.py b/tests/ports/unix/time_mktime_localtime.py
index d1c03c103..d1c03c103 100644
--- a/tests/unix/time_mktime_localtime.py
+++ b/tests/ports/unix/time_mktime_localtime.py
diff --git a/tests/run-tests.py b/tests/run-tests.py
index 4d4c2543b..39f2d73a2 100755
--- a/tests/run-tests.py
+++ b/tests/run-tests.py
@@ -183,7 +183,7 @@ special_tests = [
         "basics/bytes_compare3.py",
         "basics/builtin_help.py",
         "thread/thread_exc2.py",
-        "esp32/partition_ota.py",
+        "ports/esp32/partition_ota.py",
     )
 ]
 
@@ -1036,16 +1036,16 @@ the last matching regex is used:
             )
             if args.target == "pyboard":
                 # run pyboard tests
-                test_dirs += ("float", "stress", "pyb", "inlineasm")
+                test_dirs += ("float", "stress", "inlineasm", "ports/stm32")
             elif args.target in ("renesas-ra"):
-                test_dirs += ("float", "inlineasm", "renesas-ra")
+                test_dirs += ("float", "inlineasm", "ports/renesas-ra")
             elif args.target == "rp2":
                 test_dirs += ("float", "stress", "inlineasm", "thread")
             elif args.target in ("esp8266", "esp32", "minimal", "nrf"):
                 test_dirs += ("float",)
             elif args.target == "wipy":
                 # run WiPy tests
-                test_dirs += ("wipy",)
+                test_dirs += ("ports/cc3200",)
             elif args.target == "unix":
                 # run PC tests
                 test_dirs += (
@@ -1054,8 +1054,8 @@ the last matching regex is used:
                     "io",
                     "stress",
                     "unicode",
-                    "unix",
                     "cmdline",
+                    "ports/unix",
                 )
             elif args.target == "qemu-arm":
                 if not args.write_exp:
@@ -1065,7 +1065,7 @@ the last matching regex is used:
                 test_dirs += (
                     "float",
                     "inlineasm",
-                    "qemu-arm",
+                    "ports/qemu-arm",
                 )
         else:
             # run tests from these directories
diff --git a/tools/ci.sh b/tools/ci.sh
index 95b1f19ff..e18027ae5 100755
--- a/tools/ci.sh
+++ b/tools/ci.sh
@@ -415,7 +415,7 @@ function ci_unix_build_helper {
 }
 
 function ci_unix_build_ffi_lib_helper {
-    $1 $2 -shared -o tests/unix/ffi_lib.so tests/unix/ffi_lib.c
+    $1 $2 -shared -o tests/ports/unix/ffi_lib.so tests/ports/unix/ffi_lib.c
 }
 
 function ci_unix_run_tests_helper {