diff --git a/templates/uefi/generic-qemu-uefi-boot-template.jinja2 b/templates/uefi/generic-qemu-uefi-boot-template.jinja2
new file mode 100644
index 000000000000..fadf43828a95
--- /dev/null
+++ b/templates/uefi/generic-qemu-uefi-boot-template.jinja2
@@ -0,0 +1,54 @@
+{% extends 'base/kernel-ci-base.jinja2' %}
+{% set ctx_arch = arch %}
+{% if arch == "arm" %}
+{% set ctx_cpu = 'cortex-a15' %}
+{% set console_dev = 'ttyAMA0' %}
+{% endif %}
+{% if arch == "arm64" %}
+{% set ctx_cpu = 'cortex-a57' %}
+{% set console_dev = 'ttyAMA0' %}
+{% endif %}
+{% if arch == 'x86_64' %}
+{% set ctx_arch = 'x86_64' %}
+{% set ctx_cpu = 'qemu64' %}
+{% set console_dev = 'ttyS0' %}
+{% endif %}
+{% block metadata %}
+{{ super() }}
+{% endblock %}
+{% block main %}
+{{ super() }}
+{% endblock %}
+{% block actions %}
+context:
+  arch: {{ ctx_arch }}
+  cpu: {{ ctx_cpu }}
+  guestfs_interface: virtio
+
+actions:
+- deploy:
+    timeout:
+      minutes: 3
+    to: tmpfs
+    os: oe
+    images:
+      bios:
+        image_arg: '-bios {bios}'
+        url: http://people.linaro.org/~ard.biesheuvel/kernelci/OVMF.fd-IA32-RELEASE-325ad6226099
+      kernel:
+{%- block image_arg %}
+        image_arg: '-kernel {kernel} -append "console={{ console_dev }},115200 root=/dev/ram0 debug verbose"'
+{%- endblock %}
+        url: {{ kernel_url }}
+      ramdisk:
+        image_arg: '-initrd {ramdisk}'
+        url: {{ initrd_url }}
+
+- boot:
+    timeout:
+      minutes: 5
+    method: qemu
+    media: tmpfs
+    prompts:
+      - '{{ rootfs_prompt }}'
+{% endblock %}
diff --git a/test-configs.yaml b/test-configs.yaml
index e131756edc9f..54d66225b323 100644
--- a/test-configs.yaml
+++ b/test-configs.yaml
@@ -140,6 +140,15 @@ test_plans:
             - 'defconfig+virtualvideo'
             - 'multi_v7_defconfig+virtualvideo'
 
+  uefi:
+    name: uefi
+    rootfs: buildroot_ramdisk
+    #pattern: 'ltp/generic-qemu-uefi-boot-template.jinja2'
+    filters:
+      - whitelist:
+          defconfig:
+            - 'defconfig'
+
   ltp_ipc:
     name: ltp_ipc
     rootfs: debian_stretch-ltp_ramdisk
@@ -1177,7 +1186,7 @@ test_configs:
     test_plans: [boot_qemu, simple_qemu, v4l2_compliance_qemu_vivid, ltp_ipc]
 
   - device_type: qemu_x86_64
-    test_plans: [boot_qemu, simple_qemu, v4l2_compliance_qemu_vivid, ltp_ipc]
+    test_plans: [boot_qemu, simple_qemu, v4l2_compliance_qemu_vivid, ltp_ipc, uefi]
 
   - device_type: r8a7791_porter
     test_plans: [boot]