diff --git a/stream-tests/src/test/resources/Makefile b/stream-tests/src/test/resources/Makefile
new file mode 100644
index 0000000000..068a75523f
--- /dev/null
+++ b/stream-tests/src/test/resources/Makefile
@@ -0,0 +1,19 @@
+# Documents how truststore and keystore were created
+# A similar Makefile is found in remote/src/test/resources/, however here the cert is created without specifying a Subject Alternate Name
+all: truststore keystore
+
+truststore: domain.crt
+	keytool -importcert -file domain.crt -keystore truststore -deststorepass changeme
+
+keystore: domain.crt domain.key
+	openssl pkcs12 -export -inkey domain.key -passin pass:changeme -in domain.crt -out keystore -passout pass:changeme
+
+domain.crt: domain.csr domain.key
+	openssl x509 -req -in domain.csr -sha256 -out domain.crt -signkey domain.key
+
+domain.csr:
+	openssl req -new -newkey rsa:2048 -keyout domain.key -subj "/C=US/ST=Delaware/O=Apache/CN=pekko-remote" -out domain.csr -passout pass:changeme
+
+.PHONY: clean
+clean:
+	rm domain.key domain.crt domain.csr keystore truststore 
\ No newline at end of file
diff --git a/stream-tests/src/test/resources/keystore b/stream-tests/src/test/resources/keystore
index ee5581d930..2b0237562b 100644
Binary files a/stream-tests/src/test/resources/keystore and b/stream-tests/src/test/resources/keystore differ
diff --git a/stream-tests/src/test/resources/truststore b/stream-tests/src/test/resources/truststore
index cc07616dad..3cc1983600 100644
Binary files a/stream-tests/src/test/resources/truststore and b/stream-tests/src/test/resources/truststore differ
diff --git a/stream-tests/src/test/scala/org/apache/pekko/stream/io/DeprecatedTlsSpec.scala b/stream-tests/src/test/scala/org/apache/pekko/stream/io/DeprecatedTlsSpec.scala
index 168d8d62ba..e16d8bda64 100644
--- a/stream-tests/src/test/scala/org/apache/pekko/stream/io/DeprecatedTlsSpec.scala
+++ b/stream-tests/src/test/scala/org/apache/pekko/stream/io/DeprecatedTlsSpec.scala
@@ -526,7 +526,7 @@ class DeprecatedTlsSpec extends StreamSpec(DeprecatedTlsSpec.configOverrides) wi
 
         Source.single(SendBytes(ByteString.empty)).via(flow).runWith(Sink.ignore)
       }
-      Await.result(run("akka-remote"), 3.seconds) // CN=akka-remote
+      Await.result(run("pekko-remote"), 3.seconds) // CN=pekko-remote
       val cause = intercept[Exception] {
         Await.result(run("unknown.example.org"), 3.seconds)
       }
diff --git a/stream-tests/src/test/scala/org/apache/pekko/stream/io/TlsSpec.scala b/stream-tests/src/test/scala/org/apache/pekko/stream/io/TlsSpec.scala
index 871c54dffd..415eababc2 100644
--- a/stream-tests/src/test/scala/org/apache/pekko/stream/io/TlsSpec.scala
+++ b/stream-tests/src/test/scala/org/apache/pekko/stream/io/TlsSpec.scala
@@ -574,7 +574,7 @@ class TlsSpec extends StreamSpec(TlsSpec.configOverrides) with WithLogCapturing
           Source.single(SendBytes(ByteString.empty)).via(flow).runWith(Sink.ignore)
         }
 
-        Await.result(run("akka-remote"), 3.seconds) // CN=akka-remote
+        Await.result(run("pekko-remote"), 3.seconds) // CN=pekko-remote
         val cause = intercept[Exception] {
           Await.result(run("unknown.example.org"), 3.seconds)
         }