diff --git a/hawkbit-ddi-resource/src/test/java/org/eclipse/hawkbit/ddi/rest/resource/DdiDeploymentBaseTest.java b/hawkbit-ddi-resource/src/test/java/org/eclipse/hawkbit/ddi/rest/resource/DdiDeploymentBaseTest.java
index 0ec0d0d7e..584c774d5 100644
--- a/hawkbit-ddi-resource/src/test/java/org/eclipse/hawkbit/ddi/rest/resource/DdiDeploymentBaseTest.java
+++ b/hawkbit-ddi-resource/src/test/java/org/eclipse/hawkbit/ddi/rest/resource/DdiDeploymentBaseTest.java
@@ -60,8 +60,8 @@ import ru.yandex.qatools.allure.annotations.Stories;
 @Stories("Deployment Action Resource")
 public class DdiDeploymentBaseTest extends AbstractRestIntegrationTestWithMongoDB {
 
-    private static final String HTTP_LOCALHOST = "http://localhost:8080/";
-    private static final String HTTPS_LOCALHOST = "https://localhost:8080/";
+    private static final String HTTP_LOCALHOST = "http://localhost/";
+    private static final String HTTPS_LOCALHOST = "https://localhost/";
 
     @Test()
     @Description("Ensures that artifacts are not found, when softare module does not exists.")
diff --git a/hawkbit-dmf-amqp/src/test/java/org/eclipse/hawkbit/util/PropertyBasedArtifactUrlHandlerTest.java b/hawkbit-dmf-amqp/src/test/java/org/eclipse/hawkbit/util/PropertyBasedArtifactUrlHandlerTest.java
index 8cd92d2bd..92e8f390d 100644
--- a/hawkbit-dmf-amqp/src/test/java/org/eclipse/hawkbit/util/PropertyBasedArtifactUrlHandlerTest.java
+++ b/hawkbit-dmf-amqp/src/test/java/org/eclipse/hawkbit/util/PropertyBasedArtifactUrlHandlerTest.java
@@ -35,8 +35,8 @@ import ru.yandex.qatools.allure.annotations.Stories;
         org.eclipse.hawkbit.RepositoryApplicationConfiguration.class })
 public class PropertyBasedArtifactUrlHandlerTest extends AbstractIntegrationTestWithMongoDB {
 
-    private static final String HTTPS_LOCALHOST = "https://localhost:8080/";
-    private static final String HTTP_LOCALHOST = "http://localhost:8080/";
+    private static final String HTTPS_LOCALHOST = "https://localhost/";
+    private static final String HTTP_LOCALHOST = "http://localhost/";
 
     @Autowired
     private ArtifactUrlHandler urlHandlerProperties;