diff --git a/.idea/androidTestResultsUserPreferences.xml b/.idea/androidTestResultsUserPreferences.xml
index 3246b2675..323921b2c 100644
--- a/.idea/androidTestResultsUserPreferences.xml
+++ b/.idea/androidTestResultsUserPreferences.xml
@@ -156,6 +156,7 @@
               <option name="preferredColumnWidths">
                 <map>
                   <entry key="Duration" value="90" />
+                  <entry key="Pixel_4_XL_API_26" value="120" />
                   <entry key="Pixel_4_XL_API_32" value="120" />
                   <entry key="Realme RMX1851" value="120" />
                   <entry key="Tests" value="360" />
@@ -177,6 +178,19 @@
             </AndroidTestResultsTableState>
           </value>
         </entry>
+        <entry key="937398988">
+          <value>
+            <AndroidTestResultsTableState>
+              <option name="preferredColumnWidths">
+                <map>
+                  <entry key="Duration" value="90" />
+                  <entry key="Pixel_4_XL_API_26" value="120" />
+                  <entry key="Tests" value="360" />
+                </map>
+              </option>
+            </AndroidTestResultsTableState>
+          </value>
+        </entry>
         <entry key="984985251">
           <value>
             <AndroidTestResultsTableState>
diff --git a/app/src/androidTest/java/com/itsaky/androidide/activities/OnboardingActivityPermissionsBehaviorTest.kt b/app/src/androidTest/java/com/itsaky/androidide/activities/OnboardingActivityPermissionsBehaviorTest.kt
index 487eeb024..e664ab48e 100644
--- a/app/src/androidTest/java/com/itsaky/androidide/activities/OnboardingActivityPermissionsBehaviorTest.kt
+++ b/app/src/androidTest/java/com/itsaky/androidide/activities/OnboardingActivityPermissionsBehaviorTest.kt
@@ -98,9 +98,6 @@ class OnboardingActivityPermissionsBehaviorTest {
       device.getObjectWithText("DENY").clickAndWaitForWindowUpdate(device)
     }
 
-    // verify AndroidIDE is visible
-    assertThat(device.currentPackageName).isEqualTo(BuildInfo.PACKAGE_NAME)
-
     grantButton = device.getObjectWithText(permissionDesc)
       .parent!!
       .parent!!
diff --git a/app/src/androidTest/java/com/itsaky/androidide/activities/OnboardingActivityStatesTest.kt b/app/src/androidTest/java/com/itsaky/androidide/activities/OnboardingActivityStatesTest.kt
index 5b35fdaa7..1d0826464 100644
--- a/app/src/androidTest/java/com/itsaky/androidide/activities/OnboardingActivityStatesTest.kt
+++ b/app/src/androidTest/java/com/itsaky/androidide/activities/OnboardingActivityStatesTest.kt
@@ -17,9 +17,17 @@
 
 package com.itsaky.androidide.activities
 
+import android.Manifest
+import android.content.Context
+import android.content.Intent
+import android.net.Uri
+import android.provider.Settings
 import androidx.test.ext.junit.runners.AndroidJUnit4
 import androidx.test.platform.app.InstrumentationRegistry
+import androidx.test.rule.GrantPermissionRule
+import androidx.test.runner.permission.PermissionRequester
 import androidx.test.uiautomator.UiDevice
+import androidx.test.uiautomator.Until
 import com.adevinta.android.barista.assertion.BaristaCheckedAssertions.assertChecked
 import com.adevinta.android.barista.assertion.BaristaCheckedAssertions.assertUnchecked
 import com.adevinta.android.barista.assertion.BaristaEnabledAssertions.assertDisabled
@@ -32,7 +40,10 @@ import com.adevinta.android.barista.rule.BaristaRule
 import com.google.common.truth.Truth.assertThat
 import com.itsaky.androidide.R
 import com.itsaky.androidide.preferences.internal.statOptIn
+import com.itsaky.androidide.testing.android.LAUNCH_TIMEOUT
+import com.itsaky.androidide.testing.android.getApplicationContext
 import com.itsaky.androidide.testing.android.stringRes
+import com.itsaky.androidide.utils.isAtLeastT
 import org.junit.FixMethodOrder
 import org.junit.Rule
 import org.junit.Test
@@ -52,6 +63,10 @@ class OnboardingActivityStatesTest {
   @Rule
   val baristaActivityRule = BaristaRule.create(OnboardingActivity::class.java)
 
+  @JvmField
+  @Rule
+  val grantPermissionsRule = GrantPermissionRule.grant(Manifest.permission.WRITE_EXTERNAL_STORAGE)
+
   @Test
   fun A_testOnboarding_welcomeScreen() {
     baristaActivityRule.launchActivity()
@@ -64,6 +79,8 @@ class OnboardingActivityStatesTest {
 
   @Test
   fun B_testOnboarding_statConsentScreen() {
+    tryGrantPermissions()
+
     baristaActivityRule.launchActivity()
 
     clickOn(R.id.next)
@@ -97,10 +114,12 @@ class OnboardingActivityStatesTest {
   @Test
   fun F_testOnboarding_toolsSetup() {
 
+    tryGrantPermissions()
+
     baristaActivityRule.launchActivity()
 
-    val device = UiDevice.getInstance(InstrumentationRegistry.getInstrumentation())
-    device.grantAndroidIDEPermissions()
+    clickOn(R.id.next)
+    clickOn(R.id.next)
 
     assertDisplayed(stringRes(R.string.title_install_tools))
     assertDisplayed(stringRes(R.string.subtitle_install_tools))
@@ -139,4 +158,25 @@ class OnboardingActivityStatesTest {
     assertEnabled(R.id.sdk_version_layout)
     assertEnabled(R.id.jdk_version_layout)
   }
+
+  private fun tryGrantPermissions() {
+    if (isAtLeastT()) {
+      PermissionRequester().apply {
+        addPermissions(Manifest.permission.POST_NOTIFICATIONS)
+        requestPermissions()
+      }
+    }
+
+    val device = UiDevice.getInstance(InstrumentationRegistry.getInstrumentation())
+    val context = getApplicationContext<Context>()
+
+    device.performActionAndWait({
+      val intent = Intent(Settings.ACTION_MANAGE_UNKNOWN_APP_SOURCES,
+        Uri.parse("package:${context.packageName}"))
+      intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
+      context.startActivity(intent)
+    }, Until.newWindow(), LAUNCH_TIMEOUT)
+
+    device.handlePermissionInSettings(true)
+  }
 }
\ No newline at end of file
diff --git a/app/src/androidTest/java/com/itsaky/androidide/activities/onboardingUtils.kt b/app/src/androidTest/java/com/itsaky/androidide/activities/onboardingUtils.kt
index 06c02c19e..aa42e9f8b 100644
--- a/app/src/androidTest/java/com/itsaky/androidide/activities/onboardingUtils.kt
+++ b/app/src/androidTest/java/com/itsaky/androidide/activities/onboardingUtils.kt
@@ -72,7 +72,7 @@ fun UiDevice.nextButton(): UiObject2 {
 fun UiDevice.handlePermissionInSettings(
   allowPermission: Boolean = true,
 ) {
-  assertThat(currentPackageName).isAnyOf("com.android.settings", "com.android.permissioncontroller")
+  assertThat(currentPackageName).startsWith("com.android.")
   assertThat(hasObjectWithText(R.string.app_name)).isTrue()
 
   val switch = findObject(By.clazz(Switch::class.java))
@@ -81,14 +81,21 @@ fun UiDevice.handlePermissionInSettings(
   // verify initial state
   assertThat(switch.isCheckable).isTrue()
   assertThat(switch.isEnabled).isTrue()
-  assertThat(switch.isChecked).isFalse()
 
   if (allowPermission) {
-    // enable permission
-    switch.click()
+    if (!switch.isChecked) {
+      // enable permission
+      switch.click()
+    }
 
     // verify changed state
     assertThat(switch.isChecked).isTrue()
+  } else if (switch.isChecked) {
+    // disable permission
+    switch.click()
+
+    // verify changed state
+    assertThat(switch.isChecked).isFalse()
   }
 
   // navigate back without enabling the permission