diff --git a/core/src/test/java/org/owasp/dependencycheck/data/nvd/ecosystem/CveEcosystemMapperTest.java b/core/src/test/java/org/owasp/dependencycheck/data/nvd/ecosystem/CveEcosystemMapperTest.java
index c89400670d7..fa0e26a685a 100644
--- a/core/src/test/java/org/owasp/dependencycheck/data/nvd/ecosystem/CveEcosystemMapperTest.java
+++ b/core/src/test/java/org/owasp/dependencycheck/data/nvd/ecosystem/CveEcosystemMapperTest.java
@@ -64,7 +64,7 @@ private DefCveItem asCve(String description, String... cpe) {
         Node node = new Node(Node.Operator.OR, Boolean.FALSE, cpeMatch);
         nodes.add(node);
         Config conf = new Config(Config.Operator.AND, Boolean.FALSE, nodes);
-        CveItem cveItem = new CveItem(null, null, null, null, null, null, null, null, null, null, null, null, d, null, null, null, configurations, null);
+        CveItem cveItem = new CveItem(null, null, null, null, null, null, null, null, null, null, null, null, null, d, null, null, null, configurations, null);
         DefCveItem defCveItem = new DefCveItem(cveItem);
 
         return defCveItem;
diff --git a/core/src/test/java/org/owasp/dependencycheck/data/nvd/ecosystem/DescriptionEcosystemMapperTest.java b/core/src/test/java/org/owasp/dependencycheck/data/nvd/ecosystem/DescriptionEcosystemMapperTest.java
index d6d8d139e04..4d7825e6312 100644
--- a/core/src/test/java/org/owasp/dependencycheck/data/nvd/ecosystem/DescriptionEcosystemMapperTest.java
+++ b/core/src/test/java/org/owasp/dependencycheck/data/nvd/ecosystem/DescriptionEcosystemMapperTest.java
@@ -104,7 +104,7 @@ private DefCveItem asCve(String description) {
         List<LangString> descriptions = new ArrayList<>();
         LangString desc = new LangString("en",description);
         descriptions.add(desc);
-        CveItem cveItem = new CveItem(null, null, null, null, null, null, null, null, null, null, null, null, descriptions, null, null, null, null, null);
+        CveItem cveItem = new CveItem(null, null, null, null, null, null, null, null, null, null, null, null, null, descriptions, null, null, null, null, null);
         DefCveItem defCveItem = new DefCveItem(cveItem);
 
         return defCveItem;
diff --git a/core/src/test/java/org/owasp/dependencycheck/data/nvd/ecosystem/UrlEcosystemMapperTest.java b/core/src/test/java/org/owasp/dependencycheck/data/nvd/ecosystem/UrlEcosystemMapperTest.java
index bc10b24fb92..33478079fe6 100644
--- a/core/src/test/java/org/owasp/dependencycheck/data/nvd/ecosystem/UrlEcosystemMapperTest.java
+++ b/core/src/test/java/org/owasp/dependencycheck/data/nvd/ecosystem/UrlEcosystemMapperTest.java
@@ -27,7 +27,7 @@ private DefCveItem asCve(String url) {
         List<Reference> references  = new ArrayList<>();
         Reference ref = new Reference(url, null, null);
         references.add(ref);
-        CveItem cveItem = new CveItem(null, null, null, null, null, null, null, null, null, null, null, null, null, references, null, null, null, null);
+        CveItem cveItem = new CveItem(null, null, null, null, null, null, null, null, null, null, null, null, null, null, references, null, null, null, null);
         DefCveItem defCveItem = new DefCveItem(cveItem);
         
         return defCveItem;
diff --git a/pom.xml b/pom.xml
index 7be50c7f728..c421d8d9a68 100644
--- a/pom.xml
+++ b/pom.xml
@@ -972,13 +972,7 @@ Copyright (c) 2012 - Jeremy Long
             <dependency>
                 <groupId>io.github.jeremylong</groupId>
                 <artifactId>open-vulnerability-clients</artifactId>
-                <version>6.1.0</version>
-            </dependency>
-            <!-- downgrade required to stay on Java 8 -->
-            <dependency>
-                <groupId>com.samskivert</groupId>
-                <artifactId>jmustache</artifactId>
-                <version>1.15</version>
+                <version>6.1.1</version>
             </dependency>
             <dependency>
                 <groupId>org.anarres.jdiagnostics</groupId>