diff --git a/tests/cert.pem b/tests/cert.pem
new file mode 100644
index 0000000..f3bbfcb
--- /dev/null
+++ b/tests/cert.pem
@@ -0,0 +1,19 @@
+-----BEGIN CERTIFICATE-----
+MIIDBjCCAe6gAwIBAgIUTKopT76CFlsVcI7FAilaYLILz0owDQYJKoZIhvcNAQEL
+BQAwIzEhMB8GA1UEAwwYbG9jYWxob3N0LmVudHJvdXZlcnQub3JnMB4XDTE4MTIw
+NTE2NTkyNFoXDTI4MTIwMjE2NTkyNFowIzEhMB8GA1UEAwwYbG9jYWxob3N0LmVu
+dHJvdXZlcnQub3JnMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA4xsL
+n25yittbjk5bcKvY2I8zPivL6YWn2MJimaQQSNzCw/8POmVPLmMIb3lcZjydFRad
++RTxZfnuvCCJrnGrG7hOsJNenTLLU0ugN/yQ1869cM07a9tjSzL7NCz9H1NIK1+Q
+cBsTExc77dOWpwWI9TjqYYRL+zex3ml8cdqcQ7BQUQxAvA4UU63DM2G+5O3dE7l8
+uvyBUU3kW/shHyhfweWNXO8IXXIjvDfPYkOsjc6en2kFMr+sENSUKgfDKjz/Uzqy
+S7LBb4tkJALZM8QP56VeQAG1JZF2J2/y1RqBfIGRIEkYoaHcj6UATZa1xcZjMubL
+z3otRNYcRXKJMYWGbQIDAQABozIwMDAJBgNVHRMEAjAAMCMGA1UdEQQcMBqCGGxv
+Y2FsaG9zdC5lbnRyb3V2ZXJ0Lm9yZzANBgkqhkiG9w0BAQsFAAOCAQEAFVPavBah
+mIjgnTjq6ZbFxXTNJW0TrqN8olbKJ6SfwWVk0I8px7POekFaXd+egsFJlWYyH9q4
+HkKotddRYYrWoXcPiodNfUa+bRnh2WYl2rEGMW5dbBf/MYCDts68c3SoA7JIYJ8w
+0QZGAkijKNtVML0/FrLuJWbfFBAWH8JB46BcAg/8flbMHAULzV3F1g/v0A3FG3Y/
+9fVr+lN5qs+NB9NXIMdf5wXrmJQYRjotyOjUO6yTFqDFvqE7DEpKQD5hnvqJoXCz
+zYQS1DjH1qSRc5vC8I7YlJowCfnI9MsEICSrsk75DhT091aJC2XX93o4zhfNxmO5
+Kj28hP87GHgNIg==
+-----END CERTIFICATE-----
diff --git a/tests/conftest.py b/tests/conftest.py
index 021bf0d..eb6f012 100644
--- a/tests/conftest.py
+++ b/tests/conftest.py
@@ -1,13 +1,12 @@
 import pytest
 import tempfile
 import os
-import random
 
 from ldaptools.slapd import Slapd
 
 base_path = os.path.dirname(__file__)
-key_file = os.path.join(base_path, 'ssl-cert-snakeoil.key')
-certificate_file = os.path.join(base_path, 'ssl-cert-snakeoil.pem')
+key_file = os.path.join(base_path, 'key.pem')
+certificate_file = os.path.join(base_path, 'cert.pem')
 
 
 @pytest.fixture
@@ -19,28 +18,28 @@ def slapd(request):
 @pytest.fixture
 def slapd_tcp1(request):
     port = 4389
-    with Slapd(ldap_url='ldap://localhost:%s' % port) as s:
+    with Slapd(ldap_url='ldap://localhost.entrouvert.org:%s' % port) as s:
         yield s
 
 
 @pytest.fixture
 def slapd_tcp2(request):
     port = 5389
-    with Slapd(ldap_url='ldap://localhost:%s' % port) as s:
+    with Slapd(ldap_url='ldap://localhost.entrouvert.org:%s' % port) as s:
         yield s
 
 
 @pytest.fixture
 def slapd_ssl(request):
     port = 6389
-    with Slapd(ldap_url='ldaps://localhost:%s' % port, tls=(key_file, certificate_file)) as s:
+    with Slapd(ldap_url='ldaps://localhost.entrouvert.org:%s' % port, tls=(key_file, certificate_file)) as s:
         yield s
 
 
 @pytest.fixture
 def slapd_tls(request):
     port = 7389
-    with Slapd(ldap_url='ldap://localhost:%s' % port, tls=(key_file, certificate_file)) as s:
+    with Slapd(ldap_url='ldap://localhost.entrouvert.org:%s' % port, tls=(key_file, certificate_file)) as s:
         yield s
 
 
diff --git a/tests/key.pem b/tests/key.pem
new file mode 100644
index 0000000..9acc941
--- /dev/null
+++ b/tests/key.pem
@@ -0,0 +1,28 @@
+-----BEGIN PRIVATE KEY-----
+MIIEvwIBADANBgkqhkiG9w0BAQEFAASCBKkwggSlAgEAAoIBAQDjGwufbnKK21uO
+Tltwq9jYjzM+K8vphafYwmKZpBBI3MLD/w86ZU8uYwhveVxmPJ0VFp35FPFl+e68
+IImucasbuE6wk16dMstTS6A3/JDXzr1wzTtr22NLMvs0LP0fU0grX5BwGxMTFzvt
+05anBYj1OOphhEv7N7HeaXxx2pxDsFBRDEC8DhRTrcMzYb7k7d0TuXy6/IFRTeRb
++yEfKF/B5Y1c7whdciO8N89iQ6yNzp6faQUyv6wQ1JQqB8MqPP9TOrJLssFvi2Qk
+AtkzxA/npV5AAbUlkXYnb/LVGoF8gZEgSRihodyPpQBNlrXFxmMy5svPei1E1hxF
+cokxhYZtAgMBAAECggEAOUZI2BxyprJLlMgOJ4wvU+5JbhR9iJc8jV34n+bQdI+4
+TtW0cXW7UmeHaRWiR+Zhd0AM9xRhDObLXoaWMnhYPtVsgvunkN2OiaM49OWtYb+x
+5xDbO4hIsl5ZG/98lrnaKZYgRyWM2fOyGXiTNewfbji8Y3uJ7gFNylmwGMaZQjhr
+YNaqNEV7Vs2n7oERxqzKG9947oBAx2hpmoaW6eMyXcWl2ov7iHpJSKUBKho+5PWc
+J731no0OsGuS+3jHa/0nZXrT8nKmemyDMdSfWmtTv659L/guFInZpHPfFVLf56vc
+J6zb/IzEJV+Nh7CfBsMbHlTYBeUFlRWsy9t70+OZwQKBgQD3J4aVN4vJhXX1zDgL
+dVAczwLGKXY38BoBjOeRtVhXHs5p/eNIqeZ2YbYwBBy3nL414Un7gqb9fDtg0i3n
+5mQIOWhvpIYUxtwIPgYwzumxxp/n7XdU4BPDbxejZxkuC7AR5bB34pwJAJvWRGEf
+0X1TxJlqULhiZ6g18O3S0oiJtwKBgQDrO9ROaj6kkxjYHmljBZIXXhdKDcn0AqPi
+w20Aaafx0oxNQAoq8Gtu22Z1QHwRdBeUJwqCbmHVCCwbMf/568zFAANuT9bKMe6X
+J0p0nTDiyn8w9MfduFuG4cUMn4oK6dIuYlscguoPQCvQdciwG+djqwTrHib5TEbm
+jeKEkY2A+wKBgQDvXt+wy2BeqBzMF6M8Lb2OeUwVgniVyrxVPhPVgk5x6ks+SoAD
+k1G62/3o2UK67lsmsfDGYA69uMGFj2qYjAHcGUW1wyF9I/BdJz01rmCWJmoe5VXK
+5U8e3AyH3MV9XCKF4vCb2+UFrwo/ZnCusWVxaRqw5kb+P6ihvZuIsRE+VwKBgQC7
+2duBg3bjFlUQwbiHSzuPTaRrjvdn1XPq8wVo/vcPNoS0bB+yiqxAqxT3LbfmeD8c
+INFTt7KI3S3byeIRQy0TZR9YSInOjnFqZAYheiY/9lX8Un4Jod/1pvYlToJ+lJs0
+T3dTHXitFSHoJydM+/ucrEYRPNMC4tb75vKty06lYQKBgQCx49+g5kQaaRZ+4psw
++eolMpAwKDkpK5gYen6OsrT8m4hpxTmtiteMsH5Avb/fxqoJWLOjhN4EnEZTMJzr
+LyGoKsTv7rhZwhRznE15rOzxmldWrcCkl7DGuM2GcKgguhCYF7U7KA+vUCeqCE0H
+LA2grkY+TxFpg1pwYdF1hekmTw==
+-----END PRIVATE KEY-----
diff --git a/tests/ssl-cert-snakeoil.key b/tests/ssl-cert-snakeoil.key
deleted file mode 100644
index 52667d2..0000000
--- a/tests/ssl-cert-snakeoil.key
+++ /dev/null
@@ -1,28 +0,0 @@
------BEGIN PRIVATE KEY-----
-MIIEwAIBADANBgkqhkiG9w0BAQEFAASCBKowggSmAgEAAoIBAQDtrEI7C2ETvY8F
-UMJlhLWOQMkWNx3q2ANHAlzClVNtAmrg7CtmGBNgiDfMYf2FtpTe7chybYS529Bg
-GBsSgKhLOy5U0jGT/lBg6ja+sAKYG/ZWklIdC2tcHDvyVLW/GEN/lGkmwC82dB51
-SpFUk+UXhOu3yHsliHyX9Fe8kaPMDyrxlx8rt2WgS01AeU2zI7QZnywFdOHRhwA2
-+AjZsic5zfdnSCytqSJNiC5xHjT3Gm7zK2oGCtcRLIVfJyweTcGgfVj7v98ZcSa9
-qPbMYktmXTY3Z+iwfN8XPRT4wDUh74qjH6vlwkXUQb7s0PnBQ/+Gs/TXnd5FjSAg
-RIEXNIX5AgMBAAECggEBAI+oiFviE+p3sIQY/XeZUJhMZn9sD0RNDyYTsnfXBJcm
-V+3eMplCQiweCgQa0r/IzZE2DuvDcO9ag0giKfL0G0Vl3ypb5qW6mWELEM4P23GP
-rUVEqiduKJWDZ2SheT2pb9sknK5UifUTGPnyeYey4U1nBYePwYe9SPocMhADxArp
-kdw2g/9Eruvb+r/VL7xSAVJWBpJzC52mLIW7HtdaQV3TG6sy4QHUAipHMBsoja46
-5n2/i9CHM1ZMop9wI8O+Hb39DrObMJ/P86Q5tvGaWmQBx0GNLMYB4+KT9Dm866Gt
-ieb4ImzumW+vt4HcT7slk7yM52NX1ivyoQu1X1hq4aUCgYEA++YQCFSt80WI8Zwy
-BHoh76dHRwVzjdvznqVufha/8rzYsWOFjdPYxaLzLXmNM3AhAaM2HxcvT6Cufr0J
-d7xQmUjd1BxR+eFPkh+4r91rSJfQBcIv79O56dSCjOrom7ibk94G6IfmVC3GlwTo
-2luzsUoWA5vuevsZc/ItcZvIJXcCgYEA8Yrm0TbR7rCj7bCE1oDM/ygPkrCzFfQN
-SgG6oK+QewUEXDzBlCaZ/igRrss3YNTdBqhLT84oNTGwjOlAJgiS/PPD9pVEG3JA
-W83CS41XDprm5NZ2xDEMSFVZJHmalYyoUm5bQo4fAnhtmkuZS5+QF9Wc9DX1NkzU
-0uHFe9I9TA8CgYEAiTaJ1y/hTVm8PfgaWsv4fmX9cpdqmYSNkQaGSJK13lC2LPKM
-RnR2aTnZAxVqL/HNWOoByi/D6rkZNBpe9OUUdlr10tvWX6o2wN8cqFeRYAqqGujr
-WdVYOSI0NvSi3mhR/tr7omCcu4/v1EWtXXyERneXxEGFR2JOPBVYYcE85gMCgYEA
-oofn5xGvU6DSvccQq9IBnxQS3o8+AmC1bH4bWbKpUs4+b96GF62d43KM64Rc4DB8
-BdXKz4mWbqzf8wGlI7KTTditnUg1iw5nFh8vRW13DiHXilZxlnS2ohmkITIefdEn
-Fkih6ff+D8h/X9rM7SEScadQtNd2CDLM5pX7L+V5T6sCgYEA72PFi3w1G2jItrB9
-jt2nfMVmKe3QAmYljd6ZFriIGw5mCl8hPpCN6t1DiYapccDYIU3o1SxfF9G4RMdu
-eRupg9LPojzYLuk81sjLC1zuh5HSoiymC/dmqe3dR4u09xX9M4mzpRZdDeGcB3Rw
-GRenSfJ0H+gxAmLNNQq/3sG4EP4=
------END PRIVATE KEY-----
diff --git a/tests/ssl-cert-snakeoil.pem b/tests/ssl-cert-snakeoil.pem
deleted file mode 100644
index 72e4bc2..0000000
--- a/tests/ssl-cert-snakeoil.pem
+++ /dev/null
@@ -1,18 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIC+DCCAeCgAwIBAgIJAKXYP9qJxjLDMA0GCSqGSIb3DQEBCwUAMCIxIDAeBgNV
-BAMMF3JldmVzdGVsLmVudHJvdXZlcnQub3JnMB4XDTE3MTIxNzAxNDcwMFoXDTI3
-MTIxNTAxNDcwMFowIjEgMB4GA1UEAwwXcmV2ZXN0ZWwuZW50cm91dmVydC5vcmcw
-ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDtrEI7C2ETvY8FUMJlhLWO
-QMkWNx3q2ANHAlzClVNtAmrg7CtmGBNgiDfMYf2FtpTe7chybYS529BgGBsSgKhL
-Oy5U0jGT/lBg6ja+sAKYG/ZWklIdC2tcHDvyVLW/GEN/lGkmwC82dB51SpFUk+UX
-hOu3yHsliHyX9Fe8kaPMDyrxlx8rt2WgS01AeU2zI7QZnywFdOHRhwA2+AjZsic5
-zfdnSCytqSJNiC5xHjT3Gm7zK2oGCtcRLIVfJyweTcGgfVj7v98ZcSa9qPbMYktm
-XTY3Z+iwfN8XPRT4wDUh74qjH6vlwkXUQb7s0PnBQ/+Gs/TXnd5FjSAgRIEXNIX5
-AgMBAAGjMTAvMAkGA1UdEwQCMAAwIgYDVR0RBBswGYIXcmV2ZXN0ZWwuZW50cm91
-dmVydC5vcmcwDQYJKoZIhvcNAQELBQADggEBABxss/XDHwvKOvc/ntoKy6NWU5C4
-6B24+z0dLibr2eU+hjlRbzUYClk5er4Dd+rFqbuzewwD7bRHo4+ZfH3dQ/xAzDzs
-rAS0dZWmqYiHtjXU+38ja4iOfC+9lKWH5DS90/gIQCDJ1HyFNBuL4V9c84f5sv3p
-ErcUiOlwrzlGi1F/AsFDlMGJsepbeo4MKYv31HBwpWQoCh6W2uZPR7tB8/fp6rIX
-aqnxlvHvVHesVar72LEtHqkKZL1KXJIHMMsjowBD3sKUy2UftsdoJVZksu+WUn3O
-7B5cdOryJpMp5snM5RXInS5s3iRchUEyeMNrfwDCvjUJN7bneMyIOzZoTls=
------END CERTIFICATE-----