diff --git a/Makefile.am b/Makefile.am
index 4f8803dc1a7eed073434015e6506621f8532baf6..ea0608c651337f49e6e66b90bea7f8b202c347c5 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -27,6 +27,7 @@ test_cases = \
 	tests/match-types/contains.svtest \
 	tests/match-types/matches.svtest \
 	tests/match-types/relational.svtest \
+	tests/match-types/regex.svtest \
 	tests/address-parts/subaddress.svtest \
 	tests/extensions/encoded-character.svtest \
 	tests/extensions/envelope.svtest \
diff --git a/tests/match-types/regex.svtest b/tests/match-types/regex.svtest
new file mode 100644
index 0000000000000000000000000000000000000000..8e814b51af5d61bfb20b96d12b629d64e7712c1d
--- /dev/null
+++ b/tests/match-types/regex.svtest
@@ -0,0 +1,35 @@
+require "vnd.dovecot.testsuite";
+
+require "regex";
+require "variables";
+
+# Test overwriting only on match 
+test "RFC - values overwrite" {
+	set "sentence1" "the cat jumps off the table";
+	set "sentence2" "the dog barks at the cat in the alley";
+
+	if not string :regex "${sentence1}" "the (.*) jumps off the (.*)" {
+		test_fail "failed to match first sentence";
+	} 
+	
+	if not string :is "${1}:${2}" "cat:table" {
+		test_fail "invalid match values";
+	}
+
+	if string :regex "${sentence2}" "the (.*) barks at the (.*) in the store" {
+		test_fail "should not have matched second sentence";
+	}
+
+	if not string :is "${1}:${2}" "cat:table" {
+		test_fail "should have preserved match values";
+	}
+
+	if not string :regex "${sentence2}" "the (.*) barks at the (.*) in the alley" {
+		test_fail "failed to match the second sentence (second time)";
+	}
+
+	if not string :is "${1}:${2}" "dog:cat" {
+		test_fail "should have overwritten match values";
+	}
+}
+