diff --git a/internal/tls/testdata/server.crt b/internal/tls/testdata/server.crt
index 441710c2b7..12424f7b27 100644
--- a/internal/tls/testdata/server.crt
+++ b/internal/tls/testdata/server.crt
@@ -1,24 +1,24 @@
 -----BEGIN CERTIFICATE-----
-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
+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
 -----END CERTIFICATE-----
diff --git a/internal/tls/testdata/server.key b/internal/tls/testdata/server.key
index 8a750686f1..0efcb40bb3 100644
--- a/internal/tls/testdata/server.key
+++ b/internal/tls/testdata/server.key
@@ -1,28 +1,28 @@
 -----BEGIN PRIVATE KEY-----
-MIIEvAIBADANBgkqhkiG9w0BAQEFAASCBKYwggSiAgEAAoIBAQDdXhFIZNuti2p7
-nDLx+vouVrhyhb7B3Co+zhHmrbKOINIeVeCawQWajDFeDa7LzwV9ULmG+N6rirBz
-2vkAae/M67qkHIJ85rosmsmKubydoHcjX5VLdb4SmcILVqnG6sdTywWdvEULVcK7
-PcLrEG3MLP+gWfkh1ffndq0JQ5r2kscqHWQXwY9RzkWWddLU/RSR00z5SptyDbps
-W0YQVTDglwNJcexWvbFn6Xa9tXo9GXgi5gkL+qFOO/mR9KXxNniQmvz8Y5zmczFJ
-32MxlwTyfPVDwY4xxx7gP5i9CDs4Wk3IqLrWquvz99z/as/aH758aTgcf2XZ3Afr
-Ewk7AqWxAgMBAAECggEAYs1wg1JY5m2aek9uQajWb0ZPjvX4/UfKJzwMq1wNnPgz
-MEz+MbRDTwaRpjwPL3JYLeWQ2RhNMl11glBS4Qdne5wfMs5yw1Kr9+qiV+OstuH/
-Ku+nkAWeb2jnPe5RWrJBgznTaOK2ImgFwVLAo/AyQXY4JhbiZmK9Ajdq5f6htLlb
-cF9iSzKihBbYqc1vcv2hZWxs8PPxcc/8yNbpmY/dlD724Z4mpWeMESCby1B9hR+J
-7JSI1Yeu91fhdmv9ZjxaCz5dKJqf/SJdMwcw44TVBnB36aIBwuWYMyAXVxfpar2R
-67sSGgS52fFFeqNm9apt9sTEgqSBNv5ZA8PUMXdlLQKBgQD91R6rq88Su0Te5rEm
-zT412MuJhGdeEsI6aQbHK1iFzY8FQwkLhxfRVnq6Ve4cIDBf/+VX80KfmhQoFVLx
-loUMGV0gCOsbQaQ7gb0JOMRFvuPLJzbNlf2RS0rCE+GhKR29HOGYeyD5CpSFbgvS
-7Gv/IPf7eNjle9Bp9Zxk3TNtXwKBgQDfQfqTL67EeCNvhTCP/FLgsQPkWffP09/W
-piJnsq1m0VpI4hbah/x4d3kbid1cyTmVoxTy23gI/mhP8sBR653uT8Rthd+Uk3xH
-T3paFplz3QVTS/gKuE5y6KFTDIsPRqLFpKvkJhNNJWF94lpTqJyaJISlYK5jWcUB
-0zgIIoK27wKBgHh+II8Rgby8lNbS36kxqKRbA1OGPKNVeEnN7V/CXcU2bPvsdHC6
-cj33NU8a12sWhKAtkysK2Md2lrboWHVCJGo36BL66NAJevKchaXJArKxCOU4+jTh
-THsaKKS0V1jvcaSB/z0oxeAye4pTUN2RSTrU5aLEHQHiom6KHvFqZ601AoGAEgf1
-IeAPAGUnj4E1S9u4IdeKFe5COnHFOUPPsYpXwN8VqJ9B80JaXKxhhpza2PyTfwdd
-0MNy7V8Gs7ZKXBNofO/KUIIobYp/1g6QNihvGlF2daTEErGR/GvXY6q2rHQq/0Vu
-cI22r1tehVk7rFgI1dYvNGAblYCRjbUuaFHJNtcCgYAbcs+6Zs+y/Qx+1B2FejAv
-E0HbznhPQyTTrBxqFIpOKhXi2yLYf+xBia60hMc7iiyaob9w+R8NyJz+fKBph8db
-pMZCtZcxZgK2XBygj6p0SmJ2nblkWsjrqQHbGReSNexNCkgLiKp+qhhil+QEVQ+C
-rInrmlSojK8LrMsDllIr2w==
+MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQD9zHhy7+7K2oJM
+w/Ijo++WAibzqMrOCMvhFcGYSwHbcfivPSDia+hCpJ6CNPxWaMIOcbs+LBN7CvLk
+FQI7TdLuDLuqEJveLkgeUcRr5AVer5/tycVHQvn4/iok4NMfqRKA8VV0qy94Bdmb
+b3zXQtOfhQpN/aXRD3ubW54fiD7XF0qlprVhAS4hz4UlNBzeSVrH0GdlZAfKxUrU
+PAsBRtA1vYuhklbDdc5psy0HVTwMj+FM8vPOOP3HmbJpZCHurpNwYkUTU4VHCSpR
+SSa6AgSfMuwCQPLN7Xi1rJES4pPtMYp7ZHnes3zGkEYMzkjw3NOtkEzgxwdiJEoV
+WQHi4eznAgMBAAECggEAGv7z1O32jXc+ouG40NewNVmXQRW0NMQ0w4Vn6UYZNXlj
+BWjQJaVquCQAhEMUkDBma9jnHM7dZ5obie0+Joa5p/6Mu6M2oSR1IVx7Myq284Jk
+1Ys/w7u5ESYf33pWmqiGQlbpSxamXvLoWaM7OT5veilRlkgjqiAmerj9EceRP5mR
+aheVE5ctY5oZmdnvA9OcN6B8Oxk59EWEOECs8qAF/ChYfC8pWKOp4U0RILQ/9jXD
+lu4p0C2XyadrJReer3whudUADWa/WSxgVCrx85/g/RTKs38KTPy7W4g3bv8KBRhc
+bjLzoYTl6esRAi8nMG5Fc/85t07hkVv+j5a1NccxgQKBgQD/y/tdH90C8CrAn9y5
+mgr+1QcqJeJWaBpNf+yBqtLbybl6uLY2OzbZtzllU+TDUVlKZB36t2GnG6EIRUcd
+WTHUVq8zEIRtDBa12SZlJ08FrNFyKfBByehEOvMazTxb7rdGbiv5+XztCrcPUn1f
+cu30v5nBRjqDxtiAbKccFcZPpwKBgQD+ABUQ0h3aX5qDqzhvSLNuqy+hOZPLsqva
+VxsDsIlzzzGwmdf+m2Dn9JR/xJNMPf717LJs8IYIqW4KX/HW0pC3Y8fu/6h4fFM9
+ZpJkM2hjRu0uLxDWLc+AombMavFtkZ1tffKxv6mG7Ud163ulBIt24b701XfhR5UX
+RWvWI50gwQKBgQCFa1i9luwJJ0m1VOyk5kML7gMhqcbneL8XYzzx2S7IMuyKpSNt
+H++ZGWdXga2Vbq3bDmNQrSvDJLcWgEP6e9ZwwZH6WYgo9KA3036iTiF6fUx1doh5
+WB3M0M6SUTBFZzqzAq3vYYEWhns7A7Se/2w8N1+0HrRQnXu5aHK1RGo+iwKBgEST
+hRx7fi/dK/xsl9oDyN4SPdPLlcmjPZ6/cb23RgUMZaAGiThmfu1hLU6pphMpkdKX
+yzx6W9Wu2NTYPpT/WK8Ks4olYDjXaCnlrZR8BKz5E0Qq1OLej21ta0+5d+FbNSPA
+o2u2EXEqUubVYxaUeYrpPAMiNzGNgAU+avTvvJaBAoGBAKely84irwZicpex79T/
+KYV3VOMYs6wETNSLdKkR9G2WEI4OsEw0qGm9pZXzS6lKOSXxW6fOzwI0/vhnmT4O
+hBxeR+PriPFqD80ASXeVeVOEjMXQEjZ8Po+FfUvVu8zMNIPDwJ+hy94FE5kkDBte
+vy6FnjMquTvekIsRwo/OOdz3
 -----END PRIVATE KEY-----
diff --git a/internal/tls/testdata/tls-ca.crt b/internal/tls/testdata/tls-ca.crt
index 1018d37f55..4b861f4f40 100644
--- a/internal/tls/testdata/tls-ca.crt
+++ b/internal/tls/testdata/tls-ca.crt
@@ -1,29 +1,29 @@
 -----BEGIN CERTIFICATE-----
 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
-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
+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
-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
-XAxZrkcSjnvQln5DWkaIYBR0xhKDQM3BG+Q=
+BBSWf0MJGMR6k7iAcZMQBOIFr+DoGjANBgkqhkiG9w0BAQsFAAOCAgEAHQib14b2
+y1b9Xa+lvvpyho887AF5LJMvcAaFA2qrZTgsct9YAUyP4jwHSMa82F34GF5zWm96
+wKGa2V7rykKPLtL2o0ilfnz3bJndL2MUjgVqK7GzkOGIhhXreG6/4WZ+oNReMzjw
+uZ6zWKhUrTKfvt5J70Nzk+aPrwEzOOcb078QfrFvxElrkoyBz5LGF6HVdIVYUO94
+1DW1egaduIZCcmavO/CJ5QvzXMyiHkpuT0SoltvVFskoP9aS0OxnaQIrmNx+vajT
+9zd/WMroxBh+z4Y6sQmy6zZF+rAPItgZNHncMt8AJBGUlAhjgtiP37v/+w5zKpOD
+nXPKVf9mOPNdIDUBpzWxRXwkE1GI8kFjQsuiBD0RGNj1Db/m9lnxOX2B1vKOHRtg
+Q3LQURMd3oNj2L4dnJG4SbfXi6CdxRPPtvAb2TJh8qIsL7WxDRey1uhmQWknYXso
+kiQ1VgEBVwOXR3NGqlDboWYma/wDOtbaMSd0dl2m2PP7FXJNakUmrATNdwrWjuto
+onSHblkkDI5NvA+xUPXm4n7os3DHl6upvToVRTIDaWDBJLGyWEVw87y8+VPR0l5g
+XpYDatVLlgC/Nz3Ggn3vepGPV25d7COORXI1EXfjn2PUx7lEK0MbaPfkqPC43Q1g
+qubuxdWE+FRLgfs3Ywv1JckNAec7Jg0FA2w=
 -----END CERTIFICATE-----