diff --git a/device/testing/device-raspberry-pi/95-vchiq-permissions.rules b/device/downstream/device-raspberry-pi/95-vchiq-permissions.rules
similarity index 100%
rename from device/testing/device-raspberry-pi/95-vchiq-permissions.rules
rename to device/downstream/device-raspberry-pi/95-vchiq-permissions.rules
diff --git a/device/testing/device-raspberry-pi/APKBUILD b/device/downstream/device-raspberry-pi/APKBUILD
similarity index 100%
rename from device/testing/device-raspberry-pi/APKBUILD
rename to device/downstream/device-raspberry-pi/APKBUILD
diff --git a/device/testing/device-raspberry-pi/config.txt b/device/downstream/device-raspberry-pi/config.txt
similarity index 100%
rename from device/testing/device-raspberry-pi/config.txt
rename to device/downstream/device-raspberry-pi/config.txt
diff --git a/device/testing/device-raspberry-pi/device-raspberry-pi-kernel-rpi-openrc.post-install b/device/downstream/device-raspberry-pi/device-raspberry-pi-kernel-rpi-openrc.post-install
similarity index 100%
rename from device/testing/device-raspberry-pi/device-raspberry-pi-kernel-rpi-openrc.post-install
rename to device/downstream/device-raspberry-pi/device-raspberry-pi-kernel-rpi-openrc.post-install
diff --git a/device/testing/device-raspberry-pi/device-raspberry-pi-kernel-rpi-openrc.post-upgrade b/device/downstream/device-raspberry-pi/device-raspberry-pi-kernel-rpi-openrc.post-upgrade
similarity index 100%
rename from device/testing/device-raspberry-pi/device-raspberry-pi-kernel-rpi-openrc.post-upgrade
rename to device/downstream/device-raspberry-pi/device-raspberry-pi-kernel-rpi-openrc.post-upgrade
diff --git a/device/testing/device-raspberry-pi/device-raspberry-pi-kernel-rpi2-openrc.post-install b/device/downstream/device-raspberry-pi/device-raspberry-pi-kernel-rpi2-openrc.post-install
similarity index 100%
rename from device/testing/device-raspberry-pi/device-raspberry-pi-kernel-rpi2-openrc.post-install
rename to device/downstream/device-raspberry-pi/device-raspberry-pi-kernel-rpi2-openrc.post-install
diff --git a/device/testing/device-raspberry-pi/device-raspberry-pi-kernel-rpi2-openrc.post-upgrade b/device/downstream/device-raspberry-pi/device-raspberry-pi-kernel-rpi2-openrc.post-upgrade
similarity index 100%
rename from device/testing/device-raspberry-pi/device-raspberry-pi-kernel-rpi2-openrc.post-upgrade
rename to device/downstream/device-raspberry-pi/device-raspberry-pi-kernel-rpi2-openrc.post-upgrade
diff --git a/device/testing/device-raspberry-pi/deviceinfo b/device/downstream/device-raspberry-pi/deviceinfo
similarity index 100%
rename from device/testing/device-raspberry-pi/deviceinfo
rename to device/downstream/device-raspberry-pi/deviceinfo
diff --git a/device/testing/device-raspberry-pi/start-even-without-input.sh b/device/downstream/device-raspberry-pi/start-even-without-input.sh
similarity index 100%
rename from device/testing/device-raspberry-pi/start-even-without-input.sh
rename to device/downstream/device-raspberry-pi/start-even-without-input.sh
diff --git a/device/testing/device-raspberry-pi/usercfg.txt b/device/downstream/device-raspberry-pi/usercfg.txt
similarity index 100%
rename from device/testing/device-raspberry-pi/usercfg.txt
rename to device/downstream/device-raspberry-pi/usercfg.txt