diff --git a/package/optee-test/Config.in b/package/optee-test/Config.in
index a29eb355ac..03b532e338 100644
--- a/package/optee-test/Config.in
+++ b/package/optee-test/Config.in
@@ -36,10 +36,17 @@ if BR2_PACKAGE_OPTEE_TEST
 
 choice
 	prompt "optee-test version"
-	default BR2_PACKAGE_OPTEE_TEST_LATEST if BR2_PACKAGE_HOST_RUSTC_ARCH_SUPPORTS
+	default BR2_PACKAGE_OPTEE_TEST_AS_OS \
+				if BR2_TARGET_OPTEE_OS_CUSTOM_VERSION
+	default BR2_PACKAGE_OPTEE_TEST_LATEST \
+				if BR2_PACKAGE_HOST_RUSTC_ARCH_SUPPORTS
 	help
 	  Select the version of optee-test you want to use
 
+config BR2_PACKAGE_OPTEE_TEST_AS_OS
+	bool "Same as optee-os being built"
+	depends on BR2_TARGET_OPTEE_OS_CUSTOM_VERSION
+
 config BR2_PACKAGE_OPTEE_TEST_LATEST
 	bool "4.3.0"
 	help
@@ -68,6 +75,8 @@ endif
 
 config BR2_PACKAGE_OPTEE_TEST_VERSION
 	string
+	default BR2_TARGET_OPTEE_OS_CUSTOM_VERSION_VALUE \
+				if BR2_PACKAGE_OPTEE_TEST_AS_OS
 	default "4.3.0"		if BR2_PACKAGE_OPTEE_TEST_LATEST
 	default "custom"	if BR2_PACKAGE_OPTEE_TEST_CUSTOM_TARBALL