diff --git a/dependency-check-core/src/test/java/org/owasp/dependencycheck/analyzer/AssemblyAnalyzerTest.java b/dependency-check-core/src/test/java/org/owasp/dependencycheck/analyzer/AssemblyAnalyzerTest.java
index 08dae7c96..7e300bf35 100644
--- a/dependency-check-core/src/test/java/org/owasp/dependencycheck/analyzer/AssemblyAnalyzerTest.java
+++ b/dependency-check-core/src/test/java/org/owasp/dependencycheck/analyzer/AssemblyAnalyzerTest.java
@@ -54,8 +54,7 @@ public class AssemblyAnalyzerTest {
     public void setUp() {
         try {
             analyzer = new AssemblyAnalyzer();
-            //trick the analyzer into thinking it is active, otherwise the initialize will do nothing.
-            analyzer.supportsExtension("dll");
+            analyzer.setEnabled(true);
             analyzer.initialize();
         } catch (Exception e) {
             LOGGER.log(Level.WARNING, "Exception setting up AssemblyAnalyzer. Tests will be incomplete", e);
diff --git a/dependency-check-core/src/test/java/org/owasp/dependencycheck/analyzer/NuspecAnalyzerTest.java b/dependency-check-core/src/test/java/org/owasp/dependencycheck/analyzer/NuspecAnalyzerTest.java
index 9e4551063..d771dbf4d 100644
--- a/dependency-check-core/src/test/java/org/owasp/dependencycheck/analyzer/NuspecAnalyzerTest.java
+++ b/dependency-check-core/src/test/java/org/owasp/dependencycheck/analyzer/NuspecAnalyzerTest.java
@@ -17,39 +17,43 @@
  */
 package org.owasp.dependencycheck.analyzer;
 
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
 import org.junit.Before;
 import org.junit.Test;
-import static org.junit.Assert.*;
 
 public class NuspecAnalyzerTest {
-  private NuspecAnalyzer instance;
 
-  @Before
-  public void setUp() {
-    instance = new NuspecAnalyzer();
-  }
+    private NuspecAnalyzer instance;
 
-  @Test
-  public void testGetAnalyzerName() {
-    assertEquals("Nuspec Analyzer", instance.getName());
-  }
+    @Before
+    public void setUp() {
+        instance = new NuspecAnalyzer();
+        instance.setEnabled(true);
+    }
 
-  @Test
-  public void testGetSupportedExtensions() {
-    assertTrue(instance.getSupportedExtensions().contains("nuspec"));
-    assertFalse(instance.getSupportedExtensions().contains("nupkg"));
-  }
+    @Test
+    public void testGetAnalyzerName() {
+        assertEquals("Nuspec Analyzer", instance.getName());
+    }
 
-  @Test
-  public void testSupportsExtension() {
-    assertTrue(instance.supportsExtension("nuspec"));
-    assertFalse(instance.supportsExtension("nupkg"));
-  }
+    @Test
+    public void testGetSupportedExtensions() {
+        assertTrue(instance.getSupportedExtensions().contains("nuspec"));
+        assertFalse(instance.getSupportedExtensions().contains("nupkg"));
+    }
 
-  @Test
-  public void testGetAnalysisPhaze() {
-    assertEquals(AnalysisPhase.INFORMATION_COLLECTION, instance.getAnalysisPhase());
-  }
+    @Test
+    public void testSupportsExtension() {
+        assertTrue(instance.supportsExtension("nuspec"));
+        assertFalse(instance.supportsExtension("nupkg"));
+    }
+
+    @Test
+    public void testGetAnalysisPhaze() {
+        assertEquals(AnalysisPhase.INFORMATION_COLLECTION, instance.getAnalysisPhase());
+    }
 }
 
 // vim: cc=120:sw=4:ts=4:sts=4