diff --git a/test/certificates/ca.pem b/test/certificates/ca.pem
index 39a4bf1a4..6ac86cfcc 100644
--- a/test/certificates/ca.pem
+++ b/test/certificates/ca.pem
@@ -1,22 +1,21 @@
 -----BEGIN CERTIFICATE-----
-MIIDkzCCAnugAwIBAgIDCHYQMA0GCSqGSIb3DQEBBQUAMHUxGTAXBgNVBAMTEFB5
-dGhvbiBEcml2ZXIgQ0ExEDAOBgNVBAsTB0RyaXZlcnMxEDAOBgNVBAoTB01vbmdv
-REIxEjAQBgNVBAcTCVBhbG8gQWx0bzETMBEGA1UECBMKQ2FsaWZvcm5pYTELMAkG
-A1UEBhMCVVMwHhcNMTYwNTIzMjAxMzA4WhcNMzYwNTIzMjAxMzA4WjB1MRkwFwYD
-VQQDExBQeXRob24gRHJpdmVyIENBMRAwDgYDVQQLEwdEcml2ZXJzMRAwDgYDVQQK
-EwdNb25nb0RCMRIwEAYDVQQHEwlQYWxvIEFsdG8xEzARBgNVBAgTCkNhbGlmb3Ju
-aWExCzAJBgNVBAYTAlVTMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA
-ijh4H/G+FDuqaawzLp9ry0kSIvZJCsRJmYwB8/JGXjxKBowCW5zavwUdWYrk0pH5
-QRx9JvOwub0lpYTl26MLfNVoPe1zL+ahhyiDvobJqnQOPxxu86s56bNK+XZB7GBQ
-GoQrqm25yyODdRBRbDdeMqOT3pSGd7IkFdFWFVbs9Ro2GzUAc9SdfoAU3CJID9Up
-W3Gd/uxPIn0a/oYKPPbZzvAZ0QXVe4j01njOTn/i70btCayNOs/8uvwBEDSWGdGZ
-BHA+dfTaIG6cRnPCrhHUIKW0YIB3eOy3sdu1FUiFQXxrMLqVvaVxyfC6D1ubHAwu
-rK9ryguG2apWv4ODckoLzQIDAQABoywwKjAMBgNVHRMEBTADAQH/MBoGA1UdEQQT
-MBGCCWxvY2FsaG9zdIcEfwAAATANBgkqhkiG9w0BAQUFAAOCAQEAXbuk/+gGYvLO
-isSHUdflWHJrG1d0TpvlxRdu8uDUPtG5qqp0b7L65jUI7SBu6YF3wa5Hs+xTPGnZ
-4SG50VJ62CJckajVvrhNk1TS0NnZdCCE3PXWSm/CUJd+WQLmah5iOdb4WOGMiXoB
-ASzWee1yg9pxAxqZbqdlU/3Jk7sp98pxvz3FqQGsEWGegVUSmndGX+Dr3YbcEUrm
-DwAZdnjPV22N4HlbHXhZhn0YH9kN06mzsZND/fxw4tCkFbLH6juXyPuZnRj6TfN9
-mbgNLP87kVnY1QOgMJl1uwTYQOK1SzMg973LHu1nKzw5VpY+F1gWZptP/3ZE+vpg
-I6CowZ3LEw==
------END CERTIFICATE-----
+MIIDfzCCAmegAwIBAgIDB1MGMA0GCSqGSIb3DQEBCwUAMHkxGzAZBgNVBAMTEkRy
+aXZlcnMgVGVzdGluZyBDQTEQMA4GA1UECxMHRHJpdmVyczEQMA4GA1UEChMHTW9u
+Z29EQjEWMBQGA1UEBxMNTmV3IFlvcmsgQ2l0eTERMA8GA1UECBMITmV3IFlvcmsx
+CzAJBgNVBAYTAlVTMB4XDTE5MDUyMjIwMjMxMVoXDTM5MDUyMjIwMjMxMVoweTEb
+MBkGA1UEAxMSRHJpdmVycyBUZXN0aW5nIENBMRAwDgYDVQQLEwdEcml2ZXJzMRAw
+DgYDVQQKEwdNb25nb0RCMRYwFAYDVQQHEw1OZXcgWW9yayBDaXR5MREwDwYDVQQI
+EwhOZXcgWW9yazELMAkGA1UEBhMCVVMwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAw
+ggEKAoIBAQCl7VN+WsQfHlwapcOpTLZVoeMAl1LTbWTFuXSAavIyy0W1Ytky1UP/
+bxCSW0mSWwCgqoJ5aXbAvrNRp6ArWu3LsTQIEcD3pEdrFIVQhYzWUs9fXqPyI9k+
+QNNQ+MRFKeGteTPYwF2eVEtPzUHU5ws3+OKp1m6MCLkwAG3RBFUAfddUnLvGoZiT
+pd8/eNabhgHvdrCw+tYFCWvSjz7SluEVievpQehrSEPKe8DxJq/IM3tSl3tdylzT
+zeiKNO7c7LuQrgjAfrZl7n2SriHIlNmqiDR/kdd8+TxBuxjFlcf2WyHCO3lIcIgH
+KXTlhUCg50KfHaxHu05Qw0x8869yIzqbAgMBAAGjEDAOMAwGA1UdEwQFMAMBAf8w
+DQYJKoZIhvcNAQELBQADggEBAEHuhTL8KQZcKCTSJbYA9MgZj7U32arMGBbc1hiq
+VBREwvdVz4+9tIyWMzN9R/YCKmUTnCq8z3wTlC8kBtxYn/l4Tj8nJYcgLJjQ0Fwe
+gT564CmvkUat8uXPz6olOCdwkMpJ9Sj62i0mpgXJdBfxKQ6TZ9yGz6m3jannjZpN
+LchB7xSAEWtqUgvNusq0dApJsf4n7jZ+oBZVaQw2+tzaMfaLqHgMwcu1FzA8UKCD
+sxCgIsZUs8DdxaD418Ot6nPfheOTqe24n+TTa+Z6O0W0QtnofJBx7tmAo1aEc57i
+77s89pfwIJetpIlhzNSMKurCAocFCJMJLAASJFuu6dyDvPo=
+-----END CERTIFICATE-----
\ No newline at end of file
diff --git a/test/certificates/client.pem b/test/certificates/client.pem
index 6bf4d7fcc..5b0700109 100644
--- a/test/certificates/client.pem
+++ b/test/certificates/client.pem
@@ -1,49 +1,48 @@
 -----BEGIN RSA PRIVATE KEY-----
-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
+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
 -----END RSA PRIVATE KEY-----
 -----BEGIN CERTIFICATE-----
-MIIDjTCCAnWgAwIBAgIDAlMVMA0GCSqGSIb3DQEBBQUAMHUxGTAXBgNVBAMTEFB5
-dGhvbiBEcml2ZXIgQ0ExEDAOBgNVBAsTB0RyaXZlcnMxEDAOBgNVBAoTB01vbmdv
-REIxEjAQBgNVBAcTCVBhbG8gQWx0bzETMBEGA1UECBMKQ2FsaWZvcm5pYTELMAkG
-A1UEBhMCVVMwHhcNMTYwNTI0MDAyMDEzWhcNMzYwNTI0MDAyMDEzWjBkMQ8wDQYD
-VQQDEwZjbGllbnQxEDAOBgNVBAsTB0RyaXZlcnMxCTAHBgNVBAoTADESMBAGA1UE
-BxMJUGFsbyBBbHRvMRMwEQYDVQQIEwpDYWxpZm9ybmlhMQswCQYDVQQGEwJVUzCC
-ASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAIAxGniVt8zDUEFLoa476X2W
-Ph0mj5rgFv6Bj3MqmZAwR3WUsxumR7RZjrNrlgv+R1lpt3EyHBB+TLbzEkfkmW+0
-Mpv/MbDnzVXy2XkYwjArUqtTjzqRcJfeMHZ0FN7YhLsyb3D5GC91fGQu3HIP3jsE
-u9uQSoXizUh1hsEQQuXK7r00/B7HcuOZO9d2692+sXXu8QGksCRCoCvkvuniATNT
-daVuu4vy+4A9niGfSDHZFp0MrN/y+i+Des8cViOOTNtbdL73Lw1bJUCgrYPSAU/t
-OKztvlwqzgWakO7CJCyYBHkkE8jLR5IRS5pKgof+dfA9Sv50u7HArGpwAoI1gGUC
-AwEAAaM3MDUwCwYDVR0PBAQDAgeAMBMGA1UdJQQMMAoGCCsGAQUFBwMCMBEGA1Ud
-EQQKMAiCBmNsaWVudDANBgkqhkiG9w0BAQUFAAOCAQEAPOlVXQjEo2zd02PfbrpG
-8+UTacyUbQheeCH7rCe118XuUTCipAqEhw9D6kQaudXva+yyg7SUd3NPMQv0d64J
-CJrH2MDYlI8nFwZoWbhPEJbAdimDaFa/p9OHfeEjNyolY9aPEni7forNF/OeP6Jx
-uFnd4f2tlJjIGqi+IBARlCmpnc5XG9TRvWLo0euMgG4bkBb5O46AqBaIzNyDNRUp
-LkGE5Nr6VLKw/38WXeU40n2vNrUeDMWB0w4c3+j7k1CpiEibbeYsjML/rDMOAH9q
-zR61mhExOxRkJJ1KRjrCbD4KFqIuND+XgwhGTymGr7vL6OKXxzdi2cbnwcNDRFiP
-jQ==
+MIIDgzCCAmugAwIBAgIDAxOUMA0GCSqGSIb3DQEBCwUAMHkxGzAZBgNVBAMTEkRy
+aXZlcnMgVGVzdGluZyBDQTEQMA4GA1UECxMHRHJpdmVyczEQMA4GA1UEChMHTW9u
+Z29EQjEWMBQGA1UEBxMNTmV3IFlvcmsgQ2l0eTERMA8GA1UECBMITmV3IFlvcmsx
+CzAJBgNVBAYTAlVTMB4XDTE5MDUyMjIzNTU1NFoXDTM5MDUyMjIzNTU1NFowaTEP
+MA0GA1UEAxMGY2xpZW50MRAwDgYDVQQLEwdEcml2ZXJzMQwwCgYDVQQKEwNNREIx
+FjAUBgNVBAcTDU5ldyBZb3JrIENpdHkxETAPBgNVBAgTCE5ldyBZb3JrMQswCQYD
+VQQGEwJVUzCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALDUvFBLop+/
+ytvY13yDi6SKIdYxMllasYontjp8e7iSSnKCqJIQN13lJ1TdJOl+TMGFnDedsXJ7
+Oy2LcrdOp0aUxtv3pqFeOMPbik7h7L1G4jsElZv06CkEOBVBWaKqK1x/mZibiKST
+X6FvtwpBNbxAwiHnCKugTYOckrD7b0rkiRxo6ZnO/+WVA7xRNmifEGyVN1rNB14h
+G+spotOPC5cxC9lSl98Opqqofu3XGRgMu6mJNuRWfZLSrwnkGru5k8lNYbD6yhYi
+rTDfENmQCLV9d2rMOfyHkk6ti4CxR5W4+SqauBpi3TQrIcx+V+xMNyGDPBB5rF/H
+Zg+pob+76VcCAwEAAaMkMCIwCwYDVR0PBAQDAgeAMBMGA1UdJQQMMAoGCCsGAQUF
+BwMCMA0GCSqGSIb3DQEBCwUAA4IBAQAqRcLAGvYMaGYOV4HJTzNotT2qE0I9THNQ
+wOV1fBg69x6SrUQTQLjJEptpOA288Wue6Jt3H+p5qAGV5GbXjzN/yjCoItggSKxG
+Xg7279nz6/C5faoIKRjpS9R+MsJGlttP9nUzdSxrHvvqm62OuSVFjjETxD39DupE
+YPFQoHOxdFTtBQlc/zIKxVdd20rs1xJeeU2/L7jtRBSPuR/Sk8zot7G2/dQHX49y
+kHrq8qz12kj1T6XDXf8KZawFywXaz0/Ur+fUYKmkVk1T0JZaNtF4sKqDeNE4zcns
+p3xLVDSl1Q5Gwj7bgph9o4Hxs9izPwiqjmNaSjPimGYZ399zcurY
 -----END CERTIFICATE-----
diff --git a/test/certificates/client_encrypted.pem b/test/certificates/client_encrypted.pem
deleted file mode 100644
index 6c4e2d51b..000000000
--- a/test/certificates/client_encrypted.pem
+++ /dev/null
@@ -1,52 +0,0 @@
------BEGIN ENCRYPTED PRIVATE KEY-----
-MIIFHzBJBgkqhkiG9w0BBQ0wPDAbBgkqhkiG9w0BBQwwDgQIXVpiOphzP48CAggA
-MB0GCWCGSAFlAwQBAgQQCrPjZvdtfdmb5FnflM2QaQSCBNDwm1fRI4HsJ988MS6P
-7xRkA8fscD/krgMsnG3g47NjgM+CtYRbUfKNMrgidajQVC74P7z1pQ+uHCz9Py7U
-5Ge0uFFqkPyQl2RcnVjCdsx6ElCfdDLEnizVL1ERHMYTq0AXnYXyPN45Qpq9UfQG
-DPtoOAWpe6FSrQ0UFYZ3hTJIXK8A2J7phkPzrFz9CYtzaLv4ShD0osAOK0hN1hSp
-k258lb1oGifGc3BXv1atiXZI7R8tFhY5GlG/F6BksFHslOc01/Iix+rb04jV6aKB
-L1yyoUqjwO0Qt365FfUw/ZODwkW7n5gAT1hJ/qJc0Tkh92pv7ISnMpT5h40k4Q9L
-tkCm4aOymhSNWLjkBrgIVbLPgUo59bNZAgPrDz2Wjwt7rU3t5TyXPiScDYfxQyhj
-dhI7NkpC/nMGc/VRir8+zUSRvR6xIlkHM8glpVHWOU8gIRDv1RYQFhhecEFgoSMO
-oP54SK3a6A0BzrFZIRqMeVDXl1DXuA9tdgF7N2CIMdKTtAgOohTcTRESIk5ysFNm
-dY15ptDtj3woGsBffMgfa7AWxDq/97Gfp0leMdV7DTLHQWM/hjsmDaz7E5jRt36Z
-Qql2/SdUX3A91u4lvcCDgzcMe6YY1jJ3oPsuQRoMeZrj1jivR2TY0LUo474mxq3Y
-IxyP8wrGEhDDc3Tfq2TeFwyS2u1cxYu1JocRi1qxtbG/cdK340KXvdVJKl5mosys
-qUW0MdTyEAzzf77k14AqSOyXeVarttY4ZLMQd2qbW4kgBP7ZZ+Jz0YXPz4Pc0fiG
-ONeF8Q1LVVkneURHmvGXEoP+6rRk59neVtW1An5hxZkmeL9VPUm+q+cXAwLEJIxN
-tEzC6liIhzpMbyUFht6HbCaHvl6U4Zap56SqMfPXl6V6L3MDQC0uenQoPHmprYGP
-WcM1/F7BviQclHuyhdmkE/dbutJ8Dj7gKdv6qVYm4zS5BYcPfzqR/v4t4pXX+ubS
-Ng5GPZkrBCG4+D97/zSS4w6KPImbOsrQh6D0aJZKoRHcEgmEBaN0tDcwZQsSXQRs
-wB/ATl2sgebIRkNxABTqUyG3hnMMFNxoGPicv1P73Ai29056KrA5kq3Xz6PfOgI7
-ZwfMgvwKNPewyzQ6cIoJHKCZellBeAm8B6SPI6fes4nLBvTJi6khjpK489nnZqYz
-MDIzu1eFPQLAVM2XB9ABTdZJJVM8f2OrjUMuXAiqj3eKV9A0lVUd7YfCjPmat3+3
-JLlvJb7ePnVR7/O/4AgQatfIUyVRuqovR6s+j2KHu3iVEMUZvpEuQZpIzj+jptfC
-fSbaFoTjSGii97YKQ5OoZqnZiy3gkprY/SCkXa7Jlx7cb8h5pktbqEpAjlLd1MMd
-mES8HUiJpYSrseLCNJkbU5dKK1DqNj1UgAKRtU55HGYRGtpxx9zqPBqTiBkW7FwR
-qaBYhvM4STPj3cD0JqCE9TuJDG5/7jSKKKm342j1VyPN2VUXinreNDUFE2WePRdV
-OhyIa5zB4xuH5rLfqb3MJlxeuM7sMX/6Nor0+F7XfVn3HHEGGdjkclaJlFonmRTk
-+/xpROQ/iPCVWr85adnfkgBzIZOYDKFHqpXS0G4W0p09+eDfQWuHw1Nu5D3Gb9Y6
-CrGuA90yQPSULpuE+GBjv8Od+Q==
------END ENCRYPTED PRIVATE KEY-----
------BEGIN CERTIFICATE-----
-MIIDjTCCAnWgAwIBAgIDAmB0MA0GCSqGSIb3DQEBBQUAMHUxGTAXBgNVBAMTEFB5
-dGhvbiBEcml2ZXIgQ0ExEDAOBgNVBAsTB0RyaXZlcnMxEDAOBgNVBAoTB01vbmdv
-REIxEjAQBgNVBAcTCVBhbG8gQWx0bzETMBEGA1UECBMKQ2FsaWZvcm5pYTELMAkG
-A1UEBhMCVVMwHhcNMTYwNTI0MDAyMTQ4WhcNMzYwNTI0MDAyMTQ4WjBkMQ8wDQYD
-VQQDEwZjbGllbnQxEDAOBgNVBAsTB0RyaXZlcnMxCTAHBgNVBAoTADESMBAGA1UE
-BxMJUGFsbyBBbHRvMRMwEQYDVQQIEwpDYWxpZm9ybmlhMQswCQYDVQQGEwJVUzCC
-ASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALuWTvDI4CRfGVGkvRnGfwEp
-j2U/fwMvZoJW3LT0w2nQRUsa/hrf74Ggm9FbhaaM9bxA6eS5vWEaaJX9gfEEqOaj
-FlF8O++7+8+CrxsBWRK6yNT8nkB9rg3VCv5gqXJr9rpRhWAeq3QuFhunACrk+Mt4
-5KL+ueYerJyhJwx87LiwGAMxasdr+U8j/s5kc+SIhwQxWXYVOSgdweJd4FlEGYvZ
-0WR/oheEWp1ayZzf4cE8K2aD0YC6CS2ErFke6W4ZsdqtwGRjLwz71SMG0tSEpOjg
-NkNJBqNju3FU9AtFJFS7t9wPzMG/2LIioSXKe+RW4/SBjhc0LM7xgDM9oFYqZ3sC
-AwEAAaM3MDUwCwYDVR0PBAQDAgeAMBMGA1UdJQQMMAoGCCsGAQUFBwMCMBEGA1Ud
-EQQKMAiCBmNsaWVudDANBgkqhkiG9w0BAQUFAAOCAQEAMJgtYqm4cgOCmFiacwYy
-ZtpWJHLk1zFwBLrNdQu9GKlYhC+903yV/VypnRjOd0McdopMZ+4aQut4CE01PLty
-FEZ6UrpqXbEFniGh5PKaouhqrX896iBwPRn5eeFKf40sFgdNReJ3KDyGt6kqTWn6
-rY13wgopMy0A3NfCqmBHHXYRBRl9GS0O2bOOLMR49o7iBW+Ga638/Z3+4xx8T9Mh
-+ejauV8EWZFKfg43soXuGHLDfDl3BMqH4iP12y+e8NtBEMRl6RPbZcO3X9Zkavba
-rmlcdR/01UK9/FiWP2rPNNxk2ypqZDxkPzT8sCDBQXtRgemxTlxgeKryDgXlF1iD
-Pw==
------END CERTIFICATE-----
diff --git a/test/certificates/crl.pem b/test/certificates/crl.pem
index 35b5d6a22..733a0acdc 100644
--- a/test/certificates/crl.pem
+++ b/test/certificates/crl.pem
@@ -1,43 +1,13 @@
-Certificate Revocation List (CRL):
-        Version 2 (0x1)
-    Signature Algorithm: sha256WithRSAEncryption
-        Issuer: /CN=Python Driver CA/OU=Drivers/O=MongoDB/L=Palo Alto/ST=California/C=US
-        Last Update: Jan 31 23:00:50 2017 GMT
-        Next Update: Jan 30 23:00:50 2022 GMT
-        CRL extensions:
-            X509v3 CRL Number:
-                4096
-Revoked Certificates:
-    Serial Number: 051740
-        Revocation Date: Jan 31 23:00:50 2017 GMT
-    Serial Number: 087610
-        Revocation Date: Jan 31 23:00:50 2017 GMT
-    Signature Algorithm: sha256WithRSAEncryption
-         50:c5:77:16:8c:6b:a7:07:9a:04:97:05:e0:48:47:cc:1c:92:
-         a4:53:d6:12:91:5a:9e:b2:85:9a:20:57:cf:7c:09:58:ea:b2:
-         25:c0:8b:c5:69:64:73:d6:da:ce:41:a5:ad:c0:0a:b7:df:2a:
-         25:ca:59:fe:42:dd:d1:8c:56:d6:19:64:36:b7:2d:6e:f6:57:
-         6a:f9:a2:3d:4a:ea:f5:d1:09:56:6d:17:89:5e:0d:b5:02:3f:
-         e6:f5:74:3e:ab:78:54:80:a6:f5:dd:ac:bc:a4:77:51:e9:a7:
-         e9:98:98:0e:83:e2:96:36:0f:65:f1:1e:16:6d:fb:26:bd:e6:
-         f9:13:dd:68:23:15:bb:59:d9:f9:c5:31:ec:b2:98:d0:a5:df:
-         45:a7:a2:4d:a5:ef:20:14:f3:bd:69:f1:e4:5b:39:f4:06:af:
-         98:17:15:97:5e:5f:0e:00:6f:1c:57:cc:48:e9:3f:e6:d2:de:
-         15:fa:dc:b9:d0:de:29:02:9a:7a:05:b9:c9:b0:8d:af:ec:b5:
-         b4:76:fd:30:a4:6f:e4:d0:2b:dc:e5:dd:e3:ed:e9:b5:d9:d0:
-         cc:e5:1b:85:0c:46:5f:d3:5e:94:c9:98:82:44:d7:e0:48:30:
-         9d:ec:a5:4c:e7:a3:bf:7f:c2:4f:36:74:ea:e2:a8:cb:57:6c:
-         44:b7:4f:ef
 -----BEGIN X509 CRL-----
-MIIB/TCB5gIBATANBgkqhkiG9w0BAQsFADB1MRkwFwYDVQQDExBQeXRob24gRHJp
-dmVyIENBMRAwDgYDVQQLEwdEcml2ZXJzMRAwDgYDVQQKEwdNb25nb0RCMRIwEAYD
-VQQHEwlQYWxvIEFsdG8xEzARBgNVBAgTCkNhbGlmb3JuaWExCzAJBgNVBAYTAlVT
-Fw0xNzAxMzEyMzAwNTBaFw0yMjAxMzAyMzAwNTBaMCwwFAIDBRdAFw0xNzAxMzEy
-MzAwNTBaMBQCAwh2EBcNMTcwMTMxMjMwMDUwWqAPMA0wCwYDVR0UBAQCAhAAMA0G
-CSqGSIb3DQEBCwUAA4IBAQBQxXcWjGunB5oElwXgSEfMHJKkU9YSkVqesoWaIFfP
-fAlY6rIlwIvFaWRz1trOQaWtwAq33yolyln+Qt3RjFbWGWQ2ty1u9ldq+aI9Sur1
-0QlWbReJXg21Aj/m9XQ+q3hUgKb13ay8pHdR6afpmJgOg+KWNg9l8R4Wbfsmveb5
-E91oIxW7Wdn5xTHsspjQpd9Fp6JNpe8gFPO9afHkWzn0Bq+YFxWXXl8OAG8cV8xI
-6T/m0t4V+ty50N4pApp6BbnJsI2v7LW0dv0wpG/k0Cvc5d3j7em12dDM5RuFDEZf
-016UyZiCRNfgSDCd7KVM56O/f8JPNnTq4qjLV2xEt0/v
+MIIB6jCB0wIBATANBgkqhkiG9w0BAQsFADB5MRswGQYDVQQDExJEcml2ZXJzIFRl
+c3RpbmcgQ0ExEDAOBgNVBAsTB0RyaXZlcnMxEDAOBgNVBAoTB01vbmdvREIxFjAU
+BgNVBAcTDU5ldyBZb3JrIENpdHkxETAPBgNVBAgTCE5ldyBZb3JrMQswCQYDVQQG
+EwJVUxcNMTkwNTIyMjI0NTUzWhcNMTkwNjIxMjI0NTUzWjAVMBMCAncVFw0xOTA1
+MjIyMjQ1MzJaoA8wDTALBgNVHRQEBAICEAAwDQYJKoZIhvcNAQELBQADggEBACwQ
+W9OF6ExJSzzYbpCRroznkfdLG7ghNSxIpBQUGtcnYbkP4em6TdtAj5K3yBjcKn4a
+hnUoa5EJGr2Xgg0QascV/1GuWEJC9rsYYB9boVi95l1CrkS0pseaunM086iItZ4a
+hRVza8qEMBc3rdsracA7hElYMKdFTRLpIGciJehXzv40yT5XFBHGy/HIT0CD50O7
+BDOHzA+rCFCvxX8UY9myDfb1r1zUW7Gzjn241VT7bcIJmhFE9oV0popzDyqr6GvP
+qB2t5VmFpbnSwkuc4ie8Jizip1P8Hg73lut3oVAHACFGPpfaNIAp4GcSH61zJmff
+9UBe3CJ1INwqyiuqGeA=
 -----END X509 CRL-----
diff --git a/test/certificates/password_protected.pem b/test/certificates/password_protected.pem
new file mode 100644
index 000000000..cc9e12470
--- /dev/null
+++ b/test/certificates/password_protected.pem
@@ -0,0 +1,51 @@
+-----BEGIN ENCRYPTED PRIVATE KEY-----
+MIIFHzBJBgkqhkiG9w0BBQ0wPDAbBgkqhkiG9w0BBQwwDgQIC8as6PDVhwECAggA
+MB0GCWCGSAFlAwQBAgQQTYOgCJcRqUI7dsgqNojv/ASCBNCG9fiu642V4AuFK34c
+Q42lvy/cR0CIXLq/rDXN1L685kdeKex7AfDuRtnjY2+7CLJiJimgQNJXDJPHab/k
+MBHbwbBs38fg6eSYX8V08/IyyTege5EJMhYxmieHDC3DXKt0gyHk6hA/r5+Mr49h
+HeVGwqBLJEQ3gVIeHaOleZYspsXXWqOPHnFiqnk/biaJS0+LkDDEiQgTLEYSnOjP
+lexxUc4BV/TN0Z920tZCMfwx7IXD/C+0AkV/Iqq4LALmT702EccB3indaIJ8biGR
+radqDLR32Q+vT9uZHgT8EFiUsISMqhob2mnyTfFV/s9ghWwogjSz0HrRcq6fxdg7
+oeyT9K0ET53AGTGmV0206byPu6qCj1eNvtn+t1Ob+d5hecaTugRMVheWPlc5frsz
+AcewDNa0pv4pZItjAGMqOPJHfzEDnzTJXpLqGYhg044H1+OCY8+1YK7U0u8dO+/3
+f5AoDMq18ipDVTFTooJURej4/Wjbrfad3ZFjp86nxfHPeWM1YjC9+IlLtK1wr0/U
+V8TjGqCkw8yHayz01A86iA8X53YQBg+tyMGjxmivo6LgFGKa9mXGvDkN+B+0+OcA
+PqldAuH/TJhnkqzja767e4n9kcr+TmV19Hn1hcJPTDrRU8+sSqQFsWN4pvHazAYB
+UdWie+EXI0eU2Av9JFgrVcpRipXjB48BaPwuBw8hm+VStCH7ynF4lJy6/3esjYwk
+Mx+NUf8+pp1DRzpzuJa2vAutzqia5r58+zloQMxkgTZtJkQU6OCRoUhHGVk7WNb1
+nxsibOSzyVSP9ZNbHIHAn43vICFGrPubRs200Kc4CdXsOSEWoP0XYebhiNJgGtQs
+KoISsV4dFRLwhaJhIlayTBQz6w6Ph87WbtuiAqoLiuqdXhUGz/79j/6JZqCH8t/H
+eZs4Dhu+HdD/wZKJDYAS+JBsiwYWnI3y/EowZYgLdOMI4u6xYDejhxwEw20LW445
+qjJ7pV/iX2uavazHgC91Bfd4zodfXIQ1IDyTmb51UFwx0ARzG6enntduO6xtcYU9
+MXwfrEpuZ/MkWTLkR0PHPbIPcR1MiVwPKdvrLk42Bzj/urtXYrAFUckMFMzEh+uv
+0lix2hbq/Xwj4dXcY4w9hnC6QQDCJTf9S6MU6OisrZHKk0qZ2Vb4aU/eBcBsHBwo
+X/QGcDHneHxlrrs2eLX26Vh8Odc5h8haeIxnfaa1t+Yv56OKHuAztPMnJOUL7KtQ
+A556LxT0b5IGx0RcfUcbG8XbxEHseACptoDOoguh9923IBI0uXmpi8q0P815LPUu
+0AsE47ATDMGPnXbopejRDicfgMGjykJn8vKO8r/Ia3Fpnomx4iJNCXGqomL+GMpZ
+IhQbKNrRG6XZMlx5kVCT0Qr1nOWMiOTSDCQ5vrG3c1Viu+0bctvidEvs+LCm98tb
+7ty8F0uOno0rYGNQz18OEE1Tj+E19Vauz1U35Z5SsgJJ/GfzhSJ79Srmdg2PsAzk
+AUNTKXux1GLf1cMjTiiU5g+tCEtUL9Me7lsv3L6aFdrCyRbhXUQfJh4NAG8+3Pvh
+EaprThBzKsVvbOfU81mOaH9YMmUgmxG86vxDiNtaWd4v6c1k+HGspJr/q49pcXZP
+ltBMuS9AihstZ1sHJsyQCmNXkA==
+-----END ENCRYPTED PRIVATE KEY-----
+-----BEGIN CERTIFICATE-----
+MIIDgzCCAmugAwIBAgIDBXUHMA0GCSqGSIb3DQEBCwUAMHkxGzAZBgNVBAMTEkRy
+aXZlcnMgVGVzdGluZyBDQTEQMA4GA1UECxMHRHJpdmVyczEQMA4GA1UEChMHTW9u
+Z29EQjEWMBQGA1UEBxMNTmV3IFlvcmsgQ2l0eTERMA8GA1UECBMITmV3IFlvcmsx
+CzAJBgNVBAYTAlVTMB4XDTE5MDUyMzAwMDEyOVoXDTM5MDUyMzAwMDEyOVowaTEP
+MA0GA1UEAxMGY2xpZW50MRAwDgYDVQQLEwdEcml2ZXJzMQwwCgYDVQQKEwNNREIx
+FjAUBgNVBAcTDU5ldyBZb3JrIENpdHkxETAPBgNVBAgTCE5ldyBZb3JrMQswCQYD
+VQQGEwJVUzCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAOqCb0Lo4XsV
+W327Wlnqc5rwWa5Elw0rFuehSfViRIcYfuFWAPXoOj3fIDsYz6d41G8hp6tkF88p
+swlbzDF8Fc7mXDhauwwl2F/NrWYUXwCT8fKju4DtGd2JlDMi1TRDeofkYCGVPp70
+vNqd0H8iDWWs8OmiNrdBLJwNiGaf9y15ena4ImQGitXLFn+qNSXYJ1Rs8p7Y2PTr
+L+dff5gJCVbANwGII1rjMAsrMACPVmr8c1Lxoq4fSdJiLweosrv2Lk0WWGsO0Seg
+ZY71dNHEyNjItE+VtFEtslJ5L261i3BfF/FqNnH2UmKXzShwfwxyHT8o84gSAltQ
+5/lVJ4QQKosCAwEAAaMkMCIwCwYDVR0PBAQDAgeAMBMGA1UdJQQMMAoGCCsGAQUF
+BwMCMA0GCSqGSIb3DQEBCwUAA4IBAQBOAlKxIMFcTZ+4k8NJv97RSf+zOb5Wu2ct
+uxSZxzgKTxLFUuEM8XQiEz1iHQ3XG+uV1fzA74YLQiKjjLrU0mx54eM1vaRtOXvF
+sJlzZU8Z2+523FVPx4HBPyObQrfXmIoAiHoQ4VUeepkPRpXxpifgWd/OCWhLDr2/
+0Kgcb0ybaGVDpA0UD9uVIwgFjRu6id7wG+lVcdRxJYskTOOaN2o1hMdAKkrpFQbd
+zNRfEoBPUYR3QAmAKP2HBjpgp4ktOHoOKMlfeAuuMCUocSnmPKc3xJaH/6O7rHcf
+/Rm0X411RH8JfoXYsSiPsd601kZefhuWvJH0sJLibRDvT7zs8C1v
+-----END CERTIFICATE-----
diff --git a/test/certificates/server.pem b/test/certificates/server.pem
index 78e226183..e745e037f 100644
--- a/test/certificates/server.pem
+++ b/test/certificates/server.pem
@@ -1,49 +1,49 @@
------BEGIN RSA PRIVATE KEY-----
-MIIEpgIBAAKCAQEAkqTc5ZPVWJHKlyYK5/hQqzS7ThE4vHHuKQD0ux+y7COMhjjR
-2ILv6PIn/++7aON8Y/Ed1NBHP7Cq0Uo8eXR1st12Ehpnt132mWL8glPuKGgbaWPk
-pddKcBO5q7QsKj9/MKjR4eIIbw56ukaoDyye0Z3U0j8PIonuegGAk0Yqdd1B0BqA
-Wb1MphPvueY46Z3m4gUBl31HBabf44tYR9ma8ROYoMwypM9t48sXHNiqMwGeTSBA
-h6CfrTZXjC7Hpil2wfHS97p8ZT3EUgpegnOFvzXvyBqyXEQwr3tv5URpzupO14TP
-XUxLr+aDZMyqtt4tkgZjQvjKQVuUW0/qoQ0BUwIDAQABAoIBAQCGsW9EX7lClQbk
-NkkmMGrIFrNETYUzceIzP3GKvt71DuHwFxiIKhx6dpJO/r/A49JJahrgcj4/PeJo
-Qiux00qYc9oTXrWNM31h/g25F6ZU7urerqZBvbHdqACOufsnAxOseiPtulPMzhvk
-JSoQZgequbHVO56HNvIYlnCm1XgCsUSkSvl8PYnOARDIAWJuFiR4t/RDaOk+VRRp
-xTvmxJF1FsKeMuG/RzcCJEHYmhbOC+UWBAAailOTXm5ZOq/SWhq3I0EokaIQ0nSL
-vADXmp0NfHmCxB0Mc0a/R/ah3phIzCcHnc1PCMSobn7iabqP202FFi/R1XYmd+yc
-ngha8RxBAoGBAN3QA0kvDtTqomZmxh7ReiVy66ny/gDQy3f+fT7vE6pNBAp2/9AN
-8mSBMa78SxJWpMm3CHmyAX5rb+dJ9mHyoxADeJcMbbwEt9aQqeMEWNpewhG1SbbY
-FD7CVlewUMv/GsteHudStyi07o5SKZU9tgWkZFPEVYWDTIuXqoD0QalbAoGBAKk+
-8sUpZJATuAkbhh/HO4Jcls/hNGwyClPpXm9wnupkB7KLwkffaWKwCXEfVB1/2ERB
-iwjtxFuzKZ93RgTI3aE0tZaScGDme7u3Z/Kj1kyOdgyVxyJD5qXKcp99AWLjTa+E
-VSne5/++yXOuum+bu4Rqeo6RRsd9cRcRekkYNpFpAoGBAJ6D0EVVpuDMCWDq430U
-sJjgpr/eUl1c2XuYWANIsaILxe6AmlIiFW5z0YC+9htV5g/tiNYHOwAQYXlFpxja
-YGPKRzyS+jzallJ1MaN18NWl0ET9bH+JrfYnxbKG40bVuV1KlwUzXIdvvefhmav4
-3QLtN3GRpphye5pqucPMSrxvAoGBAJ42s1ourMynMmaJLWPtqqreBTnFzGzMhq0U
-vuwsetKgujVlwzPPHURdTiZK5CZDihecse2h3+rdXK6vIGx+nfkCPjLJKHbdX5QH
-CwxfroiYsLBpH+PfV/FqhKalhDM+TDQk4DwpHfYNE2OqVqzZB33s0C8QjfsVQDAR
-baCBGxnpAoGBALM6dqbPx2vHttYUrLQUyn1Tt+TAcCe1o/z/XlapGQfQAibkaCHG
-OuIpVZNh12MI375IkzW1BOITGx37x4LIR5f8DmdjZ5Ihw4nbAYSLRZh3NaPUwus7
-en2tQtSymZziYzI+9EGmE6Sdaxj4FtM80wqF4j5pgcVqJMimgkJ23y7J
------END RSA PRIVATE KEY-----
------BEGIN CERTIFICATE-----
-MIIDkDCCAnigAwIBAgIDBRdAMA0GCSqGSIb3DQEBBQUAMHUxGTAXBgNVBAMTEFB5
-dGhvbiBEcml2ZXIgQ0ExEDAOBgNVBAsTB0RyaXZlcnMxEDAOBgNVBAoTB01vbmdv
-REIxEjAQBgNVBAcTCVBhbG8gQWx0bzETMBEGA1UECBMKQ2FsaWZvcm5pYTELMAkG
-A1UEBhMCVVMwHhcNMTcwMTMxMjExNzU4WhcNMzcwMTMxMjExNzU4WjBuMRIwEAYD
-VQQDEwlsb2NhbGhvc3QxEDAOBgNVBAsTB0RyaXZlcnMxEDAOBgNVBAoTB01vbmdv
-REIxEjAQBgNVBAcTCVBhbG8gQWx0bzETMBEGA1UECBMKQ2FsaWZvcm5pYTELMAkG
-A1UEBhMCVVMwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCSpNzlk9VY
-kcqXJgrn+FCrNLtOETi8ce4pAPS7H7LsI4yGONHYgu/o8if/77to43xj8R3U0Ec/
-sKrRSjx5dHWy3XYSGme3XfaZYvyCU+4oaBtpY+Sl10pwE7mrtCwqP38wqNHh4ghv
-Dnq6RqgPLJ7RndTSPw8iie56AYCTRip13UHQGoBZvUymE++55jjpnebiBQGXfUcF
-pt/ji1hH2ZrxE5igzDKkz23jyxcc2KozAZ5NIECHoJ+tNleMLsemKXbB8dL3unxl
-PcRSCl6Cc4W/Ne/IGrJcRDCve2/lRGnO6k7XhM9dTEuv5oNkzKq23i2SBmNC+MpB
-W5RbT+qhDQFTAgMBAAGjMDAuMCwGA1UdEQQlMCOCCWxvY2FsaG9zdIcEfwAAAYcQ
-AAAAAAAAAAAAAAAAAAAAATANBgkqhkiG9w0BAQUFAAOCAQEAU3Fa4NYVdE6ewPHR
-q3bsNnvhTObBmQTnKKByICmfWcwQnUcFT2FraWK7X6xJcsfWZm5SYj024VtMK6c4
-kZb5ev6t7cvtQv2FFYvFZnW3Kn7RRQFAJ5zOyMc9JocZ9cZBNwiF7r51Qn1IGiwB
-eN5rN1iHr0qMlWz1zupWL3RTd57bWjauLrzyYRxbUZ05kUinzUlYrBb55f0IEAvD
-SwhNAHkb/HNzxfAhhvyIuQRqcpCiXkKcDQ/RyzxE0eltRlp5LyS7/YZ7gZXufwLa
-k0h74iXBKGrAvNzWeJrFOIOHyxBifp880cJqYS4mAEA7Q4hLiQ6lIX98FLCA9BVP
-cjdETQ==
------END CERTIFICATE-----
+-----BEGIN RSA PRIVATE KEY-----
+MIIEogIBAAKCAQEAhNrB0E6GY/kFSd8/vNpu/t952tbnOsD5drV0XPvmuy7SgKDY
+a/S+xb/jPnlZKKehdBnH7qP/gYbv34ZykzcDFZscjPLiGc2cRGP+NQCSFK0d2/7d
+y15zSD3zhj14G8+MkpAejTU+0/qFNZMc5neDvGanTe0+8aWa0DXssM0MuTxIv7j6
+CtsMWeqLLofN7a1Kw2UvmieCHfHMuA/08pJwRnV/+5T9WONBPJja2ZQRrG1BjpI4
+81zSPUZesIqi8yDlExdvgNaRZIEHi/njREqwVgJOZomUY57zmKypiMzbz48dDTsV
+gUStxrEqbaP+BEjQYPX5+QQk4GdMjkLf52LR6QIDAQABAoIBAHSs+hHLJNOf2zkp
+S3y8CUblVMsQeTpsR6otaehPgi9Zy50TpX4KD5D0GMrBH8BIl86y5Zd7h+VlcDzK
+gs0vPxI2izhuBovKuzaE6rf5rFFkSBjxGDCG3o/PeJOoYFdsS3RcBbjVzju0hFCs
+xnDQ/Wz0anJRrTnjyraY5SnQqx/xuhLXkj/lwWoWjP2bUqDprnuLOj16soNu60Um
+JziWbmWx9ty0wohkI/8DPBl9FjSniEEUi9pnZXPElFN6kwPkgdfT5rY/TkMH4lsu
+ozOUc5xgwlkT6kVjXHcs3fleuT/mOfVXLPgNms85JKLucfd6KiV7jYZkT/bXIjQ+
+7CZEn0ECgYEA5QiKZgsfJjWvZpt21V/i7dPje2xdwHtZ8F9NjX7ZUFA7mUPxUlwe
+GiXxmy6RGzNdnLOto4SF0/7ebuF3koO77oLup5a2etL+y/AnNAufbu4S5D72sbiz
+wdLzr3d5JQ12xeaEH6kQNk2SD5/ShctdS6GmTgQPiJIgH0MIdi9F3v0CgYEAlH84
+hMWcC+5b4hHUEexeNkT8kCXwHVcUjGRaYFdSHgovvWllApZDHSWZ+vRcMBdlhNPu
+09Btxo99cjOZwGYJyt20QQLGc/ZyiOF4ximQzabTeFgLkTH3Ox6Mh2Rx9yIruYoX
+nE3UfMDkYELanEJUv0zenKpZHw7tTt5yXXSlEF0CgYBSsEOvVcKYO/eoluZPYQAA
+F2jgzZ4HeUFebDoGpM52lZD+463Dq2hezmYtPaG77U6V3bUJ/TWH9VN/Or290vvN
+v83ECcC2FWlSXdD5lFyqYx/E8gqE3YdgqfW62uqM+xBvoKsA9zvYLydVpsEN9v8m
+6CSvs/2btA4O21e5u5WBTQKBgGtAb6vFpe0gHRDs24SOeYUs0lWycPhf+qFjobrP
+lqnHpa9iPeheat7UV6BfeW3qmBIVl/s4IPE2ld4z0qqZiB0Tf6ssu/TpXNPsNXS6
+dLFz+myC+ufFdNEoQUtQitd5wKbjTCZCOGRaVRgJcSdG6Tq55Fa22mOKPm+mTmed
+ZdKpAoGAFsTYBAHPxs8nzkCJCl7KLa4/zgbgywO6EcQgA7tfelB8bc8vcAMG5o+8
+YqAfwxrzhVSVbJx0fibTARXROmbh2pn010l2wj3+qUajM8NiskCPFbSjGy7HSUze
+P8Kt1uMDJdj55gATzn44au31QBioZY2zXleorxF21cr+BZCJgfA=
+-----END RSA PRIVATE KEY-----
+-----BEGIN CERTIFICATE-----
+MIIDlTCCAn2gAwIBAgICdxUwDQYJKoZIhvcNAQELBQAweTEbMBkGA1UEAxMSRHJp
+dmVycyBUZXN0aW5nIENBMRAwDgYDVQQLEwdEcml2ZXJzMRAwDgYDVQQKEwdNb25n
+b0RCMRYwFAYDVQQHEw1OZXcgWW9yayBDaXR5MREwDwYDVQQIEwhOZXcgWW9yazEL
+MAkGA1UEBhMCVVMwHhcNMTkwNTIyMjIzMjU2WhcNMzkwNTIyMjIzMjU2WjBwMRIw
+EAYDVQQDEwlsb2NhbGhvc3QxEDAOBgNVBAsTB0RyaXZlcnMxEDAOBgNVBAoTB01v
+bmdvREIxFjAUBgNVBAcTDU5ldyBZb3JrIENpdHkxETAPBgNVBAgTCE5ldyBZb3Jr
+MQswCQYDVQQGEwJVUzCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAITa
+wdBOhmP5BUnfP7zabv7fedrW5zrA+Xa1dFz75rsu0oCg2Gv0vsW/4z55WSinoXQZ
+x+6j/4GG79+GcpM3AxWbHIzy4hnNnERj/jUAkhStHdv+3ctec0g984Y9eBvPjJKQ
+Ho01PtP6hTWTHOZ3g7xmp03tPvGlmtA17LDNDLk8SL+4+grbDFnqiy6Hze2tSsNl
+L5ongh3xzLgP9PKScEZ1f/uU/VjjQTyY2tmUEaxtQY6SOPNc0j1GXrCKovMg5RMX
+b4DWkWSBB4v540RKsFYCTmaJlGOe85isqYjM28+PHQ07FYFErcaxKm2j/gRI0GD1
++fkEJOBnTI5C3+di0ekCAwEAAaMwMC4wLAYDVR0RBCUwI4IJbG9jYWxob3N0hwR/
+AAABhxAAAAAAAAAAAAAAAAAAAAABMA0GCSqGSIb3DQEBCwUAA4IBAQBol8+YH7MA
+HwnIh7KcJ8h87GkCWsjOJCDJWiYBJArQ0MmgDO0qdx+QEtvLMn3XNtP05ZfK0WyX
+or4cWllAkMFYaFbyB2hYazlD1UAAG+22Rku0UP6pJMLbWe6pnqzx+RL68FYdbZhN
+fCW2xiiKsdPoo2VEY7eeZKrNr/0RFE5EKXgzmobpTBQT1Dl3Ve4aWLoTy9INlQ/g
+z40qS7oq1PjjPLgxINhf4ncJqfmRXugYTOnyFiVXLZTys5Pb9SMKdToGl3NTYWLL
+2AZdjr6bKtT+WtXyHqO0cQ8CkAW0M6VOlMluACllcJxfrtdlQS2S4lUIj76QKBdZ
+khBHXq/b8MFX
+-----END CERTIFICATE-----
diff --git a/test/test_ssl.py b/test/test_ssl.py
index 1b5d56da2..c5531f9eb 100644
--- a/test/test_ssl.py
+++ b/test/test_ssl.py
@@ -47,11 +47,11 @@ if HAVE_SSL:
 CERT_PATH = os.path.join(os.path.dirname(os.path.realpath(__file__)),
                          'certificates')
 CLIENT_PEM = os.path.join(CERT_PATH, 'client.pem')
-CLIENT_ENCRYPTED_PEM = os.path.join(CERT_PATH, 'client_encrypted.pem')
+CLIENT_ENCRYPTED_PEM = os.path.join(CERT_PATH, 'password_protected.pem')
 CA_PEM = os.path.join(CERT_PATH, 'ca.pem')
 CRL_PEM = os.path.join(CERT_PATH, 'crl.pem')
 MONGODB_X509_USERNAME = (
-    "C=US,ST=California,L=Palo Alto,O=,OU=Drivers,CN=client")
+    "C=US,ST=New York,L=New York City,O=MDB,OU=Drivers,CN=client")
 
 _PY37PLUS = sys.version_info[:2] >= (3, 7)
 
@@ -187,21 +187,21 @@ class TestSSL(IntegrationTest):
                 'localhost',
                 ssl=True,
                 ssl_certfile=CLIENT_ENCRYPTED_PEM,
-                ssl_pem_passphrase="clientpassword",
+                ssl_pem_passphrase="qwerty",
                 ssl_ca_certs=CA_PEM,
                 serverSelectionTimeoutMS=100)
         else:
             connected(MongoClient('localhost',
                                   ssl=True,
                                   ssl_certfile=CLIENT_ENCRYPTED_PEM,
-                                  ssl_pem_passphrase="clientpassword",
+                                  ssl_pem_passphrase="qwerty",
                                   ssl_ca_certs=CA_PEM,
-                                  serverSelectionTimeoutMS=100,
+                                  serverSelectionTimeoutMS=5000,
                                   **self.credentials))
 
             uri_fmt = ("mongodb://localhost/?ssl=true"
-                       "&ssl_certfile=%s&ssl_pem_passphrase=clientpassword"
-                       "&ssl_ca_certs=%s&serverSelectionTimeoutMS=100")
+                       "&ssl_certfile=%s&ssl_pem_passphrase=qwerty"
+                       "&ssl_ca_certs=%s&serverSelectionTimeoutMS=5000")
             connected(MongoClient(uri_fmt % (CLIENT_ENCRYPTED_PEM, CA_PEM),
                                   **self.credentials))