diff --git a/viscstudies/test/src/org/labkey/test/tests/viscstudies/CAVDStudyTest.java b/viscstudies/test/src/org/labkey/test/tests/viscstudies/CAVDStudyTest.java
index 7ab2af8..275681f 100644
--- a/viscstudies/test/src/org/labkey/test/tests/viscstudies/CAVDStudyTest.java
+++ b/viscstudies/test/src/org/labkey/test/tests/viscstudies/CAVDStudyTest.java
@@ -21,7 +21,6 @@
 import org.labkey.test.BaseWebDriverTest;
 import org.labkey.test.Locator;
 import org.labkey.test.TestFileUtils;
-import org.labkey.test.WebTestHelper;
 import org.labkey.test.categories.CustomModules;
 import org.labkey.test.pages.ImportDataPage;
 import org.labkey.test.params.FieldDefinition;
@@ -47,6 +46,7 @@
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
+import static org.labkey.test.WebTestHelper.getContextPath;
 
 @Category({CustomModules.class})
 @BaseWebDriverTest.ClassTimeout(minutes = 20)
@@ -390,10 +390,10 @@ private void doVerifyCrossContainerDatasetStatus()
         DATASETS.put(5004, "ELISATest");
 
         String[][] statuses = {
-                {"Draft", WebTestHelper.getContextPath() + "/reports/icon_draft.png", "D"},
-                {"Final", WebTestHelper.getContextPath() + "/reports/icon_final.png", "F"},
-                {"Locked", WebTestHelper.getContextPath() + "/reports/icon_locked.png", "L"},
-                {"Unlocked", WebTestHelper.getContextPath() + "/reports/icon_unlocked.png", "U"}
+                {"Draft", getContextPath() + "/reports/icon_draft.png", "D"},
+                {"Final", getContextPath() + "/reports/icon_final.png", "F"},
+                {"Locked", getContextPath() + "/reports/icon_locked.png", "L"},
+                {"Unlocked", getContextPath() + "/reports/icon_unlocked.png", "U"}
         };
 
         String study2name = FOLDER_NAME2 + " Study";
@@ -513,12 +513,12 @@ private void doVerifyCrossContainerDatasetStatus()
         {
             setDatasetStatus(dataset, "Locked");
         }
-        assertElementPresent(Locator.tagWithAttribute("img", "src", WebTestHelper.getContextPath() + "/reports/icon_locked.png"), DATASETS.size());
+        assertElementPresent(Locator.tagWithAttribute("img", "src", getContextPath() + "/reports/icon_locked.png"), DATASETS.size());
         clickButton("Save Changes", defaultWaitForPage);
         // verify that we are back on the list view
         assertTextPresent("AllStudiesList", statusCol);
         // locked icon should now appear once for study2 and for all datasets in study3
-        assertElementPresent(Locator.tagWithAttribute("img", "src", WebTestHelper.getContextPath() + "/reports/icon_locked.png"), DATASETS.size() + 1);
+        assertElementPresent(Locator.tagWithAttribute("img", "src", getContextPath() + "/reports/icon_locked.png"), DATASETS.size() + 1);
 
         log("Verify data status exports to text as expected.");