diff --git a/app/src/androidTest/java/org/mozilla/fenix/ui/AddressAutofillTest.kt b/app/src/androidTest/java/org/mozilla/fenix/ui/AddressAutofillTest.kt
index 7cfcdafd6f..61a3c0b7fc 100644
--- a/app/src/androidTest/java/org/mozilla/fenix/ui/AddressAutofillTest.kt
+++ b/app/src/androidTest/java/org/mozilla/fenix/ui/AddressAutofillTest.kt
@@ -4,7 +4,6 @@
 
 package org.mozilla.fenix.ui
 
-import org.junit.Ignore
 import org.junit.Rule
 import org.junit.Test
 import org.mozilla.fenix.customannotations.SmokeTest
@@ -117,7 +116,6 @@ class AddressAutofillTest : TestSetup() {
     }
 
     // TestRail link: https://testrail.stage.mozaws.net/index.php?/cases/view/1836840
-    @Ignore("Disabled: https://bugzilla.mozilla.org/show_bug.cgi?id=1882170")
     @Test
     fun verifyAddAddressViewTest() {
         homeScreen {
@@ -132,7 +130,6 @@ class AddressAutofillTest : TestSetup() {
     }
 
     // TestRail link: https://testrail.stage.mozaws.net/index.php?/cases/view/1836841
-    @Ignore("Disabled: https://bugzilla.mozilla.org/show_bug.cgi?id=1882170")
     @Test
     fun verifyEditAddressViewTest() {
         autofillScreen {
diff --git a/app/src/androidTest/java/org/mozilla/fenix/ui/robots/SettingsSubMenuAutofillRobot.kt b/app/src/androidTest/java/org/mozilla/fenix/ui/robots/SettingsSubMenuAutofillRobot.kt
index d73d99f95e..659a2239d1 100644
--- a/app/src/androidTest/java/org/mozilla/fenix/ui/robots/SettingsSubMenuAutofillRobot.kt
+++ b/app/src/androidTest/java/org/mozilla/fenix/ui/robots/SettingsSubMenuAutofillRobot.kt
@@ -154,23 +154,18 @@ class SettingsSubMenuAutofillRobot {
             navigateBackButton(),
             toolbarCheckmarkButton(),
             nameTextInput(),
-        )
-        scrollToElementByText(getStringResource(R.string.addresses_street_address))
-        assertUIObjectExists(
             streetAddressTextInput(),
-        )
-        scrollToElementByText(getStringResource(R.string.addresses_country))
-        assertUIObjectExists(
             cityTextInput(),
             subRegionDropDown(),
-            zipCodeTextInput(),
         )
-        scrollToElementByText(getStringResource(R.string.addresses_save_button))
+        scrollToElementByText(getStringResource(R.string.addresses_country))
         assertUIObjectExists(
+            zipCodeTextInput(),
             countryDropDown(),
             phoneTextInput(),
             emailTextInput(),
         )
+        scrollToElementByText(getStringResource(R.string.addresses_save_button))
         assertUIObjectExists(
             saveButton(),
             cancelButton(),
@@ -214,23 +209,18 @@ class SettingsSubMenuAutofillRobot {
             toolbarDeleteAddressButton(),
             toolbarCheckmarkButton(),
             nameTextInput(),
-        )
-        scrollToElementByText(getStringResource(R.string.addresses_street_address))
-        assertUIObjectExists(
             streetAddressTextInput(),
-        )
-        scrollToElementByText(getStringResource(R.string.addresses_country))
-        assertUIObjectExists(
             cityTextInput(),
             subRegionDropDown(),
-            zipCodeTextInput(),
         )
-        scrollToElementByText(getStringResource(R.string.addresses_save_button))
+        scrollToElementByText(getStringResource(R.string.addresses_country))
         assertUIObjectExists(
+            zipCodeTextInput(),
             countryDropDown(),
             phoneTextInput(),
             emailTextInput(),
         )
+        scrollToElementByText(getStringResource(R.string.addresses_save_button))
         assertUIObjectExists(
             saveButton(),
             cancelButton(),