diff --git a/test/config/integration/certs/cacert.pem b/test/config/integration/certs/cacert.pem
index 4d47a1fbe347..c54bd51a3074 100644
--- a/test/config/integration/certs/cacert.pem
+++ b/test/config/integration/certs/cacert.pem
@@ -1,23 +1,23 @@
 -----BEGIN CERTIFICATE-----
-MIID3TCCAsWgAwIBAgIUeFOqqUZRxWDbAUtcIsyQv8rofbcwDQYJKoZIhvcNAQEL
+MIID3TCCAsWgAwIBAgIUdCu/mLip3X/We37vh3BA9u/nxakwDQYJKoZIhvcNAQEL
 BQAwdjELMAkGA1UEBhMCVVMxEzARBgNVBAgMCkNhbGlmb3JuaWExFjAUBgNVBAcM
 DVNhbiBGcmFuY2lzY28xDTALBgNVBAoMBEx5ZnQxGTAXBgNVBAsMEEx5ZnQgRW5n
-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
+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
-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
+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
 -----END CERTIFICATE-----
diff --git a/test/config/integration/certs/cakey.pem b/test/config/integration/certs/cakey.pem
index ab9e0555f184..c545e1d17866 100644
--- a/test/config/integration/certs/cakey.pem
+++ b/test/config/integration/certs/cakey.pem
@@ -1,27 +1,27 @@
 -----BEGIN RSA PRIVATE KEY-----
-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
+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
 -----END RSA PRIVATE KEY-----
diff --git a/test/config/integration/certs/client_ecdsacert.pem b/test/config/integration/certs/client_ecdsacert.pem
index d03e5eb241ad..f982784dea6a 100644
--- a/test/config/integration/certs/client_ecdsacert.pem
+++ b/test/config/integration/certs/client_ecdsacert.pem
@@ -1,22 +1,22 @@
 -----BEGIN CERTIFICATE-----
-MIIDpDCCAoygAwIBAgIUfBrOFWF33odNfI5WbyTrX7vSuPowDQYJKoZIhvcNAQEL
+MIIDpDCCAoygAwIBAgIUJuVBh0FKfFgIcO++ljWm7D47eYgwDQYJKoZIhvcNAQEL
 BQAwdjELMAkGA1UEBhMCVVMxEzARBgNVBAgMCkNhbGlmb3JuaWExFjAUBgNVBAcM
 DVNhbiBGcmFuY2lzY28xDTALBgNVBAoMBEx5ZnQxGTAXBgNVBAsMEEx5ZnQgRW5n
-aW5lZXJpbmcxEDAOBgNVBAMMB1Rlc3QgQ0EwHhcNMjAxMjIyMTUyMDM3WhcNMjIx
-MjIyMTUyMDM3WjCBqDELMAkGA1UEBhMCVVMxEzARBgNVBAgMCkNhbGlmb3JuaWEx
+aW5lZXJpbmcxEDAOBgNVBAMMB1Rlc3QgQ0EwHhcNMjAwODA1MTkxNjAyWhcNMjIw
+ODA1MTkxNjAyWjCBqDELMAkGA1UEBhMCVVMxEzARBgNVBAgMCkNhbGlmb3JuaWEx
 FjAUBgNVBAcMDVNhbiBGcmFuY2lzY28xDTALBgNVBAoMBEx5ZnQxGTAXBgNVBAsM
 EEx5ZnQgRW5naW5lZXJpbmcxGzAZBgNVBAMMElRlc3QgRnJvbnRlbmQgVGVhbTEl
 MCMGCSqGSIb3DQEJARYWZnJvbnRlbmQtdGVhbUBseWZ0LmNvbTBZMBMGByqGSM49
-AgEGCCqGSM49AwEHA0IABM9z7PJfcE7s9slqaCB+tFaGAMuqHf8il4VHrkVeImxp
-974SP+jVZAHu58LIaHR+zcz9gh+UyfR5axS+dqLVQkqjgcEwgb4wDAYDVR0TAQH/
+AgEGCCqGSM49AwEHA0IABFWdfntWW5wivQyk9j45hLFf7QjInjo4H8up56yUkCcm
+n7ewQ9BEPoJ74r5ro/6nPBiRiTx1aolAjDPhgOfUZiWjgcEwgb4wDAYDVR0TAQH/
 BAIwADALBgNVHQ8EBAMCBeAwHQYDVR0lBBYwFAYIKwYBBQUHAwIGCCsGAQUFBwMB
 MEIGA1UdEQQ7MDmGH3NwaWZmZTovL2x5ZnQuY29tL2Zyb250ZW5kLXRlYW2CCGx5
-ZnQuY29tggx3d3cubHlmdC5jb20wHQYDVR0OBBYEFINm62ek1kdiMIiXnnsHynJt
-FMSFMB8GA1UdIwQYMBaAFKIyeFMdy+SaTELVuKNDrkB2UTkKMA0GCSqGSIb3DQEB
-CwUAA4IBAQBnH3NBz13tgU+T785LTs7hj998PmA422Ape9FNYnfikXsoDF+ieFvY
-HFdwrGiDzANnq8em8WXTv5VEzyC9Qav9M9+A6DjOaLve9W57zw3XiIlUkK9SDbkT
-MmvsC0/PELF6hXenfwlOw21Fly1rTv0zr1+YoS7qxpnNwYs83oWQlAhefU6/+/Mi
-QBWuclaCzb7resUhQnYw8b2kNmd1e1lVD06l9DZFQR4imLwKH8m4o964X/m5ws8S
-TyfJJEG0dWP5gHDrPZKHC6q4XvouRNTSc2oZBpHo7MC++kTrK7VFDJ9wpbAOLcU8
-P5vCCBytk4RHwAxj+F4jtrFoFRIl02Tp
+ZnQuY29tggx3d3cubHlmdC5jb20wHQYDVR0OBBYEFAB5r3dICa3pCN0DVINNnm3K
+DhmKMB8GA1UdIwQYMBaAFJZL2ixTtL6VxpNz4qekny4NchiHMA0GCSqGSIb3DQEB
+CwUAA4IBAQBel+R+1BpxpPhUGwkSbZBTY4zqU8w8Zx9eCCbpeAi96Qylg++nl88H
+ZInHLsC77wfzSf8vKWpsA9KDMB4R4njN1WLsQOKYWJmOE3K+AUuPmqP6mYyAju5k
+gGSg6BIhb5+HtkmvvF56qyuc4GWH8Ab/BhPMRli7h4cBMuSBoZeFoxNbIJfJDJ/P
+ZEkHqe1NsI9VG6pmGZ1adBMf04yE+muv+s43Wl/Ry/7W3Ae28XkxmS/c0wCq5h2u
+DMn6nnjDIzJ7tUqfWfacr8QZCQDYQKdBrE+OPw6bgK2p++jXfQDD277FcnMG6je/
+ZbqoW4tPXfdl/INMbS1j2h59RTrXGZaR
 -----END CERTIFICATE-----
diff --git a/test/config/integration/certs/client_ecdsacert_hash.h b/test/config/integration/certs/client_ecdsacert_hash.h
index 3e0e7d6f6de9..f765514c363d 100644
--- a/test/config/integration/certs/client_ecdsacert_hash.h
+++ b/test/config/integration/certs/client_ecdsacert_hash.h
@@ -1,3 +1,3 @@
 // NOLINT(namespace-envoy)
-constexpr char TEST_CLIENT_ECDSA_CERT_HASH[] = "D8:42:6A:27:11:FB:28:AC:5F:79:1B:69:BB:F6:AC:CC:3F:"
-                                               "76:FD:00:E1:00:34:A4:39:95:0D:4A:80:B2:3F:E0";
+constexpr char TEST_CLIENT_ECDSA_CERT_HASH[] = "9F:F2:B4:5A:72:E4:79:82:F4:5C:B1:49:8A:EF:12:53:9C:"
+                                               "A7:AB:0A:61:DF:79:2F:D8:8D:4E:29:89:28:03:07";
diff --git a/test/config/integration/certs/client_ecdsakey.pem b/test/config/integration/certs/client_ecdsakey.pem
index 27621c1809bf..c41cf1b757cc 100644
--- a/test/config/integration/certs/client_ecdsakey.pem
+++ b/test/config/integration/certs/client_ecdsakey.pem
@@ -2,7 +2,7 @@
 BggqhkjOPQMBBw==
 -----END EC PARAMETERS-----
 -----BEGIN EC PRIVATE KEY-----
-MHcCAQEEINAVdkh1u1m0Dr6u61kLT+SmnAf5vZBzNxrm9jJYo3qSoAoGCCqGSM49
-AwEHoUQDQgAEz3Ps8l9wTuz2yWpoIH60VoYAy6od/yKXhUeuRV4ibGn3vhI/6NVk
-Ae7nwshodH7NzP2CH5TJ9HlrFL52otVCSg==
+MHcCAQEEIJjBCnRPxmRg21Jdlt8MAQGqtD6ilFK2bsxx5twZklmzoAoGCCqGSM49
+AwEHoUQDQgAEVZ1+e1ZbnCK9DKT2PjmEsV/tCMieOjgfy6nnrJSQJyaft7BD0EQ+
+gnvivmuj/qc8GJGJPHVqiUCMM+GA59RmJQ==
 -----END EC PRIVATE KEY-----
diff --git a/test/config/integration/certs/clientcert.pem b/test/config/integration/certs/clientcert.pem
index ccb71fb3fe87..e56b5aa5fa1b 100644
--- a/test/config/integration/certs/clientcert.pem
+++ b/test/config/integration/certs/clientcert.pem
@@ -1,26 +1,26 @@
 -----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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
-bmQtdGVhbYIIbHlmdC5jb22CDHd3dy5seWZ0LmNvbTAdBgNVHQ4EFgQUBimP+1Nj
-C+b+9CESalbQlO9IZR4wHwYDVR0jBBgwFoAUojJ4Ux3L5JpMQtW4o0OuQHZROQow
-DQYJKoZIhvcNAQELBQADggEBAA/ZGgzXUG0/L+vkNYdiOn61YOYJ8FHJJxpnPSUk
-s/qaEbJ9TMBHzHdNuyRv6xMKQNFE+zmMqpZOqe8xCphsxyW4QuB5Ex9NpIt4QdFo
-38I4odHc5VsVuUNox6fNFBJT4/TmTnLmALFrtawvIVbekPm3EgMRJXrxqlag9K9t
-PQahCoEo4whz/r70TCngeZoY/C4ZgJ7d1GRgPgH7O0JsEZjFHtpy4QH2Zg5DuBFi
-TSi8R1ObrfEyTP3nOfCKxjlT6Zi+0yobZx2D+Th7RwYoCckDlaIRZrI8HQSEoEK/
-a+FCII5BKI87Gz/1Iw+f2F/JzuxiUDTnd2SO39Dqlo7OEaw=
+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
 -----END CERTIFICATE-----
diff --git a/test/config/integration/certs/clientcert_hash.h b/test/config/integration/certs/clientcert_hash.h
index 4bf2f44df9cd..c40b3818f6cc 100644
--- a/test/config/integration/certs/clientcert_hash.h
+++ b/test/config/integration/certs/clientcert_hash.h
@@ -1,3 +1,3 @@
 // NOLINT(namespace-envoy)
-constexpr char TEST_CLIENT_CERT_HASH[] = "AE:B9:99:36:7B:65:97:EE:73:BF:03:EB:E2:8C:A6:39:3C:ED:3C:"
-                                         "41:01:97:BC:FA:BF:F7:BB:78:5A:C1:89:90";
+constexpr char TEST_CLIENT_CERT_HASH[] = "0E:80:B9:1F:11:3F:FB:43:9B:CB:5A:70:2D:04:C5:00:D6:81:68:"
+                                         "8C:CA:F8:91:92:21:CA:0F:91:61:A5:FB:01";
diff --git a/test/config/integration/certs/clientkey.pem b/test/config/integration/certs/clientkey.pem
index cdaa7555e100..aee2284618ee 100644
--- a/test/config/integration/certs/clientkey.pem
+++ b/test/config/integration/certs/clientkey.pem
@@ -1,27 +1,27 @@
 -----BEGIN RSA PRIVATE KEY-----
-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
+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
 -----END RSA PRIVATE KEY-----
diff --git a/test/config/integration/certs/server_ecdsacert.pem b/test/config/integration/certs/server_ecdsacert.pem
index cc87f0d1b51f..6a0c863d41d9 100644
--- a/test/config/integration/certs/server_ecdsacert.pem
+++ b/test/config/integration/certs/server_ecdsacert.pem
@@ -1,22 +1,22 @@
 -----BEGIN CERTIFICATE-----
-MIIDoTCCAomgAwIBAgIUfBrOFWF33odNfI5WbyTrX7vSuPgwDQYJKoZIhvcNAQEL
+MIIDoTCCAomgAwIBAgIUJuVBh0FKfFgIcO++ljWm7D47eYYwDQYJKoZIhvcNAQEL
 BQAwdjELMAkGA1UEBhMCVVMxEzARBgNVBAgMCkNhbGlmb3JuaWExFjAUBgNVBAcM
 DVNhbiBGcmFuY2lzY28xDTALBgNVBAoMBEx5ZnQxGTAXBgNVBAsMEEx5ZnQgRW5n
-aW5lZXJpbmcxEDAOBgNVBAMMB1Rlc3QgQ0EwHhcNMjAxMjIyMTUyMDM3WhcNMjIx
-MjIyMTUyMDM3WjCBpjELMAkGA1UEBhMCVVMxEzARBgNVBAgMCkNhbGlmb3JuaWEx
+aW5lZXJpbmcxEDAOBgNVBAMMB1Rlc3QgQ0EwHhcNMjAwODA1MTkxNjAxWhcNMjIw
+ODA1MTkxNjAxWjCBpjELMAkGA1UEBhMCVVMxEzARBgNVBAgMCkNhbGlmb3JuaWEx
 FjAUBgNVBAcMDVNhbiBGcmFuY2lzY28xDTALBgNVBAoMBEx5ZnQxGTAXBgNVBAsM
 EEx5ZnQgRW5naW5lZXJpbmcxGjAYBgNVBAMMEVRlc3QgQmFja2VuZCBUZWFtMSQw
 IgYJKoZIhvcNAQkBFhViYWNrZW5kLXRlYW1AbHlmdC5jb20wWTATBgcqhkjOPQIB
-BggqhkjOPQMBBwNCAASqdOA3gdebIvo+2WydfKoP4yyw/42MWrJAHfw8A+mqsncn
-A0DApwd0+IxWKOowYDCWaZ4p+R39WlhmkFV/fr+Zo4HAMIG9MAwGA1UdEwEB/wQC
+BggqhkjOPQMBBwNCAARbRc4+r8sbKLs89/fS0Y8CSTVNKn8opkCFx/UyLPvELLn6
+lQ86GjcQIqJRqoEqEwP7iyCaDhFigsOKsNQSzE9/o4HAMIG9MAwGA1UdEwEB/wQC
 MAAwCwYDVR0PBAQDAgXgMB0GA1UdJQQWMBQGCCsGAQUFBwMCBggrBgEFBQcDATBB
 BgNVHREEOjA4hh5zcGlmZmU6Ly9seWZ0LmNvbS9iYWNrZW5kLXRlYW2CCGx5ZnQu
-Y29tggx3d3cubHlmdC5jb20wHQYDVR0OBBYEFNg2LTtaqMn/mar3VC8EkL2g3uC9
-MB8GA1UdIwQYMBaAFKIyeFMdy+SaTELVuKNDrkB2UTkKMA0GCSqGSIb3DQEBCwUA
-A4IBAQAs5lGuvOhOwOE3EMN8230Fgt03HzQCPertFFvaRC7cYiyKp2SZ6HcFnaW6
-ZVE7WggazuIs41jOqx6gTJMvDuSo3dT4fBXt+FGHT7922qEr966YhaecomSIOTBM
-CYQLJMJrlRA8aXL4xBGYvdH6FrK9z3xbKE5YO4/nFGiAItFm5NSJGq/DW/0kc24M
-z98/MkdIdamfYFzyymSjuLcWiDtz9uDBoZ9igl+VDw5kIQ0gizpqv78OsxoIYDzq
-g0csWkLK2bshZ3qrm1AEKnL8z+HT5skD/PgZ1YA89Z88p2MSrOz5v6R7SSHSgVC5
-4TpPUHdYm6s8NNKFr9hyMHfxiSjz
+Y29tggx3d3cubHlmdC5jb20wHQYDVR0OBBYEFM6Jqpu+mo5ATAcIizKPrFH1qDLK
+MB8GA1UdIwQYMBaAFJZL2ixTtL6VxpNz4qekny4NchiHMA0GCSqGSIb3DQEBCwUA
+A4IBAQAYGH/EjPHxtE5fQ7kDsRGcafMLqcx6OYhZlqDfMqepbFEWlkL/kuNVrjez
+NoG67cc3DSagyVocjr7yCz/kkDm4HowRapGK6eSK3dWhjrQzp2F6ImAAfht7YkhF
+JKkuRYULKpsRRj+YVpBpYkUjRVaqLNJJpXOItpvZMsyXDZn/ihy1QerDXaetWXgP
+yFRL+g9f+e8OydXgd/lrKByLBCszNPeg4nhGsgZZ1WHj5sl2EY27eAIWRXqFIQbr
+VwbLfpFm2R2nrJT8zJF54OUpG/3hKOEkgZ3gSK9+tnQeSM01lXHd1ZzrmzCdItDQ
+MNl4mwlDTJLwL/vwMld9UFz0qAYi
 -----END CERTIFICATE-----
diff --git a/test/config/integration/certs/server_ecdsacert_hash.h b/test/config/integration/certs/server_ecdsacert_hash.h
index c10655050ab7..2b828070d615 100644
--- a/test/config/integration/certs/server_ecdsacert_hash.h
+++ b/test/config/integration/certs/server_ecdsacert_hash.h
@@ -1,3 +1,3 @@
 // NOLINT(namespace-envoy)
-constexpr char TEST_SERVER_ECDSA_CERT_HASH[] = "22:64:1C:9B:75:11:1B:C8:4A:71:6C:90:FB:2F:C6:32:9B:"
-                                               "6D:92:88:DB:4D:3E:FB:4D:3E:B4:12:12:BE:CD:9D";
+constexpr char TEST_SERVER_ECDSA_CERT_HASH[] = "B1:A4:B5:39:F8:91:77:00:3E:3E:23:1D:F2:AD:78:34:85:"
+                                               "D3:F0:D4:EF:D2:88:EA:B5:92:F7:71:E1:B8:0D:F5";
diff --git a/test/config/integration/certs/server_ecdsakey.pem b/test/config/integration/certs/server_ecdsakey.pem
index ccc0c5ed3302..df1f17d826d1 100644
--- a/test/config/integration/certs/server_ecdsakey.pem
+++ b/test/config/integration/certs/server_ecdsakey.pem
@@ -2,7 +2,7 @@
 BggqhkjOPQMBBw==
 -----END EC PARAMETERS-----
 -----BEGIN EC PRIVATE KEY-----
-MHcCAQEEIEhopCBdA89ZQTL9JyctomzHj8cRgSdfPe3XqKm34CUboAoGCCqGSM49
-AwEHoUQDQgAEqnTgN4HXmyL6PtlsnXyqD+MssP+NjFqyQB38PAPpqrJ3JwNAwKcH
-dPiMVijqMGAwlmmeKfkd/VpYZpBVf36/mQ==
+MHcCAQEEIGY3X0at4PZN6X+MHnEC/vwjaKTq/ffwp0KfMcAKCwgToAoGCCqGSM49
+AwEHoUQDQgAEW0XOPq/LGyi7PPf30tGPAkk1TSp/KKZAhcf1Miz7xCy5+pUPOho3
+ECKiUaqBKhMD+4sgmg4RYoLDirDUEsxPfw==
 -----END EC PRIVATE KEY-----
diff --git a/test/config/integration/certs/servercert.pem b/test/config/integration/certs/servercert.pem
index 1b0d1c62d7bb..c654495573e4 100644
--- a/test/config/integration/certs/servercert.pem
+++ b/test/config/integration/certs/servercert.pem
@@ -1,26 +1,26 @@
 -----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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
-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
+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
 -----END CERTIFICATE-----
diff --git a/test/config/integration/certs/servercert_hash.h b/test/config/integration/certs/servercert_hash.h
index 1e934b1f0281..b75188ddab54 100644
--- a/test/config/integration/certs/servercert_hash.h
+++ b/test/config/integration/certs/servercert_hash.h
@@ -1,3 +1,3 @@
 // NOLINT(namespace-envoy)
-constexpr char TEST_SERVER_CERT_HASH[] = "3A:C6:20:F1:3E:86:0A:C9:48:3A:12:A6:A3:2F:05:4B:06:7B:5D:"
-                                         "16:F6:FE:1E:F1:CA:73:BF:0D:2E:BA:7E:7C";
+constexpr char TEST_SERVER_CERT_HASH[] = "E6:D4:55:6E:BC:91:E2:2F:1E:42:48:05:3C:3E:B7:97:ED:3E:51:"
+                                         "E3:A9:C4:87:1B:FF:61:76:25:6B:F3:95:7C";
diff --git a/test/config/integration/certs/serverkey.pem b/test/config/integration/certs/serverkey.pem
index 04e666eb4087..27ea60a966ea 100644
--- a/test/config/integration/certs/serverkey.pem
+++ b/test/config/integration/certs/serverkey.pem
@@ -1,27 +1,27 @@
 -----BEGIN RSA PRIVATE KEY-----
-MIIEpQIBAAKCAQEA0pEI9vJv1W0tSGC2p2mI9ouCKkf4Xe2SG02Eiadv1ndTLKXY
-dygZEDZ+6BHkjgUBgkREayDef9FT3hGe3OGg50rwGa1x8kfuN5oQWLo23sK3kkri
-nx3F0jwfKlnNmUUK1PYxceuvAJV0w2uhD0y1ttIKMgILz77rRHU2Hb+CDuBpX44t
-c0pDqKLNLGRJje7r3iRhfRqMo0zpWBgD+0zyQWh5dwKqbBVSosvfpnZQSoRdFJfE
-RIIspQyi7OREjzcwBDxYy273YCbngnn3hb9MFc9wjqL+9W94TwVMUMniNOnT3bL9
-6POEYAdB+JJO+qAdRcY7XhjKIXt/I3Cj11yMiwIDAQABAoIBAQC53mCla5egM8E3
-FHfnC1dlGfyKSgFJGD5Sb3jA8dXc4HPBA5wygmitUQ1w2OqBGpYcYRpr3hXJigOY
-EMHEhD4+LH4IjHv6u9fhqNMpHyb0N7lHH2cvwV4vl/aCsca0tqc7GR7ISpytzT/G
-iKkhEjuM55csUXYPqZ2PTk+4rqWlboM7/VQD6VMsGWU8LESmRiptNySjlhDBDk2Y
-RkVeSFBvpP7g8QPP8ykI/0vUZDnvT7mFMwYmwwVmN1iV9zNpshkGTMeSMAahrzuD
-t+/roECWCDZR+gkqLI4WUJFiB1zR1Q25vWTWUl0mfYNExd0QRYlnn05vcjjJJGxV
-pWzgUsOxAoGBAPqzTP7yEs/J/P2r1s2imAH1JRYGJJcuJNbFyfiR+UwmiafrzNrE
-i1nP++SE5sL97lA2f2bR39/6Rp2i10Ce848iikp9r3BL2TmxCpcH9bQT7Wm4qEEL
-Wfg1bkIfXet5aLom7dzo42nRec/hd2O08pP48/BRE6Vm/MnRCrNrze/FAoGBANcE
-i2JPWNu9z1cFxbCWCPbnxxzUDAWEK834CqrgeSdrYHeCGD0GPBefWG8XZnCm9/xm
-zlnz6qI6XoLD95LMhzLZyvz85p3YEVTE7oiGJD1J6dTNpAdYigZLviR+eH4IgQXS
-y2a+RaI9XTq2KS/NAgG26vWNS8TsxytgyAJKVYAPAoGBAMBNjy80wwdOulhfWtrL
-8Ov3fmYheinZRHrWpzGbz24BVbBQKQhaoUXYSzEkXNqP7CDtXNajAKaPFWHPymuQ
-QeW2qfuv40YxeERPsH7fpTJn4sIo2i9ipLXHTnc8FlANBi9cszK0FdVS0KyMF4eN
-AlJNMdlSZ86FbDzms92jQQm9AoGAK3pbxPFOgoCLIImmQ+LSxTpw5L9r/uGPCgMS
-BSOG3BW2V/QSeqR8Gjq6YxxUNotMsdkH+OB9nXg4DDEcKq7416t6hFWPPHOobX+0
-zB5zzYDYq5M5i9K3djZyqGZ6buHBVTAeuRPYeMn3xBt5kJTfxwD52dVMcPGABKF5
-UB0/1LkCgYEAr7K4v65d/NAisWm9/oCsHEwz6oMwwEEckvJme2GSxibeyIrOZ2Nf
-ra0Y3HIWRJblgliMDI8mxgSc3Xw3Z/xhlBqx1iQ48oAARx4R45lm/4ZiEpxCLPC3
-6zzvl5D6fE1USznYykskx+3duakswnvd3QDPvLC6MApTfxCiRqRY/F8=
+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
 -----END RSA PRIVATE KEY-----
diff --git a/test/config/integration/certs/upstreamcacert.pem b/test/config/integration/certs/upstreamcacert.pem
index 248925d60909..f3f76898c347 100644
--- a/test/config/integration/certs/upstreamcacert.pem
+++ b/test/config/integration/certs/upstreamcacert.pem
@@ -1,24 +1,24 @@
 -----BEGIN CERTIFICATE-----
-MIID7zCCAtegAwIBAgIUJnL/FkQnkD3TZgigviOibTKJjcEwDQYJKoZIhvcNAQEL
+MIID7zCCAtegAwIBAgIUTQZdxxw6y4+Te1kv8hDza/KXTHUwDQYJKoZIhvcNAQEL
 BQAwfzELMAkGA1UEBhMCVVMxEzARBgNVBAgMCkNhbGlmb3JuaWExFjAUBgNVBAcM
 DVNhbiBGcmFuY2lzY28xDTALBgNVBAoMBEx5ZnQxGTAXBgNVBAsMEEx5ZnQgRW5n
-aW5lZXJpbmcxGTAXBgNVBAMMEFRlc3QgVXBzdHJlYW0gQ0EwHhcNMjAxMjIyMTUy
-MDM3WhcNMjIxMjIyMTUyMDM3WjB/MQswCQYDVQQGEwJVUzETMBEGA1UECAwKQ2Fs
+aW5lZXJpbmcxGTAXBgNVBAMMEFRlc3QgVXBzdHJlYW0gQ0EwHhcNMjAwODA1MTkx
+NjAyWhcNMjIwODA1MTkxNjAyWjB/MQswCQYDVQQGEwJVUzETMBEGA1UECAwKQ2Fs
 aWZvcm5pYTEWMBQGA1UEBwwNU2FuIEZyYW5jaXNjbzENMAsGA1UECgwETHlmdDEZ
 MBcGA1UECwwQTHlmdCBFbmdpbmVlcmluZzEZMBcGA1UEAwwQVGVzdCBVcHN0cmVh
-bSBDQTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAJotNPTYihUQKkzk
-UxkBsa8k/76MGPAXJC3O7KnvoGOGunt4YW+JtosOSllnSINsOUsjM5UX7h6hABtP
-kpuW9G6+nNW3tUXuTfnk7BxaK3rOUCuWx0lWdJFbUxgTFdOJJNWcl6mUw8H3ArUd
-67mD8TKcNWraUo5u8d3meL0CGbK8VwnwTJnv5wR0jwIQfA7PK+1yESw41vEePYY6
-fQL5nvSd4POLL+QN7pHVImPYTfybpbL1JY+z3DlIzQnyHV85YMKl/rmNLavBb/Y+
-AiCsUBjFL6iyd2leYhO9m8KYaYFfes6TreaXYC2hyVL5AlhwVxozUA6N52vezL8B
-tcO0hq0CAwEAAaNjMGEwDwYDVR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMCAQYw
-HQYDVR0OBBYEFKNWc+yyMiu38wxYE+2c6js8QDraMB8GA1UdIwQYMBaAFKNWc+yy
-Miu38wxYE+2c6js8QDraMA0GCSqGSIb3DQEBCwUAA4IBAQBX03fKPxE1cdjmhBpZ
-ApwOUmD9DDjmodFJB57ifUVMKvEdg8ieEx8TrmpfnP0HpKPVEY2Yj5tYfr6pO/9T
-zYVoiPQ/NCLpKsK6qrO9BbL+VCHN8HBKoSmbD13VYMjJA8Bexx7NrhFUbsQ4Ot8g
-ed31rnGG411+/hqb/uWaEbEX+8asX0JKQeXsuHf92Nkm6liB07gQmnRHBZzNCC73
-l5L2gNBOM0W4F0FiY899GJo1WWhgZvll2mrM7T++tQMK+jQ5fpcV0Ed/id6+OOir
-8uaGtQLX2MIm8JJOBhw+FvhvIOze8I21pff/gZfmR2Ha4dLRFLDYQYns7EurSg6k
-1TBQ
+bSBDQTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAOFT8hbqRn+9AKU2
+IFtZKFFYpt7v2x1e8gtzgPm3TT7RJcV2GLeT1cOwubL81ArQmwfyVlwJkt1wK7Uw
++Z4FvtcCjQc4dR3yxkIdhzZOiq7PbQgAjyRNNGmneYTAvpXwC+l8ZV2M66ihUKgj
+7iGiqQCvYhuYIb7BEnOj20nFuvHlxaDWOst4SQgZmRIkQyA8rrAIRfu7aQiCEla5
+86AXcXV4gmOW3dsKNoXO8Fr+9mtAmJKocLtlUkCeDW+WYqv6RLjMVa915khNQLde
+bL+5hYxBcKYB10wOVzSTCfM6fbqtpqJZEdlGjkKtQ2Szy3mpoAJKPmZYzodVhL6N
+LhoLjZ8CAwEAAaNjMGEwDwYDVR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMCAQYw
+HQYDVR0OBBYEFDtmHVOikybtJjVEI4Q7wvUbwgBkMB8GA1UdIwQYMBaAFDtmHVOi
+kybtJjVEI4Q7wvUbwgBkMA0GCSqGSIb3DQEBCwUAA4IBAQAT3kBm2uCpB4cAmdgu
+u6sqxUvYFzYlHFnWrQ3ZFwMrLRSzUdrcp2nSQz+e8VeXI2SkLPCD5Xg+8GGLWA5X
+lH6tvVx41cRqSr611ebxPVWkEeP+ALkHo4xUbcR5WUJD52VxzqYbhavYFjB2FzqA
+OfefKyXIhcKtezKBwaJbVn9FseH49q6UNjYODOY88rW+2mvDoZWBUuti8CxNhIiu
+RHnGimY7H565NpbPliVlo2GhiKhJvyPwK7+cjfj68HaoixlXHmrg506bczO/Gt1a
+USQmjtB05h8bki0LQDiCQu1fdOPEflJnv3VdFz2SSKNRab2asP+KbRPURUW8f9zN
+GNxR
 -----END CERTIFICATE-----
diff --git a/test/config/integration/certs/upstreamcakey.pem b/test/config/integration/certs/upstreamcakey.pem
index 7bde56323a13..08b5a9bfcffa 100644
--- a/test/config/integration/certs/upstreamcakey.pem
+++ b/test/config/integration/certs/upstreamcakey.pem
@@ -1,27 +1,27 @@
 -----BEGIN RSA PRIVATE KEY-----
-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
+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
 -----END RSA PRIVATE KEY-----
diff --git a/test/config/integration/certs/upstreamcert.cfg b/test/config/integration/certs/upstreamcert.cfg
index 4c6c2985ac48..4e2e760a861c 100644
--- a/test/config/integration/certs/upstreamcert.cfg
+++ b/test/config/integration/certs/upstreamcert.cfg
@@ -34,5 +34,5 @@ authorityKeyIdentifier = keyid:always
 
 [alt_names]
 DNS.1 = *.lyft.com
-IP.1 = 0.0.0.0
-IP.2 = ::
+IP.1 = 127.0.0.1
+IP.2 = ::1
\ No newline at end of file
diff --git a/test/config/integration/certs/upstreamcert.pem b/test/config/integration/certs/upstreamcert.pem
index a7c41127d2c5..211fa9d9dff6 100644
--- a/test/config/integration/certs/upstreamcert.pem
+++ b/test/config/integration/certs/upstreamcert.pem
@@ -1,25 +1,25 @@
 -----BEGIN CERTIFICATE-----
-MIIEPjCCAyagAwIBAgIULD79urJnpB5ZuWuAWZNP9p0luOkwDQYJKoZIhvcNAQEL
+MIIEPjCCAyagAwIBAgIUEuy1WgSCzX6mojPirk7Th6uhNHowDQYJKoZIhvcNAQEL
 BQAwfzELMAkGA1UEBhMCVVMxEzARBgNVBAgMCkNhbGlmb3JuaWExFjAUBgNVBAcM
 DVNhbiBGcmFuY2lzY28xDTALBgNVBAoMBEx5ZnQxGTAXBgNVBAsMEEx5ZnQgRW5n
-aW5lZXJpbmcxGTAXBgNVBAMMEFRlc3QgVXBzdHJlYW0gQ0EwHhcNMjAxMjIyMTUy
-MDM3WhcNMjIxMjIyMTUyMDM3WjCBgzELMAkGA1UEBhMCVVMxEzARBgNVBAgMCkNh
+aW5lZXJpbmcxGTAXBgNVBAMMEFRlc3QgVXBzdHJlYW0gQ0EwHhcNMjAwODA1MTkx
+NjAyWhcNMjIwODA1MTkxNjAyWjCBgzELMAkGA1UEBhMCVVMxEzARBgNVBAgMCkNh
 bGlmb3JuaWExFjAUBgNVBAcMDVNhbiBGcmFuY2lzY28xDTALBgNVBAoMBEx5ZnQx
 GTAXBgNVBAsMEEx5ZnQgRW5naW5lZXJpbmcxHTAbBgNVBAMMFFRlc3QgVXBzdHJl
-YW0gU2VydmVyMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAqgsjEbrr
-8ghk6Oge9Nllw2BZ9GrF5nS8HAMCuCHMDD8BF3ynhaQnyKVaejjhi+UOZoAcQ9/Y
-19qzjutg9f7zvRu1ogepWTUvSoEWjtbJD1y1Al6RLvRtmyhNHZIDu3x/+JFs4HMR
-xpEnsRP81xSWBvbyMU5DxNWApHmHMX6rVy9J3Jpy2p9gzYgJL51FK//DNbnXiDWL
-gunPzhAeBl0013DWps+Wa8eHmDmYa8LR/9Sb9WMsmh06o4Ji10Ns+9w2q6M9+xKa
-GRfSPAFB5ptTKKJnWj3+erO5f0Wj9Rn9iJRigMJzJ7W3MqqKQLVS97vBkvF98kF4
-c6E6jdTKtYmy2wIDAQABo4GsMIGpMAwGA1UdEwEB/wQCMAAwCwYDVR0PBAQDAgXg
+YW0gU2VydmVyMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAtpiYA4/I
+NuflkPe4L/GTslmngNQUCo8TzPXG0gt7uoxr4FeuVy7AaD28S2/hwhbl+bDtHTQY
+mvBUwNMsYzpND2eQ3sSIumdeLzBEKP2mnnZ9gE/Zd2TIuZl686RpDq0B6ZdZSpCu
+bqQmmPFLiRNH8JViJZMN5yqMt7T5oq+DnCYQZllqmpAwd6NnhKALrYmZ87oqc0zh
+kf+5amP7zMYKkwQuRwcx4QPZkEp3+qhszolpAJ52dFGJ+pLuUVDg0Gf0cnxLjFKc
+6vcTlj4tsymR4ci58MHRt4EdGdhShw0oaj67gRRfU4Vj61I2ZAVH07kL0mjO2TZT
+EKrOEJJ7/dtxdwIDAQABo4GsMIGpMAwGA1UdEwEB/wQCMAAwCwYDVR0PBAQDAgXg
 MB0GA1UdJQQWMBQGCCsGAQUFBwMCBggrBgEFBQcDATAtBgNVHREEJjAkggoqLmx5
-ZnQuY29thwQAAAAAhxAAAAAAAAAAAAAAAAAAAAAAMB0GA1UdDgQWBBTiFNI/896f
-ngtr9M+MLKDSm8K8zjAfBgNVHSMEGDAWgBSjVnPssjIrt/MMWBPtnOo7PEA62jAN
-BgkqhkiG9w0BAQsFAAOCAQEAmhPO8rH/DqkeiUiYAXJy+lxCYlm0/wZJ1GJkldEv
-jiUX9fgP+az3xxxr+vnsKPGfXnM8mcYd3XZAoHijbEXT6mutuiI8/M53LOkKWezh
-2GobBKMrNq18esXmdQpJHXnpu0VAhdVnJNUDpMkP331w4YnmchcLchglVJ4IdSBY
-CQqsieCfL8nliCk8kDlOB1tX4KgvoVxTMaU5NX8GiY125KqzKle2/1S4YJbBIimN
-9aYmdoJp3KVBKzyfD2HZ1wwDTGI/5fZMIzDqXb9PZo+beGM2R2LoND+5Y+BfeCIr
-mWGVQrw2kgaSzpZp9QvBhAcjZ6Gn995dhzOzLrYIgyeYIg==
+ZnQuY29thwR/AAABhxAAAAAAAAAAAAAAAAAAAAABMB0GA1UdDgQWBBQeoC5wxwX5
+k3ggIN/844/6jKx9czAfBgNVHSMEGDAWgBQ7Zh1TopMm7SY1RCOEO8L1G8IAZDAN
+BgkqhkiG9w0BAQsFAAOCAQEA18wEg8LnPm99cIouFUFMAO+BpiY2KVa9Bu6x07m9
+quNFv7/4mLt87sk/umD3LH/tDjqW0D84vhG9a+0yDq7ZrD/P5eK3R+yBINwhe4/x
+obJlThEsbcZF1FkMnq1rt53izukyQLLQwoVxidQl3HCg3hosWmpH1VBPgwoize6V
+aAhKLW0n+JSfIE1d80nvZdYlHuCnS6UhLmAbTBCnwT0aGTfzT0Dd4KlYiY8vGZRu
+tXOw4MzKtJcOL3t7Zpz2mhqN25dyiuyvKEhLXdx48aemwa2t6ISfFKsd0/glnNe/
+PFZMakzKv1G0xLGURjsInCZ0kePAmerfZN6CBZDo4laYEg==
 -----END CERTIFICATE-----
diff --git a/test/config/integration/certs/upstreamcert_hash.h b/test/config/integration/certs/upstreamcert_hash.h
index 3d229c010b14..ec9a111a3155 100644
--- a/test/config/integration/certs/upstreamcert_hash.h
+++ b/test/config/integration/certs/upstreamcert_hash.h
@@ -1,3 +1,3 @@
 // NOLINT(namespace-envoy)
-constexpr char TEST_UPSTREAM_CERT_HASH[] = "79:03:9B:76:7D:14:9D:6D:C4:F8:F8:C4:56:6E:6D:3C:4E:B2:"
-                                           "22:59:DC:0B:FF:35:C4:19:CA:93:E4:5A:93:92";
+constexpr char TEST_UPSTREAM_CERT_HASH[] = "9E:4B:E7:83:5B:DE:82:A6:E5:CE:24:8D:DB:91:C1:0C:20:0F:"
+                                           "25:3A:D4:4C:5E:13:AB:CD:53:00:93:85:F3:BE";
diff --git a/test/config/integration/certs/upstreamkey.pem b/test/config/integration/certs/upstreamkey.pem
index eaf75d9c5a18..c1fc3c90cc7e 100644
--- a/test/config/integration/certs/upstreamkey.pem
+++ b/test/config/integration/certs/upstreamkey.pem
@@ -1,27 +1,27 @@
 -----BEGIN RSA PRIVATE KEY-----
-MIIEowIBAAKCAQEAqgsjEbrr8ghk6Oge9Nllw2BZ9GrF5nS8HAMCuCHMDD8BF3yn
-haQnyKVaejjhi+UOZoAcQ9/Y19qzjutg9f7zvRu1ogepWTUvSoEWjtbJD1y1Al6R
-LvRtmyhNHZIDu3x/+JFs4HMRxpEnsRP81xSWBvbyMU5DxNWApHmHMX6rVy9J3Jpy
-2p9gzYgJL51FK//DNbnXiDWLgunPzhAeBl0013DWps+Wa8eHmDmYa8LR/9Sb9WMs
-mh06o4Ji10Ns+9w2q6M9+xKaGRfSPAFB5ptTKKJnWj3+erO5f0Wj9Rn9iJRigMJz
-J7W3MqqKQLVS97vBkvF98kF4c6E6jdTKtYmy2wIDAQABAoIBADSoZEDOWNjH3q/9
-ifCbDhd11AWLtyNJzSMDj6kD1lOIg0cJtDr/fc513lHxIW+YDGCTla0zOcyGjopY
-u9sSC9rpJNM7eicFAFMbLKgpPXRDak6EiIM48GRXE6JvoDZENMD+D/Bl0gBi3R7K
-KMdWOauId7HrIbNnxoGonMQoDNlfaz46b6K131kC0QPubv/1gx+wD+bPG708irRu
-gvcX+vpXXTWX8uV3lM8yiGnS+HJiIN2FG4tbtXxOcm+B9dIcELjgxVYlvDZ3rd36
-EUp9hPZWPsPiErET0JHyprjM9gfZELRbdFbHrok1siZ19KKXyw5loQaMuoXwV3gR
-QRRNV/ECgYEA151R+6VokyaXOxMG27reHCrbTvc/+yCEok6YW9UPINNd9dLQceAi
-6Jcitz3N8DIcxDnEQEONbN5Bzfi0UgZSR4NBsyR0YV17JLKnbXV5u+vu1fijYPb0
-o6viuWO3ulsU2e8PM8O6juvPJE574m/Pd3/mCjHTJ/HSFbIgjfmO+EkCgYEAyeSx
-msb/6B4deIRBgh9ZSqSOIyoUbGR12qZd0bzqtGKzAVwphPlNewHA66UDxpQG/fhe
-sTK1r3i8p9DrGDvQAb0hjJFHPnHFd5dNgK2kh8luvrOYvb3KFszMkykB6BhHwqA0
-R4x/LvnlfB6ZUSP6McCXYsvZgcGPzeFB9zY6egMCgYA4CpHmgGWf6aXhGt7rebSF
-SbZa3fTpRthyf08mf0hBVe7UGAlJr+Ii5jWFvzCpv7yuW/1gXq6Bn3snF/92WmJE
-aB9Jeq4tKGj7btwJnUEY0Qfw4YFFkKqhZ+m0GfEFJOtUgchHwhXZU/0xCJ02i602
-+C1IdQ7XEQlzziqb/ENm0QKBgQCrWJnXd48XK//tGaoTSpHYxMIRXBRLThOsB0hW
-ylQT1jSAMfzW61Lz07AtDjafIWCxyUpsb1I9Y2YRs0Djp1fJMgA4MdBaUeq6rcHM
-NRMPX0jLNteqKVpLcXMqbkI8/eZhauAT3UzPzK0UY0/Ryov8D60r30BxXJq0q7n1
-mqOUiwKBgDmatb9P3/RWw2nqsLeKVfwqGSrtkacfItp1GqsGZ3/8YoZ3sNaj0PZJ
-yJM0EsVob7CXI33qXAfTQAJOp996+ks6/en3+Nk1PyxqUV2VOAxJy2y03fAqUati
-w2NXOHv8LnMjR+PPkr4utdUXteIbaCibvXzmlk1f8EJ2M5WhwcQ5
+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
 -----END RSA PRIVATE KEY-----
diff --git a/test/config/integration/certs/upstreamlocalhostcert.pem b/test/config/integration/certs/upstreamlocalhostcert.pem
index 2a705525ca5a..33b597dfc8e4 100644
--- a/test/config/integration/certs/upstreamlocalhostcert.pem
+++ b/test/config/integration/certs/upstreamlocalhostcert.pem
@@ -1,25 +1,25 @@
 -----BEGIN CERTIFICATE-----
-MIIEPTCCAyWgAwIBAgIULD79urJnpB5ZuWuAWZNP9p0luOowDQYJKoZIhvcNAQEL
+MIIEPTCCAyWgAwIBAgIUEuy1WgSCzX6mojPirk7Th6uhNHswDQYJKoZIhvcNAQEL
 BQAwfzELMAkGA1UEBhMCVVMxEzARBgNVBAgMCkNhbGlmb3JuaWExFjAUBgNVBAcM
 DVNhbiBGcmFuY2lzY28xDTALBgNVBAoMBEx5ZnQxGTAXBgNVBAsMEEx5ZnQgRW5n
-aW5lZXJpbmcxGTAXBgNVBAMMEFRlc3QgVXBzdHJlYW0gQ0EwHhcNMjAxMjIyMTUy
-MDM3WhcNMjIxMjIyMTUyMDM3WjCBgzELMAkGA1UEBhMCVVMxEzARBgNVBAgMCkNh
+aW5lZXJpbmcxGTAXBgNVBAMMEFRlc3QgVXBzdHJlYW0gQ0EwHhcNMjAwODA1MTkx
+NjAzWhcNMjIwODA1MTkxNjAzWjCBgzELMAkGA1UEBhMCVVMxEzARBgNVBAgMCkNh
 bGlmb3JuaWExFjAUBgNVBAcMDVNhbiBGcmFuY2lzY28xDTALBgNVBAoMBEx5ZnQx
 GTAXBgNVBAsMEEx5ZnQgRW5naW5lZXJpbmcxHTAbBgNVBAMMFFRlc3QgVXBzdHJl
-YW0gU2VydmVyMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAtfda/k6X
-Tol2SzpdPKeSSywxQkhsaYVSkgIInuf5NpyC+ztkpGtLpcI2z24SITY5wPeStYUv
-khFR6iayC7DFtKvfE3utogd3UjQiVaHfzXkqWnd0QzCT6kvbUwsRhU7I83YpazV8
-wO2Ww1xWc2/Xeu7Cud3A+nZFwL+I/TUjyuWhFY6zlX87JBowBhMODoKSwMPeZNq5
-p6hKGQFfs5p0qSbtb851WrVTxL+73hmHzIg8bfM5x0UCvuAiAPBW38au02z+9mRv
-UxMhwMHfrLkJZzchcZk1vZ8jkp0BdwqQ9b+XwWcQ2ztKYOamgBLIoxzpHRX6BvTf
-3VJZhcYnQRtYDwIDAQABo4GrMIGoMAwGA1UdEwEB/wQCMAAwCwYDVR0PBAQDAgXg
+YW0gU2VydmVyMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAut0zAnO+
+0q/IyxWG/LVbjh5gI2C9ZqNpFD+PK/bwPahg5JdtLnOWPwL+3BqjRcJ7/viocncL
+eF3bhJ2hgF7gZGqd07juA3O9Qo+UUUgFvSsEGg2Y5c5gmD3rxdatxv/TnCmWn2pf
+5366GmMQXCz99QGFuwUvIAGdApTjh65V32BZlgIwI9ArRy2v4YyW4hEaqiMeMaqB
+Q994UCqlbhL/d3eBz3pEG0UIMkUPndTN42cWK8dGhSSHlJQkdAOk6x+24xY/qvjc
+OZOtoO0GQu+SBwV+S0Wt75CI2k/IKYzMX5G7QFEcE6RgkL8Ag2DSG4bl/6Zf3C3z
+ufWZwMlhjzZoHwIDAQABo4GrMIGoMAwGA1UdEwEB/wQCMAAwCwYDVR0PBAQDAgXg
 MB0GA1UdJQQWMBQGCCsGAQUFBwMCBggrBgEFBQcDATAsBgNVHREEJTAjgglsb2Nh
-bGhvc3SHBH8AAAGHEAAAAAAAAAAAAAAAAAAAAAEwHQYDVR0OBBYEFCiuXt6X0/oQ
-mA9l7z+GlyFdE3uJMB8GA1UdIwQYMBaAFKNWc+yyMiu38wxYE+2c6js8QDraMA0G
-CSqGSIb3DQEBCwUAA4IBAQCU+lPt6skveeQJS0qfFKEiAJlx3lEZCbsXHOvx5H0I
-pu3ZLsDIV/8RwvRL4ZAYD2gNEJjUGDeGdYqNARw5npBw7bLNA31w1oWRdq5u92c5
-Ezy58lWh4IcXIk8i43QkMxEE9yEaiOwSt+oLU05CjWvUgt3vJWmiIhEfNRLTaPGn
-LAtwib4tKU6KUV5FQ+q3cLyznWk9cXjdZmi7OdRkMiw7bp39yKOJfSj2/lXKgsRR
-SZuWUQ0vufiYbKT3zaTsc3Whn1lxz1c9dSHBI77lOhK36hBtqGRVlGcgcuHbjSzj
-gE1LDiuaSH+/Me+HYWMK+EmvCoYGzN1soHTMzyuHKyj4
+bGhvc3SHBH8AAAGHEAAAAAAAAAAAAAAAAAAAAAEwHQYDVR0OBBYEFKsGHS0dB1v/
+Q0YBMcKXV0BC95TFMB8GA1UdIwQYMBaAFDtmHVOikybtJjVEI4Q7wvUbwgBkMA0G
+CSqGSIb3DQEBCwUAA4IBAQAet+A9/JpMOcTstI8AVxVtJ+DuaPSl9L+kUSTPRwee
+F1YeHz3i7ibhdheZcWKWJUaVYmU2VTzYTT3iPxB36KvpHEcsxRAaCyND9a48JeIn
+awV+2KUD6QhFPWrtcM/TIzDcrl9qT69nnraVv1haXh/t5xRA30+h5aA4t9PnHxWA
+mDv6Hslqi/NLCN1KBIZxmUspLkZFJT3uS7mdcI3d0m5tQx7W7UZr/40sbdxRjK3Y
+XnCJVa51ZAkoJMEiDY7/zPraZbW1QiIaGBRTGVJ/rzJDvwnMo117GIqiRKKw9fo3
+GntHAThLZeCkdfAcDnzKLkOU6Sp9QHXd2pAC7H1z3EjP
 -----END CERTIFICATE-----
diff --git a/test/config/integration/certs/upstreamlocalhostcert_hash.h b/test/config/integration/certs/upstreamlocalhostcert_hash.h
index 64ecf2f198ce..545ee399138d 100644
--- a/test/config/integration/certs/upstreamlocalhostcert_hash.h
+++ b/test/config/integration/certs/upstreamlocalhostcert_hash.h
@@ -1,4 +1,4 @@
 // NOLINT(namespace-envoy)
 constexpr char TEST_UPSTREAMLOCALHOST_CERT_HASH[] =
-    "2C:86:75:7B:50:B4:1E:B9:84:44:26:80:C3:7B:A4:EF:14:3D:7B:AF:CC:FE:1A:42:87:25:AC:7F:70:51:11:"
-    "FB";
+    "8C:49:C0:6C:4C:02:39:29:EB:5B:37:C6:62:02:7A:81:77:22:35:DD:99:1D:62:78:4C:95:5B:38:36:6C:1F:"
+    "1E";
diff --git a/test/config/integration/certs/upstreamlocalhostkey.pem b/test/config/integration/certs/upstreamlocalhostkey.pem
index 0052be7af46a..30b9c0c46263 100644
--- a/test/config/integration/certs/upstreamlocalhostkey.pem
+++ b/test/config/integration/certs/upstreamlocalhostkey.pem
@@ -1,27 +1,27 @@
 -----BEGIN RSA PRIVATE KEY-----
-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
+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
 -----END RSA PRIVATE KEY-----
diff --git a/test/integration/fake_upstream.cc b/test/integration/fake_upstream.cc
index 4713e455fe94..763aba920556 100644
--- a/test/integration/fake_upstream.cc
+++ b/test/integration/fake_upstream.cc
@@ -374,8 +374,8 @@ makeTcpListenSocket(const Network::Address::InstanceConstSharedPtr& address) {
 }
 
 static Network::SocketPtr makeTcpListenSocket(uint32_t port, Network::Address::IpVersion version) {
-  return makeTcpListenSocket(
-      Network::Utility::parseInternetAddress(Network::Test::getAnyAddressString(version), port));
+  return makeTcpListenSocket(Network::Utility::parseInternetAddress(
+      Network::Test::getLoopbackAddressString(version), port));
 }
 
 static Network::SocketPtr