diff --git a/device/downstream/device-sony-tulip/APKBUILD b/device/archived/device-sony-tulip-downstream/APKBUILD
similarity index 87%
rename from device/downstream/device-sony-tulip/APKBUILD
rename to device/archived/device-sony-tulip-downstream/APKBUILD
index 058fc80e7..2ce0c7fca 100644
--- a/device/downstream/device-sony-tulip/APKBUILD
+++ b/device/archived/device-sony-tulip-downstream/APKBUILD
@@ -1,5 +1,6 @@
+# Archived: Downstream port, only for testing. Use mainline port!
 # Reference: <https://postmarketos.org/devicepkg>
-pkgname=device-sony-tulip
+pkgname=device-sony-tulip-downstream
 pkgdesc="Sony Xperia M4 Aqua"
 pkgver=4
 pkgrel=0
diff --git a/device/downstream/device-sony-tulip/deviceinfo b/device/archived/device-sony-tulip-downstream/deviceinfo
similarity index 100%
rename from device/downstream/device-sony-tulip/deviceinfo
rename to device/archived/device-sony-tulip-downstream/deviceinfo
diff --git a/device/downstream/device-sony-tulip/kernel-cmdline.conf b/device/archived/device-sony-tulip-downstream/kernel-cmdline.conf
similarity index 100%
rename from device/downstream/device-sony-tulip/kernel-cmdline.conf
rename to device/archived/device-sony-tulip-downstream/kernel-cmdline.conf
diff --git a/device/downstream/linux-sony-tulip/0001-posix_acl-fix-bad-kernel-backport.patch b/device/archived/linux-sony-tulip/0001-posix_acl-fix-bad-kernel-backport.patch
similarity index 100%
rename from device/downstream/linux-sony-tulip/0001-posix_acl-fix-bad-kernel-backport.patch
rename to device/archived/linux-sony-tulip/0001-posix_acl-fix-bad-kernel-backport.patch
diff --git a/device/downstream/linux-sony-tulip/APKBUILD b/device/archived/linux-sony-tulip/APKBUILD
similarity index 96%
rename from device/downstream/linux-sony-tulip/APKBUILD
rename to device/archived/linux-sony-tulip/APKBUILD
index 5d3820744..a670cd299 100644
--- a/device/downstream/linux-sony-tulip/APKBUILD
+++ b/device/archived/linux-sony-tulip/APKBUILD
@@ -1,3 +1,4 @@
+# Archived: Downstream port, only for testing, use mainline port instead
 # Reference: <https://postmarketos.org/vendorkernel>
 # Kernel config based on: arch/arm64/configs/aosp_kanuti_tulip_defconfig
 
diff --git a/device/downstream/linux-sony-tulip/config-sony-tulip.aarch64 b/device/archived/linux-sony-tulip/config-sony-tulip.aarch64
similarity index 100%
rename from device/downstream/linux-sony-tulip/config-sony-tulip.aarch64
rename to device/archived/linux-sony-tulip/config-sony-tulip.aarch64
diff --git a/device/downstream/linux-sony-tulip/gcc10-extern_YYLOC_global_declaration.patch b/device/archived/linux-sony-tulip/gcc10-extern_YYLOC_global_declaration.patch
similarity index 100%
rename from device/downstream/linux-sony-tulip/gcc10-extern_YYLOC_global_declaration.patch
rename to device/archived/linux-sony-tulip/gcc10-extern_YYLOC_global_declaration.patch
diff --git a/device/downstream/linux-sony-tulip/linux3.7to4.5-ARM64-remove-Sun-Solaris-style-flag-on-section.patch b/device/archived/linux-sony-tulip/linux3.7to4.5-ARM64-remove-Sun-Solaris-style-flag-on-section.patch
similarity index 100%
rename from device/downstream/linux-sony-tulip/linux3.7to4.5-ARM64-remove-Sun-Solaris-style-flag-on-section.patch
rename to device/archived/linux-sony-tulip/linux3.7to4.5-ARM64-remove-Sun-Solaris-style-flag-on-section.patch
diff --git a/device/testing/device-sony-tulip/APKBUILD b/device/testing/device-sony-tulip/APKBUILD
new file mode 100644
index 000000000..3f3f5919b
--- /dev/null
+++ b/device/testing/device-sony-tulip/APKBUILD
@@ -0,0 +1,33 @@
+# Reference: <https://postmarketos.org/devicepkg>
+maintainer="TuxMan <tuxkun09@gmail.com>"
+pkgname=device-sony-tulip
+pkgdesc="Sony Xperia M4 Aqua"
+pkgver=5
+pkgrel=0
+url="https://postmarketos.org"
+license="MIT"
+arch="aarch64"
+options="!check !archcheck"
+depends="
+	device-qcom-msm8916-nonfree-firmware
+	linux-postmarketos-qcom-msm8916
+	mkbootimg
+	postmarketos-base
+	soc-qcom-msm8916
+	"
+makedepends="devicepkg-dev"
+source="deviceinfo kernel-cmdline.conf"
+
+build() {
+	devicepkg_build $startdir $pkgname
+}
+
+package() {
+	devicepkg_package $startdir $pkgname
+}
+
+
+sha512sums="
+2190e0ab90969b0ec672d150c6af14ff5fcc634eb3025f6d42deed7490f94fbbc9a1cb7952fd4e8d3db5cce7f49515b11a8774f903aa4b32f85230bb61512087  deviceinfo
+67a15c9304112e80e54e62da1bfc6c4c0b942f3a125723f6d007afaa07232fe61ec14c515570ae9abf2ef35a8bdd2f4e7df892904b79b0c1b0f54073603ac157  kernel-cmdline.conf
+"
diff --git a/device/testing/device-sony-tulip/deviceinfo b/device/testing/device-sony-tulip/deviceinfo
new file mode 100644
index 000000000..e5ad35467
--- /dev/null
+++ b/device/testing/device-sony-tulip/deviceinfo
@@ -0,0 +1,28 @@
+# Reference: <https://postmarketos.org/deviceinfo>
+# Please use double quotes only. You can source this file in shell scripts.
+
+deviceinfo_format_version="0"
+deviceinfo_name="Sony Xperia M4 Aqua"
+deviceinfo_manufacturer="Sony"
+deviceinfo_codename="sony-tulip"
+deviceinfo_year="2015"
+deviceinfo_arch="aarch64"
+deviceinfo_dtb="msm8939-sony-xperia-kanuti-tulip"
+deviceinfo_append_dtb="true"
+
+# Device related
+deviceinfo_chassis="handset"
+deviceinfo_external_storage="true"
+deviceinfo_screen_width="720"
+deviceinfo_screen_height="1280"
+deviceinfo_dev_touchscreen="/dev/input/event0"
+
+# Bootloader related
+deviceinfo_flash_method="fastboot"
+deviceinfo_generate_bootimg="true"
+deviceinfo_flash_offset_base="0x81dfff00"
+deviceinfo_flash_offset_kernel="0x00008000"
+deviceinfo_flash_offset_ramdisk="0x82000000"
+deviceinfo_flash_offset_second="0x00f00000"
+deviceinfo_flash_offset_tags="0x81e00000"
+deviceinfo_flash_pagesize="2048"
diff --git a/device/testing/device-sony-tulip/kernel-cmdline.conf b/device/testing/device-sony-tulip/kernel-cmdline.conf
new file mode 100644
index 000000000..e0f946cf5
--- /dev/null
+++ b/device/testing/device-sony-tulip/kernel-cmdline.conf
@@ -0,0 +1 @@
+console=ttyHSL0,115200,n8