diff --git a/conf/machine/include/imx-base.inc b/conf/machine/include/imx-base.inc
index 8547596dc2..1a1b7c50f4 100644
--- a/conf/machine/include/imx-base.inc
+++ b/conf/machine/include/imx-base.inc
@@ -551,8 +551,8 @@ PREFERRED_VERSION_optee-os:mx8-nxp-bsp     ??= "3.21.0.imx"
 PREFERRED_VERSION_optee-os:mx9-nxp-bsp     ??= "3.21.0.imx"
 PREFERRED_VERSION_optee-client:mx8-nxp-bsp ??= "3.21.0.imx"
 PREFERRED_VERSION_optee-client:mx9-nxp-bsp ??= "3.21.0.imx"
-PREFERRED_VERSION_optee-test:mx8-nxp-bsp   ??= "3.19.0.imx"
-PREFERRED_VERSION_optee-test:mx9-nxp-bsp   ??= "3.19.0.imx"
+PREFERRED_VERSION_optee-test:mx8-nxp-bsp   ??= "3.21.0.imx"
+PREFERRED_VERSION_optee-test:mx9-nxp-bsp   ??= "3.21.0.imx"
 
 # Use i.MX opencv Version
 PREFERRED_VERSION_opencv:mx8-nxp-bsp ??= "4.6.0.imx"
diff --git a/recipes-security/optee-imx/optee-test_3.19.0.imx.bb b/recipes-security/optee-imx/optee-test_3.21.0.imx.bb
similarity index 69%
rename from recipes-security/optee-imx/optee-test_3.19.0.imx.bb
rename to recipes-security/optee-imx/optee-test_3.21.0.imx.bb
index 1ef4cad5e6..56ed2aa20e 100644
--- a/recipes-security/optee-imx/optee-test_3.19.0.imx.bb
+++ b/recipes-security/optee-imx/optee-test_3.21.0.imx.bb
@@ -4,7 +4,7 @@ require optee-test-fslc.inc
 
 SRC_URI = "git://github.com/nxp-imx/imx-optee-test.git;protocol=https;branch=${SRCBRANCH}"
 
-SRCBRANCH = "lf-6.1.1_1.0.0"
-SRCREV = "7c314e6a0cec0ba19246eb4f1959859d7a6536d6"
+SRCBRANCH = "lf-6.1.22_2.0.0"
+SRCREV = "c2c9f922044d2c8a7ab384812bb124c6da2b7888"
 
 COMPATIBLE_MACHINE = "(imx-nxp-bsp)"