diff --git a/device/.gitlab-ci/packages/single-runner-defined-in-ci-common-qcom-devicepkg-bootimg.yml.j2 b/device/.gitlab-ci/packages/single-runner-defined-in-ci-common-qcom-devicepkg-bootimg.yml.j2
new file mode 100644
index 000000000..78ad5ece5
--- /dev/null
+++ b/device/.gitlab-ci/packages/single-runner-defined-in-ci-common-qcom-devicepkg-bootimg.yml.j2
@@ -0,0 +1,27 @@
+# Use this gitlab-ci snippet if your package:
+#
+# * is a Qualcomm device
+# * has its runner tags definition found in ci-common's ci-tron/common.yml
+# * uses U-boot as bootloader
+# * The devicepackage does not support U-boot and UEFI, but still uses the stock
+#   bootloader
+test-{{ device.name }}:
+  extends:
+    # Extended from jobs defined in ci-common/ci-tron/common.yml
+    - .pmos-ci-tron-runner-{{ device.name }}
+
+    # Extended from build-jobs.yaml.j2
+    - .device-boot-flow-separate-artifacts
+    - .test-{{ device.name }}
+
+  variables:
+    # Let CI-tron construct the bootimg accepted by U-boot in a standard
+    # Qualcomm way
+    CI_TRON_FASTBOOT__HEADER_VERSION: 2
+    CI_TRON_FASTBOOT__BASE: 0x00000000
+    CI_TRON_FASTBOOT__KERNEL_OFFSET: 0x00008000
+    CI_TRON_FASTBOOT__RAMDISK_OFFSET: 0x01000000
+    CI_TRON_FASTBOOT__TAGS_OFFSET: 0x00000100
+    CI_TRON_FASTBOOT__PAGESIZE: 4096
+    CI_TRON_KERNEL_CMDLINE__CONSOLE: "console=ttyMSM0,115200"
+    KERNEL_NAME: "vmlinuz"
diff --git a/device/community/device-oneplus-fajita/APKBUILD b/device/community/device-oneplus-fajita/APKBUILD
index 7b7e67de6..fcbb176e8 100644
--- a/device/community/device-oneplus-fajita/APKBUILD
+++ b/device/community/device-oneplus-fajita/APKBUILD
@@ -3,7 +3,7 @@ maintainer="Casey Connolly <kcxt@postmarketos.org>"
 pkgname=device-oneplus-fajita
 pkgdesc="OnePlus 6T"
 pkgver=18
-pkgrel=1
+pkgrel=2
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
@@ -70,11 +70,8 @@ nonfree_firmware_openrc() {
 pmtest() {
 	depends="bootrr qrtr firmware-oneplus-sdm845 postmarketos-test-unl0kr"
 	install_if="$pkgname=$pkgver-r$pkgrel postmarketos-mkinitfs-hook-ci"
-	install="$subpkgdir/$subpkgname.post-install"
 
 	mkdir -p "$subpkgdir"
-
-	devicepkg_pmtest_post_install "ttyMSM0,115200" > "$subpkgdir/$subpkgname.post-install"
 }
 
 systemd() {
diff --git a/device/community/device-oneplus-fajita/gitlab-ci.yml.j2 b/device/community/device-oneplus-fajita/gitlab-ci.yml.j2
new file mode 120000
index 000000000..73220c4ff
--- /dev/null
+++ b/device/community/device-oneplus-fajita/gitlab-ci.yml.j2
@@ -0,0 +1 @@
+../../.gitlab-ci/packages/single-runner-defined-in-ci-common-qcom-devicepkg-bootimg.yml.j2
\ No newline at end of file