diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 44022037b..d8b3b3576 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -1,6 +1,6 @@
 [versions]
 agp = "8.3.0"
-agp-tooling = "8.3.0"
+agp-tooling = "8.4.0-rc02"
 gradle-tooling = "8.6"
 junit-jupiter = "5.10.2"
 kotlin = "1.9.22"
diff --git a/subprojects/builder-model-impl/src/main/java/com/itsaky/androidide/builder/model/DefaultSourceSetContainer.kt b/subprojects/builder-model-impl/src/main/java/com/itsaky/androidide/builder/model/DefaultSourceSetContainer.kt
index 283e19958..59c229136 100644
--- a/subprojects/builder-model-impl/src/main/java/com/itsaky/androidide/builder/model/DefaultSourceSetContainer.kt
+++ b/subprojects/builder-model-impl/src/main/java/com/itsaky/androidide/builder/model/DefaultSourceSetContainer.kt
@@ -16,14 +16,20 @@
  */
 package com.itsaky.androidide.builder.model
 
+import com.android.builder.model.v2.ide.SourceProvider
 import com.android.builder.model.v2.ide.SourceSetContainer
 import java.io.Serializable
 
 /** @author Akash Yadav */
 class DefaultSourceSetContainer : SourceSetContainer, Serializable {
+
   private val serialVersionUID = 1L
+  @Deprecated("Contained in deviceTestSourceProviders")
   override var androidTestSourceProvider: DefaultSourceProvider? = null
   override var sourceProvider: DefaultSourceProvider = DefaultSourceProvider()
   override var testFixturesSourceProvider: DefaultSourceProvider? = null
+  @Deprecated("Contained in hostTestSourceProviders")
   override var unitTestSourceProvider: DefaultSourceProvider? = null
+  override val deviceTestSourceProviders: Map<String, SourceProvider> = emptyMap()
+  override val hostTestSourceProviders: Map<String, SourceProvider> = emptyMap()
 }
diff --git a/subprojects/builder-model-impl/src/main/java/com/itsaky/androidide/builder/model/DefaultVariant.kt b/subprojects/builder-model-impl/src/main/java/com/itsaky/androidide/builder/model/DefaultVariant.kt
index 75f212f6a..83d87c05e 100644
--- a/subprojects/builder-model-impl/src/main/java/com/itsaky/androidide/builder/model/DefaultVariant.kt
+++ b/subprojects/builder-model-impl/src/main/java/com/itsaky/androidide/builder/model/DefaultVariant.kt
@@ -16,13 +16,17 @@
  */
 package com.itsaky.androidide.builder.model
 
+import com.android.builder.model.v2.ide.AndroidArtifact
+import com.android.builder.model.v2.ide.JavaArtifact
 import com.android.builder.model.v2.ide.Variant
 import java.io.File
 import java.io.Serializable
 
 /** @author Akash Yadav */
 class DefaultVariant : Variant, Serializable {
+
   private val serialVersionUID = 1L
+  @Deprecated("Contained in deviceTestArtifacts")
   override var androidTestArtifact: DefaultAndroidArtifact? = null
   override var displayName: String = ""
   override var isInstantAppCompatible: Boolean = false
@@ -31,6 +35,9 @@ class DefaultVariant : Variant, Serializable {
   override var name: String = ""
   override var testFixturesArtifact: DefaultAndroidArtifact? = null
   override var testedTargetVariant: DefaultTestedTargetVariant? = null
+  @Deprecated("Contained in hostTestArtifacts")
   override var unitTestArtifact: DefaultJavaArtifact? = null
   override val runTestInSeparateProcess: Boolean = false
+  override val deviceTestArtifacts: Map<String, AndroidArtifact> = emptyMap()
+  override val hostTestArtifacts: Map<String, JavaArtifact> = emptyMap()
 }
diff --git a/subprojects/builder-model-impl/src/main/java/com/itsaky/androidide/builder/model/DefaultVariantDependencies.kt b/subprojects/builder-model-impl/src/main/java/com/itsaky/androidide/builder/model/DefaultVariantDependencies.kt
index 9218d6b3b..f77c41fcb 100644
--- a/subprojects/builder-model-impl/src/main/java/com/itsaky/androidide/builder/model/DefaultVariantDependencies.kt
+++ b/subprojects/builder-model-impl/src/main/java/com/itsaky/androidide/builder/model/DefaultVariantDependencies.kt
@@ -16,16 +16,22 @@
  */
 package com.itsaky.androidide.builder.model
 
+import com.android.builder.model.v2.ide.ArtifactDependencies
 import com.android.builder.model.v2.models.VariantDependencies
 import java.io.Serializable
 
 /** @author Akash Yadav */
 class DefaultVariantDependencies : VariantDependencies, Serializable {
+
   private val serialVersionUID = 1L
+  @Deprecated("Contained in deviceTestArtifacts")
   override var androidTestArtifact: DefaultArtifactDependencies? = null
   override var libraries: Map<String, DefaultLibrary> = emptyMap()
   override var mainArtifact: DefaultArtifactDependencies = DefaultArtifactDependencies()
   override var name: String = ""
   override var testFixturesArtifact: DefaultArtifactDependencies? = null
+  @Deprecated("Contained in hostTestArtifacts")
   override var unitTestArtifact: DefaultArtifactDependencies? = null
+  override val deviceTestArtifacts: Map<String, ArtifactDependencies> = emptyMap()
+  override val hostTestArtifacts: Map<String, ArtifactDependencies> = emptyMap()
 }