diff --git a/Core/test/qa-functional/src/org/sleuthkit/autopsy/commonfilessearch/AbstractIntraCaseCommonFilesSearchTest.java b/Core/test/qa-functional/src/org/sleuthkit/autopsy/commonfilessearch/AbstractIntraCaseCommonFilesSearchTest.java
index 0af583d25d..d207b6a6a7 100644
--- a/Core/test/qa-functional/src/org/sleuthkit/autopsy/commonfilessearch/AbstractIntraCaseCommonFilesSearchTest.java
+++ b/Core/test/qa-functional/src/org/sleuthkit/autopsy/commonfilessearch/AbstractIntraCaseCommonFilesSearchTest.java
@@ -98,7 +98,7 @@ public abstract class AbstractIntraCaseCommonFilesSearchTest extends NbTestCase
     @Override
     public void setUp() {
 
-        CaseUtils.createCase(this.getCaseName());
+        CaseUtils.createAsCurrentCase(this.getCaseName());
         
         final ImageDSProcessor imageDSProcessor = new ImageDSProcessor();
 
@@ -112,7 +112,7 @@ public abstract class AbstractIntraCaseCommonFilesSearchTest extends NbTestCase
 
     @Override
     public void tearDown() {
-        CaseUtils.closeCase();
+        CaseUtils.closeCurrentCase(false);
         try {
             CaseUtils.deleteCaseDir(CASE_DIRECTORY_PATH.toFile());
         } catch (IOException ex) {
diff --git a/Core/test/qa-functional/src/org/sleuthkit/autopsy/testutils/CaseUtils.java b/Core/test/qa-functional/src/org/sleuthkit/autopsy/testutils/CaseUtils.java
index ebbbd3f8c7..cccd3fc639 100755
--- a/Core/test/qa-functional/src/org/sleuthkit/autopsy/testutils/CaseUtils.java
+++ b/Core/test/qa-functional/src/org/sleuthkit/autopsy/testutils/CaseUtils.java
@@ -127,5 +127,4 @@ public final class CaseUtils {
      */
     private CaseUtils() {
     }
-
 }