diff --git a/dependency-check-cli/src/test/java/org/owasp/dependencycheck/AppTest.java b/dependency-check-cli/src/test/java/org/owasp/dependencycheck/AppTest.java
index e6569e761..9659c5241 100644
--- a/dependency-check-cli/src/test/java/org/owasp/dependencycheck/AppTest.java
+++ b/dependency-check-cli/src/test/java/org/owasp/dependencycheck/AppTest.java
@@ -96,7 +96,7 @@ public class AppTest {
 
         String[] args7 = {"-P", prop.getAbsolutePath(), "--noupdate"};
         expected.put(Settings.KEYS.AUTO_UPDATE, Boolean.FALSE);
-        expected.put(Settings.KEYS.ANALYZER_ARCHIVE_ENABLED, Boolean.TRUE);
+        expected.put(Settings.KEYS.ANALYZER_ARCHIVE_ENABLED, Boolean.FALSE);
         assertTrue(testBooleanProperties(args7, expected));
 
         String[] args8 = {"-P", prop.getAbsolutePath(), "--noupdate", "--disableArchive"};
diff --git a/dependency-check-cli/src/test/resources/sample2.properties b/dependency-check-cli/src/test/resources/sample2.properties
index 34a2efe65..00d0e5a27 100644
--- a/dependency-check-cli/src/test/resources/sample2.properties
+++ b/dependency-check-cli/src/test/resources/sample2.properties
@@ -1,33 +1,33 @@
 autoupdate=true
 
-analyzer.experimental.enabled=false
-analyzer.jar.enabled=true
-analyzer.archive.enabled=true
-analyzer.node.package.enabled=true
-analyzer.composer.lock.enabled=true
-analyzer.python.distribution.enabled=true
-analyzer.python.package.enabled=true
-analyzer.ruby.gemspec.enabled=true
-analyzer.autoconf.enabled=true
-analyzer.cmake.enabled=true
-analyzer.assembly.enabled=true
-analyzer.nuspec.enabled=true
-analyzer.openssl.enabled=true
-analyzer.central.enabled=true
-analyzer.nexus.enabled=false
-analyzer.cocoapods.enabled=true
-analyzer.swift.package.manager.enabled=true
+analyzer.experimental.enabled=true
+analyzer.jar.enabled=false
+analyzer.archive.enabled=false
+analyzer.node.package.enabled=false
+analyzer.composer.lock.enabled=false
+analyzer.python.distribution.enabled=false
+analyzer.python.package.enabled=false
+analyzer.ruby.gemspec.enabled=false
+analyzer.autoconf.enabled=false
+analyzer.cmake.enabled=false
+analyzer.assembly.enabled=false
+analyzer.nuspec.enabled=false
+analyzer.openssl.enabled=false
+analyzer.central.enabled=false
+analyzer.nexus.enabled=true
+analyzer.cocoapods.enabled=false
+analyzer.swift.package.manager.enabled=false
 #whether the nexus analyzer uses the proxy
-analyzer.nexus.proxy=true
-analyzer.cpe.enabled=true
-analyzer.cpesuppression.enabled=true
-analyzer.dependencybundling.enabled=true
-analyzer.dependencymerging.enabled=true
-analyzer.falsepositive.enabled=true
-analyzer.filename.enabled=true
-analyzer.hint.enabled=true
-analyzer.nvdcve.enabled=true
-analyzer.vulnerabilitysuppression.enabled=true
-updater.nvdcve.enabled=true
-updater.versioncheck.enabled=true
-analyzer.versionfilter.enabled=true
\ No newline at end of file
+analyzer.nexus.proxy=false
+analyzer.cpe.enabled=false
+analyzer.cpesuppression.enabled=false
+analyzer.dependencybundling.enabled=false
+analyzer.dependencymerging.enabled=false
+analyzer.falsepositive.enabled=false
+analyzer.filename.enabled=false
+analyzer.hint.enabled=false
+analyzer.nvdcve.enabled=false
+analyzer.vulnerabilitysuppression.enabled=false
+updater.nvdcve.enabled=false
+updater.versioncheck.enabled=false
+analyzer.versionfilter.enabled=false
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index f49db6716..9b371cead 100644
--- a/pom.xml
+++ b/pom.xml
@@ -134,7 +134,6 @@ Copyright (c) 2012 - Jeremy Long
         <maven.api.version>3.0</maven.api.version>
         <reporting.checkstyle-plugin.version>2.17</reporting.checkstyle-plugin.version>
         <reporting.pmd-plugin.version>3.6</reporting.pmd-plugin.version>
-        <surefireArgLine></surefireArgLine>
     </properties>
     <distributionManagement>
         <snapshotRepository>
@@ -289,7 +288,7 @@ Copyright (c) 2012 - Jeremy Long
                             <goal>prepare-agent</goal>
                         </goals>
                         <configuration>
-                            <!--destFile>${project.build.directory}/coverage-reports/jacoco-ut.exec</destFile-->
+                            <destFile>${project.build.directory}/coverage-reports/jacoco-ut.exec</destFile>
                             <propertyName>surefireArgLine</propertyName>
                         </configuration>
                     </execution>
@@ -300,12 +299,31 @@ Copyright (c) 2012 - Jeremy Long
                             <goal>prepare-agent</goal>
                         </goals>
                         <configuration>
-                            <!--destFile>${project.build.directory}/coverage-reports/jacoco-it.exec</destFile-->
+                            <destFile>${project.build.directory}/coverage-reports/jacoco-it.exec</destFile>
                             <propertyName>failsafeArgLine</propertyName>
                         </configuration>
                     </execution>
                 </executions>
             </plugin>
+            <plugin>
+                <groupId>org.codehaus.gmaven</groupId>
+                <artifactId>gmaven-plugin</artifactId>
+                <version>1.5</version>
+                <executions>
+                    <execution>
+                        <id>add-dynamic-properties</id>
+                        <phase>pre-integration-test</phase>
+                        <goals>
+                            <goal>execute</goal>
+                        </goals>
+                        <configuration>
+                            <source>
+                                project.properties['invoker.mavenOpts']=project.properties.failsafeArgLine
+                            </source>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>            
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-surefire-plugin</artifactId>
@@ -579,6 +597,10 @@ Copyright (c) 2012 - Jeremy Long
                 <artifactId>jacoco-maven-plugin</artifactId>
                 <version>0.7.9</version>
                 <configuration>
+                    <dataFileIncludes>
+                        <dataFileInclude>target/coverage-reports/jacoco-ut.exec</dataFileInclude>
+                        <dataFileInclude>target/coverage-reports/jacoco-it.exec</dataFileInclude>
+                    </dataFileIncludes>
                 </configuration>
                 <reportSets>
                     <reportSet>