diff --git a/test/src/org/labkey/test/tests/cds/CDSLoginTest.java b/test/src/org/labkey/test/tests/cds/CDSLoginTest.java
index 2db72777d..2fe736aa7 100644
--- a/test/src/org/labkey/test/tests/cds/CDSLoginTest.java
+++ b/test/src/org/labkey/test/tests/cds/CDSLoginTest.java
@@ -44,7 +44,6 @@
 public class CDSLoginTest extends CDSReadOnlyTest
 {
     private static final String CDS_LOGIN_TESTUSER = "user_passwordtest@cds.test";
-    private final CDSHelper cds = new CDSHelper(this);
 
     @Before
     public void preTest()
@@ -154,6 +153,8 @@ public void testPasswordStrength()
         changePasswordDialog.setReEnterPassword(strongPwd);
         changePasswordDialog.submit();
         waitFor(() -> getCurrentUser().equals(CDS_LOGIN_TESTUSER), "login failed for " + CDS_LOGIN_TESTUSER, defaultWaitForPage);
+
+        goToHome(); // 'ensureSignedInAsPrimaryTestUser' can be interrupted by CDS session timeout page
     }
 
     @Override
diff --git a/test/src/org/labkey/test/tests/cds/CDSReadOnlyTest.java b/test/src/org/labkey/test/tests/cds/CDSReadOnlyTest.java
index 512aebe2b..4d7bacae7 100644
--- a/test/src/org/labkey/test/tests/cds/CDSReadOnlyTest.java
+++ b/test/src/org/labkey/test/tests/cds/CDSReadOnlyTest.java
@@ -52,7 +52,7 @@ public List<String> getAssociatedModules()
     @BeforeClass
     public static void doSetup() throws Exception
     {
-        CDSReadOnlyTest initTest = (CDSReadOnlyTest)getCurrentTest();
+        CDSReadOnlyTest initTest = getCurrentTest();
         if (initTest.needsSetup())
         {
             CDSInitializer _initializer = new CDSInitializer(initTest);
diff --git a/test/src/org/labkey/test/util/cds/CDSHelper.java b/test/src/org/labkey/test/util/cds/CDSHelper.java
index e5d04d4e1..6ffcca763 100644
--- a/test/src/org/labkey/test/util/cds/CDSHelper.java
+++ b/test/src/org/labkey/test/util/cds/CDSHelper.java
@@ -29,6 +29,7 @@
 import org.labkey.test.pages.cds.GroupDetailsPage;
 import org.labkey.test.pages.cds.LearnGrid;
 import org.labkey.test.pages.cds.LearnGrid.LearnTab;
+import org.labkey.test.pages.reports.ScriptReportPage.StandardReportOption;
 import org.labkey.test.util.ApiPermissionsHelper;
 import org.labkey.test.util.DataRegionTable;
 import org.labkey.test.util.Ext4Helper;
@@ -2048,7 +2049,7 @@ public int createReport(RReportHelper rReportHelper, String queryUrl, @Nullable
                 _test.setCodeEditorValue("script-report-editor", reportScript);
 
             if (shareReport)
-                rReportHelper.selectOption(RReportHelper.ReportOption.shareReport);
+                rReportHelper.selectOption(StandardReportOption.shareReport);
 
             _test.waitForElement(Locator.tagWithText("span", "Save"));
             rReportHelper.saveReport(reportName);