diff --git a/ipatests/test_xmlrpc/test_cert_plugin.py b/ipatests/test_xmlrpc/test_cert_plugin.py
index 4537002f9..e52788683 100644
--- a/ipatests/test_xmlrpc/test_cert_plugin.py
+++ b/ipatests/test_xmlrpc/test_cert_plugin.py
@@ -292,80 +292,7 @@ class test_cert_find(XMLRPC_test):
         res = api.Command['cert_find'](subject=self.short, exactly=True)
         assert 'count' in res and res['count'] == 0
 
-    def test_0007_find_revocation_reason_0(self):
-        """
-        Find all certificates with revocation reason 0
-        """
-        res = api.Command['cert_find'](revocation_reason=0)
-        assert 'count' in res and res['count'] == 0
-
-    def test_0008_find_revocation_reason_1(self):
-        """
-        Find all certificates with revocation reason 1
-        """
-        res = api.Command['cert_find'](revocation_reason=1)
-        assert 'count' in res and res['count'] == 0
-
-    def test_0009_find_revocation_reason_2(self):
-        """
-        Find all certificates with revocation reason 2
-        """
-        res = api.Command['cert_find'](revocation_reason=2)
-        assert 'count' in res and res['count'] == 0
-
-    def test_0010_find_revocation_reason_3(self):
-        """
-        Find all certificates with revocation reason 3
-        """
-        res = api.Command['cert_find'](revocation_reason=3)
-        assert 'count' in res and res['count'] == 0
-
-    def test_0011_find_revocation_reason_4(self):
-        """
-        Find all certificates with revocation reason 4
-
-        There is no way to know in advance how many revoked certificates
-        we'll have but in the context of make-test we'll have at least one.
-        """
-        res = api.Command['cert_find'](revocation_reason=4)
-        assert 'count' in res and res['count'] >= 1
-
-    def test_0012_find_revocation_reason_5(self):
-        """
-        Find all certificates with revocation reason 5
-        """
-        res = api.Command['cert_find'](revocation_reason=5)
-        assert 'count' in res and res['count'] == 0
-
-    def test_0013_find_revocation_reason_6(self):
-        """
-        Find all certificates with revocation reason 6
-        """
-        res = api.Command['cert_find'](revocation_reason=6)
-        assert 'count' in res and res['count'] == 0
-
-    # There is no revocation reason #7
-
-    def test_0014_find_revocation_reason_8(self):
-        """
-        Find all certificates with revocation reason 8
-        """
-        res = api.Command['cert_find'](revocation_reason=8)
-        assert 'count' in res and res['count'] == 0
-
-    def test_0015_find_revocation_reason_9(self):
-        """
-        Find all certificates with revocation reason 9
-        """
-        res = api.Command['cert_find'](revocation_reason=9)
-        assert 'count' in res and res['count'] == 0
-
-    def test_0016_find_revocation_reason_10(self):
-        """
-        Find all certificates with revocation reason 10
-        """
-        res = api.Command['cert_find'](revocation_reason=10)
-        assert 'count' in res and res['count'] == 0
+    # tests 0007 to 0016 removed
 
     def test_0017_find_by_issuedon(self):
         """