diff --git a/dependency-check-core/src/test/java/org/owasp/dependencycheck/analyzer/ArchiveAnalyzerTest.java b/dependency-check-core/src/test/java/org/owasp/dependencycheck/analyzer/ArchiveAnalyzerTest.java
index 7b0225c6f..381f9f250 100644
--- a/dependency-check-core/src/test/java/org/owasp/dependencycheck/analyzer/ArchiveAnalyzerTest.java
+++ b/dependency-check-core/src/test/java/org/owasp/dependencycheck/analyzer/ArchiveAnalyzerTest.java
@@ -207,6 +207,7 @@ public class ArchiveAnalyzerTest extends AbstractDatabaseTestCase {
     @Test
     public void testAnalyzeTarGz() throws Exception {
         ArchiveAnalyzer instance = new ArchiveAnalyzer();
+        instance.supportsExtension("zip"); //ensure analyzer is "enabled"
         try {
             instance.initialize();
 
@@ -256,6 +257,7 @@ public class ArchiveAnalyzerTest extends AbstractDatabaseTestCase {
     @Test
     public void testAnalyzeTgz() throws Exception {
         ArchiveAnalyzer instance = new ArchiveAnalyzer();
+        instance.supportsExtension("zip"); //ensure analyzer is "enabled"
         try {
             instance.initialize();
 
diff --git a/dependency-check-core/src/test/java/org/owasp/dependencycheck/analyzer/VulnerabilitySuppressionAnalyzerTest.java b/dependency-check-core/src/test/java/org/owasp/dependencycheck/analyzer/VulnerabilitySuppressionAnalyzerTest.java
index 5ec55e600..c0d56db4c 100644
--- a/dependency-check-core/src/test/java/org/owasp/dependencycheck/analyzer/VulnerabilitySuppressionAnalyzerTest.java
+++ b/dependency-check-core/src/test/java/org/owasp/dependencycheck/analyzer/VulnerabilitySuppressionAnalyzerTest.java
@@ -107,6 +107,7 @@ public class VulnerabilitySuppressionAnalyzerTest extends AbstractDatabaseTestCa
         instance.initialize();
         instance.analyze(dependency, engine);
         assertTrue(dependency.getVulnerabilities().size() == 0);
+        engine.cleanup();
     }
 
     /**