diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 5016ee04..11f6fc1d 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -22,7 +22,7 @@ jobs:
           java-version: 21
       - uses: gradle/actions/setup-gradle@v4
       - name: Execute lint check
-        run: ./gradlew ktlintCheck --no-configuration-cache
+        run: ./gradlew ktlintCheck --rerun-tasks
   unit-test:
     name: Unit test
     runs-on: ubuntu-latest
@@ -36,13 +36,10 @@ jobs:
           java-version: 21
       - uses: gradle/actions/setup-gradle@v4
       - name: Execute unit tests
-        run: ./gradlew jvmTest # jvmTest + testUnitTest = allTest (so execute separately)
+        run: ./gradlew jvmTest --rerun-tasks
   ui-unit-test:
     name: Ui unit test on android
     runs-on: ubuntu-latest
-    strategy:
-      matrix:
-        app: [ weather ]
     steps:
       - name: Check out code
         uses: actions/checkout@v5
@@ -52,8 +49,8 @@ jobs:
           distribution: temurin
           java-version: 21
       - uses: gradle/actions/setup-gradle@v4
-      - name: Execute ui tests for ${{ matrix.app }}
-        run: ./gradlew :${{ matrix.app }}:androidApp:testStagingDebugUnitTest
+      - name: Execute ui tests
+        run: ./gradlew testAndroidHost --rerun-tasks
   integration-test:
     name: Integration test on android
     runs-on: ubuntu-latest
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index dcb33af9..98302af7 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -26,7 +26,7 @@ ktor = "3.4.0"
 buildkonfig = "0.17.1"
 datastore = "1.2.0"
 okio = "3.16.4"
-mokkery = "3.1.1"
+mokkery = "3.2.0"
 robolectiric = "4.16.1"
 kotlin-inject = "0.9.0"
 coil = "3.3.0"
diff --git a/weather/forecast/ui/src/androidHostTest/kotlin/com/multiplatform/weather/forecast/nextdays/ForecastNextDaysScreenTest.kt b/weather/forecast/ui/src/androidHostTest/kotlin/com/multiplatform/weather/forecast/nextdays/ForecastNextDaysScreenTest.kt
index 401acc0f..3a7d50cd 100644
--- a/weather/forecast/ui/src/androidHostTest/kotlin/com/multiplatform/weather/forecast/nextdays/ForecastNextDaysScreenTest.kt
+++ b/weather/forecast/ui/src/androidHostTest/kotlin/com/multiplatform/weather/forecast/nextdays/ForecastNextDaysScreenTest.kt
@@ -104,7 +104,7 @@ internal class ForecastNextDaysScreenTest : AbstractAndroidUnitTest() {
                 .assertIsDisplayed()
 
             onAllNodesWithText("32 °C", useUnmergedTree = true)
-                .assertCountEquals(6)
+                .assertCountEquals(7)
         }
     }