diff --git a/akka-http-tests/src/test/resources/certs/README.md b/akka-http-tests/src/test/resources/certs/README.md
index 80ce851ab5..08b020c84d 100644
--- a/akka-http-tests/src/test/resources/certs/README.md
+++ b/akka-http-tests/src/test/resources/certs/README.md
@@ -3,6 +3,8 @@ Test cert files created through:
 ```shell
 $ export PW="verysecret"
 
+# delete the existing jks:es
+$ rm *.jks
 # create a fake CA
 $ keytool -genkeypair -v \
     -alias exampleca \
@@ -195,10 +197,12 @@ $ openssl pkcs12 \
 # drop that intermediate p12 keystore (we may need that later, but for now)
 $ rm client1.p12
 
-# create a client cert that we trust with different CN and SAN (mostly using openssl this time)
-$ openssl genrsa -aes256 -passout pass:"" -out client2.key 4096
+# create a client cert that we trust with different CN and SAN (mostly using openssl this time)    
+$ openssl genrsa -passout pass:"" -out client2.key 4096
 $ openssl req -new -key client2.key -out client2.csr -passin pass:"" \
+    -days 999900 \
     -subj "/C=SE/ST=StateName/L=CityName/O=CompanyName/OU=CompanySectionName/CN=client2/"
+
 $ keytool -gencert -v \
     -alias exampleca \
     -keypass:env PW \
@@ -216,7 +220,7 @@ $ openssl genrsa -aes256 -passout pass:xxxx -out untrustedca.pass.key 4096
 $ openssl rsa -passin pass:xxxx -in untrustedca.pass.key -out untrustedca.key
 $ rm untrustedca.pass.key
 $ openssl req -new -x509 -days 999900 -key untrustedca.key -out untrustedca.pem -subj "/C=XX/ST=StateName/L=CityName/O=CompanyName/OU=CompanySectionName/CN=CommonNameOrHostname"
-$ openssl genrsa -aes256 -passout pass:"" -out untrusted-client1.key 4096
+$ openssl genrsa -passout pass:"" -out untrusted-client1.key 4096
 # signing request, use the same san and CN as the trusted cert
 $ openssl req -new -key untrusted-client1.key -out untrusted-client1.csr -passin pass:"" \
     -subj "/C=XX/ST=StateName/L=CityName/O=CompanyName/OU=CompanySectionName/CN=client1/" \
diff --git a/akka-http-tests/src/test/resources/certs/client1.crt b/akka-http-tests/src/test/resources/certs/client1.crt
index c292ba59f8..baaddfa63b 100644
--- a/akka-http-tests/src/test/resources/certs/client1.crt
+++ b/akka-http-tests/src/test/resources/certs/client1.crt
@@ -1,28 +1,28 @@
 -----BEGIN CERTIFICATE-----
-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
+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
-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
+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
-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
+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
 -----END CERTIFICATE-----
diff --git a/akka-http-tests/src/test/resources/certs/client1.csr b/akka-http-tests/src/test/resources/certs/client1.csr
index 0ccc42bad6..e4e7f56426 100644
--- a/akka-http-tests/src/test/resources/certs/client1.csr
+++ b/akka-http-tests/src/test/resources/certs/client1.csr
@@ -2,17 +2,17 @@
 MIIC4zCCAcsCAQAwbjELMAkGA1UEBhMCU0UxETAPBgNVBAgTCFN2ZWFsYW5kMRIw
 EAYDVQQHEwlTdG9ja2hvbG0xEjAQBgNVBAoTCUxpZ2h0YmVuZDESMBAGA1UECxMJ
 QWtrYSBUZWFtMRAwDgYDVQQDEwdjbGllbnQxMIIBIjANBgkqhkiG9w0BAQEFAAOC
-AQ8AMIIBCgKCAQEAw8928mkjJlf75Jdc1hphYOQlukNFkVZBDHnGM6DuEoDuThrI
-eY0WhzT1JeYnoCA1u/Oj7cpA02HjO+YiihuLowWQblSAphA05K+N6wCZsoOGLLoG
-Ny2NEMy3NPgTjgjXNTglcwDkD9gRCQJ5wZ1gdbfWeUfXXjsuViRy28EwVy9gVFLQ
-iPQqPpC9RUdUNbZ3NOadxMgdWbK78Lx72wE36+PZy2pgTf9jJj0jKVTF3CFXAMjP
-BQh2uP9NfJ4S6AONF2Ph+Mkf50eR4a9kSljoa5EOlquLfUT+QmOnGyZpPGxUPzdZ
-6qKj22PNieOPHe2MZWeznnfXq08qYZQYXGYL5wIDAQABoDAwLgYJKoZIhvcNAQkO
-MSEwHzAdBgNVHQ4EFgQUfaPC8Ep71E6LuIG7dN3zbVhOG+kwDQYJKoZIhvcNAQEL
-BQADggEBAGRXiki5MWkIFRIvmEQHfBYN0SnClxsh8ju9WHRqnhz2wSTDL7/bigUN
-bRali8oAC3ty62mPPwlOJ06BOhYolmySpbPJuMQgjV3VICklK/WQO3EYFF6BEAoy
-xQ+hqrioZqBVX4+ZaEkc0S0OVKV42VqgFL7oo+UtR5s7Wv/qf/9a4M0Tjx9hFLoh
-XxfBA3RzIbrsFhQmDqLjeFA2as+wvtBVrjVgIwnL8Fgzv/dQrW5wCbOMzAOBqOFV
-vsncqdSm5pW6EhyuzaMs2yWqR3Ods3PfWaXQ0Hw565hzDn+l2exgNkBSdl4Vo8KX
-0GTYzOPEaTtPWshMOUOAEAI3iTnLzDw=
+AQ8AMIIBCgKCAQEAyuVacmN/0zdXIZ+8Cn7+1ppNSj3pFsMaaofR6lbwetXTlm5R
+13CS9MzZ3MQB5zitwzSgYMIsIe6YEc3XJ/51txcVaZ+noroyuXFKIcvLFcqNuhUz
+Jj/XjQp3d37paVp5l4cSqOWNIKpolWgF7Cr2DtrPNMeJTUmxQgO0tNv4dGJanF6u
+K0sLONks8zdz1Oc4SzDJlt6aHU4XbLXyZSZyT/qW1l053Lwi4aMwMuJLjHydcdKv
+8hg/gMOlDjr+RtqQ44x2DCNJsWgInOOdUFnEOdkX83eIdaoF2Izc3cOYrUKtD6MC
+cNWFCy0seU5sihstIK5jfuxSnvNAM7KlrcyUIQIDAQABoDAwLgYJKoZIhvcNAQkO
+MSEwHzAdBgNVHQ4EFgQUpWcs9I8OfG0chWrX61rNyI/pwKkwDQYJKoZIhvcNAQEM
+BQADggEBAHsKnlS8BMxCvCVJfco5XdlnhhB5w0l4UkqLa7wiP/F9v9+lcmxtHXvq
+8OMGWPrPSfnIU09jm98XyZyhO+BakOt2Dl/8+DGmp9mN//OoOYZ8JRr2ZX53Y6KJ
+6G6RO0z4vrxAFBBoRvt7+94u+N7Wy0ANo/15PGzg27/idJyxVQzb5g92vwaOrto1
+/0SPKUmajoL1wEctCzUk+C+mXps4w4eyTSyn34tG58e5w+sHcNXwTKtZM8DdqZMC
+b+mGdXBgv5hEl75QoQoZUiJtcarb64A9xbjSQtIVHzNSRZew5uXa9Sy8zLXYianC
+uyU5xXbihmoFEiziGejBW7NZS12FSU8=
 -----END NEW CERTIFICATE REQUEST-----
diff --git a/akka-http-tests/src/test/resources/certs/client1.jks b/akka-http-tests/src/test/resources/certs/client1.jks
index d06037415c..8ca44dc66b 100644
Binary files a/akka-http-tests/src/test/resources/certs/client1.jks and b/akka-http-tests/src/test/resources/certs/client1.jks differ
diff --git a/akka-http-tests/src/test/resources/certs/client1.key b/akka-http-tests/src/test/resources/certs/client1.key
index e22c377aaa..70b7c2fe64 100644
--- a/akka-http-tests/src/test/resources/certs/client1.key
+++ b/akka-http-tests/src/test/resources/certs/client1.key
@@ -1,28 +1,28 @@
 -----BEGIN PRIVATE KEY-----
-MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQDDz3byaSMmV/vk
-l1zWGmFg5CW6Q0WRVkEMecYzoO4SgO5OGsh5jRaHNPUl5iegIDW786PtykDTYeM7
-5iKKG4ujBZBuVICmEDTkr43rAJmyg4YsugY3LY0QzLc0+BOOCNc1OCVzAOQP2BEJ
-AnnBnWB1t9Z5R9deOy5WJHLbwTBXL2BUUtCI9Co+kL1FR1Q1tnc05p3EyB1Zsrvw
-vHvbATfr49nLamBN/2MmPSMpVMXcIVcAyM8FCHa4/018nhLoA40XY+H4yR/nR5Hh
-r2RKWOhrkQ6Wq4t9RP5CY6cbJmk8bFQ/N1nqoqPbY82J448d7YxlZ7Oed9erTyph
-lBhcZgvnAgMBAAECggEAP+G+d6WPXyITPueW1Q70OA0WtebemmTegfh0jkFxij3g
-AUFBqE48TE4dsIie4uG/RhtdnuV+Mrhbzx3spMwJyVy2WxhchFEDQJx5m3Ktsgyw
-yITEJFpLDHENUE2i65K8y1MO/K8MuJKQNDVHjcAPSTh500V54PdDzbzEcCdd4wMy
-PZk5W7bENHFgAylUWKFEL91lBmP9a1YrWVJ2wtpxJxoOasHwRmO0D2OKuEksx2Sb
-RTG0rGtwbo3q77olKzZNMnRKH8NsI+n55hS4fRl6r2z87l+bYPVvxebRJfBONQWx
-2y+At41Yb11MCN7djoAjRYhnrZsmfj9kCBp+5FHOwQKBgQDODkT/Gw0I+d8Ag6Oq
-OWZHHMHsnEgkO9Yjya4IFNOz4SStg/hD4K5sz6Y4ZZ9ZsSMrEhMEA2k6EcVqA/e9
-vhuD1IAXhpo2w4ElPOMWDruyKs/E39SlvryFHeYW6dO22Kr9obGvlmCrldjDI1HI
-PO+CSmJUaFGV3MWdsTGSVnxxhwKBgQDzRXlEOsN8j9TZcymdV6NIzjaqScLq9doe
-oVRZ30iD8I8L2IV1nJ9xBumOGwfku1NjpXhV/YOLac+n8c5ZN+XBoNaKnbMPgo3O
-HgUQXodKnt5g8B//QKL5JPx9tXpyPrww+Q2ljRgNN2HJuyxxMaXV1ZR8UX+WmLgM
-4XHlsQmqoQKBgC6vDPK/LjTaZ6u2J15posJ5wXXZ8n5DEEELcGJkVZJrb+PgAl9e
-iCYe5YnhfDjV6SHY9nXyT+TYIeHjBD341EMJ4ftyg33kzV2ibdCRhfTXvjrce1ER
-5aRDId4PG+hRLmxINfmSGFTHnlSXq++x3pGmSKDXAaTyX9NaUeDVt1wBAoGBAIQy
-tsmLHXxtNP/OA0lLvKHt3esAFnpUi+mlRg9otSFt8m4/hZb6O/LSDM16hvmXiqNV
-4mToVTnHkF71mmsFY0ervaqqNAozqhfeXGYe2GqGltYa52hwmZ/Gp6cwnY/D48TB
-MtdKK03TUMKtgmMo1bO0UvKT3z/ZUfs98AUgBd7BAoGAeoB+aFExu6LYP6Z25kOH
-PP2H11ynbdiy28xNxS7goWbAGS0oQ9CSE7QtuEXNzml3h0cduBIDs9M3QPJoD01r
-dsR7QU0S/7eR/f65HCbjEOKulLuQBmX8LkGKsJ+oh1ajX2m6REq/MNTgV1A/4yTK
-jMmYOmnNJ9u//Fs/M8hPkYQ=
+MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQDK5VpyY3/TN1ch
+n7wKfv7Wmk1KPekWwxpqh9HqVvB61dOWblHXcJL0zNncxAHnOK3DNKBgwiwh7pgR
+zdcn/nW3FxVpn6eiujK5cUohy8sVyo26FTMmP9eNCnd3fulpWnmXhxKo5Y0gqmiV
+aAXsKvYO2s80x4lNSbFCA7S02/h0YlqcXq4rSws42SzzN3PU5zhLMMmW3podThds
+tfJlJnJP+pbWXTncvCLhozAy4kuMfJ1x0q/yGD+Aw6UOOv5G2pDjjHYMI0mxaAic
+451QWcQ52Rfzd4h1qgXYjNzdw5itQq0PowJw1YULLSx5TmyKGy0grmN+7FKe80Az
+sqWtzJQhAgMBAAECggEAXIlSQQ2ERQ7eXGV/28Gj9LiXO58U6d6984xSfvB76WoQ
+gHF8PigHvkKXsopq28wL5BXid37XpfotvSEGWiVCBukuSOgaCqulatJynwtVanDh
+RtdYZr+DTb5SUlu9lOFAx41BQ2q+fQF7hXjWCqplYs0E5+uBgZB0mcka58nTfTB2
+Heb9wsSmGksQkdpitBoMLwM6Iqn4uYobNXVRsuVZFt+uSlyaUH6ps8TZ5jpCLly0
+fIehroFHNMQSTJSiuuKlmoC1/Nup4DagCWu9aHNq3PNkKw1oOCj7koukLuyl6Yd0
+BFrZk/Sf2t7V+yLnB37R+ro4JxvoHinXIR3/JT6FKQKBgQDyaz/wiBzeVqxWTshU
+byu/G5TKYUk5N+WTXRAGLhraR9p5NMCQWr8TWYB+xOp6hAV8DOaYAj9+WIkJw76v
+mlO+/e7dJDarKQCUwhRreIP4r7SIz/gWY1jI6u41GiEWiBoklfZUbXlgea1wc5w6
+fOiZtDNKryWQtWduPsTr3ERqowKBgQDWQ0SQxwMAaEWVSRdunfZCYTRJBWodW9n5
+n9tOLTicOf/4i623oVO7762vOk3fG7G0uzyVRag6rFrRah2fGdXMuyqEbDw/dx2+
+BmN+naOlVnYEcABv0G1VJ0ACPLuqFu3eWNR0d+PYG1EZygsuhPw6gi6j+ivcvIe/
+17r4Dm4WawKBgQCyK/GKr//HypxPswe6Rxs4EuWA+Y//5f1uGfA1Gp3R4Q3KF+OQ
+NaJKbnXqtoBAG9iMHE8/WiegjSHrc1srZZo3vhtZncwwcKpkq2CmvKUCmuFtzKzi
+h5Ix2bnKfbHkBZRxX2b1FqEnL0cyZ0ZkFno+vhsUwTYy7aFfffLuB66hUQKBgDFv
+idVhpYaliFB+ccKa/aOpK9ghQK+PbsaSpJXwBxy8oRumlqlEtr4o+cjxSeBNUn4h
+qUPDs6H9/GJO+pCn9FVtZczx8CCwihM7BB/FnWlbfpVdhixGScOY78LUYnRHIBDq
+K/LHarGE8/xgSp4sHsodGUfKQ+6FLUkNLF1pbusLAoGAbh3FtGj4ULZj0S4Z82oc
+KqVJBiQ+u1GIHN7EYWMR+bfDMHUpsHVbFb54f3U4a5nM5ZlvedqMykyBSVuZq9SH
+ynBps/Eis4ao2xQacl0S6m8kCWEQijRyIaf+6ilwGkYZAmHI0EQKXLtqvDEWnhJm
+80aWn/PuFiR7WXjfI+IlS/4=
 -----END PRIVATE KEY-----
diff --git a/akka-http-tests/src/test/resources/certs/client2.crt b/akka-http-tests/src/test/resources/certs/client2.crt
index 83e6f5fab4..f781805090 100644
--- a/akka-http-tests/src/test/resources/certs/client2.crt
+++ b/akka-http-tests/src/test/resources/certs/client2.crt
@@ -1,34 +1,34 @@
 -----BEGIN CERTIFICATE-----
-MIIF3jCCA8agAwIBAgIIdtov0D01OmkwDQYJKoZIhvcNAQEMBQAwfjELMAkGA1UE
+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
-cmcxEjAQBgNVBAMTCWV4YW1wbGVDQTAeFw0yNDA5MDUxMDM0MDJaFw0yNDEyMDQx
-MDM0MDJaMHkxCzAJBgNVBAYTAlNFMRIwEAYDVQQIDAlTdGF0ZU5hbWUxETAPBgNV
+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
-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
-v3mIQECzLWe1HHsdraQ6r+84
+AQEFAAOCAg8AMIICCgKCAgEAtqSVqfcyYg4T80ap5622AMnj+gEyQOQaH1MVruHb
+bUmSb1IuwUxeaeFuisxLpQNTARj0BMJGlx/tnbDkJAVwL+6IU5xHVD/mMf/l8iNU
+eTLES9yyI50Z3Onsm2aP1rPImOHhujpFp4D1ieFaPefG/mLlbNc947gg1NFCuN5f
+Ymkf3pnwltpNFwXgb6cdqj+8bhfFCrfMBsVLMbk9saB9eqPa0ySr90eV2YIlUMss
+9qOEYJ3YxmYsRqzCpEbwa78pWOFf3ipor9AY4tz+HkK6sPgM3ZEHTZoHyODUByUa
+Tf+rY9rJNIxdVTMtzXN71VdjPoG86kBKS16nWR47nKZ2nDlUWN8FuNlUe9LP0ndp
+je1KURlvJ5hPPqghX+pchSi9EECus/GTLzx2ve+x7iUikVxphChNdDdTdgjM6Efr
+AIDuf4CxJX8vSe2UEvOZXeoML1tEQ2m7KfmOCOjiF9ijv9EIwBxhoMnnCHNidot4
+R377TDEBVqHarhqPdXnobbGGAF4At6ghxZNmzG02ZHDYHVsv79IiILK5+WaswEWx
+SScz/5tg1BFULkD67sCcQfaWgKDskzkp5vC7dq5Ps1sOLg8GwSDiOF4Zofi+3sO9
+OpLupA8hugBFnvZQnxHuqogdrj6cF26/W2UQS3RsY4K+f80NhbPc3rL4QAMbPv1A
+O0cCAwEAAaNlMGMwHQYDVR0OBBYEFFpFUSa7zmaPqpQjeZQ8uGlAqgkYMCEGA1Ud
+EQQaMBiHBMCoAAGCEHNvbWUuZXhhbXBsZS5jb20wHwYDVR0jBBgwFoAUd4IgePg/
+dtk22I6i/XC5A3b6y/0wDQYJKoZIhvcNAQEMBQADggIBAHDI2A9iQIbx1mDSRJFX
+6VN6eR/Cssyd0slyP0akuST8J9uEJzgAOexwh+EIR1ZVeW2tIr/RCw4dIF8N1pyi
+pCfGJ0LjhTDNVin2NJgs5B6RnxMS+Pjw/W5u+fVWIC8QS+PlEf1rXrgRnFCtjmRA
+toOmlEj9+gEXDRL1Bg9RnT4ql5bgzdKfFmrudlcTXe2LOQO4ACo2MRIx1NgW6Enn
+ydu6tsQ+LDrZEz1/0WLR53xp2Cr/iZ8SeI7RO4jie2uzHj8QJerQr4pOgk/TLInW
+EGlrqSuD4iLL9r7URocVx3FalCDOk7i94dMut/C2h8BNaqXAZT2344NWTcz3sjdp
+88QXZ6DnAy/x/y52lcpsHk9iNVmRllLd2maboExx/odNHFsqY0eqZx9VMPdZL7U1
+ts7sGIjtkxhZzNHj3az/By/Dytg57vDyAKr0eDTw4V0UvKLuVcxNvRdBP7FJ1QQ9
+WxHW7QK78AEfPSWDopZmcktNnyTdJRLjkkvx1V7GYEsfrPVeyDyfGzj/jEfXkI1W
+xamfda9nk3xm09cY9INSSEpJEYSixx8HXrPUgHC7pBMrjuKSEfhkgIFLi8umkP8e
+GyWBpNmVNNGJH3OPyLPGodDz73+xGqV9vuf6cZ1+4jIS9iPrSL6zjHMKdkHgtCU9
+Cvxp3w7QiMqGGHCUpShNbFOo
 -----END CERTIFICATE-----
diff --git a/akka-http-tests/src/test/resources/certs/client2.csr b/akka-http-tests/src/test/resources/certs/client2.csr
index 6de5ab9cbb..ab9828c823 100644
--- a/akka-http-tests/src/test/resources/certs/client2.csr
+++ b/akka-http-tests/src/test/resources/certs/client2.csr
@@ -2,27 +2,27 @@
 MIIEvjCCAqYCAQAweTELMAkGA1UEBhMCU0UxEjAQBgNVBAgMCVN0YXRlTmFtZTER
 MA8GA1UEBwwIQ2l0eU5hbWUxFDASBgNVBAoMC0NvbXBhbnlOYW1lMRswGQYDVQQL
 DBJDb21wYW55U2VjdGlvbk5hbWUxEDAOBgNVBAMMB2NsaWVudDIwggIiMA0GCSqG
-SIb3DQEBAQUAA4ICDwAwggIKAoICAQCwkPd6uyzYjKImKrLo2zcXoBR9iQJ7vhMH
-rkhVZsDCLBT4Gw4VticNZDWgOESRwgh8IDGkVjocadWr0uF8JGpMzQjhF7mjCSa2
-YbRjUvh28Pxl6fPa/QC1p6savbzSbMlk1gKQB43csc2G4Ynme8V5yuqBLgQmC70o
-JPgQwG1eChCYBW/VwuIXgIpOYPPG8ON56N+s9w7L+d8vdCkb5vTYCL6gR0hXcxaL
-zGGFZNEpXcrKNnuNqZmoMbrq6TMi37ToyiDo/wTwczEWydqymszemSx/dpLTg54D
-7eNEFplC1paA++0wZFPz4r0lGNftiUxGIUq/4K+YSh2zRd0qRb1/63TDLvB8OAGB
-lfGv37IPaY4jXGdCyJU1pgVT9pTVS1gm9GhrvvGy5w+gx4agl1XcMox98Lnbwaoi
-seBCq6wNsD+gX6lK7qK8OPvX08YUh0T7tEm4z9aOH7sp57Pmq2/N8+WL3e7vuRPg
-+meUY6HFXbCBQSbNvMxsj6lBiFIesuea7yxRvtGFTjI3Z3Q5rVY/hRcrhQsjZCPh
-yFJeQo8c0kKGf5xQup+bN99DU82o+oXL/3ViIf5NdUslUfFrbIJkPPhZfayov9wj
-e/aU7JH3F/KabbBQv5D/hD/0NcVwEWBTdqrn5av1EqSjliC9k5fF9T9uEWn4FfD4
-W65r7IQHKwIDAQABoAAwDQYJKoZIhvcNAQELBQADggIBADyWnPUiIG6fAwXGCR2q
-aoAwe1y4CPCRPvp7Tibm1Ieto09s3AcGPCkp6KTp+hTr78sW2hfV0+DQVhHP63DA
-lTIOCtmf2JOX2oueQl7Mxd8wl/4c7Gb/LNiM67cqOHpj6SQjQo4qGcX1R/BMg7FK
-gMRinyRTJQlWzTp4zMP0jPsjqZG0gEr2jrOTWva3mqIDX1kMDco1bsTR4UXZJEkA
-jcsr3pqME2/XfPQ0++PSPH7t6deVk73sJ4OGhRScNa/hQW41yKeYxgnQUyaI5P53
-F5mWElcWO23d3nl/aDFwExDAKREGBkyJQpe7HhNJ4wS9IdQIivIwx3LyO3uNztPU
-nX9qiAweBYtdARfvOfCP1rHps68xWoVtvIXk0uzDdw9uue2DZ4E1uykfaWI6XWY1
-tTY1XRGbpCLho9GF4xX9rBKQYTijr6lm8KSiNztwIqXu8Xp9mG7LY4jWWf+TCeGA
-oSCy5blRYIXbq+7fn9uZ1CiNRKxLly/CG5hMrJSk3GjHCUb4eRvjqwiY645PGF3G
-/xEV2cYdUK0ZEG7Jj7aTn9O8bYnu4dVE6kqevpXIf6dYCU+eXPlErc54cs29KBDc
-n/QVyk44UCRf1ETMjYVJ+YvIGVlwjFu6n8+mGALq7lXpRSEfwHT9i5N8ynt7dHjy
-X6m7KCGqIf275AToS/ru6GVg
+SIb3DQEBAQUAA4ICDwAwggIKAoICAQC2pJWp9zJiDhPzRqnnrbYAyeP6ATJA5Bof
+UxWu4dttSZJvUi7BTF5p4W6KzEulA1MBGPQEwkaXH+2dsOQkBXAv7ohTnEdUP+Yx
+/+XyI1R5MsRL3LIjnRnc6eybZo/Ws8iY4eG6OkWngPWJ4Vo958b+YuVs1z3juCDU
+0UK43l9iaR/emfCW2k0XBeBvpx2qP7xuF8UKt8wGxUsxuT2xoH16o9rTJKv3R5XZ
+giVQyyz2o4RgndjGZixGrMKkRvBrvylY4V/eKmiv0Bji3P4eQrqw+AzdkQdNmgfI
+4NQHJRpN/6tj2sk0jF1VMy3Nc3vVV2M+gbzqQEpLXqdZHjucpnacOVRY3wW42VR7
+0s/Sd2mN7UpRGW8nmE8+qCFf6lyFKL0QQK6z8ZMvPHa977HuJSKRXGmEKE10N1N2
+CMzoR+sAgO5/gLElfy9J7ZQS85ld6gwvW0RDabsp+Y4I6OIX2KO/0QjAHGGgyecI
+c2J2i3hHfvtMMQFWodquGo91eehtsYYAXgC3qCHFk2bMbTZkcNgdWy/v0iIgsrn5
+ZqzARbFJJzP/m2DUEVQuQPruwJxB9paAoOyTOSnm8Lt2rk+zWw4uDwbBIOI4Xhmh
++L7ew706ku6kDyG6AEWe9lCfEe6qiB2uPpwXbr9bZRBLdGxjgr5/zQ2Fs9zesvhA
+Axs+/UA7RwIDAQABoAAwDQYJKoZIhvcNAQELBQADggIBAHnEExboMWZpNg9enYu7
+gkgJur6Z3eL2XyYhCpvaxUl50AU2B2o/iySecKh1sz3jSVAmvN6YySwBhHEGHalV
+AJEL2J6dQSdH/W9NjwiUWc6A1xuXmG0jHFBPJznrozONccaqvCEhN2JO1DUs/Xpu
+dTATeGJpZn0Jjn+2WeX/xx67BPsfrvk1v53TIyRRid61W5kTyWLneH4Ta5HY0UP7
+MlYJIdSaxwFUvuU9IsPjblBNKGds/XmZXolD/7rlbYSBQOrrBG1QlrP8ZGgJXlS0
+ktKqx+NMAVfk8NaNY3JLeygVR1SM68e1RJGNRKr3PnuIUAmsBTtk256SItcVMEzJ
+Tt0JlRYaI/T6leNstOqo9ARXzWqPhFoAhlN6RrScVKL9/YFjLySw8TrhpwubAO11
+URgdpt7j8hInclYOh9iWLOIeSqxZ7U7BHwxN7PbvlAu/GoLPjn57R5HMLBdunePA
+smkANZcXp+Hiq0Nc0S5TZLyu3oPllmxw1UDMjrjjIDmgkts8xG465cz0UEda48v3
+QUAss1+SDyBebnR050CArD3NIfW3HNKvnAbNlPRssYzivyxKyreU3S5K0co+ypui
+y2yo65JEOSozPspWL+CLpkVxOjaW5aGTOcGQ23hGtnmZ9O05H9Z3wJGadif2XxbK
+4qOF+fesM3aJJCVOYEdP9w6D
 -----END CERTIFICATE REQUEST-----
diff --git a/akka-http-tests/src/test/resources/certs/client2.key b/akka-http-tests/src/test/resources/certs/client2.key
index c650d6de2a..bb5e65c89a 100644
--- a/akka-http-tests/src/test/resources/certs/client2.key
+++ b/akka-http-tests/src/test/resources/certs/client2.key
@@ -1,52 +1,51 @@
------BEGIN PRIVATE KEY-----
-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
-vwQMrhVlOGZn0FcmPTe24w3oJb7mLvt3XFVoqLcCggEAJ0b3LMcseWsPy2w5iGal
-fP5LeS1+f+VNB8GpF6c4vRiFxOXvmBvowfvI8n84lA3y2nWrFn5RCHwASieahgi3
-CQcOe7kt/3hJhNl05AnOJFaRGcDGzbE+UrwZGmTtfqOhKPpa2rJOaFdvZlG3oYBD
-lJG9BXdNbyZZoOTUGIFyXdxp1iNlKbkGokNnLKuz4ZMdJUKjOsRQv+KvSLs90Axm
-VIatcFMfiCX4n+kV0qq/cykm8BKVR+/z2GzTHGUoPFu6O7Mlu825N6nwRhxSSfHe
-ZZsQ4nV9ANGvWllY+o99dPki2rr1AbEn5NV6Xrza3/cjYZqTO2u4v45cynr2CDoJ
-mQKCAQAAqpCBEWNOLgKIz5MS7JiiOu7WPn/tRR/fdfjZ5LKSMX1woKClteY4tb96
-/UJUTdQJeqPwS9bs6eGJwXMc+5ba8pLJ9Ab28rAwqJVvW9V5b6XDQSUm5GdCOG+b
-y8kHVgBMOF0403kH/gjxdrMKwn9v7VQbhlYhlKiGzTLgabQviFlYQKFBiRQKeRwg
-yWzYXE7J/REjp+96uS/NUF6a8NaBJhKKIyL15OxoxiRyGTAeHBbnk9JjRq1r++K6
-Q1AjCCYynPXw9QiQKcO032hg6O202HMGp7NTmhNhB9u99Y6T2B8tay5r8chheNA4
-SeUefGo+c+BpA6wh17j/z5ItinVi
------END PRIVATE KEY-----
+-----BEGIN RSA PRIVATE KEY-----
+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
+-----END RSA PRIVATE KEY-----
diff --git a/akka-http-tests/src/test/resources/certs/example.com.crt b/akka-http-tests/src/test/resources/certs/example.com.crt
index 8d5e6b54cf..445f785f88 100644
--- a/akka-http-tests/src/test/resources/certs/example.com.crt
+++ b/akka-http-tests/src/test/resources/certs/example.com.crt
@@ -1,29 +1,29 @@
 -----BEGIN CERTIFICATE-----
-MIIFADCCAuigAwIBAgIIOPUCud7IsMswDQYJKoZIhvcNAQEMBQAwfjELMAkGA1UE
-BhMCVVMxEzARBgNVBAgTCkNhbGlmb3JuaWExFjAUBgNVBAcTDVNhbiBGcmFuY2lz
-Y28xGDAWBgNVBAoTD0V4YW1wbGUgQ29tcGFueTEUMBIGA1UECxMLRXhhbXBsZSBP
-cmcxEjAQBgNVBAMTCWV4YW1wbGVDQTAeFw0yNDA5MDUxMDI5NTBaFw0yNDEyMDQx
-MDI5NTBaMIGAMQswCQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQG
-A1UEBxMNU2FuIEZyYW5jaXNjbzEYMBYGA1UEChMPRXhhbXBsZSBDb21wYW55MRQw
-EgYDVQQLEwtFeGFtcGxlIE9yZzEUMBIGA1UEAxMLZXhhbXBsZS5jb20wggEiMA0G
-CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCzo2960arMMfKYZhDN9n6YQQwZW/bU
-x+hgCris6VGYs9b88Zv46Vk9fkgUJ+rmCVqK1OAEk6QHf3bOrQIIO2hlaaZKTvjV
-MWGwGEaGrmJt8Jl/rEaeB2AUd7sTvYQJBfrDF4H3B98ikM7pj36+sazbTOE8wx0g
-hW8QrVQ9GT8xiZJ37BlHapvEcpkZZL/HlAqJgNCYzdM/B5Xer+xNbi9c/KemvD9b
-wQazworojdL6W5IKqwFYwHywTpKHc2/qUNd9CWcHjfkzdWzWnm1ZO5GJbSwWCQoZ
-stOhnRoIbKpoPRfEHEmkBt0eMj4e9FLKpnu7ulpcnwskFpwO0IYM0qwTAgMBAAGj
-fzB9MB0GA1UdDgQWBBRPrkdhz/Ra2sBG9jjmDO74qJcdkjAOBgNVHQ8BAf8EBAMC
-BaAwFgYDVR0RBA8wDYILZXhhbXBsZS5jb20wHwYDVR0jBBgwFoAUf2V46Bl2UHzd
-DPAQsUQ5FLIJocQwEwYDVR0lBAwwCgYIKwYBBQUHAwEwDQYJKoZIhvcNAQEMBQAD
-ggIBAKbJzPZ53cat/R6pG0aSHLwprnUuk9z5bOYRuCw881QmuXmUHHKYu4UqGPqo
-ZEFFzd2IUG09z/aVy3g7jlj8vx/czgiGAkJSpM/OP0tWj7xEun7c8a027RMw4IAH
-JU/bJXacczGgKHISJP9D3ozY3YPthfE7a+Gx0Y2hetSa7NHNPRxpGcrDAJ6+9B4N
-pbr531gHBxiy29BqI+h0NExBMJ8bpjg0TuVBFN1fVM7ryOKObokROczVTnqaRP4j
-ktGd8vVWZgtg6f/syX8M7AMVBbFjoJzZ6ovJ3vxqi7xtcAQM1lcCVYKS1XFN6RsD
-zs3w0jYZJRRqXGIVvbjVh3VPBlqQ/TDW3mpWY1CQkIYbw9j3+mDjp1V6XX5+JQGC
-61CMIIcQp9uRnZETCUj0i1yme7FXdoLgXPz7u32kmWrq7Y69MqG+FER7ua/KW3Bv
-gEa+bHh4B1OgLVOfkwrwcmT+QcY6eHn7ZQGF1z6YILT6GRs2jSDzv8CTEo7ksC/c
-UcM3MoYi4PNK0tRlwlyLi++RDlhbH6+iaDKgj6wOKCDs9rMEewMAhNZhPOyGle+J
-2umMcIjpKL++589d03Qhq8SFGfj6gt5e1NMavXVEaluQl4zj+0NY/Bibuojo1Ra7
-LKwJPYPvHZcar7C3Ar0nC/ElGLqdbwewFodeaPSbHwKrTT2z
+MIIFATCCAumgAwIBAgIJAK7Qwd5UWtV8MA0GCSqGSIb3DQEBDAUAMH4xCzAJBgNV
+BAYTAlVTMRMwEQYDVQQIEwpDYWxpZm9ybmlhMRYwFAYDVQQHEw1TYW4gRnJhbmNp
+c2NvMRgwFgYDVQQKEw9FeGFtcGxlIENvbXBhbnkxFDASBgNVBAsTC0V4YW1wbGUg
+T3JnMRIwEAYDVQQDEwlleGFtcGxlQ0EwHhcNMjQxMjE2MDc0NTI5WhcNMjUwMzE2
+MDc0NTI5WjCBgDELMAkGA1UEBhMCVVMxEzARBgNVBAgTCkNhbGlmb3JuaWExFjAU
+BgNVBAcTDVNhbiBGcmFuY2lzY28xGDAWBgNVBAoTD0V4YW1wbGUgQ29tcGFueTEU
+MBIGA1UECxMLRXhhbXBsZSBPcmcxFDASBgNVBAMTC2V4YW1wbGUuY29tMIIBIjAN
+BgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAshC5zIgr4CIeguLuOz+TiTZRsiXA
+EIms/vxi101XxrcgsKag+HPDgcPwxFPBdtwcbCiKMvRk0kjHAbJ5kgAd1lwcq+jH
+e2F0udaSRlkSAsSIU/k1qivx5fdy2OwbMa1U1sDY3t703L2Hqe2pbCaOOQmomKbC
+C7ZOk65MWmxQZ0nUUw9e4PFlVqIsRk0mwmeof9aFR10sc9sE6xxvRyLQIx7nktBI
+NHV2OA9oVUdaWSTs42EbBJhdXAlyZnCmPrMMzA5uBXcGOJI15jSPXm3zDwNk4HUJ
+URREMLXWTk/FD2Du1iHCupnVSSvQIW1t3CgIE4fuCJ9R2dSFC+hjkVLNwQIDAQAB
+o38wfTAdBgNVHQ4EFgQUZehTKLCq7lUNJ0x8/lXRoX2xSa4wDgYDVR0PAQH/BAQD
+AgWgMBYGA1UdEQQPMA2CC2V4YW1wbGUuY29tMB8GA1UdIwQYMBaAFHeCIHj4P3bZ
+NtiOov1wuQN2+sv9MBMGA1UdJQQMMAoGCCsGAQUFBwMBMA0GCSqGSIb3DQEBDAUA
+A4ICAQAA4j+xdslJj/Sy5xigxP6WzCo8qXlJKa+bfoERNAzf3ajOq+cYCffa6PqV
+dl9cVaFSRcA9Gzr30XivyxBP45sTWCQf7u5+pqtpJg26p8ztr3fAQ7t+zLNhrXw0
+/4bA5UtscO4jb/V7uruhfL4FECu3UBRTEarJ0r5auX1/UGl1atIyfuBmdK2jTeH8
+7ygMPRMtFCUD3bWqQ2BOGFQkQ0ug0S0Fz1qlXx8Je7ten/d7kfzQv8Y2X7ShoKtC
+tt4Uz0FGO6aFX4F95gyG4jr2ZT3tdTD6zo+wUN/JlSFMrXTK0cAA/ettGIH0G4dg
+FhH93YytMPxScPUSjelA5tIGGTvsV/j5iKAPRC1glb6UfpILbdzO5/uvwFwXkyD3
+Sn2W63fJg8Vpsd9+890sP0awkZq/fBviGwL3jH41SFX4oy8IXT89+oVbIhk+bXog
+JNPfP8laybTpAiHvEFKHAWevoY5icvCfq6ZOdWf8GzZg/stbxrKnP3J3vmbF7VqT
+YJIEZ7Zt6rVOzzdnhZPfzLyHygwj8Qay1j69l1tOTkfvXYvqpxi6G3RI+E6yrBp2
+q2JdH2cHABCACxDq7zc/z2uxyRrVmtzr1a2BWb9opCUG3NZ4zNlCKNyYcjohD1Hn
+iT4fW6QiaLQqPc9a5HXZt3LuaDGBzbqmWVPwuo57dDMWSvlDIA==
 -----END CERTIFICATE-----
diff --git a/akka-http-tests/src/test/resources/certs/example.com.csr b/akka-http-tests/src/test/resources/certs/example.com.csr
index baca5f22fd..a3b2dfd3e7 100644
--- a/akka-http-tests/src/test/resources/certs/example.com.csr
+++ b/akka-http-tests/src/test/resources/certs/example.com.csr
@@ -2,17 +2,17 @@
 MIIC9jCCAd4CAQAwgYAxCzAJBgNVBAYTAlVTMRMwEQYDVQQIEwpDYWxpZm9ybmlh
 MRYwFAYDVQQHEw1TYW4gRnJhbmNpc2NvMRgwFgYDVQQKEw9FeGFtcGxlIENvbXBh
 bnkxFDASBgNVBAsTC0V4YW1wbGUgT3JnMRQwEgYDVQQDEwtleGFtcGxlLmNvbTCC
-ASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALOjb3rRqswx8phmEM32fphB
-DBlb9tTH6GAKuKzpUZiz1vzxm/jpWT1+SBQn6uYJWorU4ASTpAd/ds6tAgg7aGVp
-pkpO+NUxYbAYRoauYm3wmX+sRp4HYBR3uxO9hAkF+sMXgfcH3yKQzumPfr6xrNtM
-4TzDHSCFbxCtVD0ZPzGJknfsGUdqm8RymRlkv8eUComA0JjN0z8Hld6v7E1uL1z8
-p6a8P1vBBrPCiuiN0vpbkgqrAVjAfLBOkodzb+pQ130JZweN+TN1bNaebVk7kYlt
-LBYJChmy06GdGghsqmg9F8QcSaQG3R4yPh70Usqme7u6WlyfCyQWnA7QhgzSrBMC
-AwEAAaAwMC4GCSqGSIb3DQEJDjEhMB8wHQYDVR0OBBYEFE+uR2HP9FrawEb2OOYM
-7violx2SMA0GCSqGSIb3DQEBCwUAA4IBAQClKwoLulKg1Psd9hF34zi7ObtRHu7s
-FtAhaQOkH6UCfbZoyqNAUJ7ATN8wS9VSEimpfUdQqx/01fs0/sSAZZkj9ySdh564
-uW6lN7HIfabvFi8emNBBgQCKlnEBBQsrfCSuZmf6NAaGivL73+3jAFDp952MDqe/
-juSJCEvEXgv81ADTDjqjBLNu5xM2r5yYwnk1y9OfnlHMRTPbGduDYrOH4hdJnOSo
-K9JheNXquIeZDEy7ASxOS/ilVku40ztPvRePQP8TIBLkpYj3sXQbbTituboPyxdE
-Jr46Ks3MFz/hqP+y1HJZRJSRcWdgbSDBs7XqZF9VLWu3wIdRMlCeoXaD
+ASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALIQucyIK+AiHoLi7js/k4k2
+UbIlwBCJrP78YtdNV8a3ILCmoPhzw4HD8MRTwXbcHGwoijL0ZNJIxwGyeZIAHdZc
+HKvox3thdLnWkkZZEgLEiFP5Naor8eX3ctjsGzGtVNbA2N7e9Ny9h6ntqWwmjjkJ
+qJimwgu2TpOuTFpsUGdJ1FMPXuDxZVaiLEZNJsJnqH/WhUddLHPbBOscb0ci0CMe
+55LQSDR1djgPaFVHWlkk7ONhGwSYXVwJcmZwpj6zDMwObgV3BjiSNeY0j15t8w8D
+ZOB1CVEURDC11k5PxQ9g7tYhwrqZ1Ukr0CFtbdwoCBOH7gifUdnUhQvoY5FSzcEC
+AwEAAaAwMC4GCSqGSIb3DQEJDjEhMB8wHQYDVR0OBBYEFGXoUyiwqu5VDSdMfP5V
+0aF9sUmuMA0GCSqGSIb3DQEBDAUAA4IBAQBNZ+2hXa1mMZWpIA90IyiXz5rYWxwX
+LP0tri5Aq4ejH3EtfB8vDvaMu9/KA+rozKpOaJCiktkUrVd5u7x7Oq2MHAsQ9/TO
+48AyrFJKTra3K+VBXWXNuVM7D4CpDKekE6ybnTlySKMEwq4lUBM15BJCh5emD6Xe
+onkvEFzNqFUk1UwGqAw49gQo/E56LxVpOp3JWLVRqiJxk7FplRUFrOwe2lrfUWGO
+3ImyRd80aslfg+5txvG9TS1dd63qgsmWGN7x2SQa7fK+tqSVE3EyKkvDkJKNVhXa
+EwcHLhA8MVxBDOFWxtA8OgFpiZOFZTG2gEbqQBtpEpNhYA71l59v5gr+
 -----END NEW CERTIFICATE REQUEST-----
diff --git a/akka-http-tests/src/test/resources/certs/example.com.jks b/akka-http-tests/src/test/resources/certs/example.com.jks
index 0d0c8005dc..5ce3699df2 100644
Binary files a/akka-http-tests/src/test/resources/certs/example.com.jks and b/akka-http-tests/src/test/resources/certs/example.com.jks differ
diff --git a/akka-http-tests/src/test/resources/certs/example.com.key b/akka-http-tests/src/test/resources/certs/example.com.key
index 190406f5b5..0316646791 100644
--- a/akka-http-tests/src/test/resources/certs/example.com.key
+++ b/akka-http-tests/src/test/resources/certs/example.com.key
@@ -1,28 +1,28 @@
 -----BEGIN PRIVATE KEY-----
-MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQCzo2960arMMfKY
-ZhDN9n6YQQwZW/bUx+hgCris6VGYs9b88Zv46Vk9fkgUJ+rmCVqK1OAEk6QHf3bO
-rQIIO2hlaaZKTvjVMWGwGEaGrmJt8Jl/rEaeB2AUd7sTvYQJBfrDF4H3B98ikM7p
-j36+sazbTOE8wx0ghW8QrVQ9GT8xiZJ37BlHapvEcpkZZL/HlAqJgNCYzdM/B5Xe
-r+xNbi9c/KemvD9bwQazworojdL6W5IKqwFYwHywTpKHc2/qUNd9CWcHjfkzdWzW
-nm1ZO5GJbSwWCQoZstOhnRoIbKpoPRfEHEmkBt0eMj4e9FLKpnu7ulpcnwskFpwO
-0IYM0qwTAgMBAAECggEAENTM4rCXdLdvWAkkJPAmD2T02cFsoKY0Zx9KC2V3EDw1
-dhC7QPi4NFNLNJxC3ZfdxGlKrhMZSNyQCLBcIuJSF0JtYsQAe5U7ZnD31rGrJkrn
-TveYzEC7p19Kh4B3yRKm2rWupzM1HHt975NS2FI0dH3BEtzjM0NdUy4yWOEvMxhd
-BJX3Pu55uKnLu4ql9JcM4PzM/sr21fnRvKPsEJAJB3RHZbbm0bkznqxhON2S03Y7
-rR9tT2zbOp1Em6esD8Q8nJ5s0yz07sqCtA3gZspyJkcmsGGZeSR91vE4Ll29z/8P
-PIBYP7UBG1RuORncK7qPyblX9QybyEUvwdFKwJxkWQKBgQDL2h+zrQbfulTlUwiq
-9QLTyeJON7ggqQYxR0uSti18m8P1UAqHKpFj0X1yy/L9c+KqtV05FQu/a2F5tY34
-zAeYmcB0Gw7H/vJ8OlPBIBjJah8GabidQaXgOrvYe0nTEZ5Vt6fRvPgCmBqhO58P
-2R0RSEeiRZvqllPYu+bCCuwyuQKBgQDhl5uq9ZlXj1DxsR+Wsvc19G72S6hWmTrg
-CdNXlx+c83y92HFzyzXgId5flGkm50u58DibOWF00AFpaSMzJQcL3WJckCljiTU6
-q7wSkPE23RFH0PKwugjzAjHxVdubC0p4m8MrYK3js93j6AUPA67qaGUJfrGLyVvJ
-WRTO3y/fKwKBgGOCvyb+t/RPCVJJDlol8JNiYc689G09FYDIxOOBewLxJt+BiyIg
-bYjEovB/Dsca4vNiRXewBmQTDypSrlNdhffAVmpXKwgGNGjgMDJ+cJsh6rM+uJhL
-i6XCBiDPTmJyn1BIrut7y7W4eodqi2M5IS9mkVFtmYcSiyupziO7IUJBAoGBAKTB
-K6A8xCPNeEk7mZ1e0OrnvI5GDQhJ2lS6+E2VAjKHJQglZh4yQAOT2KsnYXBXJdgD
-F+RNkN5V92H7tghpN28z3N1LL98Q2v4hZDaPAouWAkPX1xa4l0aayMy/bqYaJeZV
-o8EvV2/f8eK7lc40W2+4lGnNzG8RvOYdF/RJzdWHAoGAXQuRJJAyQB/ESN0cJUd6
-3hYih4DdsiT++lC5ci05L6HzB2oOWv2JYwOqvrfmFoxb7ow/AwV8rYuMqUpvjQFn
-NwOa17Q2kJYUWjTyGJu+6SP+/tlPffUFERM6LOiEb7szb669mvhLsMK5GXwO626N
-bvHh0IpaQY24aLsyXWl1snE=
+MIIEvAIBADANBgkqhkiG9w0BAQEFAASCBKYwggSiAgEAAoIBAQCyELnMiCvgIh6C
+4u47P5OJNlGyJcAQiaz+/GLXTVfGtyCwpqD4c8OBw/DEU8F23BxsKIoy9GTSSMcB
+snmSAB3WXByr6Md7YXS51pJGWRICxIhT+TWqK/Hl93LY7BsxrVTWwNje3vTcvYep
+7alsJo45CaiYpsILtk6TrkxabFBnSdRTD17g8WVWoixGTSbCZ6h/1oVHXSxz2wTr
+HG9HItAjHueS0Eg0dXY4D2hVR1pZJOzjYRsEmF1cCXJmcKY+swzMDm4FdwY4kjXm
+NI9ebfMPA2TgdQlRFEQwtdZOT8UPYO7WIcK6mdVJK9AhbW3cKAgTh+4In1HZ1IUL
+6GORUs3BAgMBAAECggEAQBJHoKJg0znDq8n2+cezERzEAauWs/yuDGQJNrpkOqL7
+NsUGR8/zybYU5LfUda3W5k4iCBqrSoUYYnJzTwcOtWqYgHz2hl03UIU2RezXz7oi
+6cBSwIQmet5yaz5tvI7HZ6ylfHBSQDlMXuce3sTyyPBCQ4dBbFBxbq85VxIBTmCF
+bJk6yeUvjOFniLBIdO9SEnJ5MZblfWYhfTGtnYZlMUi8lPO1jo4LUFK650Rg6Ge+
+XtM0Rf4t+lqrqxTrhVwhIkte2Anj+AH5XspiBir6BQqbamrOpv8EgfqfQ794HwBM
+rQmvXHTqhACasfRj8U8qfKpeZP1hBKEj/oeynRTcbwKBgQD5bDaylEFQQ805yyXe
+IwQnv+u2gH3teBn6cloBBsQpOewArd8KAE/7vP9cDNQemY+GWVfgznH9RlLrOsdX
+RXcPpFINsYy212WW7KUsmYRr4MdGm+uZnDlW1OhXdoY4WaHnQPkANCig3w4dJuqb
+VU8Wx1LukzokoHAPIYro7M7vCwKBgQC2wswm46Psmg9G+NiIbRszvW5C173Ciy6K
+dGH6O0RutouwXNwRfZM3qIK+hvSqzUV1qo9JYtKdzlmE7nW7DXOyRCKP31uN1GOp
+fcygV/vCNE1MW0GH9fkNbVr77UIDqh7N8dUrhcWEljNnS6iQcyG+scWHNWQRuzpj
+D++BrgDl4wKBgEaZIKpPWGVVq6MuIxvLIYP2yMsxd3NdyUygTWV4+tEIegp/LGBy
+UjFY/5aYcvnuUTef1kXlaVJdM18tlfrXyKl+w1Lo7IFcWn7roJ0NHvRB/WW5AGjM
+VVaEkPcgr0EH7dG9DD3Iha9zM1WBDGrHLMmvxYON3Kk9WDqQLfdb//6dAoGAS9rE
+Iyv+gJhc2Oc18EHgtXPdTM8Airt74Kl3dQWeXJlVlyijinrlXIeLZIrdB/tU5gaZ
+nCrxIeBglWTn5nAp4gaXlcFt3YsWpmV5Rd/etXdB0fxaUZUM/r6xsbiC2sSELpQ+
+FudZ2LMCuM/VMccnbV+ZjYnic92S2UTm8psG8mMCgYAmCqVErCireKUTHbaVvEo1
+4nRv0RJ6x9u2QPtpcDZCEW8wZZ7zGJ3di1SdHK4zjoLn9kfPCk6Uu9bMBvRIlu4g
+SgWlAe0AABjSoaGWigEyPRP7LwxVFqchziC6viJ6IVukjctiDW0U3g648VHHf6A1
+XgC+miySchj36WVpyfKX2A==
 -----END PRIVATE KEY-----
diff --git a/akka-http-tests/src/test/resources/certs/exampleca.crt b/akka-http-tests/src/test/resources/certs/exampleca.crt
index a30c7b0a42..59d07f8bbb 100644
--- a/akka-http-tests/src/test/resources/certs/exampleca.crt
+++ b/akka-http-tests/src/test/resources/certs/exampleca.crt
@@ -1,33 +1,33 @@
 -----BEGIN CERTIFICATE-----
-MIIFwjCCA6qgAwIBAgIIJT4Yu9UzhpIwDQYJKoZIhvcNAQEMBQAwfjELMAkGA1UE
-BhMCVVMxEzARBgNVBAgTCkNhbGlmb3JuaWExFjAUBgNVBAcTDVNhbiBGcmFuY2lz
-Y28xGDAWBgNVBAoTD0V4YW1wbGUgQ29tcGFueTEUMBIGA1UECxMLRXhhbXBsZSBP
-cmcxEjAQBgNVBAMTCWV4YW1wbGVDQTAgFw0yNDA5MDUxMDI4NThaGA80NzYyMDQy
-NTEwMjg1OFowfjELMAkGA1UEBhMCVVMxEzARBgNVBAgTCkNhbGlmb3JuaWExFjAU
-BgNVBAcTDVNhbiBGcmFuY2lzY28xGDAWBgNVBAoTD0V4YW1wbGUgQ29tcGFueTEU
-MBIGA1UECxMLRXhhbXBsZSBPcmcxEjAQBgNVBAMTCWV4YW1wbGVDQTCCAiIwDQYJ
-KoZIhvcNAQEBBQADggIPADCCAgoCggIBALFF5oDCjxSQe8n8bJKXesYQWLm/JQzI
-I80lL3K/DRPV3jH5fUfC70NINLJT1K+iZOJonr5MGZpzEBa7uRx4JLFBCqYnOVDa
-rCbb/9CLMev58H5t/aMgA5NgWjbtKqSNNqjD3CmmZXTrdIMek+Uc6+F17HuXkIQN
-yJV4jMDcKeCEmzA9IHfXWX006pOJXliX7kP9qr9HLgSnSjhAI9TiNeGBjypN40Ve
-TMVWsbvE3I8m/yEPw7AsM9z9tDu03HDSy2oP9kTkD1r8PTs9NU9iUoffGq/+Y/0H
-VvYTT0oL6vXQxO9p1tdaRP/dXJOF2iRJ94K6Jbu4YJuW2CyXlIwI6HtOV9H7ya+E
-J8p91mNcJUEKteoRZufyLCmA/+IzirPUhgu4jV0dT5vobskK2eomYZS3gJw76rAW
-//Ov99Rn2p0gBRoYPKBFE0im4DCnNOWHgBrpeTi4nm77ytnI4rUsMdA7kbg/mx+7
-75Uz3mY2p0CnmwBk7ldtejYbtGweF8BS2aH5XnKwDoH5D2UMa3UGcPGkM3jRTsqL
-KatAy96uirkDNlcvdCB3QgR6fAOWT7Kizcqg9m5h+Sk67YIk+lJtJ77N8yTcm0aA
-QKa0E3KLd6b6xdyrU6qRRgszNY8pSri3n2B6QqltHlnKPhySPv/Q52/vCk+yp5BO
-FtrpE7ss76YBAgMBAAGjQjBAMB0GA1UdDgQWBBR/ZXjoGXZQfN0M8BCxRDkUsgmh
-xDAOBgNVHQ8BAf8EBAMCAgQwDwYDVR0TAQH/BAUwAwEB/zANBgkqhkiG9w0BAQwF
-AAOCAgEAqatu8Bk16CTfxJTAUP9mXZhVCr9lbYXe2oSVQEowZzQcB4v6H1ut/+2n
-Oi0lvw0jo/1eWZKClNfIed1/+0RQlRoc0Zl0YVVLhbUE2m/Ys2GpNZaNPa3nyttt
-wUBpbV+pV7wa/44CJ/eeaskWsMUzX9hcY0RMdWQ8e3fTgxZ/tUb7y0LqCJrmibJR
-T0+6/UqQPa9gLENyPU0toft0mgKVpbiDxQvm1GAjFXIodNVsNpfhR99IRnf+XpKN
-2Dmoj1qx/RR/c8R+PC8XUiftaXMwRkehdpJUO+Z8xT1BMWr5PkBikuOcK05zyMWn
-pNnZurraZdsal5/Z71/4gQuCdU4LnMb13uzwIDU6c1lz+5EishjG3CD43UtQehuR
-te5W+meprbCs9eembmvKO0XRn0l1LsrYW1jdG4IA1BYHjDq/magCKchUeQJ0fI84
-qlAnqZMAekuy29I9Q2P0sahSESkIO0NIyaELPWek3s3zZKlv1G0l/xd6UVmT4Yf5
-WmJ+fehAYPOrPmIWC20mnsCqn/ahNLDbxdWydD4oXoB8JsiVJ261CgUXZnQ7msW0
-1F2GQza/HrR2B3kUHl2R6eEElZKpWuAKKPcn8RAAK2OnCMBlyPvubeoF3FaGxtWZ
-gF5ovIg9LCiFJC2KqGiY01XM3RDK109iA+4QMRjZpSH7qPWkwys=
+MIIFwzCCA6ugAwIBAgIJAITKJLNrVjIfMA0GCSqGSIb3DQEBDAUAMH4xCzAJBgNV
+BAYTAlVTMRMwEQYDVQQIEwpDYWxpZm9ybmlhMRYwFAYDVQQHEw1TYW4gRnJhbmNp
+c2NvMRgwFgYDVQQKEw9FeGFtcGxlIENvbXBhbnkxFDASBgNVBAsTC0V4YW1wbGUg
+T3JnMRIwEAYDVQQDEwlleGFtcGxlQ0EwIBcNMjQxMjE2MDc0NTAzWhgPNDc2MjA4
+MDUwNzQ1MDNaMH4xCzAJBgNVBAYTAlVTMRMwEQYDVQQIEwpDYWxpZm9ybmlhMRYw
+FAYDVQQHEw1TYW4gRnJhbmNpc2NvMRgwFgYDVQQKEw9FeGFtcGxlIENvbXBhbnkx
+FDASBgNVBAsTC0V4YW1wbGUgT3JnMRIwEAYDVQQDEwlleGFtcGxlQ0EwggIiMA0G
+CSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQCIJRYoMlkjusLBYBegj/PFOQ6XvRQc
++6OkUsRZSIHWPyU749ZUGLKcCB/t2Q/DZqnXtPOYTyHmxnMozNwxkMRkd3z0ZvgK
+UnF2sX2X8HQ4qD35cAwi5tOcHXQ98o4F85LtZENEEwLkS+hcoP3AGV+83n/ELmt1
+Eb4kGisjaOZJSdU0I6YlApjL7LtBpf/oFga9Q6WMT5rIxc4O8/a0C1ZVi2Vrzlfi
+qSA78PqniHa8reA6lidFTW6a7gx5jp6Kjks7lFYjpFh7hsyXI6uKqrSrijCl2yxE
+3mxePIvk31i41rBks/GD+9qkbrum9/XkA10IdXlAU5+h1dtjmhlgLPTZsFdw0W8I
+h8CB+LSVtwqKwIZXq2FgUfIHluRDbhdIpJGNVYFThAk/hce36hTDRgz3UjCDRGMW
+fCPVEHmC2fwt8wpo1CosQuA2JQMTVlYi/EX2G7skzn0I3bGI46eYFnwFlCPdGXan
+Ts0HWGxFgj5eV7F+iHY+0+CWE9HHqb7cnr2QJ+dR8acVjI5pB2UubN0h2lmwMRka
+vtwPjHDLZSH2oV4TphUGLiJ9Vg05v/7853Dbym6aNyejZ2DTGPMGFmuzGebOnwEK
+bDKTb5K2/GxSxtW2c8V11UsvF4GRQc2RhQu6o/jtvLVGaWNvBepYyuTQuZTlIizl
+0kxw09Jja71xRQIDAQABo0IwQDAdBgNVHQ4EFgQUd4IgePg/dtk22I6i/XC5A3b6
+y/0wDgYDVR0PAQH/BAQDAgIEMA8GA1UdEwEB/wQFMAMBAf8wDQYJKoZIhvcNAQEM
+BQADggIBAAVdDCKUEVGTz/ACW+pKqGZJUqundj3ozy7QPWkmLX1qbrswxmiq8Zjd
+8fHr8UMi0f3eXlS283CEBah+It9e/WnxsX6KcC4ERq7EGWfCfaa/+7JGc0mKfcoY
+oE8bJDp3qAV+odCxBZ47jzKrZ2nRiVmrqnEhp87SrzxstAuSddiTWtbvaM3auds2
+rEutRbftPbbf/rgrE4J/fjVy34v9dfa/0Y4uV230C5rYwmxjF1P6aG39maCU8csU
+yFfiN+nT1834VBDpVZY5YoxRzTwlbO+ng5YTvzxlma1vzqK1S24nstqr0PV38OJZ
+VahzqmZ9mjjpvNE5p5vtnT1AW9c1UiVxGrGWsNopSpS/pq5sygeTzDZWRMdHhzIt
+W4m55qX82tJKAjQgqTZVUsX3u3NUWTlgoinKNOsjLyWSjjPUolRPJ6+XjkZN0Dcm
+VvldWZRSO84sIp3VpG1LWuGPWoX2l9qps4iuo46wKVYM6EYXAwjthNipbN5AHpXA
+UC7kx7KML0+gpTNLKz3p7CeN66o84fRoFij9afCfm24k/tCNC9OS/BwfCvav15YT
+aWcY76IIvHe777mgzdmKRqjZ4/o8kjMu8IxEcGvRmCWgSRGuGmTC22CtdEnplVxQ
+N5QMgpju1zwxG2fbG4gx3OTty/aUbe9q2db+0Br3VrHRm5XBP4Jk
 -----END CERTIFICATE-----
diff --git a/akka-http-tests/src/test/resources/certs/exampleca.jks b/akka-http-tests/src/test/resources/certs/exampleca.jks
index eebc70ad09..000dda8ce8 100644
Binary files a/akka-http-tests/src/test/resources/certs/exampleca.jks and b/akka-http-tests/src/test/resources/certs/exampleca.jks differ
diff --git a/akka-http-tests/src/test/resources/certs/exampletrust.jks b/akka-http-tests/src/test/resources/certs/exampletrust.jks
index b6819ec019..cbcafcfda7 100644
Binary files a/akka-http-tests/src/test/resources/certs/exampletrust.jks and b/akka-http-tests/src/test/resources/certs/exampletrust.jks differ
diff --git a/akka-http-tests/src/test/resources/certs/untrusted-client1.csr b/akka-http-tests/src/test/resources/certs/untrusted-client1.csr
index 44010356e8..1bb1f9e0ab 100644
--- a/akka-http-tests/src/test/resources/certs/untrusted-client1.csr
+++ b/akka-http-tests/src/test/resources/certs/untrusted-client1.csr
@@ -2,28 +2,28 @@
 MIIE6zCCAtMCAQAweTELMAkGA1UEBhMCWFgxEjAQBgNVBAgMCVN0YXRlTmFtZTER
 MA8GA1UEBwwIQ2l0eU5hbWUxFDASBgNVBAoMC0NvbXBhbnlOYW1lMRswGQYDVQQL
 DBJDb21wYW55U2VjdGlvbk5hbWUxEDAOBgNVBAMMB2NsaWVudDEwggIiMA0GCSqG
-SIb3DQEBAQUAA4ICDwAwggIKAoICAQD6JGxrIrqAWCGi3MxxscAkthjoQKsFFitg
-Xhan1UQ5u2XZehlwjWBlV2Hg1VIX3cSQcJcqBXnkaOaZNWjrAOcgYTINMJiwAOFT
-0pF0oLaYGyDwViRSWJUqttoZTUzp19Km+IYkgkLp7RoLI9/tWNrXCE0h+rhEcVV6
-n2d7zn+JMB+zo7t19MdXD1UmAh3qLtJPXIQ/JHsHaMsOXZHHQocFUXngBoV/8sur
-yyBvLaMQfRIExYiK4AYx1w3o5W3TLE6zyynP4BvyxKsm/Ya6ykosVcmklrPm6Y5S
-wtV9syh5BvQjfGrSNAigbewHT2gi9Pz5FHjFSVrwV4nE058smFSLrueVb0MkJwQV
-9A7gWp5LsHtu/q+NvNlmnPUMGFfcoS9DW2UrtEv+b/c2Y5bF3fKM3H6OXg92qqRx
-oe4Oc9DA68F6HqUQ5XPTxItK2ovWaZUQEE5OtBg+aWNGzerf8RpWZaQzbXPfpKV8
-Zw0p6DOvr10Iz3SJl38N1qphlMSBVchdA+oayU5tDagXqVrkRfweD62jQL1opR8L
-6QP5eL5AI4CvXOBJPE09TI3wdd+IZoUXsFZbCUw9R2Sjp32hRdaZHEz5ftW/qnYh
-KSlGbrZoJglnYXaPkYjInrhlPc5NBhsfkyhnt0R+xlxrv0H8PZzbM718xlPWPD3Y
-95bSSptRHwIDAQABoC0wKwYJKoZIhvcNAQkOMR4wHDAaBgNVHREEEzARgglsb2Nh
-bGhvc3SHBH8AAAEwDQYJKoZIhvcNAQELBQADggIBAAcDDOafo0llq4m1dEr3gWW7
-Lb+0OJYHsezg3GNVyOTkmIERaIFO69SoKvcQGiHgO7+wK/yJ7kj993q3LJJI1gG+
-vRuPrKSQ6AkU0Hrb5DYRY/PVzj+MYUK9kvgF8/NpoXLdfv/SA//Owbb8KnR4B4ff
-GXOf3DMV1ykDhAKPqFo/H8iIJbRCzDqf6THfEaXLIwR1Zfq9AUzr0eXQbG6AXhJj
-bYUoPMTRWuqdEt0LBc3+xDAUo6f4k0pEkFpw+ctkHua2iVJYxmF0fcoHqsUAKJoJ
-y4dHiQbO4ztVG0Xd+9vEphY9YkqmWoxRRI4en3abdp6IXMH65jJyJ+QQ0DS0Ge9i
-vBwEbBo6nsJEa34YyIl5HcNIozystQVb6/P+uN4zh2P8b6pKROdAo5Rr+mlY7X8o
-wtFibvN/nN9dC7o7Kc3BP8qE1aK3H0tRuf1FdUWbr0yKiiBuS2kRr20zFXtF8GJC
-z68I2+m5xvi+vl1M7mIu+fd6eEZfrC7kl9BMMYiQXQTmng03zmkoalRh/Gwuuca/
-AxdJde73zz+r+TF/Gz5JMfTNrl6Vlurnh+Vymy0NQagexsK8zH8K+ZjHIpom5P+h
-lfs0mSTUPPH59VYcu63gf5LSBfNlMpnVdyMSGpjtLDZeFRDfbv0zq0Mg2Tmp7Svh
-zxA1MLo92xvAP6n1a5nY
+SIb3DQEBAQUAA4ICDwAwggIKAoICAQDWQpADxGPIAVQKSLtFx1+1ke6n7Tnrl/dG
+yooOyQ6+KftqQh0+kN5CE95vhHaLZSKLRXaPR0i1CKzahcVYgezB6fkM8/7o1y/4
+2u0wv6u3mV4sCt4jhW09N4jIr6wUHcVDwL2OfT+wO/Gi3U5691IgNTPZGRbr9+Jp
+NkNK978vrC9vLXUgfAWXj3g7rbqj+FgvqST8aMozkeA10oAlxDUne8dtCXzHRlPR
+rkZl1bwoezoVY9pw33ZlEAFiicxB98IFIrW+1qTMO+01mWpKccPX3oEXsb2+oZl3
+bEhJS9d6G73pD+Kp6mMwzg+xa5ng9Zkhebxi9rz8xOhYgQ8qzmfZKwNVCvzAHXvK
+srSpQLcRA5o4JZdzTG9nKym+Rm5j3Gpqi9UdDgbrL9GkO4LTmJFOwaw+ebFsHniN
+idM2ONH5cB/7nH+dM1V22GiSNgpTyLXTGTg2tUAnYLXdqwf76q2II11V+Nyitav8
+aMjGHAdZ1Mh9qy/6Hqfbiqcj8G3GTJLXdod6oCj57HsMBifcEdFmVbaAeCaDSgAD
+SBbBxO05EjUVD4bam6U4ZEF+mxmxBv1H+rcZ53xlODSQaON6haLvF0e/G6hMRm7f
+1/xlXbl5lPeFnlwpyou6udTShNqxYQwD6CX1Mv2L7E1sOo3zfRBtsp68EMhOKNSj
+QXwJkTEOTQIDAQABoC0wKwYJKoZIhvcNAQkOMR4wHDAaBgNVHREEEzARgglsb2Nh
+bGhvc3SHBH8AAAEwDQYJKoZIhvcNAQELBQADggIBAK4hEiCPErteIuThZrul2Y6m
+pZSJZstCqXzEQLELjCRc6+gYo63Gybx0ILHWwYKKmmXtSzieF4rFroNKULK1aLzk
+n37EJEPC1FEevIXJcKSq0O7Z+FeePSaROjGn1u2v1atnhc0/ahTGD5niTjnN843u
+L+OJftgkWVP5MtYaDz6OvuAzDHphpo0MGaQL6DSFSlq/8+exAyLhAmI5DZxDFTkz
+jCwEtgPJJsaCl/NdrA/+XiGOmwwEFv8XveAZVzHDOMjUoeFMzjcC09Ui3K94iN6n
+fQZr03v+fHJR+2d3w+G7Qsb/Ndo9USFJRSVy4FXSrcvnMOMWxGP5NRsSImLB4/7h
+86Sks8iRL2GVChR5yaIx3IbU7L0Xk6GuwK7qA7WIfqFOmIxTZBAlwqk+e1Cw7GXL
+vRbuEOJky0CBiCsNDN+Voq3NbENLHcovQDZ13pbXYK5F+18ZjEbyl1r9rTOhfRug
+a8Lb5plZoAcqOs9ouSyCc07RZDmFgo0kY4JrJ67Hc1xpA1GbBgWe5csLjAITG9Ky
+1W/IYDK5s4QdVMNtm4oYfitNRlpnokg9PUM8e/9g1hm9vS3mOY7ZlbqGoYuAiC/E
+Qz25S/fPiAXVdFUJE7u3ZSzNQ2RG2Jf7rS2j4fjpPzA+8AISFxkDlx1IkLonpjVV
+NVAJNPAz+DEkthtJRJfe
 -----END CERTIFICATE REQUEST-----
diff --git a/akka-http-tests/src/test/resources/certs/untrusted-client1.key b/akka-http-tests/src/test/resources/certs/untrusted-client1.key
index 334220c085..f906b36963 100644
--- a/akka-http-tests/src/test/resources/certs/untrusted-client1.key
+++ b/akka-http-tests/src/test/resources/certs/untrusted-client1.key
@@ -1,52 +1,51 @@
------BEGIN PRIVATE KEY-----
-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
-pgFQ1R6yv5svLnbf22tIyOJ/ic2XziWv
------END PRIVATE KEY-----
+-----BEGIN RSA PRIVATE KEY-----
+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
+-----END RSA PRIVATE KEY-----
diff --git a/akka-http-tests/src/test/resources/certs/untrusted-client1.pem b/akka-http-tests/src/test/resources/certs/untrusted-client1.pem
index b7fbf8c4ca..a76e2d9f13 100644
--- a/akka-http-tests/src/test/resources/certs/untrusted-client1.pem
+++ b/akka-http-tests/src/test/resources/certs/untrusted-client1.pem
@@ -1,33 +1,32 @@
 -----BEGIN CERTIFICATE-----
-MIIFvzCCA6egAwIBAgIBATANBgkqhkiG9w0BAQsFADCBhjELMAkGA1UEBhMCWFgx
-EjAQBgNVBAgMCVN0YXRlTmFtZTERMA8GA1UEBwwIQ2l0eU5hbWUxFDASBgNVBAoM
-C0NvbXBhbnlOYW1lMRswGQYDVQQLDBJDb21wYW55U2VjdGlvbk5hbWUxHTAbBgNV
-BAMMFENvbW1vbk5hbWVPckhvc3RuYW1lMCAXDTI0MDYwNTExMjE1MFoYDzQ3NjIw
-MTIzMTEyMTUwWjB5MQswCQYDVQQGEwJYWDESMBAGA1UECAwJU3RhdGVOYW1lMREw
-DwYDVQQHDAhDaXR5TmFtZTEUMBIGA1UECgwLQ29tcGFueU5hbWUxGzAZBgNVBAsM
-EkNvbXBhbnlTZWN0aW9uTmFtZTEQMA4GA1UEAwwHY2xpZW50MTCCAiIwDQYJKoZI
-hvcNAQEBBQADggIPADCCAgoCggIBAN+/p52HZ+rTlqfdyaEuDHNhYoK0uDmFk598
-NiuAKtIGckIjJC3zXq6DJSBOnoURvD5N45ndtSmblW6I6+Lb1tpHK9liSj/6OQxY
-qgxZa7X0sD/rLmjRZNYEGCUTHybAj86U/Ao9vzrqihOy5nhzxAFhGjlep3xygLgq
-ExPPuJMBJdZkF0ISyAiI4vfTryHw4AOVSUgchEg5Inb4Wc/8C28ok/cbuxxonU3p
-gtl6RsN5vdTJl05yInVbdqZhjrlYs8ZPKuThf5S6l1Uj0ew4kol87hJ/esab9H1E
-y2u+2iS1FwiqTtYhbxMLjXnj4XYru9K2eSIS/1IcKzzSBknGZhQBCAHM5NuLaBqW
-U00dyP4rI9IPBHuGV6C5FqutIqCir8RgLKX6koWoDAJWzc25C1OdQ4v0+iZVirYD
-0SvzWt6RkEPSMYbLmOkg4NSoblJyOR4ZqW6G9me8cMq+yvV9/ThYdPgY3gNA66e0
-Jj0vAEZ2B458xvxlNtWY9q43pL6oGRliLBvFeAU9PMu1R+R2g5T3Vp4GsAisqfhA
-hiZZewLN/4X/BN+unBxB4sEgx3ybqZhSTSotqB+8rUQz2VGT2uLJLnCQr1a8FfGN
-Wh29w5kv4BvvJHlPEMHK9uH9XlnRCQ7HhI3Rtl3ZWw8zEWxbmTWvV3u4tS+LK0or
-TKR620wPAgMBAAGjQjBAMB0GA1UdDgQWBBSzXFBO+WRYYzt/UGQC612nshJoszAf
-BgNVHSMEGDAWgBSSdabHtMlwH7AwAFg4Qq1NnLqhETANBgkqhkiG9w0BAQsFAAOC
-AgEAHz9H8Y4iReTDT++5EVVIozQEexkXhVZPaHW+613F1kq43ygJv6Ft5GPOelKM
-6KbtnjD7DY11JTsuasafUuXfWKqlU+lUZ1e8lqeaTH4VJG/7oKdR8/SfgQKo834q
-cfzLWGOFRgW4MGzDkq/2JCD3KEQ7l2PWdpbHibuN2V6/HxQq7JqEAA1EimDq+B+w
-LQN+mMYkTlJEjCU2oHdxIoWc4oio2aIyiYT2PqnEM3Fg3NNLyW1CsKU4vTUfbnF3
-//MGyu84F8dcU/vL5OGghNykst2DmxH2PoBSD6oanMpORGqOWc8x9uv7cn7BReM0
-BJ6gs9NCUJLv0TmsL5BUfPnXvcrBqryncJo/qxlF5lSzeVk1pkGFwz4FHNNeLXKA
-Hwj+FrxbnpzcofQamw2urDhms7xcDD7icMQHO/XdOAJmB79kRVF8VQvt3r1Hs2S9
-gkgRPc49yz2q7DM7GMl4SbKsxHhNDQzTr7k04/u3d6JHUdzBvAqpAawkvcOTRliY
-QnM6fhU7h2J51Pi6Qpsz7PygmA5yvnncjhGzWjI07fU9zHTdqJqw3oM8v449RISB
-lJeydvomvcK2lqCcJhNVzY8bKzGiAfG6pLqZYXn+CZYjnXwCDuOm+gZTUqQsZwS4
-xHe/9gGLklzfFn7+6uP195TpNIz21P3bx4B+iwd25mxYZBo=
+MIIFdjCCA14CAQEwDQYJKoZIhvcNAQELBQAwgYYxCzAJBgNVBAYTAlhYMRIwEAYD
+VQQIDAlTdGF0ZU5hbWUxETAPBgNVBAcMCENpdHlOYW1lMRQwEgYDVQQKDAtDb21w
+YW55TmFtZTEbMBkGA1UECwwSQ29tcGFueVNlY3Rpb25OYW1lMR0wGwYDVQQDDBRD
+b21tb25OYW1lT3JIb3N0bmFtZTAgFw0yNDEyMTYwODI1NTBaGA80NzYyMDgwNTA4
+MjU1MFoweTELMAkGA1UEBhMCWFgxEjAQBgNVBAgMCVN0YXRlTmFtZTERMA8GA1UE
+BwwIQ2l0eU5hbWUxFDASBgNVBAoMC0NvbXBhbnlOYW1lMRswGQYDVQQLDBJDb21w
+YW55U2VjdGlvbk5hbWUxEDAOBgNVBAMMB2NsaWVudDEwggIiMA0GCSqGSIb3DQEB
+AQUAA4ICDwAwggIKAoICAQDWQpADxGPIAVQKSLtFx1+1ke6n7Tnrl/dGyooOyQ6+
+KftqQh0+kN5CE95vhHaLZSKLRXaPR0i1CKzahcVYgezB6fkM8/7o1y/42u0wv6u3
+mV4sCt4jhW09N4jIr6wUHcVDwL2OfT+wO/Gi3U5691IgNTPZGRbr9+JpNkNK978v
+rC9vLXUgfAWXj3g7rbqj+FgvqST8aMozkeA10oAlxDUne8dtCXzHRlPRrkZl1bwo
+ezoVY9pw33ZlEAFiicxB98IFIrW+1qTMO+01mWpKccPX3oEXsb2+oZl3bEhJS9d6
+G73pD+Kp6mMwzg+xa5ng9Zkhebxi9rz8xOhYgQ8qzmfZKwNVCvzAHXvKsrSpQLcR
+A5o4JZdzTG9nKym+Rm5j3Gpqi9UdDgbrL9GkO4LTmJFOwaw+ebFsHniNidM2ONH5
+cB/7nH+dM1V22GiSNgpTyLXTGTg2tUAnYLXdqwf76q2II11V+Nyitav8aMjGHAdZ
+1Mh9qy/6Hqfbiqcj8G3GTJLXdod6oCj57HsMBifcEdFmVbaAeCaDSgADSBbBxO05
+EjUVD4bam6U4ZEF+mxmxBv1H+rcZ53xlODSQaON6haLvF0e/G6hMRm7f1/xlXbl5
+lPeFnlwpyou6udTShNqxYQwD6CX1Mv2L7E1sOo3zfRBtsp68EMhOKNSjQXwJkTEO
+TQIDAQABMA0GCSqGSIb3DQEBCwUAA4ICAQAW7tWyLj5Uifi1AzDXigFy7vab4RZQ
+Wb1C2wP+4+1xXvWhEund4mStqqvac6A+UQpfkTF8qh+jO2uu6jS9J5wILXNAhaaF
+EsoX8ZjSa2JRCm27vHYPo2ZvC/5Rf+zRrHFQIOigDBpZ1KrLKOv5NTD6M1oZYHbw
+uWfoeFfkNNrHTR1PaE0TRoKhjtJG1U1D2y4NJnq7n45PRDDkxMD3C66m/YKyfMxZ
+wDNAj9BvsfPc8PLwisgfZhbP9y9W2hiPRaw/Frk7Swuxf1RlIbcaJgz9B9bJbefA
+OWqvK7s7Kb5wZi1dRTdgThFPw43onWpDn3717JDJ/5yaj8giTt/FpyUiCDJ1iB+5
+IeJ9tj0IzLUUhyhv4bFNs4K09GNqG5rB1rVq7utSO07aAmR/WbTNsSuxxz4ySvBR
+xwvmi5j8R8CQkIGY2ejwoqFKwo1oWlZkMEbGxdODwP2m50i3tt2oguL28Gh7FvwA
+mECiVc1GkbOxJGqu6ljrz5VvYF7gekOiRdPO6JEoCirAntUcQjMCziNa5wF92y+z
+MJPOay+gvZ1y50TvUv2Gw+MYFptDGVOjonOxqFCzSIzC40FSggziglJqDAYGVJC9
+b5mglO3zuIjvY13IF6hJqBGFkieJAqi7LL+j3xNKvNEwbXxwVI/E3X/SgNoxTWsB
+WUxlfnESE2OMOg==
 -----END CERTIFICATE-----
diff --git a/akka-http-tests/src/test/resources/certs/untrustedca.key b/akka-http-tests/src/test/resources/certs/untrustedca.key
index 187d33fa21..849c4e1ce3 100644
--- a/akka-http-tests/src/test/resources/certs/untrustedca.key
+++ b/akka-http-tests/src/test/resources/certs/untrustedca.key
@@ -1,52 +1,51 @@
------BEGIN PRIVATE KEY-----
-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
-S2HMu69lHeoAwfIKwOtRMl8Mvu243CE=
------END PRIVATE KEY-----
+-----BEGIN RSA PRIVATE KEY-----
+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
+-----END RSA PRIVATE KEY-----
diff --git a/akka-http-tests/src/test/resources/certs/untrustedca.pem b/akka-http-tests/src/test/resources/certs/untrustedca.pem
index becb0a5caa..6e8bd38776 100644
--- a/akka-http-tests/src/test/resources/certs/untrustedca.pem
+++ b/akka-http-tests/src/test/resources/certs/untrustedca.pem
@@ -1,33 +1,32 @@
 -----BEGIN CERTIFICATE-----
-MIIFvzCCA6egAwIBAgIBATANBgkqhkiG9w0BAQsFADCBhjELMAkGA1UEBhMCWFgx
-EjAQBgNVBAgMCVN0YXRlTmFtZTERMA8GA1UEBwwIQ2l0eU5hbWUxFDASBgNVBAoM
-C0NvbXBhbnlOYW1lMRswGQYDVQQLDBJDb21wYW55U2VjdGlvbk5hbWUxHTAbBgNV
-BAMMFENvbW1vbk5hbWVPckhvc3RuYW1lMCAXDTI0MDkwNTEwMzUxMFoYDzQ3NjIw
-NDI1MTAzNTEwWjB5MQswCQYDVQQGEwJYWDESMBAGA1UECAwJU3RhdGVOYW1lMREw
-DwYDVQQHDAhDaXR5TmFtZTEUMBIGA1UECgwLQ29tcGFueU5hbWUxGzAZBgNVBAsM
-EkNvbXBhbnlTZWN0aW9uTmFtZTEQMA4GA1UEAwwHY2xpZW50MTCCAiIwDQYJKoZI
-hvcNAQEBBQADggIPADCCAgoCggIBAPokbGsiuoBYIaLczHGxwCS2GOhAqwUWK2Be
-FqfVRDm7Zdl6GXCNYGVXYeDVUhfdxJBwlyoFeeRo5pk1aOsA5yBhMg0wmLAA4VPS
-kXSgtpgbIPBWJFJYlSq22hlNTOnX0qb4hiSCQuntGgsj3+1Y2tcITSH6uERxVXqf
-Z3vOf4kwH7Oju3X0x1cPVSYCHeou0k9chD8kewdoyw5dkcdChwVReeAGhX/yy6vL
-IG8toxB9EgTFiIrgBjHXDejlbdMsTrPLKc/gG/LEqyb9hrrKSixVyaSWs+bpjlLC
-1X2zKHkG9CN8atI0CKBt7AdPaCL0/PkUeMVJWvBXicTTnyyYVIuu55VvQyQnBBX0
-DuBankuwe27+r4282Wac9QwYV9yhL0NbZSu0S/5v9zZjlsXd8ozcfo5eD3aqpHGh
-7g5z0MDrwXoepRDlc9PEi0rai9ZplRAQTk60GD5pY0bN6t/xGlZlpDNtc9+kpXxn
-DSnoM6+vXQjPdImXfw3WqmGUxIFVyF0D6hrJTm0NqBepWuRF/B4PraNAvWilHwvp
-A/l4vkAjgK9c4Ek8TT1MjfB134hmhRewVlsJTD1HZKOnfaFF1pkcTPl+1b+qdiEp
-KUZutmgmCWdhdo+RiMieuGU9zk0GGx+TKGe3RH7GXGu/Qfw9nNszvXzGU9Y8Pdj3
-ltJKm1EfAgMBAAGjQjBAMB0GA1UdDgQWBBSQ5BsHkAPOj1l19RcyrwBqjUqerzAf
-BgNVHSMEGDAWgBSA7kOrzdeTfaO5eyCvx0kjztHmQjANBgkqhkiG9w0BAQsFAAOC
-AgEAAyYqtXGkVXN4lwSe76539XsrUdkt8pbDuSfWyiIerjKQDf++jewIja8RvYGn
-GZNuCFwrMSJmpPcQgE0UCTFOFs7u16XxBejIwYKGGolD1ep+rI8bzXcG19JmnIOa
-94/oQf54PS2jGFX/2waY8a9QwRrYQHOQJGx3aUf4g+Nn6KvQ4AplqaZYM7mSODJ7
-+NBdsxjWpqbFcmqRpNWZ4IKfGcrTahdtpre+1R7hpYwU/vmd8x0XkeOWUwHJttjV
-rfiuUpXfkm3cyCq03OGqTKpPyWcwRuSbU0WqdDebSJRD80KpYQCRRDoAnx4EGFqB
-nJWNcxv2NRi2prH+8/fZGP2QkqF0CI6mXY6ISrXYiWFXMzZrmbzqySL7cw7S6utq
-E0Mf8W7dZCr19dMAAgdXzSrB8s4TrW+bcl6cF1GZDky1sBHBnxfD/U1H3HYKyF7F
-CWX8/yS5tUbfP5TOfCYKdvkfZpUgQv7QyxWywOzP/+mIc0OcvkBuVoF+Rh7mJzPQ
-J9C63jsSIuwXMzbqs/F8sAHblajSElfemlwg3sb1qxTgVg9Oe9UJWw60S+XtAcqM
-hRrh/MXRLiFdd+Nq2EyFoDH+w62U0W5UUQSNzCL5lxMmVoq6EMRp9xVAFQUgOgsC
-2FWqUECHJ6ZC43VKUjz5hFBvOV7M2FCrfI93hOPiAalttYc=
+MIIFjDCCA3QCCQCe0unGm1LGyTANBgkqhkiG9w0BAQsFADCBhjELMAkGA1UEBhMC
+WFgxEjAQBgNVBAgMCVN0YXRlTmFtZTERMA8GA1UEBwwIQ2l0eU5hbWUxFDASBgNV
+BAoMC0NvbXBhbnlOYW1lMRswGQYDVQQLDBJDb21wYW55U2VjdGlvbk5hbWUxHTAb
+BgNVBAMMFENvbW1vbk5hbWVPckhvc3RuYW1lMCAXDTI0MTIxNjA4MjEyMFoYDzQ3
+NjIwODA1MDgyMTIwWjCBhjELMAkGA1UEBhMCWFgxEjAQBgNVBAgMCVN0YXRlTmFt
+ZTERMA8GA1UEBwwIQ2l0eU5hbWUxFDASBgNVBAoMC0NvbXBhbnlOYW1lMRswGQYD
+VQQLDBJDb21wYW55U2VjdGlvbk5hbWUxHTAbBgNVBAMMFENvbW1vbk5hbWVPckhv
+c3RuYW1lMIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAnLKCF4G7TfTo
+jzEd83SAzc8BBDdTIBjwhQTNBKq330slr80u6jw+jVBQk28qFnNrXRiMHv3Y6lvE
+Kkfu9/Jm9dBDxH3o7rnfrynX90TYnzWEQHPCcFThdKkbhQPWm5oL+sCkeoAXMkZ0
+5XhFQS1qU4vH1/KFvN1Su+GWTZstYZ9vdta1pk2CKmv7/6VXCfb1/+FOHL40NuzP
+6RH4r1ucjT58mzQPgENQG0wGojg0M710NvC12q51YT2U37DFi/ok4ln45BXYQ3OC
+fQslUviuYCvZxsPbnvVxKCNPv58MEdX8iOyXAH8tWPWbW5lkPaHtESahZHi1Ng0P
+Ag8D0/gStermH1phiEMNnSUXBkvbSjiG7oSI7BqLNxmzZ+FP2tj9lcRW+WHd1K87
+0ObEZK7EJLMF3Vsei0OAMPBhkT2PPJ7gDg58gp6m1JXQRZFfdI/wcXaA5RNFom4K
+h40h6wnPAscsfwGCNp0TvKE3wg6JldzD60Gb6vhCboN79PPu5BDiM4vc/xoE1PQb
+teyAgIhgVugkL1pVJ6BDNxCiNvMnLgxEu5cxAt+PCq/nv8uEKrquNqAKu8DfK/A8
+CUvvmhRhKhwU2uD+riOp1OvuckqUtjaOcdXHl3Q1OQ/ujkN4JzVbXm0LEXTHbP+1
+jtBsc3nVfNLYX/h/guQhIN2Y6SGm4asCAwEAATANBgkqhkiG9w0BAQsFAAOCAgEA
+IAHnY67UgbFYOjdVY9l5jy1p0jQJFd2JXaALspqQq0G9ce8nvrvnPtdj/kKAvOyo
+iN3mqtdjfyzMP6WBuZqVUOCFhXrn8HbiRr25YH6IE/CHclSk7zGzf/AIzdpzfeJk
+rRPMY/x0sAIUYLJzTUiIrJPeS27q2S2/5As6Ey5p+R0hjNa6hKUrDxw4dirBH7rs
+JO2J/cnn45kpUMjnAa30xKkPX8hlb92aaCUAtlOpXqouQgCfoTQa4vk5Hzq707Ct
+CxiKsGaouNyh/Dz4G2l3NFJOLLo80CfLQ/BawEsAefECe6P5CfGt1+zQUQu+T1nt
+9nner0MZTY1LkDcZcL/HlXwoQy5GlHtb6lFgmariUecIm+ca3X90o1BTrPE9kbNQ
+aLJJaYWUREAJq9AI854G08hy0Z6y52BWCMfuexVhtDKtudS70H+CaGCV9aPWzsg3
+ZPdo/TtxKMpcvEmzpqPia5XUcAwsYaoKQEK5YFGGfUWBdkW0kkss81zEJ70lkIh0
+z67g0FbJT6Zt/W3tS78himo/TDJMJ8TGGl2Bj6qkSuC5CqMWsn0boU3Rms1XYHJD
+1c9dfEfaA4EfIJUD+Kqxz3Xk+Boo0Y5C5C8PINWY6yby0kMjslBzIedlxrWx1mQN
+/u4ESj0zKFPj5V6udGMIENc7hMkE2yoQQkijL8onc+8=
 -----END CERTIFICATE-----