diff --git a/awx/ui/test/e2e/commands/navigateTo.js b/awx/ui/test/e2e/commands/navigateTo.js
index b79a69338d..d896f1e282 100644
--- a/awx/ui/test/e2e/commands/navigateTo.js
+++ b/awx/ui/test/e2e/commands/navigateTo.js
@@ -6,7 +6,8 @@ exports.command = function navigateTo (url, expectSpinny = true) {
 
     if (expectSpinny) {
         this.waitForElementVisible(spinny, () => {
-            this.waitForElementNotVisible(spinny);
+            // If a process is running, give spinny a little more time before timing out.
+            this.waitForElementNotVisible(spinny, 30000);
         });
     }
 
diff --git a/awx/ui/test/e2e/commands/waitForSpinny.js b/awx/ui/test/e2e/commands/waitForSpinny.js
index 34b8c0c5f5..b4a55a0cac 100644
--- a/awx/ui/test/e2e/commands/waitForSpinny.js
+++ b/awx/ui/test/e2e/commands/waitForSpinny.js
@@ -5,6 +5,9 @@ exports.command = function waitForSpinny (useXpath = false) {
         selector = '//*[contains(@class, "spinny")]';
     }
     this.waitForElementVisible(selector);
-    this.waitForElementNotVisible(selector);
+    // if a process is running for an extended period,
+    // spinny might last longer than five seconds.
+    // this gives it a max of 30 secs before failing.
+    this.waitForElementNotVisible(selector, 30000);
     return this;
 };