diff --git a/src/org/labkey/test/pages/pipeline/PipelineStatusDetailsPage.java b/src/org/labkey/test/pages/pipeline/PipelineStatusDetailsPage.java
index 762dedf7f0..fc8812153b 100644
--- a/src/org/labkey/test/pages/pipeline/PipelineStatusDetailsPage.java
+++ b/src/org/labkey/test/pages/pipeline/PipelineStatusDetailsPage.java
@@ -421,14 +421,14 @@ public boolean clickDataLink()
     @LogMethod
     public PipelineStatusDetailsPage clickRetry()
     {
-        clickAndWait(elementCache().retryButton);
+        waitAndClickAndWait(Locator.id("retry-btn"));
         return new PipelineStatusDetailsPage(getDriver());
     }
 
     @LogMethod
     public PipelineStatusDetailsPage clickCancel()
     {
-        clickAndWait(elementCache().cancelButton);
+        waitAndClickAndWait(Locator.id("cancel-btn"));
         waitForLogText("Attempting to cancel");
         waitForCancelled();
         return this;
@@ -459,8 +459,6 @@ protected class ElementCache extends LabKeyPage.ElementCache
         protected final WebElement showGridButton = Locator.lkButton("Show Grid").findWhenNeeded(this);
         protected final WebElement showDataButton = Locator.id("show-data-btn").findWhenNeeded(this);
         protected final WebElement browseFilesButton = Locator.lkButton("Browse Files").findWhenNeeded(this);
-        protected final WebElement cancelButton = Locator.id("cancel-btn").findWhenNeeded(this);
-        protected final WebElement retryButton = Locator.id("retry-btn").findWhenNeeded(this);
 
         protected final WebElement showFullLogLink = Locator.id("show-full-log").findWhenNeeded(this);
         protected final WebElement logContainer = Locator.id("log-container").findWhenNeeded(this);