diff --git a/.docker/cert.sh b/.docker/cert.sh
index e22cfba2995b5fd9d812232f562b7254233fe5b0..efc660ba784924cca0b21515d3c846348b1fa628 100755
--- a/.docker/cert.sh
+++ b/.docker/cert.sh
@@ -43,6 +43,7 @@ function cert() {
     # Certificate is for localhost
     KEYPW="${KEYPW}" openssl req -new -x509 -key caosdb.key.pem \
          -out caosdb.cert.pem -passin env:KEYPW \
+         -addext "subjectAltName = DNS:${CAOSHOSTNAME}" \
          -subj "/C=/ST=/L=/O=/OU=/CN=${CAOSHOSTNAME}"
     KEYPW="${KEYPW}" KEYSTOREPW="$KEYSTOREPW" openssl pkcs12 -export \
          -inkey caosdb.key.pem -in caosdb.cert.pem -out all-certs.pkcs12 \
diff --git a/.gitignore b/.gitignore
index 33eb35cfe783041b0a3380e9710e42d7320e41f8..f5e46b698cdb99eb18c7bac8e226c7692325cbd7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,7 @@
 # General
 build/
 include/libcaosdbConfig.h
+cert/
 .*
 
 # CMake
diff --git a/test/test_connection.cpp b/test/test_connection.cpp
index f2bc8298f6ba96539679d4a23b7e3ded483c20e0..4b62179fa4ff13d467c6e1c17e06d85a434b490c 100644
--- a/test/test_connection.cpp
+++ b/test/test_connection.cpp
@@ -76,7 +76,7 @@ TEST(test_connection, connection_ssl_authentication_error) {
 }
 
 TEST(test_connection, connection_ssl_authentication_success) {
-  auto port = 8443;
+  auto port = 8080;
   const auto host = caosdb::utils::get_env_var("CAOSDB_SERVER_HOST", "localhost");
   const auto path = caosdb::utils::get_env_var("CAOSDB_SERVER_CA_PEM", std::string());
   const auto user = caosdb::utils::get_env_var("CAOSDB_USER", "admin");