diff --git a/app/src/androidTest/java/org/fnives/test/showcase/endtoend/LoginLogoutEndToEndTest.kt b/app/src/androidTest/java/org/fnives/test/showcase/endtoend/LoginLogoutEndToEndTest.kt
index 4cd6c5f..9651ea5 100644
--- a/app/src/androidTest/java/org/fnives/test/showcase/endtoend/LoginLogoutEndToEndTest.kt
+++ b/app/src/androidTest/java/org/fnives/test/showcase/endtoend/LoginLogoutEndToEndTest.kt
@@ -11,12 +11,12 @@ import androidx.test.rule.ActivityTestRule
 import androidx.test.runner.AndroidJUnit4
 import kotlinx.coroutines.test.UnconfinedTestDispatcher
 import org.fnives.test.showcase.R
-import org.fnives.test.showcase.network.testutil.NetworkTestConfigurationHelper
-import org.fnives.test.showcase.testutils.idling.CompositeDisposable
-import org.fnives.test.showcase.testutils.idling.Disposable
-import org.fnives.test.showcase.testutils.idling.IdlingResourceDisposable
-import org.fnives.test.showcase.testutils.idling.OkHttp3IdlingResource
+import org.fnives.test.showcase.android.testutil.synchronization.idlingresources.CompositeDisposable
+import org.fnives.test.showcase.android.testutil.synchronization.idlingresources.Disposable
+import org.fnives.test.showcase.android.testutil.synchronization.idlingresources.IdlingResourceDisposable
+import org.fnives.test.showcase.android.testutil.synchronization.idlingresources.OkHttp3IdlingResource
 import org.fnives.test.showcase.android.testutil.synchronization.loopMainThreadFor
+import org.fnives.test.showcase.network.testutil.NetworkTestConfigurationHelper
 import org.fnives.test.showcase.testutils.storage.TestDatabaseInitialization
 import org.fnives.test.showcase.ui.splash.SplashActivity
 import org.hamcrest.Description
diff --git a/app/src/robolectricTest/java/org/fnives/test/showcase/ui/RobolectricAuthActivityInstrumentedTest.kt b/app/src/robolectricTest/java/org/fnives/test/showcase/ui/RobolectricAuthActivityInstrumentedTest.kt
index f66736f..1cc7276 100644
--- a/app/src/robolectricTest/java/org/fnives/test/showcase/ui/RobolectricAuthActivityInstrumentedTest.kt
+++ b/app/src/robolectricTest/java/org/fnives/test/showcase/ui/RobolectricAuthActivityInstrumentedTest.kt
@@ -11,15 +11,15 @@ import kotlinx.coroutines.test.TestDispatcher
 import kotlinx.coroutines.test.resetMain
 import kotlinx.coroutines.test.setMain
 import org.fnives.test.showcase.R
+import org.fnives.test.showcase.android.testutil.activity.safeClose
+import org.fnives.test.showcase.android.testutil.synchronization.idlingresources.CompositeDisposable
+import org.fnives.test.showcase.android.testutil.synchronization.idlingresources.Disposable
+import org.fnives.test.showcase.android.testutil.synchronization.idlingresources.IdlingResourceDisposable
+import org.fnives.test.showcase.android.testutil.synchronization.idlingresources.OkHttp3IdlingResource
 import org.fnives.test.showcase.network.mockserver.MockServerScenarioSetup
 import org.fnives.test.showcase.network.mockserver.scenario.auth.AuthScenario
 import org.fnives.test.showcase.network.testutil.NetworkTestConfigurationHelper
-import org.fnives.test.showcase.testutils.idling.CompositeDisposable
-import org.fnives.test.showcase.testutils.idling.Disposable
-import org.fnives.test.showcase.testutils.idling.IdlingResourceDisposable
 import org.fnives.test.showcase.testutils.idling.MainDispatcherTestRule.Companion.advanceUntilIdleWithIdlingResources
-import org.fnives.test.showcase.testutils.idling.OkHttp3IdlingResource
-import org.fnives.test.showcase.android.testutil.activity.safeClose
 import org.fnives.test.showcase.testutils.storage.TestDatabaseInitialization
 import org.fnives.test.showcase.ui.auth.AuthActivity
 import org.junit.After
diff --git a/app/src/sharedTest/java/org/fnives/test/showcase/testutils/idling/Disposable.kt b/app/src/sharedTest/java/org/fnives/test/showcase/testutils/idling/Disposable.kt
deleted file mode 100644
index 56a3e04..0000000
--- a/app/src/sharedTest/java/org/fnives/test/showcase/testutils/idling/Disposable.kt
+++ /dev/null
@@ -1,6 +0,0 @@
-package org.fnives.test.showcase.testutils.idling
-
-interface Disposable {
-    val isDisposed: Boolean
-    fun dispose()
-}
diff --git a/app/src/sharedTest/java/org/fnives/test/showcase/testutils/idling/NetworkSynchronizationTestRule.kt b/app/src/sharedTest/java/org/fnives/test/showcase/testutils/idling/NetworkSynchronizationTestRule.kt
index d2cf705..ee3cff5 100644
--- a/app/src/sharedTest/java/org/fnives/test/showcase/testutils/idling/NetworkSynchronizationTestRule.kt
+++ b/app/src/sharedTest/java/org/fnives/test/showcase/testutils/idling/NetworkSynchronizationTestRule.kt
@@ -3,6 +3,10 @@ package org.fnives.test.showcase.testutils.idling
 import androidx.annotation.CheckResult
 import androidx.test.espresso.IdlingResource
 import okhttp3.OkHttpClient
+import org.fnives.test.showcase.android.testutil.synchronization.idlingresources.CompositeDisposable
+import org.fnives.test.showcase.android.testutil.synchronization.idlingresources.Disposable
+import org.fnives.test.showcase.android.testutil.synchronization.idlingresources.IdlingResourceDisposable
+import org.fnives.test.showcase.android.testutil.synchronization.idlingresources.OkHttp3IdlingResource
 import org.fnives.test.showcase.network.testutil.NetworkTestConfigurationHelper
 import org.junit.rules.TestRule
 import org.junit.runner.Description
diff --git a/test-util-android/build.gradle b/test-util-android/build.gradle
index 6459217..91dbe0b 100644
--- a/test-util-android/build.gradle
+++ b/test-util-android/build.gradle
@@ -33,4 +33,5 @@ dependencies {
     implementation "org.jetbrains.kotlinx:kotlinx-coroutines-test:$coroutines_version"
     implementation "androidx.test:core:$androidx_test_version"
     implementation"androidx.test.espresso:espresso-core:$espresso_version"
+    implementation "com.squareup.okhttp3:okhttp:$okhttp_version"
 }
\ No newline at end of file
diff --git a/app/src/sharedTest/java/org/fnives/test/showcase/testutils/idling/CompositeDisposable.kt b/test-util-android/src/main/java/org/fnives/test/showcase/android/testutil/synchronization/idlingresources/CompositeDisposable.kt
similarity index 85%
rename from app/src/sharedTest/java/org/fnives/test/showcase/testutils/idling/CompositeDisposable.kt
rename to test-util-android/src/main/java/org/fnives/test/showcase/android/testutil/synchronization/idlingresources/CompositeDisposable.kt
index a3fbda4..ff3c139 100644
--- a/app/src/sharedTest/java/org/fnives/test/showcase/testutils/idling/CompositeDisposable.kt
+++ b/test-util-android/src/main/java/org/fnives/test/showcase/android/testutil/synchronization/idlingresources/CompositeDisposable.kt
@@ -1,4 +1,4 @@
-package org.fnives.test.showcase.testutils.idling
+package org.fnives.test.showcase.android.testutil.synchronization.idlingresources
 
 class CompositeDisposable(disposable: List<Disposable> = emptyList()) : Disposable {
 
diff --git a/test-util-android/src/main/java/org/fnives/test/showcase/android/testutil/synchronization/idlingresources/Disposable.kt b/test-util-android/src/main/java/org/fnives/test/showcase/android/testutil/synchronization/idlingresources/Disposable.kt
new file mode 100644
index 0000000..32f97a1
--- /dev/null
+++ b/test-util-android/src/main/java/org/fnives/test/showcase/android/testutil/synchronization/idlingresources/Disposable.kt
@@ -0,0 +1,6 @@
+package org.fnives.test.showcase.android.testutil.synchronization.idlingresources
+
+interface Disposable {
+    val isDisposed: Boolean
+    fun dispose()
+}
diff --git a/app/src/sharedTest/java/org/fnives/test/showcase/testutils/idling/IdlingResourceDisposable.kt b/test-util-android/src/main/java/org/fnives/test/showcase/android/testutil/synchronization/idlingresources/IdlingResourceDisposable.kt
similarity index 69%
rename from app/src/sharedTest/java/org/fnives/test/showcase/testutils/idling/IdlingResourceDisposable.kt
rename to test-util-android/src/main/java/org/fnives/test/showcase/android/testutil/synchronization/idlingresources/IdlingResourceDisposable.kt
index df5e2f3..2d2e934 100644
--- a/app/src/sharedTest/java/org/fnives/test/showcase/testutils/idling/IdlingResourceDisposable.kt
+++ b/test-util-android/src/main/java/org/fnives/test/showcase/android/testutil/synchronization/idlingresources/IdlingResourceDisposable.kt
@@ -1,9 +1,9 @@
-package org.fnives.test.showcase.testutils.idling
+package org.fnives.test.showcase.android.testutil.synchronization.idlingresources
 
 import androidx.test.espresso.IdlingRegistry
 import androidx.test.espresso.IdlingResource
 
-internal class IdlingResourceDisposable(private val idlingResource: IdlingResource) : Disposable {
+class IdlingResourceDisposable(private val idlingResource: IdlingResource) : Disposable {
     override var isDisposed: Boolean = false
         private set
 
diff --git a/app/src/sharedTest/java/org/fnives/test/showcase/testutils/idling/OkHttp3IdlingResource.kt b/test-util-android/src/main/java/org/fnives/test/showcase/android/testutil/synchronization/idlingresources/OkHttp3IdlingResource.kt
similarity index 94%
rename from app/src/sharedTest/java/org/fnives/test/showcase/testutils/idling/OkHttp3IdlingResource.kt
rename to test-util-android/src/main/java/org/fnives/test/showcase/android/testutil/synchronization/idlingresources/OkHttp3IdlingResource.kt
index 14dd5a3..f0770ff 100644
--- a/app/src/sharedTest/java/org/fnives/test/showcase/testutils/idling/OkHttp3IdlingResource.kt
+++ b/test-util-android/src/main/java/org/fnives/test/showcase/android/testutil/synchronization/idlingresources/OkHttp3IdlingResource.kt
@@ -1,4 +1,4 @@
-package org.fnives.test.showcase.testutils.idling
+package org.fnives.test.showcase.android.testutil.synchronization.idlingresources
 
 import androidx.annotation.CheckResult
 import androidx.annotation.NonNull
@@ -40,7 +40,7 @@ class OkHttp3IdlingResource private constructor(
          * this instance using `Espresso.registerIdlingResources`.
          */
         @CheckResult
-        @NonNull // Extra guards as a library.
+        @NonNull
         fun create(@NonNull name: String?, @NonNull client: OkHttpClient?): OkHttp3IdlingResource {
             if (name == null) throw NullPointerException("name == null")
             if (client == null) throw NullPointerException("client == null")