diff --git a/mockserver/src/main/java/org/fnives/test/showcase/network/mockserver/MockServerScenarioSetup.kt b/mockserver/src/main/java/org/fnives/test/showcase/network/mockserver/MockServerScenarioSetup.kt
index b1da9c2..f1a94f4 100644
--- a/mockserver/src/main/java/org/fnives/test/showcase/network/mockserver/MockServerScenarioSetup.kt
+++ b/mockserver/src/main/java/org/fnives/test/showcase/network/mockserver/MockServerScenarioSetup.kt
@@ -20,13 +20,13 @@ class MockServerScenarioSetup internal constructor(
     var clientCertificates: HandshakeCertificates? = null
         private set
 
-    fun start(useHttps: Boolean) {
+    fun start(useHttps: Boolean): String {
         val mockWebServer = MockWebServer().also { this.mockWebServer = it }
         if (useHttps) {
             clientCertificates = mockWebServer.useHttps()
         }
         mockWebServer.dispatcher = networkDispatcher
-        mockWebServer.start(InetAddress.getLocalHost(), PORT)
+        return mockWebServer.url("/").toString()
     }
 
     /**
@@ -69,9 +69,6 @@ class MockServerScenarioSetup internal constructor(
     }
 
     companion object {
-        const val PORT: Int = 7335
-        val HTTP_BASE_URL get() = "http://${InetAddress.getLocalHost().canonicalHostName}"
-        val HTTPS_BASE_URL get() = "https://localhost"
 
         private fun MockWebServer.useHttps(): HandshakeCertificates {
             val localhost = InetAddress.getByName("localhost").canonicalHostName
diff --git a/network/src/test/java/org/fnives/test/showcase/network/shared/MockServerScenarioSetupExtensions.kt b/network/src/test/java/org/fnives/test/showcase/network/shared/MockServerScenarioSetupExtensions.kt
index a74864d..6c6fd7d 100644
--- a/network/src/test/java/org/fnives/test/showcase/network/shared/MockServerScenarioSetupExtensions.kt
+++ b/network/src/test/java/org/fnives/test/showcase/network/shared/MockServerScenarioSetupExtensions.kt
@@ -7,12 +7,12 @@ import org.junit.jupiter.api.extension.ExtensionContext
 
 class MockServerScenarioSetupExtensions : BeforeEachCallback, AfterEachCallback {
 
-    val url: String = "${MockServerScenarioSetup.HTTP_BASE_URL}:${MockServerScenarioSetup.PORT}/"
+    lateinit var url: String
     lateinit var mockServerScenarioSetup: MockServerScenarioSetup
 
     override fun beforeEach(context: ExtensionContext?) {
         mockServerScenarioSetup = MockServerScenarioSetup()
-        mockServerScenarioSetup.start(false)
+        url = mockServerScenarioSetup.start(false)
     }
 
     override fun afterEach(context: ExtensionContext?) {