diff --git a/atox/src/androidTest/kotlin/IntegrationTest.kt b/atox/src/androidTest/kotlin/IntegrationTest.kt
index 88704a6ea..81caf40b5 100644
--- a/atox/src/androidTest/kotlin/IntegrationTest.kt
+++ b/atox/src/androidTest/kotlin/IntegrationTest.kt
@@ -1,4 +1,4 @@
-// SPDX-FileCopyrightText: 2020-2025 Robin Lindén <dev@robinlinden.eu>
+// SPDX-FileCopyrightText: 2020-2026 Robin Lindén <dev@robinlinden.eu>
 //
 // SPDX-License-Identifier: GPL-3.0-only
 
@@ -37,7 +37,6 @@ import ltd.evilcorp.core.db.Database
 import ltd.evilcorp.core.vo.PublicKey
 import ltd.evilcorp.domain.tox.BootstrapNodeRegistry
 import ltd.evilcorp.domain.tox.SaveManager
-import org.hamcrest.core.AllOf.allOf
 import org.junit.Rule
 import org.junit.runner.RunWith
 
@@ -113,7 +112,6 @@ class IntegrationTest {
         // ContactListFragment
         onView(withId(R.id.drawerLayout)).perform(DrawerActions.open())
         onView(withId(R.id.profileName)).check(matches(isDisplayed()))
-        onView(allOf(withId(R.id.profileName), withText("mr robotto")))
-            .check(matches(isDisplayed()))
+        onView(withId(R.id.profileName)).check(matches(withText("mr robotto")))
     }
 }
diff --git a/gradle.properties b/gradle.properties
index 81461cfe3..869b83bbc 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -3,15 +3,3 @@ org.gradle.caching=true
 org.gradle.parallel=true
 kotlin.code.style=official
 android.enableJetifier=false
-
-# TODO(robinlinden): Migrate away from the below flags.
-# See: https://developer.android.com/build/releases/agp-9-0-0-release-notes#android-gradle-plugin-behavior-changes
-android.defaults.buildfeatures.resvalues=true
-android.dependency.useConstraints=true
-android.enableAppCompileTimeRClass=false
-android.newDsl=false
-android.r8.optimizedResourceShrinking=false
-android.r8.strictFullModeForKeepRules=false
-android.sdk.defaultTargetSdkToCompileSdkIfUnset=false
-android.uniquePackageNames=false
-android.usesSdkInManifest.disallowed=false