diff --git a/study/test/src/org/labkey/test/tests/search/SearchTest.java b/study/test/src/org/labkey/test/tests/search/SearchTest.java
index a72b86d4a15..69c4330cb4d 100644
--- a/study/test/src/org/labkey/test/tests/search/SearchTest.java
+++ b/study/test/src/org/labkey/test/tests/search/SearchTest.java
@@ -510,8 +510,7 @@ private void addSearchableStudy()
     {
         importStudy();
         startSpecimenImport(2);
-
-        waitForPipelineJobsToComplete(2, "study import", false);
+        waitForSpecimenImport();
 
         _searchHelper.enqueueSearchItem("999320016", Locator.linkContainingText("999320016"));
         _searchHelper.enqueueSearchItem("Urinalysis", Locator.linkContainingText("URF-1"),
diff --git a/study/test/src/org/labkey/test/tests/study/AssayTest.java b/study/test/src/org/labkey/test/tests/study/AssayTest.java
index ef89275eb02..c93d98d478b 100644
--- a/study/test/src/org/labkey/test/tests/study/AssayTest.java
+++ b/study/test/src/org/labkey/test/tests/study/AssayTest.java
@@ -48,7 +48,6 @@
 import org.labkey.test.util.TestDataGenerator;
 import org.labkey.test.util.data.TestDataUtils;
 
-import java.io.File;
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.List;
@@ -149,8 +148,11 @@ public void testAssaySecurity() throws Exception
         log("Starting Assay security scenario tests");
         setupEnvironment();
         setupPipeline(getProjectName());
-        SpecimenImporter importer = new SpecimenImporter(TestFileUtils.getTestTempDir(), StudyHelper.SPECIMEN_ARCHIVE_A, FileUtil.appendName(TestFileUtils.getTestTempDir(), "specimensSubDir"), TEST_ASSAY_FLDR_STUDY2, 1);
-        importer.importAndWaitForComplete();
+        if (_studyHelper.isSpecimenModulePresent())
+        {
+            SpecimenImporter importer = new SpecimenImporter(TestFileUtils.getTestTempDir(), StudyHelper.SPECIMEN_ARCHIVE_A, FileUtil.appendName(TestFileUtils.getTestTempDir(), "specimensSubDir"), TEST_ASSAY_FLDR_STUDY2, 1);
+            importer.importAndWaitForComplete();
+        }
         defineAssay();
         uploadRuns(TEST_ASSAY_FLDR_LAB1, TEST_ASSAY_USR_TECH1);
         editResults();
diff --git a/study/test/src/org/labkey/test/tests/study/CohortTest.java b/study/test/src/org/labkey/test/tests/study/CohortTest.java
index 2a6c4d87c14..8a1d7289912 100644
--- a/study/test/src/org/labkey/test/tests/study/CohortTest.java
+++ b/study/test/src/org/labkey/test/tests/study/CohortTest.java
@@ -28,7 +28,6 @@
 import org.labkey.test.pages.study.ManageVisitPage;
 import org.labkey.test.util.DataRegionTable;
 import org.labkey.test.util.LogMethod;
-import org.labkey.test.util.PortalHelper;
 import org.openqa.selenium.WebElement;
 
 import java.io.File;
@@ -79,10 +78,10 @@ private void doSetup()
     {
         log("Check advanced cohort features.");
         _containerHelper.createProject(PROJECT_NAME, "Study");
-        _containerHelper.enableModule("Specimen");
+//        _containerHelper.enableModule("Specimen");
         importStudyFromZip(COHORT_STUDY_ZIP);
         clickProject(PROJECT_NAME);
-        new PortalHelper(this).addWebPart("Specimens");
+//        new PortalHelper(this).addWebPart("Specimens");
         // Check all cohorts after initial import.
     }
 
diff --git a/study/test/src/org/labkey/test/tests/study/SpecimenMergeTest.java b/study/test/src/org/labkey/test/tests/study/SpecimenMergeTest.java
index d77db1300fe..821e37cdf54 100644
--- a/study/test/src/org/labkey/test/tests/study/SpecimenMergeTest.java
+++ b/study/test/src/org/labkey/test/tests/study/SpecimenMergeTest.java
@@ -15,12 +15,12 @@
  */
 package org.labkey.test.tests.study;
 
+import org.junit.Assume;
 import org.junit.Test;
 import org.junit.experimental.categories.Category;
 import org.labkey.test.BaseWebDriverTest;
 import org.labkey.test.Locator;
 import org.labkey.test.TestTimeoutException;
-import org.labkey.test.categories.Daily;
 import org.labkey.test.categories.Specimen;
 import org.labkey.test.util.StudyHelper;
 
@@ -31,7 +31,7 @@
 /**
  * CreateVialsTest also uses the specimen merge feature.
  */
-@Category({Daily.class, Specimen.class})
+@Category({Specimen.class})
 @BaseWebDriverTest.ClassTimeout(minutes = 7)
 public class SpecimenMergeTest extends BaseWebDriverTest
 {
@@ -105,6 +105,7 @@ protected void importFirstFileSet()
 
     protected void setUpSteps()
     {
+        Assume.assumeTrue("Specimen module not present", _studyHelper.isSpecimenModulePresent());
         _containerHelper.createProject(PROJECT_NAME, null);
         _containerHelper.createSubfolder(PROJECT_NAME, PROJECT_NAME, FOLDER_NAME, "Study", null);
         _containerHelper.enableModule("Specimen");
diff --git a/study/test/src/org/labkey/test/tests/study/SpecimenReplaceTest.java b/study/test/src/org/labkey/test/tests/study/SpecimenReplaceTest.java
index a8f9d19cf0c..0049f7825ce 100644
--- a/study/test/src/org/labkey/test/tests/study/SpecimenReplaceTest.java
+++ b/study/test/src/org/labkey/test/tests/study/SpecimenReplaceTest.java
@@ -19,13 +19,12 @@
 import org.junit.experimental.categories.Category;
 import org.labkey.test.BaseWebDriverTest;
 import org.labkey.test.Locator;
-import org.labkey.test.categories.Daily;
 import org.labkey.test.categories.Specimen;
 import org.labkey.test.util.StudyHelper;
 
 import java.io.File;
 
-@Category({Daily.class, Specimen.class})
+@Category({Specimen.class})
 @BaseWebDriverTest.ClassTimeout(minutes = 6)
 public class SpecimenReplaceTest extends SpecimenMergeTest
 {
diff --git a/study/test/src/org/labkey/test/tests/study/StudyLotsOfParticipantsTest.java b/study/test/src/org/labkey/test/tests/study/StudyLotsOfParticipantsTest.java
index 88c362d8867..354027b14a2 100644
--- a/study/test/src/org/labkey/test/tests/study/StudyLotsOfParticipantsTest.java
+++ b/study/test/src/org/labkey/test/tests/study/StudyLotsOfParticipantsTest.java
@@ -22,7 +22,7 @@
 import org.labkey.test.BaseWebDriverTest;
 import org.labkey.test.Locator;
 import org.labkey.test.TestFileUtils;
-import org.labkey.test.categories.InDevelopment;
+import org.labkey.test.categories.Disabled;
 import org.labkey.test.components.ChartTypeDialog;
 import org.labkey.test.components.LookAndFeelTimeChart;
 import org.labkey.test.pages.TimeChartWizard;
@@ -34,7 +34,7 @@
 import java.util.Arrays;
 import java.util.List;
 
-@Category({InDevelopment.class})
+@Category({Disabled.class})
 public class StudyLotsOfParticipantsTest extends BaseWebDriverTest
 {
     // TODO add test case for Scatter plot binning
diff --git a/study/test/src/org/labkey/test/tests/study/StudyManualTest.java b/study/test/src/org/labkey/test/tests/study/StudyManualTest.java
index 542ab3bfab0..52de7ece3b5 100644
--- a/study/test/src/org/labkey/test/tests/study/StudyManualTest.java
+++ b/study/test/src/org/labkey/test/tests/study/StudyManualTest.java
@@ -45,6 +45,7 @@ protected void doCreateSteps()
     {
         createStudyManually();
         startSpecimenImport(2);
+        waitForSpecimenImport();
 
         afterManualCreate();
     }
diff --git a/study/test/src/org/labkey/test/tests/study/StudySimpleExportTest.java b/study/test/src/org/labkey/test/tests/study/StudySimpleExportTest.java
index 699d603c8f6..8ef17a1181b 100644
--- a/study/test/src/org/labkey/test/tests/study/StudySimpleExportTest.java
+++ b/study/test/src/org/labkey/test/tests/study/StudySimpleExportTest.java
@@ -17,6 +17,7 @@
 
 import org.apache.commons.collections4.MapUtils;
 import org.jetbrains.annotations.Nullable;
+import org.junit.Assume;
 import org.junit.BeforeClass;
 import org.junit.Ignore;
 import org.junit.Test;
@@ -1097,6 +1098,8 @@ private void createSubfolderAndImportFolderFromPipeline(String subfolderName)
     @Test
     public void verifySpecimenSettings()
     {
+        Assume.assumeTrue("Specimen module not present", _studyHelper.isSpecimenModulePresent());
+
         final String FOLDER_NAME = "Specimen Settings";
 
         log("Export specimen request settings");