diff --git a/tests/test_ssl.py b/tests/test_ssl.py
index d23af11a..ac2fed3b 100644
--- a/tests/test_ssl.py
+++ b/tests/test_ssl.py
@@ -20,6 +20,19 @@ CA_BUNDLE = pytest_httpbin.certs.where()
 
 class TestClientCert:
 
+    def test_cert_and_key(self, httpbin_secure):
+        r = http(httpbin_secure + '/get',
+                 '--verify', CA_BUNDLE,
+                 '--cert', CLIENT_CERT,
+                 '--cert-key', CLIENT_KEY)
+        assert HTTP_OK in r
+
+    def test_cert_pem(self, httpbin_secure):
+        r = http(httpbin_secure + '/get',
+                 '--verify', CA_BUNDLE,
+                 '--cert', CLIENT_PEM)
+        assert HTTP_OK in r
+
     def test_cert_file_not_found(self, httpbin_secure):
         r = http(httpbin_secure + '/get',
                  '--verify', CA_BUNDLE,
@@ -40,27 +53,8 @@ class TestClientCert:
                  '--verify', CA_BUNDLE,
                  '--cert', CLIENT_CERT)
 
-    def test_cert_and_key(self, httpbin_secure):
-        r = http(httpbin_secure + '/get',
-                 '--verify', CA_BUNDLE,
-                 '--cert', CLIENT_CERT,
-                 '--cert-key', CLIENT_KEY)
-        assert HTTP_OK in r
-
-    def test_cert_pem(self, httpbin_secure):
-        r = http(httpbin_secure + '/get',
-                 '--verify', CA_BUNDLE,
-                 '--cert', CLIENT_PEM)
-        assert HTTP_OK in r
-
 
 class TestServerCert:
-
-    def test_self_signed_server_cert_by_default_raises_ssl_error(
-            self, httpbin_secure):
-        with pytest.raises(SSLError):
-            http(httpbin_secure.url + '/get')
-
     def test_verify_no_OK(self, httpbin_secure):
         r = http(httpbin_secure.url + '/get', '--verify=no')
         assert HTTP_OK in r
@@ -70,6 +64,11 @@ class TestServerCert:
         r = http(httpbin_secure.url + '/get', '--verify', CA_BUNDLE)
         assert HTTP_OK in r
 
+    def test_self_signed_server_cert_by_default_raises_ssl_error(
+            self, httpbin_secure):
+        with pytest.raises(SSLError):
+            http(httpbin_secure.url + '/get')
+
     def test_verify_custom_ca_bundle_invalid_path(self, httpbin_secure):
         with pytest.raises(SSLError):
             http(httpbin_secure.url + '/get', '--verify', '/__not_found__')