diff --git a/src/test/java/de/ganskef/test/SecureServer.java b/src/test/java/de/ganskef/test/SecureServer.java
index <HASH>..<HASH> 100644
--- a/src/test/java/de/ganskef/test/SecureServer.java
+++ b/src/test/java/de/ganskef/test/SecureServer.java
@@ -34,7 +34,11 @@ public class SecureServer extends Server {
 
     @Override
     public String getBaseUrl() {
-        return ("https://localhost:" + getPort());
+        if (getPort() == 443) {
+            return ("https://localhost");
+        } else {
+            return ("https://localhost:" + getPort());
+        }
     }
 
     public static void main(String[] args) throws Exception {
diff --git a/src/test/java/de/ganskef/test/Server.java b/src/test/java/de/ganskef/test/Server.java
index <HASH>..<HASH> 100644
--- a/src/test/java/de/ganskef/test/Server.java
+++ b/src/test/java/de/ganskef/test/Server.java
@@ -43,7 +43,11 @@ public class Server {
     }
 
     public String getBaseUrl() {
-        return ("http://127.0.0.1");
+        if (port == 80) {
+            return ("http://127.0.0.1");
+        } else {
+            return ("http://127.0.0.1:" + port);
+        }
     }
 
     public static void main(String[] args) throws Exception {
Revert last commit

"Fix scheme handling in the servers" was totally wrong