diff --git a/testsuite/citest.py b/testsuite/citest.py
index c5996830..d068ca11 100644
--- a/testsuite/citest.py
+++ b/testsuite/citest.py
@@ -446,21 +446,14 @@ class CrossTest(CIBaseTest):
         ]
 
         self.init()
-        try:
-            self.perform_build_test(targets)
-        except exceptions.TestFail:
-            self.cancel('KFAIL')
+        self.perform_build_test(targets)
 
-    # TODO: broken because of moving to UEFI
     def test_run_arm64_resolute(self):
         """
         :avocado: tags=startvm
         """
         self.init()
-        try:
-            self.vm_start('arm64', 'resolute')
-        except exceptions.TestFail:
-            self.cancel('KFAIL')
+        self.vm_start('arm64', 'resolute')
 
     def test_cross_debsrc(self):
         targets = [
@@ -548,10 +541,7 @@ class CrossTest(CIBaseTest):
         ]
 
         self.init()
-        try:
-            self.perform_build_test(targets)
-        except exceptions.TestFail:
-            self.cancel('KFAIL')
+        self.perform_build_test(targets)
 
     def test_run_riscv64_trixie(self):
         """
@@ -568,10 +558,7 @@ class CrossTest(CIBaseTest):
         :avocado: tags=startvm,riscv64
         """
         self.init()
-        try:
-            self.vm_start('riscv64', 'resolute', image='isar-image-ci')
-        except exceptions.TestFail:
-            self.cancel('KFAIL')
+        self.vm_start('riscv64', 'resolute', image='isar-image-ci')
 
     def test_cross_forky(self):
         targets = [
diff --git a/testsuite/dockerdata/Dockerfile b/testsuite/dockerdata/Dockerfile
index d4698aea..3ca5472d 100644
--- a/testsuite/dockerdata/Dockerfile
+++ b/testsuite/dockerdata/Dockerfile
@@ -11,7 +11,9 @@ RUN sudo pip3 --proxy=$https_proxy install --break-system-packages \
               avocado-framework==${AVOCADO_VERSION} \
               avocado-framework-plugin-varianter-yaml-to-mux==${AVOCADO_VERSION} && \
     sudo apt-get update && \
-    sudo apt-get install -y -f --no-install-recommends qemu-system ovmf python3-apt busybox squid && \
+    sudo apt-get install -y -f --no-install-recommends \
+        qemu-system qemu-efi-aarch64 qemu-efi-riscv64 ovmf \
+        python3-apt busybox squid && \
     sudo apt-get clean && \
     sudo rm -rf $(pip3 cache dir) /var/lib/apt/lists/* /tmp/* /var/tmp/* && \
     sudo sh -c 'echo "max_filedescriptors 1048576" > /etc/squid/conf.d/docker.conf'
diff --git a/testsuite/dockerdata/version b/testsuite/dockerdata/version
index b8626c4c..7ed6ff82 100644
--- a/testsuite/dockerdata/version
+++ b/testsuite/dockerdata/version
@@ -1 +1 @@
-4
+5