diff --git a/src/test/java/fi/livi/digitraffic/tie/AbstractTest.java b/src/test/java/fi/livi/digitraffic/tie/AbstractTest.java
index f3d3f76ed..7860c2910 100644
--- a/src/test/java/fi/livi/digitraffic/tie/AbstractTest.java
+++ b/src/test/java/fi/livi/digitraffic/tie/AbstractTest.java
@@ -13,7 +13,9 @@
     "roadConditions.baseUrl=https://roadConditions/",
     "roadConditions.suid=suid",
     "roadConditions.user=user",
-    "roadConditions.pass=pass"
+    "roadConditions.pass=pass",
+    // https://github.com/spring-projects/spring-boot/issues/39735 as default Tomcat listens 0.0.0.0 and stopping takes ages
+    "server.address=127.0.0.1"
 })
 public abstract class AbstractTest {
 
diff --git a/src/test/java/fi/livi/digitraffic/tie/SwaggerUiWebTest.java b/src/test/java/fi/livi/digitraffic/tie/SwaggerUiWebTest.java
index 39f7aff34..9a1488de8 100644
--- a/src/test/java/fi/livi/digitraffic/tie/SwaggerUiWebTest.java
+++ b/src/test/java/fi/livi/digitraffic/tie/SwaggerUiWebTest.java
@@ -8,11 +8,9 @@
 import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.jsonPath;
 import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
 
-import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.MediaType;
-import org.springframework.test.web.servlet.setup.MockMvcBuilders;
 
 import fi.livi.digitraffic.tie.controller.beta.BetaController;
 import fi.livi.digitraffic.tie.controller.tms.TmsControllerV1;
@@ -25,11 +23,6 @@ public class SwaggerUiWebTest extends AbstractRestWebTest {
 
     private final MediaType restContentType = MediaType.APPLICATION_JSON;
 
-    @BeforeEach
-    public void setup() {
-        this.mockMvc = MockMvcBuilders.webAppContextSetup(wac).build();
-    }
-
     @Test
     public void testSwaggerHome() throws Exception {
         this.mockMvc.perform(get("/swagger-ui/index.html")).andExpect(status().isOk())