diff --git a/app/src/androidTest/java/com/google/samples/apps/nowinandroid/ui/NavigationTest.kt b/app/src/androidTest/java/com/google/samples/apps/nowinandroid/ui/NavigationTest.kt
index 17dd28ac7..a37eb7a77 100644
--- a/app/src/androidTest/java/com/google/samples/apps/nowinandroid/ui/NavigationTest.kt
+++ b/app/src/androidTest/java/com/google/samples/apps/nowinandroid/ui/NavigationTest.kt
@@ -19,9 +19,11 @@ package com.google.samples.apps.nowinandroid.ui
 import androidx.compose.ui.test.assertCountEquals
 import androidx.compose.ui.test.assertIsOn
 import androidx.compose.ui.test.assertIsSelected
+import androidx.compose.ui.test.hasAnyAncestor
+import androidx.compose.ui.test.hasTestTag
+import androidx.compose.ui.test.hasText
 import androidx.compose.ui.test.junit4.createAndroidComposeRule
 import androidx.compose.ui.test.onAllNodesWithText
-import androidx.compose.ui.test.onLast
 import androidx.compose.ui.test.onNodeWithContentDescription
 import androidx.compose.ui.test.onNodeWithText
 import androidx.compose.ui.test.performClick
@@ -213,7 +215,12 @@ class NavigationTest {
             onNodeWithText(ok).performClick()
 
             // Check that the saved screen is still visible and selected.
-            onAllNodesWithText(saved).onLast().assertIsSelected()
+            onNode(
+                hasText(saved) and
+                    hasAnyAncestor(
+                        hasTestTag("NiaBottomBar") or hasTestTag("NiaNavRail"),
+                    ),
+            ).assertIsSelected()
         }
     }
 
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 00fdd422f..243f45705 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -1,7 +1,7 @@
 [versions]
 accompanist = "0.28.0"
 androidDesugarJdkLibs = "1.2.2"
-androidGradlePlugin = "7.4.0"
+androidGradlePlugin = "7.4.1"
 androidxActivity = "1.6.1"
 androidxAppCompat = "1.5.1"
 androidxBrowser = "1.4.0"
diff --git a/lint/build.gradle b/lint/build.gradle.kts
similarity index 85%
rename from lint/build.gradle
rename to lint/build.gradle.kts
index 4574fdffd..c87bb7877 100644
--- a/lint/build.gradle
+++ b/lint/build.gradle.kts
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 plugins {
-    id 'java-library'
-    id 'kotlin'
-    id 'com.android.lint'
+    `java-library`
+    kotlin("jvm")
+    id("com.android.lint")
 }
 
 java {
@@ -25,6 +25,6 @@ java {
 }
 
 dependencies {
-    compileOnly libs.kotlin.stdlib
-    compileOnly libs.lint.api
+    compileOnly(libs.kotlin.stdlib)
+    compileOnly(libs.lint.api)
 }