diff --git a/tests/manual/audiocore/jeplayer-splash-16000-16bit-mono-signed.wav b/tests/circuitpython-manual/audiocore/jeplayer-splash-16000-16bit-mono-signed.wav
similarity index 100%
rename from tests/manual/audiocore/jeplayer-splash-16000-16bit-mono-signed.wav
rename to tests/circuitpython-manual/audiocore/jeplayer-splash-16000-16bit-mono-signed.wav
diff --git a/tests/manual/audiocore/jeplayer-splash-16000-16bit-stereo-signed.wav b/tests/circuitpython-manual/audiocore/jeplayer-splash-16000-16bit-stereo-signed.wav
similarity index 100%
rename from tests/manual/audiocore/jeplayer-splash-16000-16bit-stereo-signed.wav
rename to tests/circuitpython-manual/audiocore/jeplayer-splash-16000-16bit-stereo-signed.wav
diff --git a/tests/manual/audiocore/jeplayer-splash-16000-24bit-mono-signed.wav b/tests/circuitpython-manual/audiocore/jeplayer-splash-16000-24bit-mono-signed.wav
similarity index 100%
rename from tests/manual/audiocore/jeplayer-splash-16000-24bit-mono-signed.wav
rename to tests/circuitpython-manual/audiocore/jeplayer-splash-16000-24bit-mono-signed.wav
diff --git a/tests/manual/audiocore/jeplayer-splash-16000-24bit-stereo-signed.wav b/tests/circuitpython-manual/audiocore/jeplayer-splash-16000-24bit-stereo-signed.wav
similarity index 100%
rename from tests/manual/audiocore/jeplayer-splash-16000-24bit-stereo-signed.wav
rename to tests/circuitpython-manual/audiocore/jeplayer-splash-16000-24bit-stereo-signed.wav
diff --git a/tests/manual/audiocore/jeplayer-splash-16000-8bit-mono-unsigned.wav b/tests/circuitpython-manual/audiocore/jeplayer-splash-16000-8bit-mono-unsigned.wav
similarity index 100%
rename from tests/manual/audiocore/jeplayer-splash-16000-8bit-mono-unsigned.wav
rename to tests/circuitpython-manual/audiocore/jeplayer-splash-16000-8bit-mono-unsigned.wav
diff --git a/tests/manual/audiocore/jeplayer-splash-16000-8bit-stereo-unsigned.wav b/tests/circuitpython-manual/audiocore/jeplayer-splash-16000-8bit-stereo-unsigned.wav
similarity index 100%
rename from tests/manual/audiocore/jeplayer-splash-16000-8bit-stereo-unsigned.wav
rename to tests/circuitpython-manual/audiocore/jeplayer-splash-16000-8bit-stereo-unsigned.wav
diff --git a/tests/manual/audiocore/jeplayer-splash-44100-16bit-mono-signed.wav b/tests/circuitpython-manual/audiocore/jeplayer-splash-44100-16bit-mono-signed.wav
similarity index 100%
rename from tests/manual/audiocore/jeplayer-splash-44100-16bit-mono-signed.wav
rename to tests/circuitpython-manual/audiocore/jeplayer-splash-44100-16bit-mono-signed.wav
diff --git a/tests/manual/audiocore/jeplayer-splash-44100-16bit-stereo-signed.wav b/tests/circuitpython-manual/audiocore/jeplayer-splash-44100-16bit-stereo-signed.wav
similarity index 100%
rename from tests/manual/audiocore/jeplayer-splash-44100-16bit-stereo-signed.wav
rename to tests/circuitpython-manual/audiocore/jeplayer-splash-44100-16bit-stereo-signed.wav
diff --git a/tests/manual/audiocore/jeplayer-splash-44100-24bit-mono-signed.wav b/tests/circuitpython-manual/audiocore/jeplayer-splash-44100-24bit-mono-signed.wav
similarity index 100%
rename from tests/manual/audiocore/jeplayer-splash-44100-24bit-mono-signed.wav
rename to tests/circuitpython-manual/audiocore/jeplayer-splash-44100-24bit-mono-signed.wav
diff --git a/tests/manual/audiocore/jeplayer-splash-44100-24bit-stereo-signed.wav b/tests/circuitpython-manual/audiocore/jeplayer-splash-44100-24bit-stereo-signed.wav
similarity index 100%
rename from tests/manual/audiocore/jeplayer-splash-44100-24bit-stereo-signed.wav
rename to tests/circuitpython-manual/audiocore/jeplayer-splash-44100-24bit-stereo-signed.wav
diff --git a/tests/manual/audiocore/jeplayer-splash-44100-8bit-mono-unsigned.wav b/tests/circuitpython-manual/audiocore/jeplayer-splash-44100-8bit-mono-unsigned.wav
similarity index 100%
rename from tests/manual/audiocore/jeplayer-splash-44100-8bit-mono-unsigned.wav
rename to tests/circuitpython-manual/audiocore/jeplayer-splash-44100-8bit-mono-unsigned.wav
diff --git a/tests/manual/audiocore/jeplayer-splash-44100-8bit-stereo-unsigned.wav b/tests/circuitpython-manual/audiocore/jeplayer-splash-44100-8bit-stereo-unsigned.wav
similarity index 100%
rename from tests/manual/audiocore/jeplayer-splash-44100-8bit-stereo-unsigned.wav
rename to tests/circuitpython-manual/audiocore/jeplayer-splash-44100-8bit-stereo-unsigned.wav
diff --git a/tests/manual/audiocore/jeplayer-splash-44100-stereo.mp3 b/tests/circuitpython-manual/audiocore/jeplayer-splash-44100-stereo.mp3
similarity index 100%
rename from tests/manual/audiocore/jeplayer-splash-44100-stereo.mp3
rename to tests/circuitpython-manual/audiocore/jeplayer-splash-44100-stereo.mp3
diff --git a/tests/manual/audiocore/jeplayer-splash-8000-16bit-mono-signed.wav b/tests/circuitpython-manual/audiocore/jeplayer-splash-8000-16bit-mono-signed.wav
similarity index 100%
rename from tests/manual/audiocore/jeplayer-splash-8000-16bit-mono-signed.wav
rename to tests/circuitpython-manual/audiocore/jeplayer-splash-8000-16bit-mono-signed.wav
diff --git a/tests/manual/audiocore/jeplayer-splash-8000-16bit-stereo-signed.wav b/tests/circuitpython-manual/audiocore/jeplayer-splash-8000-16bit-stereo-signed.wav
similarity index 100%
rename from tests/manual/audiocore/jeplayer-splash-8000-16bit-stereo-signed.wav
rename to tests/circuitpython-manual/audiocore/jeplayer-splash-8000-16bit-stereo-signed.wav
diff --git a/tests/manual/audiocore/jeplayer-splash-8000-24bit-mono-signed.wav b/tests/circuitpython-manual/audiocore/jeplayer-splash-8000-24bit-mono-signed.wav
similarity index 100%
rename from tests/manual/audiocore/jeplayer-splash-8000-24bit-mono-signed.wav
rename to tests/circuitpython-manual/audiocore/jeplayer-splash-8000-24bit-mono-signed.wav
diff --git a/tests/manual/audiocore/jeplayer-splash-8000-24bit-stereo-signed.wav b/tests/circuitpython-manual/audiocore/jeplayer-splash-8000-24bit-stereo-signed.wav
similarity index 100%
rename from tests/manual/audiocore/jeplayer-splash-8000-24bit-stereo-signed.wav
rename to tests/circuitpython-manual/audiocore/jeplayer-splash-8000-24bit-stereo-signed.wav
diff --git a/tests/manual/audiocore/jeplayer-splash-8000-8bit-mono-unsigned.wav b/tests/circuitpython-manual/audiocore/jeplayer-splash-8000-8bit-mono-unsigned.wav
similarity index 100%
rename from tests/manual/audiocore/jeplayer-splash-8000-8bit-mono-unsigned.wav
rename to tests/circuitpython-manual/audiocore/jeplayer-splash-8000-8bit-mono-unsigned.wav
diff --git a/tests/manual/audiocore/jeplayer-splash-8000-8bit-stereo-unsigned.wav b/tests/circuitpython-manual/audiocore/jeplayer-splash-8000-8bit-stereo-unsigned.wav
similarity index 100%
rename from tests/manual/audiocore/jeplayer-splash-8000-8bit-stereo-unsigned.wav
rename to tests/circuitpython-manual/audiocore/jeplayer-splash-8000-8bit-stereo-unsigned.wav
diff --git a/tests/manual/audiopwmio/single_buffer_loop.py b/tests/circuitpython-manual/audiopwmio/single_buffer_loop.py
similarity index 100%
rename from tests/manual/audiopwmio/single_buffer_loop.py
rename to tests/circuitpython-manual/audiopwmio/single_buffer_loop.py
diff --git a/tests/manual/audiopwmio/wavefile_pause_resume.py b/tests/circuitpython-manual/audiopwmio/wavefile_pause_resume.py
similarity index 100%
rename from tests/manual/audiopwmio/wavefile_pause_resume.py
rename to tests/circuitpython-manual/audiopwmio/wavefile_pause_resume.py
diff --git a/tests/manual/audiopwmio/wavefile_playback.py b/tests/circuitpython-manual/audiopwmio/wavefile_playback.py
similarity index 100%
rename from tests/manual/audiopwmio/wavefile_playback.py
rename to tests/circuitpython-manual/audiopwmio/wavefile_playback.py
diff --git a/tests/_manual/socketpool/client/cpy-client.py b/tests/circuitpython-manual/socketpool/client/cpy-client.py
similarity index 100%
rename from tests/_manual/socketpool/client/cpy-client.py
rename to tests/circuitpython-manual/socketpool/client/cpy-client.py
diff --git a/tests/_manual/socketpool/client/host-server.py b/tests/circuitpython-manual/socketpool/client/host-server.py
similarity index 100%
rename from tests/_manual/socketpool/client/host-server.py
rename to tests/circuitpython-manual/socketpool/client/host-server.py
diff --git a/tests/_manual/socketpool/client/readme.md b/tests/circuitpython-manual/socketpool/client/readme.md
similarity index 100%
rename from tests/_manual/socketpool/client/readme.md
rename to tests/circuitpython-manual/socketpool/client/readme.md
diff --git a/tests/_manual/socketpool/datagram/ntp.py b/tests/circuitpython-manual/socketpool/datagram/ntp.py
similarity index 100%
rename from tests/_manual/socketpool/datagram/ntp.py
rename to tests/circuitpython-manual/socketpool/datagram/ntp.py
diff --git a/tests/_manual/socketpool/datagram/readme.md b/tests/circuitpython-manual/socketpool/datagram/readme.md
similarity index 100%
rename from tests/_manual/socketpool/datagram/readme.md
rename to tests/circuitpython-manual/socketpool/datagram/readme.md
diff --git a/tests/_manual/socketpool/server/cpy-server.py b/tests/circuitpython-manual/socketpool/server/cpy-server.py
similarity index 100%
rename from tests/_manual/socketpool/server/cpy-server.py
rename to tests/circuitpython-manual/socketpool/server/cpy-server.py
diff --git a/tests/_manual/socketpool/server/host-client.py b/tests/circuitpython-manual/socketpool/server/host-client.py
similarity index 100%
rename from tests/_manual/socketpool/server/host-client.py
rename to tests/circuitpython-manual/socketpool/server/host-client.py
diff --git a/tests/_manual/socketpool/server/readme.md b/tests/circuitpython-manual/socketpool/server/readme.md
similarity index 100%
rename from tests/_manual/socketpool/server/readme.md
rename to tests/circuitpython-manual/socketpool/server/readme.md