diff --git a/firebase-auth/src/commonTest/kotlin/dev/gitlive/firebase/auth/auth.kt b/firebase-auth/src/commonTest/kotlin/dev/gitlive/firebase/auth/auth.kt
index 457fed86f..d0fe6a2aa 100644
--- a/firebase-auth/src/commonTest/kotlin/dev/gitlive/firebase/auth/auth.kt
+++ b/firebase-auth/src/commonTest/kotlin/dev/gitlive/firebase/auth/auth.kt
@@ -33,7 +33,7 @@ class FirebaseAuthTest {
         )
 
         auth = Firebase.auth(app).apply {
-            useEmulator(emulatorHost, 9094)
+            useEmulator(emulatorHost, 9099)
         }
     }
 
diff --git a/firebase-firestore/src/commonTest/kotlin/dev/gitlive/firebase/firestore/firestore.kt b/firebase-firestore/src/commonTest/kotlin/dev/gitlive/firebase/firestore/firestore.kt
index 7fbf48172..0eb41f96e 100644
--- a/firebase-firestore/src/commonTest/kotlin/dev/gitlive/firebase/firestore/firestore.kt
+++ b/firebase-firestore/src/commonTest/kotlin/dev/gitlive/firebase/firestore/firestore.kt
@@ -64,6 +64,7 @@ class FirebaseFirestoreTest {
 
         firestore = Firebase.firestore(app).apply {
             useEmulator(emulatorHost, 8080)
+            setSettings(FirebaseFirestore.Settings.create(cacheSettings = LocalCacheSettings.Memory(LocalCacheSettings.Memory.GarbageCollectorSettings.Eager)))
         }
     }
 
diff --git a/gradle.properties b/gradle.properties
index c3674c9d9..b6c72a41e 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -12,7 +12,7 @@ kotlin.mpp.stability.nowarn=true
 kotlin.native.enableParallelExecutionCheck=false
 kotlin.setJvmTargetFromAndroidCompileOptions=true
 org.gradle.jvmargs=-Xmx8G -Dfile.encoding\=UTF-8 -XX:MaxMetaspaceSize=512m -Dkotlin.daemon.jvm.options\=-Xmx8G,-XX:MaxMetaspaceSize=512m
-org.gradle.parallel=false
+org.gradle.parallel=true
 systemProp.org.gradle.internal.publish.checksums.insecure=true
 testOptions.unitTests.isIncludeAndroidResources=true
 kotlin.mpp.enableCInteropCommonization=true
diff --git a/test/firebase.json b/test/firebase.json
index 452d6952c..5b55e4f2c 100644
--- a/test/firebase.json
+++ b/test/firebase.json
@@ -10,7 +10,7 @@
   },
   "emulators": {
     "auth": {
-      "port": 9094
+      "port": 9099
     },
     "firestore": {
       "port": 8080