diff --git a/akka-http-tests/src/test/resources/certs/client1.crt b/akka-http-tests/src/test/resources/certs/client1.crt
index e66d72762d..c292ba59f8 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 eb91ec2f6a..0ccc42bad6 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
-AQ8AMIIBCgKCAQEAtOSWRT8EXV/S8KC2eZbuNsztPWqD5W6yHp8PqPPNVCPLUFRp
-S5NSuemmfl/Oj46MJBoh4nT98o95dtrxRW5hZR9lnKkvDih9xaZLDRygAAO8AzUm
-Uy9YeNqoW2jEOZTTb269D5NEbcU/YseMtnqBI4Eh12kuLcaFURqSXDSjtGz0Ag5N
-LRdmuzfkxh3Tobvqwsxofy70zL/m4XqtJpnnfizdlM8tAWmRpqqZGzDMouzKRIFq
-D8J149uYU5/9CdZdIY2laIkZOK17Xy5n6ZJjjdANliGWkeFTbp0yiDPD6r+N2kMU
-3g8x2XSziMR17PPRnHVMzYnPYEu+gLEKb1fYrQIDAQABoDAwLgYJKoZIhvcNAQkO
-MSEwHzAdBgNVHQ4EFgQUVC1Wmxl0aY+drufj0/emAEdgIlEwDQYJKoZIhvcNAQEM
-BQADggEBAF/5qm6WqF29sRQnClhNaDtkdlF9ZVsROlXDocdvntyOkf4e2mjbQMA2
-xi/QVih9xP9LaT6tUazT/cgVcF2QtyyuHmnSnM0IHabP1R6EdDtYNK97KUgvroSQ
-C7cpdNUTkEBGo6qfpFP/3M2u8lB/z8LN6zSPpNMYZ5M/MbTZ/PS7RlRpusLk84Pm
-Fry93SUJwvZUYXiGdWGAtyAnjlm0LT4zjfAeXsdzGqE2Ymhe5GpG4bJm58kL/wCe
-YgZQi+qN5JtgCJ8drO6DFxt4qM8hqvqcOR5/8doqLOFcBELjWOXpSz9zgZvITZlW
-yqxoZ9pgqnECc5ANcTzUh4Gel1Wo99s=
+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=
 -----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 82c3729233..d06037415c 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 d8228e9a0c..e22c377aaa 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-----
-MIIEugIBADANBgkqhkiG9w0BAQEFAASCBKQwggSgAgEAAoIBAQC05JZFPwRdX9Lw
-oLZ5lu42zO09aoPlbrIenw+o881UI8tQVGlLk1K56aZ+X86PjowkGiHidP3yj3l2
-2vFFbmFlH2WcqS8OKH3FpksNHKAAA7wDNSZTL1h42qhbaMQ5lNNvbr0Pk0RtxT9i
-x4y2eoEjgSHXaS4txoVRGpJcNKO0bPQCDk0tF2a7N+TGHdOhu+rCzGh/LvTMv+bh
-eq0mmed+LN2Uzy0BaZGmqpkbMMyi7MpEgWoPwnXj25hTn/0J1l0hjaVoiRk4rXtf
-LmfpkmON0A2WIZaR4VNunTKIM8Pqv43aQxTeDzHZdLOIxHXs89GcdUzNic9gS76A
-sQpvV9itAgMBAAECgf8cVA0F4mQpr6lwYqN2xENyrqUEJ8Foz6dD3o3D0Gpuq4lx
-UN4VPZ/8wz1m6iW04UDilQaK5LAmHcZE7gSsN/of8z8lA7bPI7a9JfCa7oOUZbuA
-OXWBNF1JeJefLWvqgUzJ4NOMP8mmIVT6aP/mH3e8upOSKHJBcxs/I+ok443Wypim
-kEX/16SqECNgdbUr9D+i+o1zBg9Z48ZM4tfZszaiFKEWH7vXkIRiaYPICONUUZAA
-SkxZ9yt6u+nX3ixfW7ZNHFwi0wzapx9GF5/N/8H5YKLTxbNwQRnHrG8Swq1sGjXG
-C7RouaQ26l7y8sBRu2QrqJSwAca8M8qXyNoJ2TUCgYEA4w8blIeGlWdK/8kV8ZQ6
-JKansKuMd5m8QQAgYEU6SCW/tbG1bVMuW7VVKixKW5wfqSoTxEFWZL8sFWLCZFS1
-mB/9qPn2FMLyNRvt98Y/LWoMgsQqAS2fqJalHyB2vpeVGNFCwrmltjEqIuledf5H
-PzPvrf379KskAaiusxK0xIMCgYEAy/MWndUB+aFEEcfetWKth7UazXl2BYuSOm9r
-YSOQjrSXBJI+407dx2S5V6No18WginQvXTXO5/0+tT26FI978rfPGjPtjAcC08rh
-Tovl+DKS8pVPWWpY7WHT4Vt3yrBKaQ5VgJSbFUtWgBKfD6ObQ4CVuHcMWAAtFTnr
-L0bARw8CgYAiJ2mco+4olwr/Ar5cQlGkpbTfrE5Kx0M7+8ri8EbeB1+Y8ww5T6PP
-g6011Meyk/9nML8cbD+Uk/ULmnlnIh7WrSk4u7C6WsCYIIVhGd7y89rB6MPwvW4g
-q9hWoEl8TczNmNyT8dztVOPjsHrXANKyvRs2btfxa7TU0wzEPvIWBQKBgAm4yLc1
-VCbGHSyLzn3u+j6hz2lEBPA2uv22GfRDcbybtycsoXrMY54BmyQmUfUXIpP2/dr/
-maFNXRPeoWQhgtMLGAAzwXsPSn82CI9p88hlAMQ3gdTNUPff1e3EIm2zAZkIaeL7
-MnlNYg4w1Qw1zEzncDue0SPQvlVosWFLihbZAoGAYKeKu3d9eSu2dUgoy8FwRTmU
-rhAAjJ1uDVlzfmCiPcUZrzTkvR1DDR+Z9S2yWRPWi8a+tJxJRqze75rI/Sityr82
-j0+cxnSq1SNDbNm62idUYvqOe8M0XlC4fF+N4cqDXAQPIh7TVqGMzBeuPbygIuer
-Sy60UigQ5lW//RaFj88=
+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=
 -----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 c3ef19449e..83e6f5fab4 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-----
-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
-cMJ+bVkBxy8XxthM3XGPCU+leQ==
+MIIF3jCCA8agAwIBAgIIdtov0D01OmkwDQYJKoZIhvcNAQEMBQAwfjELMAkGA1UE
+BhMCVVMxEzARBgNVBAgTCkNhbGlmb3JuaWExFjAUBgNVBAcTDVNhbiBGcmFuY2lz
+Y28xGDAWBgNVBAoTD0V4YW1wbGUgQ29tcGFueTEUMBIGA1UECxMLRXhhbXBsZSBP
+cmcxEjAQBgNVBAMTCWV4YW1wbGVDQTAeFw0yNDA5MDUxMDM0MDJaFw0yNDEyMDQx
+MDM0MDJaMHkxCzAJBgNVBAYTAlNFMRIwEAYDVQQIDAlTdGF0ZU5hbWUxETAPBgNV
+BAcMCENpdHlOYW1lMRQwEgYDVQQKDAtDb21wYW55TmFtZTEbMBkGA1UECwwSQ29t
+cGFueVNlY3Rpb25OYW1lMRAwDgYDVQQDDAdjbGllbnQyMIICIjANBgkqhkiG9w0B
+AQEFAAOCAg8AMIICCgKCAgEAsJD3erss2IyiJiqy6Ns3F6AUfYkCe74TB65IVWbA
+wiwU+BsOFbYnDWQ1oDhEkcIIfCAxpFY6HGnVq9LhfCRqTM0I4Re5owkmtmG0Y1L4
+dvD8Zenz2v0AtaerGr280mzJZNYCkAeN3LHNhuGJ5nvFecrqgS4EJgu9KCT4EMBt
+XgoQmAVv1cLiF4CKTmDzxvDjeejfrPcOy/nfL3QpG+b02Ai+oEdIV3MWi8xhhWTR
+KV3KyjZ7jamZqDG66ukzIt+06Mog6P8E8HMxFsnasprM3pksf3aS04OeA+3jRBaZ
+QtaWgPvtMGRT8+K9JRjX7YlMRiFKv+CvmEods0XdKkW9f+t0wy7wfDgBgZXxr9+y
+D2mOI1xnQsiVNaYFU/aU1UtYJvRoa77xsucPoMeGoJdV3DKMffC528GqIrHgQqus
+DbA/oF+pSu6ivDj719PGFIdE+7RJuM/Wjh+7Keez5qtvzfPli93u77kT4PpnlGOh
+xV2wgUEmzbzMbI+pQYhSHrLnmu8sUb7RhU4yN2d0Oa1WP4UXK4ULI2Qj4chSXkKP
+HNJChn+cULqfmzffQ1PNqPqFy/91YiH+TXVLJVHxa2yCZDz4WX2sqL/cI3v2lOyR
+9xfymm2wUL+Q/4Q/9DXFcBFgU3aq5+Wr9RKko5YgvZOXxfU/bhFp+BXw+Fuua+yE
+BysCAwEAAaNlMGMwHQYDVR0OBBYEFJ1PnLW06bgeMrxHL5rqWf09Uc47MCEGA1Ud
+EQQaMBiHBMCoAAGCEHNvbWUuZXhhbXBsZS5jb20wHwYDVR0jBBgwFoAUf2V46Bl2
+UHzdDPAQsUQ5FLIJocQwDQYJKoZIhvcNAQEMBQADggIBAAKuuvgOhyK4iBKOo5HF
+mW2UI94uibm7gzFVyGxEYtUKcmur4E+cMoGN/sSGeZWoEsxaYuoyDKdXiXbP5E49
+R/NMfyszZxi0IyGUm6LdDOtqh0GP0ZX4XatLAuUuX5SrPEoIgmGWtQGQQ1Oi6iVQ
+G+TknbcVvsZSaL0bWDacG6BEAWOEsG863KUuMqwZBnJ9MEwy5ihm4I5/9ShgudxG
++z1EJuK0iJIuwYdaqBSLWvQMkxQ3Cgf/g/UZY/K2/oAfW/jU40ZZSUnYHP73I5m1
+PLUVBwZ5vzgbzaqMBEdxXJXjylDojRC8Ti3JuwrPujIEBQNs9+Sfco+GDpkbFxpO
+uH+XjjA5KcfU4eFpbunlxvNpOAH2i/mksAMF02YFPAEIXus7wuiUQ0LkAFxrU4cO
+vrvb7sgltMKENlZQCM5NhNU2/U97CakfonCKwymBu3Ru5qEykw+yVhxBHJSzF+cr
+pMp1E7C72o3R119UKmnlJ8fILqvNZTggGVivsvmkiF/3AWV+hwMo7DFVJ2DM91Tz
+Uj252BmQVmROPzCN2XrFzVoJa/V4hNu0+jE85Fa9aUh0AYu/sqYVXHdh1QowsWpx
+p69UDV63u9h3tGHBiOya6vCn8NmVxAhoenciyATaaHxmD/PJeYfGXJuaFM6zJoQA
+v3mIQECzLWe1HHsdraQ6r+84
 -----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 89091a78e4..6de5ab9cbb 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
-SIb3DQEBAQUAA4ICDwAwggIKAoICAQCVoV8mDl3+rRS0JmeD3oyc/Qh7uNolcHh2
-xv4orZNalBVeFKyM1KQWz5wi6AR0KutQ2yUaPUNn2W30C/NzOyOkAdsCrzi6dG4j
-0WzTJC2w9emytz7kXDM/iHSXrdhQZ2pPAFgnPTKUFRIXL/sj81FYEq5rS7InZSNv
-rohV88+nZYi4uGWMe4rBQ05yqGTbU8qHOtaV7LL2fXFENPF1s62r6BtXmq9XKT2v
-kxzovNqBgkSGrmuo/+GPFGZQUd2HI/oyQF2U3j5omqyotL99gofTTRBYlVeIDKgL
-oScS0BWRBaUNJwKl1BeFKUn5g9igR7FPh9nuD1obGYc/Gy+9p72GglxOrgfxNsR5
-fXvlX2zwQwQvWJHWrAkJxq8zdqfO2uk/Quw6r/xSbD0rxgky+cwZlmY8LIkONMS8
-VdGXFLjMAnFnxDCh6ItW+aQAgHO2QqJtDkG3gPN6Sm+4+37cOxdNZEDYKscOS71u
-YlnZs452yoesfJHD71mp9c9flQjlMJqUM7aFTSVafIRDWlZ3gFR+3H1ICYNY/35b
-h2KshX0YaMNC0nt3kLNUX+As7cwhOs3hdRA+pHVfIksGUavu9TZc5lO5TxXFBAJ3
-d0PrgFisH2rT9OT3A0FJJwsKGOvRaJmJNQrg2OtG5Yd4bvPDAOzPG8maPZSZR6XX
-jBIGM4NITQIDAQABoAAwDQYJKoZIhvcNAQELBQADggIBABgctci/CQhn2JCXyLfM
-wKRIS9DmpCDiZpjva6N0VBWzlz03UG7aSJtsCU2nS9rhZm0la9kAh9irC7n4T9Rb
-wraPwzMPVsD2XnizyqA9zk1U/McYGw4tnBM7GY71RqXp8/pOe/UtEGUQzf8+sNSe
-YeuvMEHZiU8X5bKs3K1DO/zYgKZm+2I+riADcsvkRQPIqxtEQk2WyAklpna4GEzV
-QL+7UxRf5lXg6X8HzqgFMZpNVxHVJH1H8UnD0kw8jRlGZVCciLZ69F9ollVF99gC
-TZyTVjYhFzuNZZKV+KI1ss97UFCoUzb2tITY2hIQcMdhZsXYC84yMqtu79pSqji9
-wec8tTIemoyBJSZE4B1Qx89h8DEvESnshqL0Pb678EXEMtjtAAKuc9wyyJRSoQzu
-6Kt5lEFwiEmEOf7JZTfV/ASBktCa2a2XkNe8COKMiq7PnajQPscAZWAAYbpZjIZ8
-FhA+WqrIVuHDrpRVukn6qh2wID4k5yeVDS/jQ13Jc356gxfUw0lCIKg9B90hPjQD
-mdMdYYkKeYsZVNCC4TmEtwAv6P3p+7lGLP6iUGquBdToQY/YTe7YVz9B1LiGkhvw
-SOi/kV21WBEBodSSw8Mt4aTuSekNdl8pqt5zPoN1ebgWeiBUcOPtXdMhf0rtCG+q
-LNhuAWIHeJwpMVMLgGNctsFn
+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
 -----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 efe75d2d92..c650d6de2a 100644
--- a/akka-http-tests/src/test/resources/certs/client2.key
+++ b/akka-http-tests/src/test/resources/certs/client2.key
@@ -1,52 +1,52 @@
 -----BEGIN PRIVATE KEY-----
-MIIJRAIBADANBgkqhkiG9w0BAQEFAASCCS4wggkqAgEAAoICAQCVoV8mDl3+rRS0
-JmeD3oyc/Qh7uNolcHh2xv4orZNalBVeFKyM1KQWz5wi6AR0KutQ2yUaPUNn2W30
-C/NzOyOkAdsCrzi6dG4j0WzTJC2w9emytz7kXDM/iHSXrdhQZ2pPAFgnPTKUFRIX
-L/sj81FYEq5rS7InZSNvrohV88+nZYi4uGWMe4rBQ05yqGTbU8qHOtaV7LL2fXFE
-NPF1s62r6BtXmq9XKT2vkxzovNqBgkSGrmuo/+GPFGZQUd2HI/oyQF2U3j5omqyo
-tL99gofTTRBYlVeIDKgLoScS0BWRBaUNJwKl1BeFKUn5g9igR7FPh9nuD1obGYc/
-Gy+9p72GglxOrgfxNsR5fXvlX2zwQwQvWJHWrAkJxq8zdqfO2uk/Quw6r/xSbD0r
-xgky+cwZlmY8LIkONMS8VdGXFLjMAnFnxDCh6ItW+aQAgHO2QqJtDkG3gPN6Sm+4
-+37cOxdNZEDYKscOS71uYlnZs452yoesfJHD71mp9c9flQjlMJqUM7aFTSVafIRD
-WlZ3gFR+3H1ICYNY/35bh2KshX0YaMNC0nt3kLNUX+As7cwhOs3hdRA+pHVfIksG
-Uavu9TZc5lO5TxXFBAJ3d0PrgFisH2rT9OT3A0FJJwsKGOvRaJmJNQrg2OtG5Yd4
-bvPDAOzPG8maPZSZR6XXjBIGM4NITQIDAQABAoICABOjQALAHEufjpnizRohpqW3
-OxpLFUJC+Q8UUxNRTdyzllGod/RBt3QQ9PEghJkfGuQb5sot+Sno1NqUiPPPcqrZ
-3X2u3ndGGZW/ghSnPmHnsa9VXRPeb+a/iMHGvJ7iJlx480OEb3NqMoYdiMyGk19H
-kGGfknbuJKZJ1eB7T6kCFTKybLgbwgcBnOBFGSYvNeOP8CLGvmlwPDcolaS4xgB2
-RW8MFkVjsbytxjuwsXgRed833ARW6ipQ5z6qXTRudIM3hFtUhwShLCuLZp2ueGyz
-GVlEPF6BfrqMAL33gPptWbnuAUB0o05EMCO8Tz115fTwo5mapTJCTvLpeqyy65dy
-H0fMUGngg8SZqv9ECKcVFNRNjpxCFPB/7Zm3vdMZ47tMrLrrYlIHltZmLwboCFXX
-KphsOFUCyafBdD6at8IU9WDy+62TMpIg/RadczC223XZw2Np4FVQdFtDjN0csKcQ
-isVaT23Bvfwg3h1/4RsDg+uiL3V6ubBIl+QY4MBwlM5Skxb6bWwcx4NVPOk2VMr9
-FvFckFV/jmalA7RkxoI3P+MjbiBdCPU0RDE6ERfuuLnek1/NxASljSKF2U0PYh8B
-+4+Y4pi5P2klPTBpV1Gu0fK4Mq/05tOcTBblE1bapTnkXMZlu3bSG+qWf0+0+Mwk
-TNsPhoAb9PPY0tr2UpsnAoIBAQDKVlFtWV48T110joDROdfOe69/shRPACauYbXl
-3OTh9J4lWweiQhad8Or2zg4WhHwW+97aOJGTfjIq/+9XCQohxjMFpGElIrnTXh/V
-0Jsglmks9M7lbApyKdViWxRadoCAfRFKDVmD6Ei7ixpy9DNpPj2JfSdUfwKtO5Dt
-wNq7CQoJGs5Gep1lwug2viX5ml60ynL0sKmf6GVsO9TrJZ5m8aTYs2TpvHXJFyi/
-wqWK18pQS1nR8PawUkNYAPzAiI7OFfT4ofN92c+s2oYJBYPXj+DZY7SWy7xj+4YR
-O60tO7YZIZdvKjyrMy7zCTJfSa0U/zm26Qu3c3C+PvpWBcerAoIBAQC9UIYvshNY
-V4BdP8UbZkzNVHn2XLx+ityH9QY74uSforhE7avo1B7UMy7MCyhodXWoyyH0OYW/
-t/OuI9rlPH1YjAldAmgxkEnnikVUiE3adzjCDn6VGQdhr4DBt+dH/RG6BscE7yOw
-V5L8pJnhLZDC41IV9yam6chtNLoyrsyqXIn2LsEnrrc/z2fsxLyjNybzGAJwyT0A
-N4ft7kPDgeUImMrLfxvrL/fqe6WFAEqO9Xj7Wd5D5/0w0jiEMmRkfk+VDpl4V5q+
-gwZ388CENJ1KlvBnkCgKbMtJRdF9RXYvlnVU8qeN9d0LeX7QDjITFdUt8cIYEozZ
-p/U+Ua+jU1fnAoIBAQCZG+hSDqY4jPXzFUJ1EIg1P3L19hNYFI0wt8+lORoZwblK
-GzAToF7s9TlXuWT/tRERc1aXWucN7RiZYUIDYlvAYvKI+nJoX3auczMz4L8CUc8U
-rctB4Bene/B0lOc57SIgGIPUvXVXU5Z2FDTXd+LPaMG4IHR6hAHKhKCOyLi7f4OQ
-kDA3NOGV938wrYKe9ilkNS336xbwYjMdS8k6hyTuUTyknltmY63dlSDIusn53oDB
-ccNuEiEaG6XKGjUonC0z1XmiCyrtuLxl2JZEjV/O5pkG52PoGBNetR4mPDo3WE/b
-hIfLHvL5ual1TyhG4sGOefN6ba7oCvrte0qDfawxAoIBAQCISBFxAFZgwAzOE/wG
-r2wWW/u4WCXxSnFbBg5Iyhset/rC0/1vDFRtGbNUe6vJFtVuf1yf/VDFJN0svO71
-Gsh5F8YdyH/NPjuVjLpAEidJX43iVKDXID9qGPctfP/nmMxMCFj4ulYMud48NRn5
-Od3+DbqnyVVvztfTlaN8nM0Ezr0aFapCsMmGC/6aOT46mJdXZC9NlfBt2YvmwiDR
-+w4vVB6Yw5YLhmqHyB7tUbpak2dWOemBJN3laU/6CnSuyybq/KmKMjZZcuUTMMuj
-4GRir6m8Q9AvQQZOZw5Zicl8lGk+j7gCv70yZ3HcwHtXtd3SxzicL65peTlYdWFk
-x7h9AoIBAQCGqJDvEO06OwuxFPnCpmuDUnVIVzwmhAAOTKwBxFQRkMZz7Cz2/SnY
-fPihLbbVf76M5PZyIdh6d5Jfw0gN81rpv1mdhtTd84EED7G9K/j0CIVXktwZPgSj
-CQuUSRxNcvu5M3YS5YrbIUilDih9RxfE/0OZV8aiF/FrwTxOsCkx4AifS8LDndZD
-pstH2XTutU175C1LJYWC00JcoI4POU1inopQIdb2jh9lOu0IFUUa/O0P7vloCZQi
-w/LO2Bd5xw6q+vwNn8Rbrr/hYn/be8hwYMETY+uVGgDqU1i19x27OxtW27H1CYBe
-Sj2w1uTS3YfseWbm+S80UHpFtUFTkpw9
+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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-----
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 be2217d6af..8d5e6b54cf 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-----
-MIIFATCCAumgAwIBAgIJANfMx3XpOyE4MA0GCSqGSIb3DQEBDAUAMH4xCzAJBgNV
-BAYTAlVTMRMwEQYDVQQIEwpDYWxpZm9ybmlhMRYwFAYDVQQHEw1TYW4gRnJhbmNp
-c2NvMRgwFgYDVQQKEw9FeGFtcGxlIENvbXBhbnkxFDASBgNVBAsTC0V4YW1wbGUg
-T3JnMRIwEAYDVQQDEwlleGFtcGxlQ0EwHhcNMjQwNjA1MTExODMwWhcNMjQwOTAz
-MTExODMwWjCBgDELMAkGA1UEBhMCVVMxEzARBgNVBAgTCkNhbGlmb3JuaWExFjAU
-BgNVBAcTDVNhbiBGcmFuY2lzY28xGDAWBgNVBAoTD0V4YW1wbGUgQ29tcGFueTEU
-MBIGA1UECxMLRXhhbXBsZSBPcmcxFDASBgNVBAMTC2V4YW1wbGUuY29tMIIBIjAN
-BgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAsLHiDgKn7rpuQ454P8Ux59LAQ3P5
-NaRU+t0pKe/ORZQuz7dWXTOXqZs3aK98EkuC3D3Ji0lPpGx9BV3VMx9JDnuML8nu
-BYycNnl8AKCA4atxHb0aVisu4HnEyvWaRpU1ozIUBXgKj20pvq+4FHCuUfYkyGnh
-X5tvhWpt4qgHF3+wRFZjEdufZIzUTAz2iqij2JPuWT3emf+5wHfdxuJuxYDTfcPP
-OfKGJkMOqBlXKFDsLfTCgOKhi8Iqml1vBmXwQ0vF6DZG2mKManimmobhs/4qY6Xm
-pcLkYEwZYfTp6P88jW0ikpAColmvyzWVlttT9rFnkV/rnxtf5gtr+hPO8QIDAQAB
-o38wfTAdBgNVHQ4EFgQUNJHGEw/fdj2bRE4/+/x5PPaquNQwDgYDVR0PAQH/BAQD
-AgWgMBYGA1UdEQQPMA2CC2V4YW1wbGUuY29tMB8GA1UdIwQYMBaAFPMFMCB1HgC9
-Tj7LvQUHJBVmf4ReMBMGA1UdJQQMMAoGCCsGAQUFBwMBMA0GCSqGSIb3DQEBDAUA
-A4ICAQC3GwAjoGKJekdbHHh6IKCRd+ZHAtcq/lzHafWJzT0u/5J92zTde26tGaFR
-/dTi6iIp5xbQg6L/gbI6eh4oAQXN9yiqnUjvmqNJU3axgSchU9tpKcAk9PbDtmuD
-0YVtIcwmQK7GSCg6g0Net34ug3zblZ/JqhtB9mgROXNuJzOKpqgZ1ZTQ7CBo3/B4
-He6+VjAm75Iy2qcieeqJ7YcPZdVF0U6cZakB14fC6PaiwBIEb6EkFns/VdAE2PXF
-JIcQdA0/rFV8xzK2soO7FT09q+8t75ZdHgEerIufQooieW89SI3dhswvnLyCROOg
-VnEFQntbLEtAicRMZjwp4Lwx6B/ZEWRUXd0+LKrAfyGhnWsko4mIjFFg5yQ9xhIf
-HriLqy+CnBVVR1GMrVzC9PsL8spOg83ttr8kNW/4nHCCM/TIf4tlaisXqV6YetW7
-+e4s58Z31ijUFv2rvZem3V9dSTwH6P/Zm2oAecIVdp06y5e6u0O4AaZZaIPnJDYU
-f4mV5BMg3mcR32Q9BeDy6V+4xbU3gQShDUOGFmxMAqEabTuIflYD7y10knfAwNaW
-suMnrItYFi/I/QSLxq0hzgkcLPPOfHwESrUMlQEq3rS6IRgJ58fKom3kbZoRc+/p
-KnSiP1OuKpgSCuwG9VRn1VpSIk4C2rA328lDT/CA/pcBZlc/Sw==
+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
 -----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 4bf2f77d99..baca5f22fd 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
-ASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALCx4g4Cp+66bkOOeD/FMefS
-wENz+TWkVPrdKSnvzkWULs+3Vl0zl6mbN2ivfBJLgtw9yYtJT6RsfQVd1TMfSQ57
-jC/J7gWMnDZ5fACggOGrcR29GlYrLuB5xMr1mkaVNaMyFAV4Co9tKb6vuBRwrlH2
-JMhp4V+bb4VqbeKoBxd/sERWYxHbn2SM1EwM9oqoo9iT7lk93pn/ucB33cbibsWA
-033DzznyhiZDDqgZVyhQ7C30woDioYvCKppdbwZl8ENLxeg2RtpijGp4ppqG4bP+
-KmOl5qXC5GBMGWH06ej/PI1tIpKQAqJZr8s1lZbbU/axZ5Ff658bX+YLa/oTzvEC
-AwEAAaAwMC4GCSqGSIb3DQEJDjEhMB8wHQYDVR0OBBYEFDSRxhMP33Y9m0ROP/v8
-eTz2qrjUMA0GCSqGSIb3DQEBDAUAA4IBAQB/POKUqOePFxm+/rWhiHxcgWthBTEu
-/bU6wPbY5z8F48lbobBDGXt4xez8mB6Qti5gSddJju5vtj1u0uhghMhLiBI0kFcw
-Ne6tjKTbUSODNKYLN/yCpXD3zRaVuRQxPXJ8wvINuAfPRVZ9AezfG9pEsfidSKzI
-jwVWfBHhFzWTzZDFrnvNi/A3tc7s+WOndN2RCcTNObd0GjE/E/W0qmx3YPP9nwvH
-t0LaViHwuJ5SXWqSJp2UB/ckhUVCFtoAe9hdgvehUUpJJ3SnDIVa4TFI3Uy/UBM2
-vyZzEXXeMAon4hnJdk6ly6+v4VoHYg4m2teLETb613jepK+cJISQw8bN
+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
 -----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 c4e5480348..0d0c8005dc 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 8fa7c5901a..190406f5b5 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-----
-MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQCwseIOAqfuum5D
-jng/xTHn0sBDc/k1pFT63Skp785FlC7Pt1ZdM5epmzdor3wSS4LcPcmLSU+kbH0F
-XdUzH0kOe4wvye4FjJw2eXwAoIDhq3EdvRpWKy7gecTK9ZpGlTWjMhQFeAqPbSm+
-r7gUcK5R9iTIaeFfm2+Fam3iqAcXf7BEVmMR259kjNRMDPaKqKPYk+5ZPd6Z/7nA
-d93G4m7FgNN9w8858oYmQw6oGVcoUOwt9MKA4qGLwiqaXW8GZfBDS8XoNkbaYoxq
-eKaahuGz/ipjpealwuRgTBlh9Ono/zyNbSKSkAKiWa/LNZWW21P2sWeRX+ufG1/m
-C2v6E87xAgMBAAECggEAJrBsfQDb4Iv1xNkXP29gRBCDhMGKGdLHwL5YWxRlKBsQ
-PO85++JmHP8dnNB/7EmYd70XumXtCGWw4lHvcugwyPkIcxZWBeUJ92uWWVTLo540
-gHx9ncyK0SAYlRA+HaJiQj+e3quwNEOE1noHZoJdyRiKaU+1x4dzXdU2BmEgXGZ9
-YCdqGUgr40Hoi9zawMS5IAKknEOTgjBAWPM3Ka/s/od1ZqbZRSkF3cNg9G228xU9
-YZJap8XNHrm57tLusoWWN+mK+fNOWjug8kZwVUVTI9/w1LbHsusblfcKVuRZ/FFf
-BHG8pJgjJ9m0krNYfA/Q9KYidwGll1isvEOWhtGMWQKBgQDuz1orEos+bKzZFwrA
-L6c7U6HJC+7rpFEsnaT3NXf1nHOHl/BE5kSKaDaWJuAPuoThcijENgT4Ux7VgEyP
-cmkBr0u31vaEW/dEDT6r1lBJzeqpBqj3Xj0n0nSyiSS103oqfLlbdkzq5Ihdtcpe
-HqzEYAV85bRJcGJN4A2uObx86wKBgQC9aekXDYJzrKqSmVmUjlJnCxrPJ9d2cVC9
-kTlMc9F3uZ3xMtqSEbP+sJNKX+xCGTKcrwdAua2VuxpGpE7trmK/dFtXwSTH2p12
-bZQhcro+QCXCt175dBJXGSiRKfjBXNq/r0ivMwL7MrlNAou8NSKEzhkTboywVFwo
-4I7DmHM8kwKBgQC8IIT74YPoDVytOEWz2NZ5Gg0dgFUbNTrtVtMaG/kAd9tbOgqB
-fJUKI8a8yqtAOMNthq0uxQ9tQK3Nq2CksJCgTyPrE2DoLDrCVVzFqfNd8OWneiOp
-m4e500UzUG6m/o4C4nZy4uL9OENk700YkDmyCaLJHXvFTs9iYdrlIX6nOQKBgQCA
-T/ri7vfsPI/gd5nDlRYlT9R9eNPxHJpBkNtr+xlvLYLdHkIKqYtxgVSGEa0Oqdsr
-YTZclmwM/o6yRCRjxrqGT+CA9gpgiKwayeiLMBkSiooJ+gaQnhy+fACLNg+Zjbly
-GN/4L2pZmOcGUC8w9B3KMYOzMjSETuGPn2+W+PM3mQKBgGWsjgoPiwAuXoh4eePB
-EAqqD40jU+Pv9bOUZfY8KpehsNowfAtAGaLaupU5dY9f+j2hUD/zBRTNcjErO6kZ
-tP6JU703HXl92awcQeIv9K3c59Ch3D+n2y7VftWYyaU82Y4GKu6tPFDt25zmJ+oj
-vGyhAKf7RV2Mndd1iZIULkU3
+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=
 -----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 5ddf07a8d5..a30c7b0a42 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-----
-MIIFwjCCA6qgAwIBAgIICmgwpsOe5E0wDQYJKoZIhvcNAQEMBQAwfjELMAkGA1UE
+MIIFwjCCA6qgAwIBAgIIJT4Yu9UzhpIwDQYJKoZIhvcNAQEMBQAwfjELMAkGA1UE
 BhMCVVMxEzARBgNVBAgTCkNhbGlmb3JuaWExFjAUBgNVBAcTDVNhbiBGcmFuY2lz
 Y28xGDAWBgNVBAoTD0V4YW1wbGUgQ29tcGFueTEUMBIGA1UECxMLRXhhbXBsZSBP
-cmcxEjAQBgNVBAMTCWV4YW1wbGVDQTAgFw0yNDA2MDUxMTE3MDhaGA80NzYyMDEy
-MzExMTcwOFowfjELMAkGA1UEBhMCVVMxEzARBgNVBAgTCkNhbGlmb3JuaWExFjAU
+cmcxEjAQBgNVBAMTCWV4YW1wbGVDQTAgFw0yNDA5MDUxMDI4NThaGA80NzYyMDQy
+NTEwMjg1OFowfjELMAkGA1UEBhMCVVMxEzARBgNVBAgTCkNhbGlmb3JuaWExFjAU
 BgNVBAcTDVNhbiBGcmFuY2lzY28xGDAWBgNVBAoTD0V4YW1wbGUgQ29tcGFueTEU
 MBIGA1UECxMLRXhhbXBsZSBPcmcxEjAQBgNVBAMTCWV4YW1wbGVDQTCCAiIwDQYJ
-KoZIhvcNAQEBBQADggIPADCCAgoCggIBALdg7+8PPfWTK4P4kCnTBL6KnFVYWGxG
-tZJBYdbXHOnGg/9jHnW3lxFWoOWcfFn9FxENf4MGqnbm8eF7/W+z4VvtPxrT5nan
-UZHLcz9aQtrvFHNsapsRxpBTH6jFUqPeasqT+zPPoGyf6eTi3w+n2HIlSOb+jK/t
-BA4z93qKrLkS2Fo5HAYRvmN0H6HnG0BSYJMzFMFB154KUrYdBTNQlYhq3ZOvD5RN
-lk0MNyXLyfayZK94tjD02SwM8zaprkbbhinPgM3BH3yASW5hjn5Fh5M92tldUkD9
-E4WhsG3ywFxHBKRDeYSHWkqo4WdGdtgOuk7gAnvRDc3Zzdm3ZiRHHahbCsMq2BGl
-IbxjkcmX/Q2C8vvUauyPbKWTz1bVy3Gxwiau5k7Dz0DMnxOYcgBX83R+4nw80anE
-qQYfiTm85TQ9WJOVD6JPPIgZnggpL27q/oriZVd4N0kY3Dint+eWAc8L72hqlKTG
-NCcm2Yn1WzgX5UD8AYqvLkYHndzpTxWeAkSdUDg8MOXidOxd3SYws91/P6VJCP1h
-bKY3yEHop6CVbIgEkIzmWrPJJPICtF8anpBt66WQKxJdGcgofq1jDE7OfdY/rC0d
-GmkOc88dLIw/Mf7nDVDyg3uYY/i5yCAdFmsKxdphdi14Opv0Q66KPDaSy7dNYdBz
-MgcI8bKBJAOHAgMBAAGjQjBAMB0GA1UdDgQWBBTzBTAgdR4AvU4+y70FByQVZn+E
-XjAOBgNVHQ8BAf8EBAMCAgQwDwYDVR0TAQH/BAUwAwEB/zANBgkqhkiG9w0BAQwF
-AAOCAgEArgGQ/ZSwrSj8KW5T8EL7y7eiFQ8VfqQ0MlRTi74ZCJt5rzKZWgL6jCWB
-qFaxF7VgV+MzqUnHwdEav+fecgZvLaT8lxtGmLt6amGqlAZ5J8kS7xv/AbcR7Q+b
-kt8qpxI7rEepeWHMAzkoFhnnOg28UHCaD11LCYwTs7HPw4kOQUoyALzfgr0Djab8
-KZhh41fIfZXN74QLhX4lERdWPJsfnUd4SlHdLVMTX/Z522XDDSpjPorNk3Bk3cm8
-9lGfe9UO0bFORTOmB/PNub8CUZ+2dWotK0sLU2pDYnLrwdnAXYzYIj5lvNQAVGnD
-B6Q7u1WzWvCdwINDfr5v7ih7HkVZbSk/Dm09GgLCg/FYqejHBslpI1i14CTNjhFw
-f62p0HHz8UCSJFzdVLn+JFvSd9lSh6vDPKirbGq6SZcnpn6OdY3MW48mYeNPyO/E
-CMM08GEjs2Nls8d4UJhXSn1j+Re7sHD/30Y1+oPkxliW4EtoMTK+op6Z3t2eargE
-1+QsqlnM11H3ZDYmn6qqenp9ejlmHoHUmGudWS/YXRtR5DkEBxuVXYeaxVzQd8sF
-AN3Nk+S8bmYTs7/chxsXvF9NbcddVah+3fM9BqfPZGnMjFszjSivfF/H+1sJ6ihu
-nFjOdBV2u7KJzv6/eRj5hyxTUJlNqG6bP7sHbnOTRcZXXJC4lNo=
+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=
 -----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 ecc6c655b6..eebc70ad09 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 88723556d1..b6819ec019 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 37b9a777e9..44010356e8 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
-SIb3DQEBAQUAA4ICDwAwggIKAoICAQDfv6edh2fq05an3cmhLgxzYWKCtLg5hZOf
-fDYrgCrSBnJCIyQt816ugyUgTp6FEbw+TeOZ3bUpm5VuiOvi29baRyvZYko/+jkM
-WKoMWWu19LA/6y5o0WTWBBglEx8mwI/OlPwKPb866ooTsuZ4c8QBYRo5Xqd8coC4
-KhMTz7iTASXWZBdCEsgIiOL3068h8OADlUlIHIRIOSJ2+FnP/AtvKJP3G7scaJ1N
-6YLZekbDeb3UyZdOciJ1W3amYY65WLPGTyrk4X+UupdVI9HsOJKJfO4Sf3rGm/R9
-RMtrvtoktRcIqk7WIW8TC4154+F2K7vStnkiEv9SHCs80gZJxmYUAQgBzOTbi2ga
-llNNHcj+KyPSDwR7hleguRarrSKgoq/EYCyl+pKFqAwCVs3NuQtTnUOL9PomVYq2
-A9Er81rekZBD0jGGy5jpIODUqG5ScjkeGaluhvZnvHDKvsr1ff04WHT4GN4DQOun
-tCY9LwBGdgeOfMb8ZTbVmPauN6S+qBkZYiwbxXgFPTzLtUfkdoOU91aeBrAIrKn4
-QIYmWXsCzf+F/wTfrpwcQeLBIMd8m6mYUk0qLagfvK1EM9lRk9riyS5wkK9WvBXx
-jVodvcOZL+Ab7yR5TxDByvbh/V5Z0QkOx4SN0bZd2VsPMxFsW5k1r1d7uLUviytK
-K0ykettMDwIDAQABoC0wKwYJKoZIhvcNAQkOMR4wHDAaBgNVHREEEzARgglsb2Nh
-bGhvc3SHBH8AAAEwDQYJKoZIhvcNAQELBQADggIBALAo29FUAfgOxzKazueHGmHW
-ScUKULtHKeXPGCIsQRQySW3jN3/idD/NI9LM6w1V/jrSf77Fjld97CFRZKS9ezAJ
-UL7lmwLJzqXM+5LtyJgWxF909YFpCjCIpsVsJrGIi81j2sitW3C8YyARGq5MZpSs
-YNI1ouu3BSVlRctAF3Vp4sLxsJNoSwHtdB4oiAQA3JLjutgd3ZwRiwwGHSrFrCGr
-SF93gOD5+wXM6bwh8I4kscfQCQAUmTu+SrnLQNwwAgxSEu7JPEzQ2iqTMoKDC8N5
-POuxKLrC3h3a6LdAzUTdzkU+ry3pWI/vqy57wUDLYwqMsP/Wdr4R/z/c1YBAHqWQ
-oVhVxTnHwLO25t4vvCdh+A0aqNOnyqoM3mW1NvVLsjBd6chqN0RpOj5gEOXwq+SH
-sCIYXZnMcWwBwgliWA0l8hwdX5et+KdA6mSQs19+llxsrCfuLHx6Lb/84u0JMxGA
-FjRmNhqNvkaM7ReGyB0qcPIBN57zHjBkI/5+0mClCH1Ts/SxUmR8tbYyi9g760Bf
-tKmHVlkJL3ky4exmsvVyLsntorTLE7zYW6P7mkyq6VKeSXj8b862+/isGSIiiNFE
-TUnSRqu8LbKH8JdTgdtYsF2xy+MBGeniloQqyPmA2exCMHSBXGunQ+PGmftTAHgg
-B8OE9XaYHejTO7gf96bt
+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
 -----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 8a06be2ea4..334220c085 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,52 @@
 -----BEGIN PRIVATE KEY-----
-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
-ywsZuR6jvkeXJHa6gJtXHPwlzFvS
+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
+pgFQ1R6yv5svLnbf22tIyOJ/ic2XziWv
 -----END PRIVATE KEY-----
diff --git a/akka-http-tests/src/test/resources/certs/untrustedca.key b/akka-http-tests/src/test/resources/certs/untrustedca.key
index 8ac0f70fba..187d33fa21 100644
--- a/akka-http-tests/src/test/resources/certs/untrustedca.key
+++ b/akka-http-tests/src/test/resources/certs/untrustedca.key
@@ -1,52 +1,52 @@
 -----BEGIN PRIVATE KEY-----
-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
-FXrOHuuBFLCN3SPfRKTlKcBA7UMFeYo=
+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
+S2HMu69lHeoAwfIKwOtRMl8Mvu243CE=
 -----END 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 8283b94f82..becb0a5caa 100644
--- a/akka-http-tests/src/test/resources/certs/untrustedca.pem
+++ b/akka-http-tests/src/test/resources/certs/untrustedca.pem
@@ -1,34 +1,33 @@
 -----BEGIN CERTIFICATE-----
-MIIF8TCCA9mgAwIBAgIUZaqo7vOJIJCAdN8IxDbeb7+DMWYwDQYJKoZIhvcNAQEL
-BQAwgYYxCzAJBgNVBAYTAlhYMRIwEAYDVQQIDAlTdGF0ZU5hbWUxETAPBgNVBAcM
-CENpdHlOYW1lMRQwEgYDVQQKDAtDb21wYW55TmFtZTEbMBkGA1UECwwSQ29tcGFu
-eVNlY3Rpb25OYW1lMR0wGwYDVQQDDBRDb21tb25OYW1lT3JIb3N0bmFtZTAgFw0y
-NDA2MDUxMTIxMzNaGA80NzYyMDEyMzExMjEzM1owgYYxCzAJBgNVBAYTAlhYMRIw
-EAYDVQQIDAlTdGF0ZU5hbWUxETAPBgNVBAcMCENpdHlOYW1lMRQwEgYDVQQKDAtD
-b21wYW55TmFtZTEbMBkGA1UECwwSQ29tcGFueVNlY3Rpb25OYW1lMR0wGwYDVQQD
-DBRDb21tb25OYW1lT3JIb3N0bmFtZTCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCC
-AgoCggIBAI3sHknIBlEeUttLkoxvagcpg0WfzxkSB9EagVn5d9tQ2b5ClGgFHP4x
-7U/CVj5Bu8pjG0SZeMRLFYxo9GQAp6WElBRKud+HvPKHI4QsJsDacWTwbous1oyY
-1ZGHYca8laxtNOKVYf1nvhth0vWWO849i8Ge4Ysur5AeqJyH+wKf7mVhVi716fUF
-2BCyZIp/Q3K7yXk2ggCHuBvD4RhYmfOVg/tEUIW7KEBlgefHfhn68WcJKsB8lIAa
-igXObihF1HzDLZBq3bdf+7Cs60LeL96z2k5slMxj1XSMwxLmn+ukL4x8kXuZoFtj
-fI3QxsgE76rzow0BeV6+R2ZscDYRY1owKp73uegjoZV4G9D0S+Hp87JKRo5jWfUB
-ZDpeJeaeCY7IE1Rw74pl5JfqcxjhS7vZTdo2v5jeO7Y229eVTzp0zU8Cv8PE3wuG
-EsrubDqLJNgK0WAvEu/RPOaxWZX7aXg8qFLaQOrf7c5D7Ej4bxsnTBdjUR9r7SDc
-Stw7b9f43Oc6DWEgUWpaAH37sUw2kn5CPIL3MVMxRo/yymtc3Sm2LyNQfWoYGPAR
-RjUEr4VyrfxyH020qXA+JsEl7yoQYiUvv3rZOyukiWgIka5jYByQwXZlpIz+Sk/Y
-6OltLZDM06Pt22nIsHiuyZZG8wmC7GpBlB/NniYSIFFqwExGsWxLAgMBAAGjUzBR
-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
+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
 -----END CERTIFICATE-----