diff --git a/tests/scripts/components-configuration.sh b/tests/scripts/components-configuration.sh
index b1e6332..4f212be 100644
--- a/tests/scripts/components-configuration.sh
+++ b/tests/scripts/components-configuration.sh
@@ -353,11 +353,12 @@
 }
 
 # Temporary component for SHA3 config option removal
-# Must be removed when SHA3 removal is merged
+# Will be removed according to this issue:
+# https://github.com/Mbed-TLS/mbedtls/issues/10203
 component_test_full_no_sha3 () {
     msg "build: full config without SHA3"
     scripts/config.py full
-    scripts/config.py unset-all PSA_WANT_ALG_SHA3_*
+    scripts/config.py unset-all 'PSA_WANT_ALG_SHA3_*'
     make
 
     msg "test: full - PSA_WANT_ALG_SHA3_*"