diff --git a/modules/mol/base/tests/test_query.cc b/modules/mol/base/tests/test_query.cc
index 0e474611a6491239d6b3dc212bce5720250a6961..f868c468acaa6a0c8b5494c394375a6b9fe77f22 100644
--- a/modules/mol/base/tests/test_query.cc
+++ b/modules/mol/base/tests/test_query.cc
@@ -123,6 +123,8 @@ BOOST_AUTO_TEST_CASE(test_query_parse_properties)
   BOOST_CHECK(Query("grtest:2=8").IsValid());
   BOOST_CHECK(Query("gctest:3.0=9").IsValid());
   BOOST_CHECK(Query("anita=3").IsValid()==false);
+  BOOST_CHECK(Query("gc*test=3").IsValid()==false);
+  BOOST_CHECK(Query("gc?test=3").IsValid()==false);
 }
 
 BOOST_AUTO_TEST_CASE(test_query_parse_value_type) 
@@ -279,8 +281,10 @@ BOOST_AUTO_TEST_CASE(test_glob)
   ensure_counts(e, "rname=ARG and aname=N?1", 1, 1, 1);
   ensure_counts(e, "rname=ARG and aname=NH?", 1, 1, 2);
   ensure_counts(e, "rname=ARG and aname=\"*2\"", 1, 1, 1);
+  ensure_counts(e, "rname=ARG and aname=*2", 1, 1, 1);
   ensure_counts(e, "rname=ARG and aname=N?", 1, 1, 1);
   ensure_counts(e, "rname=LEU and aname=\"?D?\"", 1, 1, 2);
+  ensure_counts(e, "rname=LEU and aname=?D?", 1, 1, 2);
 }
 
 BOOST_AUTO_TEST_SUITE_END()