diff --git a/test/regress/basic_tests.cpp b/test/regress/basic_tests.cpp
index 2c552542..2c248fc0 100644
--- a/test/regress/basic_tests.cpp
+++ b/test/regress/basic_tests.cpp
@@ -129,6 +129,10 @@ void test_partial_match()
    TEST_REGEX_SEARCH("[\\x0-\\xff]{4,}", perl, "xxa", match_default|match_partial, make_array(0, 3, -2, -2));
    TEST_REGEX_SEARCH("a{4,}", perl, "aaa", match_default|match_partial, make_array(0, 3, -2, -2));
    TEST_REGEX_SEARCH("\\w{4,}", perl, "aaa", match_default|match_partial, make_array(0, 3, -2, -2));
+   TEST_REGEX_SEARCH(".*?<tag>", perl, "aaa", match_default|match_partial, make_array(0, 3, -2, -2));
+   TEST_REGEX_SEARCH("a*?<tag>", perl, "aaa", match_default|match_partial, make_array(0, 3, -2, -2));
+   TEST_REGEX_SEARCH("\\w*?<tag>", perl, "aaa", match_default|match_partial, make_array(0, 3, -2, -2));
+   TEST_REGEX_SEARCH("(\\w)*?<tag>", perl, "aaa", match_default|match_partial, make_array(0, 3, -2, -2));
 }
 
 void test_nosubs()
diff --git a/test/regress/test_simple_repeats.cpp b/test/regress/test_simple_repeats.cpp
index 684d2d99..04dfbf71 100644
--- a/test/regress/test_simple_repeats.cpp
+++ b/test/regress/test_simple_repeats.cpp
@@ -39,6 +39,65 @@ void test_simple_repeats()
    TEST_REGEX_SEARCH("\\*", perl, "*", match_default, make_array(0, 1, -2, -2));
    TEST_REGEX_SEARCH("(ab)*", perl, "abab", match_default, make_array(0, 4, 2, 4, -2, 4, 4, -2, -2));
 
+   TEST_INVALID_REGEX("(*)", perl);
+   TEST_INVALID_REGEX("(*)", extended);
+   TEST_INVALID_REGEX("\\(*\\)", basic);
+   TEST_INVALID_REGEX("^*", perl);
+   TEST_INVALID_REGEX("^*", extended);
+   TEST_INVALID_REGEX("$*", perl);
+   TEST_INVALID_REGEX("$*", extended);
+   TEST_INVALID_REGEX("$*", basic);
+   TEST_INVALID_REGEX("\\b*", perl);
+   TEST_INVALID_REGEX("\\B*", perl);
+   TEST_INVALID_REGEX("\\A*", perl);
+   TEST_INVALID_REGEX("\\z*", perl);
+   TEST_INVALID_REGEX("\\Z*", perl);
+   TEST_INVALID_REGEX("\\A*", perl);
+   TEST_INVALID_REGEX("a|*", perl);
+   TEST_INVALID_REGEX("a|*", extended);
+   TEST_INVALID_REGEX("(+)", perl);
+   TEST_INVALID_REGEX("(+)", extended);
+   TEST_INVALID_REGEX("^+", perl);
+   TEST_INVALID_REGEX("^+", extended);
+   TEST_INVALID_REGEX("$+", perl);
+   TEST_INVALID_REGEX("$+", extended);
+   TEST_INVALID_REGEX("\\b+", perl);
+   TEST_INVALID_REGEX("\\B+", perl);
+   TEST_INVALID_REGEX("\\A+", perl);
+   TEST_INVALID_REGEX("\\z+", perl);
+   TEST_INVALID_REGEX("\\Z+", perl);
+   TEST_INVALID_REGEX("\\A+", perl);
+   TEST_INVALID_REGEX("a|+", perl);
+   TEST_INVALID_REGEX("a|+", extended);
+   TEST_INVALID_REGEX("(?)", perl);
+   TEST_INVALID_REGEX("(?)", extended);
+   TEST_INVALID_REGEX("^?", perl);
+   TEST_INVALID_REGEX("^?", extended);
+   TEST_INVALID_REGEX("$?", perl);
+   TEST_INVALID_REGEX("$?", extended);
+   TEST_INVALID_REGEX("\\b?", perl);
+   TEST_INVALID_REGEX("\\B?", perl);
+   TEST_INVALID_REGEX("\\A?", perl);
+   TEST_INVALID_REGEX("\\z?", perl);
+   TEST_INVALID_REGEX("\\Z?", perl);
+   TEST_INVALID_REGEX("\\A?", perl);
+   TEST_INVALID_REGEX("a|?", perl);
+   TEST_INVALID_REGEX("a|?", extended);
+   TEST_INVALID_REGEX("({1,2})", perl);
+   TEST_INVALID_REGEX("({1,2})", extended);
+   TEST_INVALID_REGEX("^{1,2}", perl);
+   TEST_INVALID_REGEX("^{1,2}", extended);
+   TEST_INVALID_REGEX("${1,2}", perl);
+   TEST_INVALID_REGEX("${1,2}", extended);
+   TEST_INVALID_REGEX("\\b{1,2}", perl);
+   TEST_INVALID_REGEX("\\B{1,2}", perl);
+   TEST_INVALID_REGEX("\\A{1,2}", perl);
+   TEST_INVALID_REGEX("\\z{1,2}", perl);
+   TEST_INVALID_REGEX("\\Z{1,2}", perl);
+   TEST_INVALID_REGEX("\\A{1,2}", perl);
+   TEST_INVALID_REGEX("a|{1,2}", perl);
+   TEST_INVALID_REGEX("a|{1,2}", extended);
+
    // now try operator + :
    TEST_REGEX_SEARCH("ab+", perl, "a", match_default, make_array(-2, -2));
    TEST_REGEX_SEARCH("ab+", perl, "ab", match_default, make_array(0, 2, -2, -2));