diff --git a/scm-core/src/test/java/sonia/scm/util/HttpUtilTest.java b/scm-core/src/test/java/sonia/scm/util/HttpUtilTest.java
index 04faea138b..e1bbe09846 100644
--- a/scm-core/src/test/java/sonia/scm/util/HttpUtilTest.java
+++ b/scm-core/src/test/java/sonia/scm/util/HttpUtilTest.java
@@ -37,8 +37,16 @@ package sonia.scm.util;
 
 import org.junit.Test;
 
+import sonia.scm.config.ScmConfiguration;
+
 import static org.junit.Assert.*;
 
+import static org.mockito.Mockito.*;
+
+//~--- JDK imports ------------------------------------------------------------
+
+import javax.servlet.http.HttpServletRequest;
+
 /**
  *
  * @author Sebastian Sdorra
@@ -61,4 +69,22 @@ public class HttpUtilTest
         HttpUtil.getPortFromUrl("http://www.scm-manager.org:8181/test/folder")
         == 8181);
   }
+
+  /**
+   * Method description
+   *
+   */
+  @Test
+  public void getServerPortTest()
+  {
+    HttpServletRequest request = mock(HttpServletRequest.class);
+
+    when(request.getServerPort()).thenReturn(443);
+
+    ScmConfiguration config = new ScmConfiguration();
+
+    assertTrue(HttpUtil.getServerPort(config, request) == 443);
+    config.setBaseUrl("http://www.scm-manager.org:8080");
+    assertTrue(HttpUtil.getServerPort(config, request) == 8080);
+  }
 }