diff --git a/arrow-libs/core/arrow-core-retrofit/src/test/kotlin/arrow/retrofit/adapter/either/ArrowEitherCallAdapterTest.kt b/arrow-libs/core/arrow-core-retrofit/src/test/kotlin/arrow/retrofit/adapter/either/ArrowEitherCallAdapterTest.kt
index 3089af5b731..a1c16bd47c5 100644
--- a/arrow-libs/core/arrow-core-retrofit/src/test/kotlin/arrow/retrofit/adapter/either/ArrowEitherCallAdapterTest.kt
+++ b/arrow-libs/core/arrow-core-retrofit/src/test/kotlin/arrow/retrofit/adapter/either/ArrowEitherCallAdapterTest.kt
@@ -5,7 +5,7 @@ import arrow.core.right
 import arrow.core.test.UnitSpec
 import arrow.retrofit.adapter.mock.ErrorMock
 import arrow.retrofit.adapter.mock.ResponseMock
-import arrow.retrofit.adapter.retrofit.SuspedApiClientTest
+import arrow.retrofit.adapter.retrofit.SuspendApiTestClient
 import io.kotest.matchers.shouldBe
 import okhttp3.mockwebserver.MockResponse
 import okhttp3.mockwebserver.MockWebServer
@@ -15,21 +15,23 @@ import retrofit2.converter.gson.GsonConverterFactory
 
 class ArrowEitherCallAdapterTest : UnitSpec() {
 
-  private val server = MockWebServer()
-
-  private val service: SuspedApiClientTest by lazy {
-    Retrofit.Builder()
-      .baseUrl(server.url("/"))
-      .addConverterFactory(GsonConverterFactory.create())
-      .addCallAdapterFactory(EitherCallAdapterFactory.create())
-      .build()
-      .create(SuspedApiClientTest::class.java)
-  }
+  private lateinit var server: MockWebServer
+  private lateinit var service: SuspendApiTestClient
 
   init {
 
-    beforeSpec { server.start() }
-    afterSpec { server.shutdown() }
+    beforeAny {
+      server = MockWebServer()
+      server.start()
+      service = Retrofit.Builder()
+        .baseUrl(server.url("/"))
+        .addConverterFactory(GsonConverterFactory.create())
+        .addCallAdapterFactory(EitherCallAdapterFactory.create())
+        .build()
+        .create(SuspendApiTestClient::class.java)
+    }
+
+    afterAny { server.shutdown() }
 
     "should return ResponseMock for 200 with valid JSON" {
       server.enqueue(MockResponse().setBody("""{"response":"Arrow rocks"}"""))
diff --git a/arrow-libs/core/arrow-core-retrofit/src/test/kotlin/arrow/retrofit/adapter/either/ArrowResponseEAdapterTest.kt b/arrow-libs/core/arrow-core-retrofit/src/test/kotlin/arrow/retrofit/adapter/either/ArrowResponseEAdapterTest.kt
index 9681c76704f..36f45a90995 100644
--- a/arrow-libs/core/arrow-core-retrofit/src/test/kotlin/arrow/retrofit/adapter/either/ArrowResponseEAdapterTest.kt
+++ b/arrow-libs/core/arrow-core-retrofit/src/test/kotlin/arrow/retrofit/adapter/either/ArrowResponseEAdapterTest.kt
@@ -5,7 +5,7 @@ import arrow.core.right
 import arrow.core.test.UnitSpec
 import arrow.retrofit.adapter.mock.ErrorMock
 import arrow.retrofit.adapter.mock.ResponseMock
-import arrow.retrofit.adapter.retrofit.SuspedApiClientTest
+import arrow.retrofit.adapter.retrofit.SuspendApiTestClient
 import io.kotest.matchers.shouldBe
 import okhttp3.mockwebserver.MockResponse
 import okhttp3.mockwebserver.MockWebServer
@@ -15,21 +15,23 @@ import retrofit2.converter.gson.GsonConverterFactory
 
 class ArrowResponseEAdapterTest : UnitSpec() {
 
-  private val server = MockWebServer()
-
-  private val service: SuspedApiClientTest by lazy {
-    Retrofit.Builder()
-      .baseUrl(server.url("/"))
-      .addConverterFactory(GsonConverterFactory.create())
-      .addCallAdapterFactory(EitherCallAdapterFactory.create())
-      .build()
-      .create(SuspedApiClientTest::class.java)
-  }
+  private lateinit var server: MockWebServer
+  private lateinit var service: SuspendApiTestClient
 
   init {
 
-    beforeSpec { server.start() }
-    afterSpec { server.shutdown() }
+    beforeAny {
+      server = MockWebServer()
+      server.start()
+      service = Retrofit.Builder()
+        .baseUrl(server.url("/"))
+        .addConverterFactory(GsonConverterFactory.create())
+        .addCallAdapterFactory(EitherCallAdapterFactory.create())
+        .build()
+        .create(SuspendApiTestClient::class.java)
+    }
+
+    afterAny { server.shutdown() }
 
     "should return ResponseMock for 200 with valid JSON" {
       server.enqueue(MockResponse().setBody("""{"response":"Arrow rocks"}"""))
diff --git a/arrow-libs/core/arrow-core-retrofit/src/test/kotlin/arrow/retrofit/adapter/retrofit/SuspedApiClientTest.kt b/arrow-libs/core/arrow-core-retrofit/src/test/kotlin/arrow/retrofit/adapter/retrofit/SuspendApiTestClient.kt
similarity index 92%
rename from arrow-libs/core/arrow-core-retrofit/src/test/kotlin/arrow/retrofit/adapter/retrofit/SuspedApiClientTest.kt
rename to arrow-libs/core/arrow-core-retrofit/src/test/kotlin/arrow/retrofit/adapter/retrofit/SuspendApiTestClient.kt
index d884ceed91d..f44336b4ae8 100644
--- a/arrow-libs/core/arrow-core-retrofit/src/test/kotlin/arrow/retrofit/adapter/retrofit/SuspedApiClientTest.kt
+++ b/arrow-libs/core/arrow-core-retrofit/src/test/kotlin/arrow/retrofit/adapter/retrofit/SuspendApiTestClient.kt
@@ -6,7 +6,7 @@ import arrow.retrofit.adapter.mock.ErrorMock
 import arrow.retrofit.adapter.mock.ResponseMock
 import retrofit2.http.GET
 
-interface SuspedApiClientTest {
+interface SuspendApiTestClient {
 
   @GET("/")
   suspend fun getEither(): Either<ErrorMock, ResponseMock>