diff --git a/NOTICE b/NOTICE
index 3025e7d1..bf1bc702 100644
--- a/NOTICE
+++ b/NOTICE
@@ -12,25 +12,15 @@ specific language governing permissions and limitations
 under the License.
 
 This project includes:
-  Animal Sniffer Annotations under MIT license
   Bean Validation API under Apache License 2.0
-  Checker Qual under GNU General Public License, version 2 (GPL2), with the classpath exception or The MIT License
   ClassMate under The Apache Software License, Version 2.0
   digipost-data-types under The Apache Software License, Version 2.0
-  error-prone annotations under Apache 2.0
   Expression Language 3.0 under CDDL + GPLv2 with classpath exception
-  FindBugs-jsr305 under The Apache Software License, Version 2.0
-  Guava: Google Core Libraries for Java under The Apache Software License, Version 2.0
-  Hamcrest Core under New BSD License
   Hibernate Validator Engine under Apache License, Version 2.0
-  J2ObjC Annotations under The Apache Software License, Version 2.0
   Jackson datatype: JSR310 under The Apache Software License, Version 2.0
   Jackson-annotations under The Apache Software License, Version 2.0
   Jackson-core under The Apache Software License, Version 2.0
   jackson-databind under The Apache Software License, Version 2.0
-  Java Hamcrest under BSD Licence 3
-  java-8-matchers under MIT License
   JBoss Logging 3 under Apache License, version 2.0
-  JUnit under Eclipse Public License 1.0
   Project Lombok under The MIT License
 
diff --git a/pom.xml b/pom.xml
index cb3137c3..d022d5d3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -92,7 +92,7 @@
         <dependency>
             <groupId>co.unruly</groupId>
             <artifactId>java-8-matchers</artifactId>
-            <version>1.5</version>
+            <version>1.6</version>
             <scope>test</scope>
             <exclusions>
                 <exclusion>
@@ -107,12 +107,6 @@
             <version>25.0-jre</version>
             <scope>test</scope>
         </dependency>
-        <dependency>
-            <groupId>co.unruly</groupId>
-            <artifactId>java-8-matchers</artifactId>
-            <version>1.6</version>
-            <scope>test</scope>
-        </dependency>
     </dependencies>
     <build>
         <resources>
@@ -219,6 +213,11 @@
                 <groupId>org.jasig.maven</groupId>
                 <artifactId>maven-notice-plugin</artifactId>
                 <version>1.1.0</version>
+                <configuration>
+                    <excludeScopes>
+                        <excludeScope>test</excludeScope>
+                    </excludeScopes>
+                </configuration>
                 <executions>
                     <execution>
                         <goals>