diff --git a/app/src/androidTest/java/org/mozilla/fenix/helpers/TestHelper.kt b/app/src/androidTest/java/org/mozilla/fenix/helpers/TestHelper.kt
index 559c430e3..f6de8ee14 100644
--- a/app/src/androidTest/java/org/mozilla/fenix/helpers/TestHelper.kt
+++ b/app/src/androidTest/java/org/mozilla/fenix/helpers/TestHelper.kt
@@ -54,7 +54,6 @@ import org.mozilla.fenix.helpers.idlingresource.NetworkConnectionIdlingResource
 import org.mozilla.fenix.ui.robots.BrowserRobot
 import org.mozilla.fenix.utils.IntentUtils
 import java.util.regex.Pattern
-import org.junit.Assert.assertTrue
 
 object TestHelper {
 
@@ -131,17 +130,20 @@ object TestHelper {
     // Remove test file from Google Photos (AOSP) on Firebase
     fun deleteDownloadFromStorage() {
         val deleteButton = mDevice.findObject(UiSelector().resourceId("$GOOGLE_APPS_PHOTOS:id/trash"))
+        deleteButton.waitForExists(waitingTime)
         deleteButton.click()
 
         // Sometimes there's a secondary confirmation
         try {
             val deleteConfirm = mDevice.findObject(UiSelector().text("Got it"))
+            deleteConfirm.waitForExists(waitingTime)
             deleteConfirm.click()
         } catch (e: UiObjectNotFoundException) {
             // Do nothing
         }
 
         val trashIt = mDevice.findObject(UiSelector().resourceId("$GOOGLE_APPS_PHOTOS:id/move_to_trash"))
+        trashIt.waitForExists(waitingTime)
         trashIt.click()
     }
 
diff --git a/app/src/androidTest/java/org/mozilla/fenix/ui/DownloadTest.kt b/app/src/androidTest/java/org/mozilla/fenix/ui/DownloadTest.kt
index fd725edf6..2236b04ef 100644
--- a/app/src/androidTest/java/org/mozilla/fenix/ui/DownloadTest.kt
+++ b/app/src/androidTest/java/org/mozilla/fenix/ui/DownloadTest.kt
@@ -12,7 +12,6 @@ import androidx.test.runner.permission.PermissionRequester
 import androidx.test.uiautomator.UiDevice
 import org.junit.After
 import org.junit.Before
-import org.junit.Ignore
 import org.junit.Rule
 import org.junit.Test
 import org.junit.rules.TestRule
@@ -163,7 +162,6 @@ class DownloadTest {
         }
     }
 
-    @Ignore("Failing, see: https://github.com/mozilla-mobile/fenix/issues/17485")
     @SmokeTest
     @Test
         /* Verifies downloads in the Downloads Menu: