diff --git a/tuxlava/devices/qemu.py b/tuxlava/devices/qemu.py
index 4b7120c..8edba01 100644
--- a/tuxlava/devices/qemu.py
+++ b/tuxlava/devices/qemu.py
@@ -107,8 +107,8 @@ def definition(self, **kwargs):
         # Options that can *not* be updated
         kwargs["arch"] = self.arch
         kwargs["lava_arch"] = self.lava_arch
-        kwargs["machine"] = self.machine
-        kwargs["cpu"] = self.cpu
+        kwargs["machine"] = kwargs.get("parameters", {}).get("machine", self.machine)
+        kwargs["cpu"] = kwargs.get("parameters", {}).get("cpu", self.cpu)
         kwargs["memory"] = self.memory
         kwargs["extra_options"] = self.extra_options.copy()
         kwargs["console"] = self.console
diff --git a/tuxlava/templates/tests/optee-xtest.yaml.jinja2 b/tuxlava/templates/tests/optee-xtest.yaml.jinja2
new file mode 100644
index 0000000..a10fd5e
--- /dev/null
+++ b/tuxlava/templates/tests/optee-xtest.yaml.jinja2
@@ -0,0 +1,15 @@
+- test:
+    timeout:
+      minutes: {{ timeout }}
+    definitions:
+    - repository: {{ test_definitions }}
+{%if device.redirect_to_kmsg %}
+      lava-signal: kmsg
+{% endif %}
+      from: url
+      compression: zstd
+      path: automated/linux/optee/optee-xtest.yaml
+      parameters:
+        TEST_LEVEL: '{{ parameters.get("LEVEL", "0") }}'
+        TEST_SUITE: '{{ parameters.get("TEST_SUITE", "regression") }}'
+      name: {{ name }}
diff --git a/tuxlava/tests/__init__.py b/tuxlava/tests/__init__.py
index 35c2b21..36916de 100644
--- a/tuxlava/tests/__init__.py
+++ b/tuxlava/tests/__init__.py
@@ -93,6 +93,7 @@ def _render(self, filename, **kwargs):
 import tuxlava.tests.modules  # noqa: E402,F401
 import tuxlava.tests.morello  # noqa: E402,F401
 import tuxlava.tests.network  # noqa: E402,F401
+import tuxlava.tests.optee  # noqa: E402,F401
 import tuxlava.tests.perf  # noqa: E402,F401
 import tuxlava.tests.peripherals  # noqa: E402,F401
 import tuxlava.tests.rcutorture  # noqa: E402,F401
diff --git a/tuxlava/tests/optee.py b/tuxlava/tests/optee.py
new file mode 100644
index 0000000..94a24bd
--- /dev/null
+++ b/tuxlava/tests/optee.py
@@ -0,0 +1,27 @@
+# -*- coding: utf-8 -*-
+#
+# vim: set ts=4
+#
+# Copyright 2025-present Linaro Limited
+#
+# SPDX-License-Identifier: MIT
+
+from tuxlava.tests import Test
+
+
+class OPTEEXtestTest(Test):
+    devices = [
+        "qemu-*",
+        "fvp-aemva",
+        "nfs-*",
+        "fastboot-*",
+    ]
+    name = "optee-xtest"
+    timeout = 30
+    need_test_definition = True
+
+    def render(self, **kwargs):
+        kwargs["name"] = self.name
+        kwargs["timeout"] = self.timeout
+
+        return self._render("optee-xtest.yaml.jinja2", **kwargs)