diff --git a/hw/boards/mta1-usb-v1/.gitignore b/hw/production_test/.gitignore
similarity index 100%
rename from hw/boards/mta1-usb-v1/.gitignore
rename to hw/production_test/.gitignore
diff --git a/hw/boards/mta1-usb-v1/test/README.md b/hw/production_test/README.md
similarity index 100%
rename from hw/boards/mta1-usb-v1/test/README.md
rename to hw/production_test/README.md
diff --git a/hw/boards/mta1-usb-v1/test/app_test/Makefile b/hw/production_test/app_test/Makefile
similarity index 100%
rename from hw/boards/mta1-usb-v1/test/app_test/Makefile
rename to hw/production_test/app_test/Makefile
diff --git a/hw/boards/mta1-usb-v1/test/app_test/SB_HFOSC.v b/hw/production_test/app_test/SB_HFOSC.v
similarity index 100%
rename from hw/boards/mta1-usb-v1/test/app_test/SB_HFOSC.v
rename to hw/production_test/app_test/SB_HFOSC.v
diff --git a/hw/boards/mta1-usb-v1/test/app_test/SB_RGBA_DRV.v b/hw/production_test/app_test/SB_RGBA_DRV.v
similarity index 100%
rename from hw/boards/mta1-usb-v1/test/app_test/SB_RGBA_DRV.v
rename to hw/production_test/app_test/SB_RGBA_DRV.v
diff --git a/hw/boards/mta1-usb-v1/test/app_test/app.pcf b/hw/production_test/app_test/app.pcf
similarity index 100%
rename from hw/boards/mta1-usb-v1/test/app_test/app.pcf
rename to hw/production_test/app_test/app.pcf
diff --git a/hw/boards/mta1-usb-v1/test/app_test/top.v b/hw/production_test/app_test/top.v
similarity index 100%
rename from hw/boards/mta1-usb-v1/test/app_test/top.v
rename to hw/production_test/app_test/top.v
diff --git a/hw/boards/mta1-usb-v1/test/binaries/main.uf2 b/hw/production_test/binaries/main.uf2
similarity index 100%
rename from hw/boards/mta1-usb-v1/test/binaries/main.uf2
rename to hw/production_test/binaries/main.uf2
diff --git a/hw/boards/mta1-usb-v1/test/binaries/top.bin b/hw/production_test/binaries/top.bin
similarity index 100%
rename from hw/boards/mta1-usb-v1/test/binaries/top.bin
rename to hw/production_test/binaries/top.bin
diff --git a/hw/boards/mta1-usb-v1/test/binaries/usb_device_cdc.bin b/hw/production_test/binaries/usb_device_cdc.bin
similarity index 100%
rename from hw/boards/mta1-usb-v1/test/binaries/usb_device_cdc.bin
rename to hw/production_test/binaries/usb_device_cdc.bin
diff --git a/hw/boards/mta1-usb-v1/test/connected_test.py b/hw/production_test/connected_test.py
similarity index 100%
rename from hw/boards/mta1-usb-v1/test/connected_test.py
rename to hw/production_test/connected_test.py
diff --git a/hw/boards/mta1-usb-v1/test/connected_test_gui.py b/hw/production_test/connected_test_gui.py
similarity index 100%
rename from hw/boards/mta1-usb-v1/test/connected_test_gui.py
rename to hw/production_test/connected_test_gui.py
diff --git a/hw/boards/mta1-usb-v1/test/encode_usb_strings.py b/hw/production_test/encode_usb_strings.py
similarity index 100%
rename from hw/boards/mta1-usb-v1/test/encode_usb_strings.py
rename to hw/production_test/encode_usb_strings.py
diff --git a/hw/boards/mta1-usb-v1/test/hid_test.py b/hw/production_test/hid_test.py
similarity index 100%
rename from hw/boards/mta1-usb-v1/test/hid_test.py
rename to hw/production_test/hid_test.py
diff --git a/hw/boards/mta1-usb-v1/test/production_test.py b/hw/production_test/production_test.py
similarity index 100%
rename from hw/boards/mta1-usb-v1/test/production_test.py
rename to hw/production_test/production_test.py
diff --git a/hw/boards/mta1-usb-v1/test/requirements.txt b/hw/production_test/requirements.txt
similarity index 100%
rename from hw/boards/mta1-usb-v1/test/requirements.txt
rename to hw/production_test/requirements.txt
diff --git a/hw/boards/mta1-usb-v1/test/reset.py b/hw/production_test/reset.py
similarity index 100%
rename from hw/boards/mta1-usb-v1/test/reset.py
rename to hw/production_test/reset.py
diff --git a/hw/boards/mta1-usb-v1/test/touch_stability_test/touch_analyzer.py b/hw/production_test/touch_stability_test/touch_analyzer.py
similarity index 100%
rename from hw/boards/mta1-usb-v1/test/touch_stability_test/touch_analyzer.py
rename to hw/production_test/touch_stability_test/touch_analyzer.py
diff --git a/hw/boards/mta1-usb-v1/test/touch_stability_test/touch_recorder.py b/hw/production_test/touch_stability_test/touch_recorder.py
similarity index 100%
rename from hw/boards/mta1-usb-v1/test/touch_stability_test/touch_recorder.py
rename to hw/production_test/touch_stability_test/touch_recorder.py
diff --git a/hw/boards/mta1-usb-v1/test/usb_pins-good.csv b/hw/production_test/usb_pins-good.csv
similarity index 100%
rename from hw/boards/mta1-usb-v1/test/usb_pins-good.csv
rename to hw/production_test/usb_pins-good.csv
diff --git a/hw/boards/mta1-usb-v1/test/usb_pins.csv b/hw/production_test/usb_pins.csv
similarity index 100%
rename from hw/boards/mta1-usb-v1/test/usb_pins.csv
rename to hw/production_test/usb_pins.csv