diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index bd1ae59d..276cb26b 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -129,6 +129,7 @@ juno:
   parallel:
     matrix:
       - TOOLCHAINS: [gcc, clang]
+        FIRMWARE: [none, edk2]
 
 microbit-v1:
   extends: .build_and_test
diff --git a/ci/edk2.yml b/ci/edk2.yml
new file mode 100644
index 00000000..77eaee88
--- /dev/null
+++ b/ci/edk2.yml
@@ -0,0 +1,9 @@
+header:
+  version: 11
+
+local_conf_header:
+  bootfirmware: |
+    PREFERRED_PROVIDER_virtual/bootloader = "edk2-firmware"
+    MACHINE_FEATURES += "efi"
+    TFA_UBOOT = "0"
+    TFA_UEFI = "1"