diff --git a/.ci/build-jobs.yaml.j2 b/.ci/build-jobs.yaml.j2
index 7e01af81e..c03b239fe 100644
--- a/.ci/build-jobs.yaml.j2
+++ b/.ci/build-jobs.yaml.j2
@@ -88,7 +88,7 @@ prepare-{{ device.name }}:
   extends:
     .pmos-ci-tron-build-boot-artifacts
   {%- if device.has_kernel_variants %}
-  # Let's build all the boot artifacts for all the supported kernel variants in
+  # Build all the boot artifacts for all the supported kernel variants in
   # different jobs, but hide them behind a single job name so as not to pollute
   # the pipeline.
   parallel:
@@ -112,10 +112,8 @@ prepare-{{ device.name }}:
 
 .test-{{ device.name }}:
   stage: hardware tests
-  extends:
-    - .pmos-ci-tron-initramfs-test
   {%- if device.has_kernel_variants %}
-  # Let's test all the kernels in different jobs, but hide them behind a single
+  # Test all the kernels in different jobs, but hide them behind a single
   # job name so as not to pollute the pipeline.
   parallel:
     matrix:
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
index dd64dc18e..0e35b8f0e 100644
--- 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
@@ -9,6 +9,7 @@ test-{{ device.name }}:
   extends:
     # Extended from jobs defined in ci-common/ci-tron/common.yml
     - .pmos-ci-tron-runner-{{ device.name }}
+    - .pmos-ci-tron-initramfs-test
 
     # Extended from build-jobs.yaml.j2
     - .device-boot-flow-separate-artifacts
diff --git a/device/.gitlab-ci/packages/single-runner-defined-in-ci-common-with-vmlinuz-kernel-variant.yml.j2 b/device/.gitlab-ci/packages/single-runner-defined-in-ci-common-with-vmlinuz-kernel-variant.yml.j2
index 139789ae2..cfa85dd68 100644
--- a/device/.gitlab-ci/packages/single-runner-defined-in-ci-common-with-vmlinuz-kernel-variant.yml.j2
+++ b/device/.gitlab-ci/packages/single-runner-defined-in-ci-common-with-vmlinuz-kernel-variant.yml.j2
@@ -10,6 +10,7 @@ test-{{ device.name }}:
   extends:
     # Extended from jobs defined in ci-common's ci-tron/common.yml
     - .pmos-ci-tron-runner-{{ device.name }}
+    - .pmos-ci-tron-initramfs-test
 
     # Extended from build-jobs.yaml.j2
     - .device-boot-flow-separate-artifacts