diff --git a/gradle-plugin/plugin/src/functionalTest/kotlin/com/emergetools/android/gradle/ConfigurationCacheTest.kt b/gradle-plugin/plugin/src/functionalTest/kotlin/com/emergetools/android/gradle/ConfigurationCacheTest.kt
index 69fcf11e..64c22d78 100644
--- a/gradle-plugin/plugin/src/functionalTest/kotlin/com/emergetools/android/gradle/ConfigurationCacheTest.kt
+++ b/gradle-plugin/plugin/src/functionalTest/kotlin/com/emergetools/android/gradle/ConfigurationCacheTest.kt
@@ -1,5 +1,6 @@
 package com.emergetools.android.gradle
 
+import com.autonomousapps.kit.truth.TestKitTruth
 import com.emergetools.android.gradle.base.EmergeGradleRunner
 import com.emergetools.android.gradle.mocks.assertSuccessfulUploadRequests
 import org.junit.jupiter.api.Test
diff --git a/gradle-plugin/plugin/src/functionalTest/kotlin/com/emergetools/android/gradle/EmergePluginTest.kt b/gradle-plugin/plugin/src/functionalTest/kotlin/com/emergetools/android/gradle/EmergePluginTest.kt
index b11a920b..9a567c16 100644
--- a/gradle-plugin/plugin/src/functionalTest/kotlin/com/emergetools/android/gradle/EmergePluginTest.kt
+++ b/gradle-plugin/plugin/src/functionalTest/kotlin/com/emergetools/android/gradle/EmergePluginTest.kt
@@ -1,13 +1,9 @@
 package com.emergetools.android.gradle
 
+import com.autonomousapps.kit.truth.TestKitTruth.Companion.assertThat
 import com.emergetools.android.gradle.base.EmergeGradleRunner
 import com.emergetools.android.gradle.mocks.getEmergeDispatcher
 import org.gradle.testkit.runner.BuildResult
-import org.gradle.testkit.runner.BuildTask
-import org.gradle.testkit.runner.TaskOutcome
-import org.junit.Assert.assertTrue
-import org.junit.jupiter.api.Assertions.assertEquals
-import org.junit.jupiter.api.Assertions.assertNotNull
 
 abstract class EmergePluginTest {
   protected fun EmergeGradleRunner.withDefaultServer(timeout: Boolean = false) =
@@ -15,22 +11,19 @@ abstract class EmergePluginTest {
       this.dispatcher = getEmergeDispatcher(baseUrl, timeout)
     }
 
-  protected fun BuildResult.executedTask(name: String): BuildTask {
-    val task = task(name)
-    assertNotNull(task, "Task \"$name\" did not run. Tasks that did run: ${tasks.joinToString()}")
-    return task!!
-  }
-
+  @Deprecated("Use TestKitTruth.assertThat instead",
+    ReplaceWith("com.autonomousapps.kit.truth.TestKitTruth.assertThat(this).task(name).succeeded()")
+  )
   protected fun BuildResult.assertSuccessfulTask(name: String): BuildResult {
-    val task = executedTask(name)
-    assertEquals(TaskOutcome.SUCCESS, task.outcome, "Task \"$name\" was not successful")
-    assertTrue(output.contains("SUCCESSFUL"))
+    assertThat(this).task(name).succeeded()
     return this
   }
 
+  @Deprecated("Use TestKitTruth.assertThat instead",
+    ReplaceWith("com.autonomousapps.kit.truth.TestKitTruth.assertThat(this).task(name).failed()")
+  )
   protected fun BuildResult.assertFailedTask(name: String): BuildResult {
-    val task = executedTask(name)
-    assertEquals(TaskOutcome.FAILED, task.outcome, "Task \"$name\" did not fail")
+    assertThat(this).task(name).failed()
     return this
   }
 }