diff --git a/gramps/gen/filters/rules/test/repository_rules_test.py b/gramps/gen/filters/rules/test/repository_rules_test.py
new file mode 100644
index 000000000..47db7ec7c
--- /dev/null
+++ b/gramps/gen/filters/rules/test/repository_rules_test.py
@@ -0,0 +1,131 @@
+#
+# Gramps - a GTK+/GNOME based genealogy program
+#
+# Copyright (C) 2016 Tom Samstag
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+#
+
+"""
+Unittest that tests repository-specific filter rules
+"""
+import unittest
+
+from gramps.gen.merge.diff import import_as_dict
+from gramps.cli.user import User
+from gramps.gen.filters import GenericFilterFactory
+
+from gramps.gen.filters.rules.repository import (
+    AllRepos, HasIdOf, RegExpIdOf, HasNoteRegexp, HasReferenceCountOf,
+    RepoPrivate, ChangedSince, MatchesNameSubstringOf, HasTag)
+
+GenericRepositoryFilter = GenericFilterFactory('Repository')
+
+class BaseTest(unittest.TestCase):
+    """
+    Repository rule tests.
+    """
+
+    @classmethod
+    def setUpClass(cls):
+        """
+        Import example database.
+        """
+        cls.db = import_as_dict("example/gramps/example.gramps", User())
+
+    def filter_with_rule(self, rule):
+        """
+        Apply a filter with the given rule.
+        """
+        filter_ = GenericRepositoryFilter()
+        filter_.add_rule(rule)
+        results = filter_.apply(self.db)
+        return set(results)
+
+    def test_allrepos(self):
+        """
+        Test AllRepos rule.
+        """
+        rule = AllRepos([])
+        self.assertEqual(len(self.filter_with_rule(rule)),
+                         self.db.get_number_of_repositories())
+
+    def test_hasidof(self):
+        """
+        Test HasIdOf rule.
+        """
+        rule = HasIdOf(['R0000'])
+        self.assertEqual(self.filter_with_rule(rule),
+                         set([b'b39fe38593f3f8c4f12']))
+
+    def test_regexpidof(self):
+        """
+        Test RegExpIdOf rule.
+        """
+        rule = RegExpIdOf(['R000.'], use_regex=True)
+        self.assertEqual(self.filter_with_rule(rule), set([
+            b'a701ead12841521cd4d', b'a701e99f93e5434f6f3',
+            b'b39fe38593f3f8c4f12']))
+
+    def test_hasnoteregexp(self):
+        """
+        Test HasNoteRegexp rule.
+        """
+        rule = HasNoteRegexp(['.'], use_regex=True)
+        self.assertEqual(self.filter_with_rule(rule), set([
+            b'a701ead12841521cd4d', b'b39fe38593f3f8c4f12']))
+
+    def test_hasreferencecountof(self):
+        """
+        Test HasReferenceCountOf rule.
+        """
+        rule = HasReferenceCountOf(['greater than', '1'])
+        self.assertEqual(self.filter_with_rule(rule),
+                         set([b'a701e99f93e5434f6f3']))
+
+    def test_repoprivate(self):
+        """
+        Test RepoPrivate rule.
+        """
+        rule = RepoPrivate([])
+        self.assertEqual(self.filter_with_rule(rule), set([]))
+
+    def test_changedsince(self):
+        """
+        Test ChangedSince rule.
+        """
+        rule = ChangedSince(['2010-01-01', '2016-01-01'])
+        self.assertEqual(self.filter_with_rule(rule),
+                         set([b'a701e99f93e5434f6f3']))
+
+    def test_matchesnamesubstringof(self):
+        """
+        Test MatchesNameSubstringOf rule.
+        """
+        rule = MatchesNameSubstringOf(['Martha'])
+        self.assertEqual(self.filter_with_rule(rule),
+                         set([b'a701ead12841521cd4d']))
+
+    def test_hastag(self):
+        """
+        Test HasTag rule.
+        """
+        rule = HasTag(['ToDo'])
+        self.assertEqual(self.filter_with_rule(rule),
+                         set())
+
+
+if __name__ == "__main__":
+    unittest.main()
diff --git a/po/POTFILES.skip b/po/POTFILES.skip
index 9351c9c93..7e05c5b41 100644
--- a/po/POTFILES.skip
+++ b/po/POTFILES.skip
@@ -87,6 +87,7 @@ gramps/gen/filters/rules/test/media_rules_test.py
 gramps/gen/filters/rules/test/note_rules_test.py
 gramps/gen/filters/rules/test/person_rules_test.py
 gramps/gen/filters/rules/test/place_rules_test.py
+gramps/gen/filters/rules/test/repository_rules_test.py
 #
 # gen.filters.rules.person package
 #