diff --git a/src/Test/TestSafeRe.py b/src/Test/TestSafeRe.py
new file mode 100644
index 00000000..670bb764
--- /dev/null
+++ b/src/Test/TestSafeRe.py
@@ -0,0 +1,18 @@
+from util import SafeRe
+
+import pytest
+
+
+class TestSafeRe:
+    def testSafeMatch(self):
+        assert SafeRe.match(
+            "((js|css)/(?!all.(js|css))|data/users/.*db|data/users/.*/.*|data/archived|.*.py)",
+            "js/ZeroTalk.coffee"
+        )
+        assert SafeRe.match(".+/data.json", "data/users/1J3rJ8ecnwH2EPYa6MrgZttBNc61ACFiCj/data.json")
+
+    @pytest.mark.parametrize("pattern", ["([a-zA-Z]+)*", "(a|aa)+*", "(a|a?)+", "(.*a){10}"])
+    def testUnsafeMatch(self, pattern):
+        with pytest.raises(SafeRe.UnsafePatternError) as err:
+            SafeRe.match(pattern, "aaaaaaaaaaaaaaaaaaaaaaaa!")
+            assert "Potentially unsafe" in str(err)