diff --git a/fvwm/conditional.c b/fvwm/conditional.c
index 00b6b5254..5032f39ac 100644
--- a/fvwm/conditional.c
+++ b/fvwm/conditional.c
@@ -2090,7 +2090,12 @@ void CMD_Test(F_CMD_ARGS)
 			flags_ptr = GetNextSimpleOption(flags_ptr, &var_name);
 			if (var_name)
 			{
-				const char *value = getenv(var_name);
+				const char *value;
+
+				if (memcmp(var_name,"infostore.",10) == 0)
+					value = get_metainfo_value(var_name+10);
+				else
+					value = getenv(var_name);
 
 				match = (value != NULL) ? 1 : 0;
 			}