diff --git a/scripts/data_files/query_config.fmt b/scripts/data_files/query_config.fmt
index e0e14cbd8..b22474ac2 100644
--- a/scripts/data_files/query_config.fmt
+++ b/scripts/data_files/query_config.fmt
@@ -99,9 +99,9 @@
 #define MACRO_NAME_TO_STR(macro)                                        \
     mbedtls_printf( "%s", strlen( #macro "" ) > 0 ? #macro "\n" : "" )
 
-#define NAME_TO_STR(macro)  #macro
+#define STRINGIFY(macro)  #macro
 #define OUTPUT_MACRO_NAME_VALUE(macro) mbedtls_printf( #macro "%s\n",   \
-    strlen( NAME_TO_STR(macro) "") > 0 ? "=" NAME_TO_STR(macro) : "" )
+    STRINGIFY(macro)[0] != 0 ? "=" STRINGIFY(macro) : "" )
 
 #if defined(_MSC_VER)
 /*
diff --git a/tests/ssl-opt.sh b/tests/ssl-opt.sh
index 7b994cd9e..0c6afae42 100755
--- a/tests/ssl-opt.sh
+++ b/tests/ssl-opt.sh
@@ -207,8 +207,7 @@ skip_next_test() {
 # skip next test if the flag is not enabled in mbedtls_config.h
 requires_config_enabled() {
     case $CONFIGS_ENABLED in
-        *" $1 "*) :;;
-        *" $1="*) :;;
+        *" $1"[\ =]*) :;;
         *) SKIP_NEXT="YES";;
     esac
 }
@@ -216,8 +215,7 @@ requires_config_enabled() {
 # skip next test if the flag is enabled in mbedtls_config.h
 requires_config_disabled() {
     case $CONFIGS_ENABLED in
-        *" $1 "*) SKIP_NEXT="YES";;
-        *" $1="*) SKIP_NEXT="YES";;
+        *" $1"[\ =]*) SKIP_NEXT="YES";;
     esac
 }