diff --git a/ms2/test/src/org/labkey/test/ms2/AbstractMS2SearchEngineTest.java b/ms2/test/src/org/labkey/test/ms2/AbstractMS2SearchEngineTest.java
index 6498355822..5c15753acf 100644
--- a/ms2/test/src/org/labkey/test/ms2/AbstractMS2SearchEngineTest.java
+++ b/ms2/test/src/org/labkey/test/ms2/AbstractMS2SearchEngineTest.java
@@ -20,6 +20,7 @@
 import org.labkey.test.TestTimeoutException;
 import org.labkey.test.WebTestHelper;
 import org.labkey.test.components.ui.lineage.LineageGraph;
+import org.labkey.test.pipeline.ExperimentGraph;
 import org.labkey.test.util.PipelineAnalysisHelper;
 import org.openqa.selenium.NoSuchElementException;
 
@@ -168,11 +169,10 @@ public void basicMS2Check()
         popLocation();
 
         log("Verify experiment view");
-        clickAndWait(Locator.imageMapLinkByTitle("graphmap", "bov_sample/" + SAMPLE_BASE_NAME + " (test2) (CAexample_mini.mzXML)"));
+        new ExperimentGraph(this).clickLink("bov_sample/" + SAMPLE_BASE_NAME + " (test2) (CAexample_mini.mzXML)");
 
         log("Verify experiment run view.");
-        String dataHref = Locator.imageMapLinkByTitle("graphmap", "Data: CAexample_mini.mzXML").findElement(getDriver()).getAttribute("href");
-        beginAt(dataHref); // Clicking this is unreliable. Possibly because the image is so large. Just navigate.
+        new ExperimentGraph(this).clickInputLink("CAexample_mini.mzXML");
         assertTextPresent(
                 "bov_sample/" + SAMPLE_BASE_NAME,
                 "Data CAexample_mini.mzXML");
diff --git a/ms2/test/src/org/labkey/test/ms2/QuantitationTest.java b/ms2/test/src/org/labkey/test/ms2/QuantitationTest.java
index 4dabc79555..6bb07de58e 100644
--- a/ms2/test/src/org/labkey/test/ms2/QuantitationTest.java
+++ b/ms2/test/src/org/labkey/test/ms2/QuantitationTest.java
@@ -25,6 +25,7 @@
 import org.labkey.test.categories.MS2;
 import org.labkey.test.categories.XTandem;
 import org.labkey.test.components.ui.lineage.LineageGraph;
+import org.labkey.test.pipeline.ExperimentGraph;
 import org.labkey.test.util.PipelineAnalysisHelper;
 
 import java.io.File;
@@ -92,7 +93,7 @@ public void testSteps()
         assertElementPresent(Locator.linkWithText("libra Protein Quantitation"));
 
         clickAndWait(Locator.linkWithText("Lineage for " + SAMPLE_BASE_NAME + ".libra.tsv"));
-        beginAt(Locator.imageMapLinkByTitle("graphmap", "libra Peptide Quantitation").findElement(getDriver()).getAttribute("href"));
+        new ExperimentGraph(this).clickLink("libra Peptide Quantitation");
         // Check to see that arguments to xinteract are showing
         assertTextPresent("-LLibraConfig1.xml-2");
     }