diff --git a/remote/src/test/resources/Makefile b/remote/src/test/resources/Makefile
index 86edcc4eaf..bec01c0ad2 100644
--- a/remote/src/test/resources/Makefile
+++ b/remote/src/test/resources/Makefile
@@ -17,7 +17,7 @@ domain.cnf:
 	echo "subjectAltName=DNS:localhost" >> domain.cnf
 
 domain.csr: domain.cnf
-	openssl req -new -newkey rsa:2048 -keyout domain.key -subj "/C=ZA/ST=web/O=Lightbend/CN=akka-remote" -reqexts SAN -config domain.cnf -out domain.csr -passout pass:changeme
+	openssl req -new -newkey rsa:2048 -keyout domain.key -subj "/C=US/ST=Delaware/O=Apache/CN=pekko-remote" -reqexts SAN -config domain.cnf -out domain.csr -passout pass:changeme
 
 .PHONY: clean
 clean:
diff --git a/remote/src/test/resources/domain.crt b/remote/src/test/resources/domain.crt
index facd3f74a6..f19193d286 100644
--- a/remote/src/test/resources/domain.crt
+++ b/remote/src/test/resources/domain.crt
@@ -1,20 +1,20 @@
 -----BEGIN CERTIFICATE-----
-MIIDMDCCAhigAwIBAgIULYjj2NGVQ1r1MzK9j03lmw/s9AAwDQYJKoZIhvcNAQEL
-BQAwRTELMAkGA1UEBhMCWkExDDAKBgNVBAgMA3dlYjESMBAGA1UECgwJTGlnaHRi
-ZW5kMRQwEgYDVQQDDAtha2thLXJlbW90ZTAeFw0yMDA2MDIxMTA1MDVaFw0yMDA3
-MDIxMTA1MDVaMEUxCzAJBgNVBAYTAlpBMQwwCgYDVQQIDAN3ZWIxEjAQBgNVBAoM
-CUxpZ2h0YmVuZDEUMBIGA1UEAwwLYWtrYS1yZW1vdGUwggEiMA0GCSqGSIb3DQEB
-AQUAA4IBDwAwggEKAoIBAQC8bahFbJFC31YWoyJGdOasMnZHE+D3jjnTmGS+E6Ev
-YxQ1zR+ja2CpDv1M5VjOS4qzVXBXm/2OM35Er6sE+cAdtO8qXq39hzhNoS5nvHIo
-hl881MHIbndohtMZm2NsKM2yHnqnFI4jMnlEK9d8gmn25PsqUwOC9g9h4HOp+qys
-mqDzMmyZSS3qotyximOPBIQcRan6xh9i3Zhi3VRIxMl9WNR1gU5sbOeO4G7xsKyY
-FjfEeVjyDOG1pYHpnBVtqTDJoNzs5jZIslzpZU/iCW1fF2r5VwCuwMj/fgSxz7Qv
-LXqw70QDKeDkebgaTmhqAtYbAT20JXwMCuiE+8Lo4hGbAgMBAAGjGDAWMBQGA1Ud
-EQQNMAuCCWxvY2FsaG9zdDANBgkqhkiG9w0BAQsFAAOCAQEAm97sH2qjazMJV66X
-wJfxk72qHpZIXyzGIAcORcF8lxDOKaqO8q85cZa9uNhq+CtSOEN41KupBKVk4dfa
-ZZ7IWFqptXKsztQ6Ff+ruEX3ZeW3ZsZp72+PuauC6ClNmxZG4/bUA0uKKd8s5yPK
-jqJ3KR6ZuYykBvT2dQrHdI4LQPC4Sh+AZtfizTh21dYz4F1HPe/aBoDx0eAO6oyF
-S0V6Mm8d/ydCg5wS+s0NmNniia3sww2fud+PyR3AaaubSBKhThQg6pQhFiaxjKSz
-IMCg9Yicy8vem5w+HqOJqoyiPDSdxtInyeNKskxcB7ayOpcWj/TX/W379FWABxeo
-rt8eZw==
+MIIDNjCCAh6gAwIBAgIULYe4EBXmMjvX8QpoUDdKsL7L64wwDQYJKoZIhvcNAQEL
+BQAwSDELMAkGA1UEBhMCVVMxETAPBgNVBAgMCERlbGF3YXJlMQ8wDQYDVQQKDAZB
+cGFjaGUxFTATBgNVBAMMDHBla2tvLXJlbW90ZTAeFw0yMzA0MjUyMDMxMTBaFw0y
+MzA1MjUyMDMxMTBaMEgxCzAJBgNVBAYTAlVTMREwDwYDVQQIDAhEZWxhd2FyZTEP
+MA0GA1UECgwGQXBhY2hlMRUwEwYDVQQDDAxwZWtrby1yZW1vdGUwggEiMA0GCSqG
+SIb3DQEBAQUAA4IBDwAwggEKAoIBAQC4Ljhl1x9yitKPRLK7x2p54U+MMpaWqnH8
+IoK1vq4PJ3Tj5V2sXzNBtAcwBjdiQCJAPh77WHWtPpDTsYFXh5RSe0lEc1P3j9Zb
+Hp7DwWzmorwdHpdVVB3eaFktlkjCi/townSxlgeudeGzKIUfI4Jfbs/K9a6cihSQ
+fWxi5H4h+FZRQzoc/8nfQtcQsff89OaQZRBssCrU+fFqX6vEjdTXftXF/wcACYev
+29BoK/IVz0ULS+yJQOiemt7yq5Zu22PDEpzb8gEnrA7gFZ0HwmQmYcMv7Uqfii9Y
+Y7VAK/Lzu9jM5lJsR0tw9W7x0uQzx9SC3iIS75NrDMPPVBGkjvUPAgMBAAGjGDAW
+MBQGA1UdEQQNMAuCCWxvY2FsaG9zdDANBgkqhkiG9w0BAQsFAAOCAQEAbGZD87Ir
+/CrE4hMGZkO0rcdsrBNGeQqKSCNypuTab4bVnCiJP8TxJWlKg5YEkrmv9kKWDKvw
+PE8mH72SM6s/HdMbW2DTXidP3EqRpnehWnDD7jeVj9M/pv/fER1rYZ2yYsjVd2Zw
+jev8kJDQTjrgjUzJAd1XjitXxTwLzajIf9poXlAEZ3Q0yilcsm1pcZwUPxEgxKFW
+Qa2vP0PM5XSSBhn6uFgPrm2e2vheo1oEwFWe2wYL32c5mFpcqPTTNzdWqb8erLKR
+BtHX36+OiOt4KQhgimGecVTVFLoJzIDP4upgb6lqTNfgdJ9+XOOKzhBjnEjGwcwk
+96dbiUglmS/e3A==
 -----END CERTIFICATE-----
diff --git a/remote/src/test/resources/keystore b/remote/src/test/resources/keystore
index 14a0e51f7f..7685885383 100644
Binary files a/remote/src/test/resources/keystore and b/remote/src/test/resources/keystore differ
diff --git a/remote/src/test/resources/truststore b/remote/src/test/resources/truststore
index 7f6041469c..8e0af84787 100644
Binary files a/remote/src/test/resources/truststore and b/remote/src/test/resources/truststore differ
diff --git a/remote/src/test/scala/org/apache/pekko/remote/artery/tcp/ssl/X509ReadersSpec.scala b/remote/src/test/scala/org/apache/pekko/remote/artery/tcp/ssl/X509ReadersSpec.scala
index a8c67ad61e..ec0d1fd211 100644
--- a/remote/src/test/scala/org/apache/pekko/remote/artery/tcp/ssl/X509ReadersSpec.scala
+++ b/remote/src/test/scala/org/apache/pekko/remote/artery/tcp/ssl/X509ReadersSpec.scala
@@ -29,7 +29,7 @@ class X509ReadersSpec extends AnyWordSpec with Matchers {
 
     "read both the CN and the subject alternative names" in {
       val serverCert = loadCert("/domain.crt")
-      X509Readers.getAllSubjectNames(serverCert) mustBe (Set("akka-remote", "localhost"))
+      X509Readers.getAllSubjectNames(serverCert) mustBe (Set("pekko-remote", "localhost"))
     }
 
     "read a certificate that has no SAN extension" in {