diff --git a/artiq/test/coredevice_vs_host.py b/artiq/test/coredevice/portability.py
similarity index 100%
rename from artiq/test/coredevice_vs_host.py
rename to artiq/test/coredevice/portability.py
diff --git a/artiq/test/coredevice.py b/artiq/test/coredevice/rtio.py
similarity index 100%
rename from artiq/test/coredevice.py
rename to artiq/test/coredevice/rtio.py