diff --git a/.travis.yml b/.travis.yml
index 764c1ee9..ae763ffb 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,9 +1,11 @@
 dist: trusty
 language: java
 jdk:
-  - oraclejdk8  # Legacy
-  - oraclejdk11 # LTS
-  - oraclejdk15 # Latest
+  - oraclejdk8  # LTS until Mar 2022
+  - oraclejdk11 # LTS until Sep 2023
+  - oraclejdk15 # out of support
+  - oraclejdk16 # out of support
+  - oraclejdk17 # LTS until Sep 2026
 jobs:
   include:
     # Extra job, testing legacy CMM option
diff --git a/imageio/imageio-batik/src/test/java/com/twelvemonkeys/imageio/plugins/svg/SVGImageReaderTest.java b/imageio/imageio-batik/src/test/java/com/twelvemonkeys/imageio/plugins/svg/SVGImageReaderTest.java
index 602acc33..550f0cdb 100755
--- a/imageio/imageio-batik/src/test/java/com/twelvemonkeys/imageio/plugins/svg/SVGImageReaderTest.java
+++ b/imageio/imageio-batik/src/test/java/com/twelvemonkeys/imageio/plugins/svg/SVGImageReaderTest.java
@@ -54,8 +54,6 @@ import java.util.Collections;
 import java.util.List;
 
 import static org.junit.Assert.*;
-import static org.mockito.Matchers.any;
-import static org.mockito.Matchers.anyString;
 import static org.mockito.Mockito.*;
 
 /**
@@ -225,7 +223,7 @@ public class SVGImageReaderTest extends ImageReaderAbstractTest<SVGImageReader>
             assertEquals(500, image.getHeight());
 
             // CSS and embedded resources all go!
-            verifyZeroInteractions(listener);
+            verifyNoInteractions(listener);
         }
         finally {
             reader.dispose();
@@ -266,7 +264,7 @@ public class SVGImageReaderTest extends ImageReaderAbstractTest<SVGImageReader>
             assertEquals(500, image.getHeight());
 
             // No more warnings now that the base URI is set
-            verifyZeroInteractions(listener);
+            verifyNoInteractions(listener);
         }
         finally {
             reader.dispose();
diff --git a/imageio/imageio-bmp/src/test/java/com/twelvemonkeys/imageio/plugins/bmp/BMPImageReaderTest.java b/imageio/imageio-bmp/src/test/java/com/twelvemonkeys/imageio/plugins/bmp/BMPImageReaderTest.java
index 6c81bdd6..6138e0ff 100755
--- a/imageio/imageio-bmp/src/test/java/com/twelvemonkeys/imageio/plugins/bmp/BMPImageReaderTest.java
+++ b/imageio/imageio-bmp/src/test/java/com/twelvemonkeys/imageio/plugins/bmp/BMPImageReaderTest.java
@@ -32,8 +32,8 @@ package com.twelvemonkeys.imageio.plugins.bmp;
 
 import static org.junit.Assert.*;
 import static org.junit.Assume.assumeNoException;
-import static org.mockito.Matchers.anyInt;
-import static org.mockito.Matchers.eq;
+import static org.mockito.ArgumentMatchers.anyFloat;
+import static org.mockito.ArgumentMatchers.eq;
 import static org.mockito.Mockito.atLeastOnce;
 import static org.mockito.Mockito.inOrder;
 import static org.mockito.Mockito.mock;
@@ -295,7 +295,7 @@ public class BMPImageReaderTest extends ImageReaderAbstractTest<BMPImageReader>
         // At least imageStarted and imageComplete, plus any number of imageProgress
         InOrder ordered = inOrder(listener);
         ordered.verify(listener).imageStarted(reader, 0);
-        ordered.verify(listener, atLeastOnce()).imageProgress(eq(reader), anyInt());
+        ordered.verify(listener, atLeastOnce()).imageProgress(eq(reader), anyFloat());
         ordered.verify(listener).imageComplete(reader);
     }
 
@@ -318,7 +318,7 @@ public class BMPImageReaderTest extends ImageReaderAbstractTest<BMPImageReader>
         // At least imageStarted and imageComplete, plus any number of imageProgress
         InOrder ordered = inOrder(listener);
         ordered.verify(listener).imageStarted(reader, 0);
-        ordered.verify(listener, atLeastOnce()).imageProgress(eq(reader), anyInt());
+        ordered.verify(listener, atLeastOnce()).imageProgress(eq(reader), anyFloat());
         ordered.verify(listener).imageComplete(reader);
     }
 
diff --git a/imageio/imageio-core/src/test/java/com/twelvemonkeys/imageio/color/KCMSSanitizerStrategyTest.java b/imageio/imageio-core/src/test/java/com/twelvemonkeys/imageio/color/KCMSSanitizerStrategyTest.java
index e5012a34..3cf80a29 100644
--- a/imageio/imageio-core/src/test/java/com/twelvemonkeys/imageio/color/KCMSSanitizerStrategyTest.java
+++ b/imageio/imageio-core/src/test/java/com/twelvemonkeys/imageio/color/KCMSSanitizerStrategyTest.java
@@ -39,8 +39,6 @@ import java.io.IOException;
 import java.util.Arrays;
 
 import static org.junit.Assert.assertArrayEquals;
-import static org.mockito.Matchers.any;
-import static org.mockito.Matchers.eq;
 import static org.mockito.Mockito.*;
 
 public class KCMSSanitizerStrategyTest {
diff --git a/imageio/imageio-core/src/test/java/com/twelvemonkeys/imageio/util/ImageReaderAbstractTest.java b/imageio/imageio-core/src/test/java/com/twelvemonkeys/imageio/util/ImageReaderAbstractTest.java
index ea383dfb..9e55d83b 100644
--- a/imageio/imageio-core/src/test/java/com/twelvemonkeys/imageio/util/ImageReaderAbstractTest.java
+++ b/imageio/imageio-core/src/test/java/com/twelvemonkeys/imageio/util/ImageReaderAbstractTest.java
@@ -1151,7 +1151,7 @@ public abstract class ImageReaderAbstractTest<T extends ImageReader> {
         // At least imageStarted and imageComplete, plus any number of imageProgress
         InOrder ordered = inOrder(listener);
         ordered.verify(listener).imageStarted(reader, 0);
-        ordered.verify(listener, atLeastOnce()).imageProgress(eq(reader), anyInt());
+        ordered.verify(listener, atLeastOnce()).imageProgress(eq(reader), anyFloat());
         ordered.verify(listener).imageComplete(reader);
         reader.dispose();
     }
@@ -1184,9 +1184,9 @@ public abstract class ImageReaderAbstractTest<T extends ImageReader> {
         ordered.verify(listenerToo).imageStarted(reader, 0);
         ordered.verify(listenerThree).imageStarted(reader, 0);
 
-        ordered.verify(listener, atLeastOnce()).imageProgress(eq(reader), anyInt());
-        ordered.verify(listenerToo, atLeastOnce()).imageProgress(eq(reader), anyInt());
-        ordered.verify(listenerThree, atLeastOnce()).imageProgress(eq(reader), anyInt());
+        ordered.verify(listener, atLeastOnce()).imageProgress(eq(reader), anyFloat());
+        ordered.verify(listenerToo, atLeastOnce()).imageProgress(eq(reader), anyFloat());
+        ordered.verify(listenerThree, atLeastOnce()).imageProgress(eq(reader), anyFloat());
 
         ordered.verify(listener).imageComplete(reader);
         ordered.verify(listenerToo).imageComplete(reader);
@@ -1226,7 +1226,7 @@ public abstract class ImageReaderAbstractTest<T extends ImageReader> {
         }
 
         // Should not have called any methods...
-        verifyZeroInteractions(listener);
+        verifyNoInteractions(listener);
         reader.dispose();
     }
 
@@ -1253,11 +1253,11 @@ public abstract class ImageReaderAbstractTest<T extends ImageReader> {
         }
 
         // Should not have called any methods on listener1...
-        verifyZeroInteractions(listener);
+        verifyNoInteractions(listener);
 
         InOrder ordered = inOrder(listenerToo);
         ordered.verify(listenerToo).imageStarted(reader, 0);
-        ordered.verify(listenerToo, atLeastOnce()).imageProgress(eq(reader), anyInt());
+        ordered.verify(listenerToo, atLeastOnce()).imageProgress(eq(reader), anyFloat());
         ordered.verify(listenerToo).imageComplete(reader);
         reader.dispose();
     }
@@ -1281,7 +1281,7 @@ public abstract class ImageReaderAbstractTest<T extends ImageReader> {
         }
 
         // Should not have called any methods...
-        verifyZeroInteractions(listener);
+        verifyNoInteractions(listener);
         reader.dispose();
     }
 
@@ -1307,8 +1307,8 @@ public abstract class ImageReaderAbstractTest<T extends ImageReader> {
         }
 
         // Should not have called any methods...
-        verifyZeroInteractions(listener);
-        verifyZeroInteractions(listenerToo);
+        verifyNoInteractions(listener);
+        verifyNoInteractions(listenerToo);
         reader.dispose();
     }
 
@@ -1333,7 +1333,7 @@ public abstract class ImageReaderAbstractTest<T extends ImageReader> {
             }
         };
         doAnswer(abort).when(abortingListener).imageStarted(any(ImageReader.class), anyInt());
-        doAnswer(abort).when(abortingListener).imageProgress(any(ImageReader.class), anyInt());
+        doAnswer(abort).when(abortingListener).imageProgress(any(ImageReader.class), anyFloat());
 
         reader.addIIOReadProgressListener(abortingListener);
 
diff --git a/imageio/imageio-core/src/test/java/com/twelvemonkeys/imageio/util/ImageWriterAbstractTest.java b/imageio/imageio-core/src/test/java/com/twelvemonkeys/imageio/util/ImageWriterAbstractTest.java
index 5671e2db..3f3f3d4b 100755
--- a/imageio/imageio-core/src/test/java/com/twelvemonkeys/imageio/util/ImageWriterAbstractTest.java
+++ b/imageio/imageio-core/src/test/java/com/twelvemonkeys/imageio/util/ImageWriterAbstractTest.java
@@ -52,7 +52,6 @@ import java.net.URL;
 import java.util.List;
 
 import static org.junit.Assert.*;
-import static org.mockito.Matchers.anyInt;
 import static org.mockito.Mockito.*;
 
 /**
@@ -104,7 +103,7 @@ public abstract class ImageWriterAbstractTest<T extends ImageWriter> {
 
         return image;
     }
-    
+
     protected final RenderedImage getTestData(final int index) {
         return getTestData().get(index);
     }
@@ -219,7 +218,7 @@ public abstract class ImageWriterAbstractTest<T extends ImageWriter> {
         // At least imageStarted and imageComplete, plus any number of imageProgress
         InOrder ordered = inOrder(listener);
         ordered.verify(listener).imageStarted(writer, 0);
-        ordered.verify(listener, atLeastOnce()).imageProgress(eq(writer), anyInt());
+        ordered.verify(listener, atLeastOnce()).imageProgress(eq(writer), anyFloat());
         ordered.verify(listener).imageComplete(writer);
     }
 
@@ -251,9 +250,9 @@ public abstract class ImageWriterAbstractTest<T extends ImageWriter> {
         ordered.verify(listenerToo).imageStarted(writer, 0);
         ordered.verify(listenerThree).imageStarted(writer, 0);
 
-        ordered.verify(listener, atLeastOnce()).imageProgress(eq(writer), anyInt());
-        ordered.verify(listenerToo, atLeastOnce()).imageProgress(eq(writer), anyInt());
-        ordered.verify(listenerThree, atLeastOnce()).imageProgress(eq(writer), anyInt());
+        ordered.verify(listener, atLeastOnce()).imageProgress(eq(writer), anyFloat());
+        ordered.verify(listenerToo, atLeastOnce()).imageProgress(eq(writer), anyFloat());
+        ordered.verify(listenerThree, atLeastOnce()).imageProgress(eq(writer), anyFloat());
 
         ordered.verify(listener).imageComplete(writer);
         ordered.verify(listenerToo).imageComplete(writer);
@@ -290,7 +289,7 @@ public abstract class ImageWriterAbstractTest<T extends ImageWriter> {
         }
 
         // Should not have called any methods...
-        verifyZeroInteractions(listener);
+        verifyNoInteractions(listener);
     }
 
     @Test
@@ -315,12 +314,12 @@ public abstract class ImageWriterAbstractTest<T extends ImageWriter> {
         }
 
         // Should not have called any methods...
-        verifyZeroInteractions(listener);
+        verifyNoInteractions(listener);
 
         // At least imageStarted and imageComplete, plus any number of imageProgress
         InOrder ordered = inOrder(listenerToo);
         ordered.verify(listenerToo).imageStarted(writer, 0);
-        ordered.verify(listenerToo, atLeastOnce()).imageProgress(eq(writer), anyInt());
+        ordered.verify(listenerToo, atLeastOnce()).imageProgress(eq(writer), anyFloat());
         ordered.verify(listenerToo).imageComplete(writer);
 
     }
@@ -345,7 +344,7 @@ public abstract class ImageWriterAbstractTest<T extends ImageWriter> {
         }
 
         // Should not have called any methods...
-        verifyZeroInteractions(listener);
+        verifyNoInteractions(listener);
     }
 
     @Test
@@ -371,7 +370,7 @@ public abstract class ImageWriterAbstractTest<T extends ImageWriter> {
         }
 
         // Should not have called any methods...
-        verifyZeroInteractions(listener);
-        verifyZeroInteractions(listenerToo);
+        verifyNoInteractions(listener);
+        verifyNoInteractions(listenerToo);
     }
 }
\ No newline at end of file
diff --git a/imageio/imageio-jpeg/src/test/java/com/twelvemonkeys/imageio/plugins/jpeg/JPEGImageReaderTest.java b/imageio/imageio-jpeg/src/test/java/com/twelvemonkeys/imageio/plugins/jpeg/JPEGImageReaderTest.java
index d4d5c62e..6a1482e8 100644
--- a/imageio/imageio-jpeg/src/test/java/com/twelvemonkeys/imageio/plugins/jpeg/JPEGImageReaderTest.java
+++ b/imageio/imageio-jpeg/src/test/java/com/twelvemonkeys/imageio/plugins/jpeg/JPEGImageReaderTest.java
@@ -36,7 +36,6 @@ import com.twelvemonkeys.lang.StringUtil;
 
 import org.hamcrest.core.IsInstanceOf;
 import org.junit.Test;
-import org.mockito.internal.matchers.GreaterThan;
 import org.w3c.dom.Element;
 import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
@@ -66,12 +65,11 @@ import static com.twelvemonkeys.imageio.util.IIOUtil.lookupProviderByName;
 import static org.hamcrest.CoreMatchers.allOf;
 import static org.hamcrest.CoreMatchers.containsString;
 import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.greaterThan;
 import static org.junit.Assert.*;
 import static org.junit.Assume.assumeNoException;
 import static org.junit.Assume.assumeNotNull;
 import static org.mockito.AdditionalMatchers.and;
-import static org.mockito.Matchers.anyString;
-import static org.mockito.Matchers.eq;
 import static org.mockito.Mockito.*;
 
 /**
@@ -1456,7 +1454,7 @@ public class JPEGImageReaderTest extends ImageReaderAbstractTest<JPEGImageReader
                     assertTrue(markerSequences.getLength() == 1 || markerSequences.getLength() == 2); // In case of JPEG encoded thumbnail, there will be 2
                     IIOMetadataNode markerSequence = (IIOMetadataNode) markerSequences.item(markerSequences.getLength() - 1); // The last will be the "main" image
                     assertNotNull(markerSequence);
-                    assertThat(markerSequence.getChildNodes().getLength(), new GreaterThan<>(0));
+                    assertThat(markerSequence.getChildNodes().getLength(), greaterThan(0));
 
                     NodeList unknowns = markerSequence.getElementsByTagName("unknown");
                     for (int j = 0; j < unknowns.getLength(); j++) {
diff --git a/imageio/imageio-jpeg/src/test/java/com/twelvemonkeys/imageio/plugins/jpeg/JPEGSegmentImageInputStreamTest.java b/imageio/imageio-jpeg/src/test/java/com/twelvemonkeys/imageio/plugins/jpeg/JPEGSegmentImageInputStreamTest.java
index da151d67..8269cae7 100644
--- a/imageio/imageio-jpeg/src/test/java/com/twelvemonkeys/imageio/plugins/jpeg/JPEGSegmentImageInputStreamTest.java
+++ b/imageio/imageio-jpeg/src/test/java/com/twelvemonkeys/imageio/plugins/jpeg/JPEGSegmentImageInputStreamTest.java
@@ -36,7 +36,6 @@ import com.twelvemonkeys.imageio.metadata.jpeg.JPEGSegmentUtil;
 import com.twelvemonkeys.imageio.stream.URLImageInputStreamSpi;
 
 import org.junit.Test;
-import org.mockito.internal.matchers.LessOrEqual;
 
 import javax.imageio.IIOException;
 import javax.imageio.ImageIO;
@@ -48,6 +47,7 @@ import java.net.URL;
 import java.util.List;
 
 import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.lessThanOrEqualTo;
 import static org.junit.Assert.assertArrayEquals;
 import static org.junit.Assert.assertEquals;
 
@@ -124,7 +124,7 @@ public class JPEGSegmentImageInputStreamTest {
             length++;
         }
 
-        assertThat(length, new LessOrEqual<>(10203L)); // In no case should length increase
+        assertThat(length, lessThanOrEqualTo(10203L)); // In no case should length increase
 
         assertEquals(9607L, length); // May change, if more chunks are passed to reader...
     }
diff --git a/imageio/imageio-tiff/src/test/java/com/twelvemonkeys/imageio/plugins/tiff/TIFFImageReaderTest.java b/imageio/imageio-tiff/src/test/java/com/twelvemonkeys/imageio/plugins/tiff/TIFFImageReaderTest.java
index 41ba555e..057b054b 100644
--- a/imageio/imageio-tiff/src/test/java/com/twelvemonkeys/imageio/plugins/tiff/TIFFImageReaderTest.java
+++ b/imageio/imageio-tiff/src/test/java/com/twelvemonkeys/imageio/plugins/tiff/TIFFImageReaderTest.java
@@ -58,8 +58,6 @@ import static org.hamcrest.CoreMatchers.instanceOf;
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.junit.Assert.*;
 import static org.mockito.AdditionalMatchers.and;
-import static org.mockito.Matchers.contains;
-import static org.mockito.Matchers.eq;
 import static org.mockito.Mockito.*;
 
 /**
diff --git a/imageio/imageio-tiff/src/test/java/com/twelvemonkeys/imageio/plugins/tiff/TIFFStreamMetadataTest.java b/imageio/imageio-tiff/src/test/java/com/twelvemonkeys/imageio/plugins/tiff/TIFFStreamMetadataTest.java
index a563d7be..b61ae430 100644
--- a/imageio/imageio-tiff/src/test/java/com/twelvemonkeys/imageio/plugins/tiff/TIFFStreamMetadataTest.java
+++ b/imageio/imageio-tiff/src/test/java/com/twelvemonkeys/imageio/plugins/tiff/TIFFStreamMetadataTest.java
@@ -47,8 +47,6 @@ import static java.nio.ByteOrder.LITTLE_ENDIAN;
 import static org.hamcrest.CoreMatchers.instanceOf;
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.junit.Assert.*;
-import static org.mockito.Matchers.any;
-import static org.mockito.Matchers.eq;
 import static org.mockito.Mockito.*;
 
 /**
diff --git a/imageio/pom.xml b/imageio/pom.xml
index 28a95309..c827c447 100644
--- a/imageio/pom.xml
+++ b/imageio/pom.xml
@@ -104,8 +104,15 @@
 
         <dependency>
             <groupId>org.mockito</groupId>
-            <artifactId>mockito-all</artifactId>
-            <version>1.8.5</version>
+            <artifactId>mockito-core</artifactId>
+            <version>3.12.4</version>
+            <scope>test</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.hamcrest</groupId>
+            <artifactId>hamcrest</artifactId>
+            <version>2.2</version>
             <scope>test</scope>
         </dependency>
     </dependencies>
diff --git a/servlet/pom.xml b/servlet/pom.xml
index 74f9599f..4d901ab5 100644
--- a/servlet/pom.xml
+++ b/servlet/pom.xml
@@ -73,8 +73,8 @@
 
         <dependency>
             <groupId>org.mockito</groupId>
-            <artifactId>mockito-all</artifactId>
-            <version>1.8.5</version>
+            <artifactId>mockito-core</artifactId>
+            <version>3.12.4</version>
             <scope>test</scope>
         </dependency>
     </dependencies>
diff --git a/servlet/src/test/java/com/twelvemonkeys/servlet/FilterAbstractTest.java b/servlet/src/test/java/com/twelvemonkeys/servlet/FilterAbstractTest.java
index 80cfb44f..f5dd73b6 100755
--- a/servlet/src/test/java/com/twelvemonkeys/servlet/FilterAbstractTest.java
+++ b/servlet/src/test/java/com/twelvemonkeys/servlet/FilterAbstractTest.java
@@ -176,8 +176,8 @@ public abstract class FilterAbstractTest extends ObjectAbstractTest {
             private final Map<String, String> params;
 
             MockServletContext() {
-                attributes = new HashMap<String, Object>();
-                params = new HashMap<String, String>();
+                attributes = new HashMap<>();
+                params = new HashMap<>();
             }
 
             public Object getAttribute(String s) {
@@ -193,7 +193,7 @@ public abstract class FilterAbstractTest extends ObjectAbstractTest {
             }
 
             public String getInitParameter(String s) {
-                return (String) params.get(s);
+                return params.get(s);
             }
 
             public Enumeration getInitParameterNames() {
diff --git a/servlet/src/test/java/com/twelvemonkeys/servlet/GenericFilterTest.java b/servlet/src/test/java/com/twelvemonkeys/servlet/GenericFilterTest.java
index 8efd283a..1340a3d9 100755
--- a/servlet/src/test/java/com/twelvemonkeys/servlet/GenericFilterTest.java
+++ b/servlet/src/test/java/com/twelvemonkeys/servlet/GenericFilterTest.java
@@ -69,7 +69,7 @@ public final class GenericFilterTest extends FilterAbstractTest {
 
         // TRUE
         filter = new GenericFilterImpl();
-        Map<String, String> params = new HashMap<String, String>();
+        Map<String, String> params = new HashMap<>();
         params.put("once-per-request", "true");
 
         try {
@@ -84,7 +84,7 @@ public final class GenericFilterTest extends FilterAbstractTest {
 
         // TRUE
         filter = new GenericFilterImpl();
-        params = new HashMap<String, String>();
+        params = new HashMap<>();
         params.put("oncePerRequest", "true");
 
         try {
@@ -115,10 +115,7 @@ public final class GenericFilterTest extends FilterAbstractTest {
         try {
             chain.doFilter(makeRequest(), makeResponse());
         }
-        catch (IOException e) {
-            fail(e.getMessage());
-        }
-        catch (ServletException e) {
+        catch (IOException | ServletException e) {
             fail(e.getMessage());
         }
 
@@ -145,10 +142,7 @@ public final class GenericFilterTest extends FilterAbstractTest {
         try {
             chain.doFilter(makeRequest(), makeResponse());
         }
-        catch (IOException e) {
-            fail(e.getMessage());
-        }
-        catch (ServletException e) {
+        catch (IOException | ServletException e) {
             fail(e.getMessage());
         }
 
diff --git a/servlet/src/test/java/com/twelvemonkeys/servlet/ServletAttributesMapAdapterContextTest.java b/servlet/src/test/java/com/twelvemonkeys/servlet/ServletAttributesMapAdapterContextTest.java
index 5d25f825..6f88a2b4 100755
--- a/servlet/src/test/java/com/twelvemonkeys/servlet/ServletAttributesMapAdapterContextTest.java
+++ b/servlet/src/test/java/com/twelvemonkeys/servlet/ServletAttributesMapAdapterContextTest.java
@@ -85,7 +85,7 @@ public class ServletAttributesMapAdapterContextTest extends MapAbstractTest {
     }
 
     private Map<String, Object> createAttributes(boolean initialValues) {
-        Map<String, Object> map = new ConcurrentHashMap<String, Object>();
+        Map<String, Object> map = new ConcurrentHashMap<>();
 
         if (initialValues) {
             String[] sampleKeys = (String[]) getSampleKeys();
@@ -110,7 +110,7 @@ public class ServletAttributesMapAdapterContextTest extends MapAbstractTest {
     @Override
     public Object[] getNewSampleValues() {
         // Needs to be same length but different values
-        return new Object[] {new Date(-1l), "foo/bar", Arrays.asList(2, 3, 4)};
+        return new Object[] {new Date(-1L), "foo/bar", Arrays.asList(2, 3, 4)};
     }
 
     @Test
diff --git a/servlet/src/test/java/com/twelvemonkeys/servlet/ServletAttributesMapAdapterRequestTest.java b/servlet/src/test/java/com/twelvemonkeys/servlet/ServletAttributesMapAdapterRequestTest.java
index a8d0cb4b..765564a7 100755
--- a/servlet/src/test/java/com/twelvemonkeys/servlet/ServletAttributesMapAdapterRequestTest.java
+++ b/servlet/src/test/java/com/twelvemonkeys/servlet/ServletAttributesMapAdapterRequestTest.java
@@ -85,7 +85,7 @@ public class ServletAttributesMapAdapterRequestTest extends MapAbstractTest {
     }
 
     private Map<String, Object> createAttributes(boolean initialValues) {
-        Map<String, Object> map = new ConcurrentHashMap<String, Object>();
+        Map<String, Object> map = new ConcurrentHashMap<>();
 
         if (initialValues) {
             String[] sampleKeys = (String[]) getSampleKeys();
@@ -110,7 +110,7 @@ public class ServletAttributesMapAdapterRequestTest extends MapAbstractTest {
     @Override
     public Object[] getNewSampleValues() {
         // Needs to be same length but different values
-        return new Object[] {new Date(-1l), "foo/bar", Arrays.asList(2, 3, 4)};
+        return new Object[] {new Date(-1L), "foo/bar", Arrays.asList(2, 3, 4)};
     }
 
     @Test
diff --git a/servlet/src/test/java/com/twelvemonkeys/servlet/ServletConfigExceptionTest.java b/servlet/src/test/java/com/twelvemonkeys/servlet/ServletConfigExceptionTest.java
index eb7dc2cd..f49efb72 100755
--- a/servlet/src/test/java/com/twelvemonkeys/servlet/ServletConfigExceptionTest.java
+++ b/servlet/src/test/java/com/twelvemonkeys/servlet/ServletConfigExceptionTest.java
@@ -35,7 +35,7 @@ import org.junit.Test;
 
 import java.io.PrintWriter;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNull;
 import static org.junit.Assert.assertSame;
 
 /**
@@ -62,8 +62,8 @@ public class ServletConfigExceptionTest {
             throw new ServletConfigException("FooBar!");
         }
         catch (ServletConfigException e) {
-            assertEquals(null, e.getRootCause()); // Old API
-            assertEquals(null, e.getCause());
+            assertNull(e.getRootCause()); // Old API
+            assertNull(e.getCause());
 
             e.printStackTrace(new PrintWriter(new NullOutputStream()));
         }
@@ -77,8 +77,8 @@ public class ServletConfigExceptionTest {
             throw e;
         }
         catch (ServletConfigException e) {
-            assertEquals(null, e.getRootCause()); // Old API
-            assertEquals(null, e.getCause());
+            assertNull(e.getRootCause()); // Old API
+            assertNull(e.getCause());
 
             e.printStackTrace(new PrintWriter(new NullOutputStream()));
         }
@@ -108,8 +108,8 @@ public class ServletConfigExceptionTest {
             throw new ServletConfigException("FooBar!", null);
         }
         catch (ServletConfigException e) {
-            assertEquals(null, e.getRootCause()); // Old API
-            assertEquals(null, e.getCause());
+            assertNull(e.getRootCause()); // Old API
+            assertNull(e.getCause());
 
             e.printStackTrace(new PrintWriter(new NullOutputStream()));
         }
diff --git a/servlet/src/test/java/com/twelvemonkeys/servlet/ServletConfiguratorTest.java b/servlet/src/test/java/com/twelvemonkeys/servlet/ServletConfiguratorTest.java
index fa0a7a92..2b9820ec 100644
--- a/servlet/src/test/java/com/twelvemonkeys/servlet/ServletConfiguratorTest.java
+++ b/servlet/src/test/java/com/twelvemonkeys/servlet/ServletConfiguratorTest.java
@@ -31,7 +31,6 @@
 package com.twelvemonkeys.servlet;
 
 import org.junit.Test;
-import org.mockito.Matchers;
 
 import javax.servlet.Filter;
 import javax.servlet.FilterConfig;
@@ -114,7 +113,7 @@ public class ServletConfiguratorTest {
 
         ServletConfig config = mock(ServletConfig.class);
         when(config.getServletName()).thenReturn("FooServlet");
-        when(config.getInitParameterNames()).thenReturn(Collections.enumeration(Arrays.asList("private")));
+        when(config.getInitParameterNames()).thenReturn(Collections.enumeration(Collections.singletonList("private")));
         when(config.getInitParameter("private")).thenReturn("99");
 
         ServletConfigurator.configure(servlet, config);
@@ -134,7 +133,7 @@ public class ServletConfiguratorTest {
 
         ServletConfig config = mock(ServletConfig.class);
         when(config.getServletName()).thenReturn("FooServlet");
-        when(config.getInitParameterNames()).thenReturn(Collections.enumeration(Arrays.asList("private")));
+        when(config.getInitParameterNames()).thenReturn(Collections.enumeration(Collections.singletonList("private")));
         when(config.getInitParameter("private")).thenReturn("private");
         when(config.getInitParameter("package-private")).thenReturn("package");
 
@@ -247,7 +246,7 @@ public class ServletConfiguratorTest {
         // Verify
         verify(servlet, never()).setX(anyInt());
         verify(servlet, times(1)).setFoo("Foo");
-        verify(servlet, times(1)).setFoo(Matchers.<String>any()); // We don't want multiple invocations
+        verify(servlet, times(1)).setFoo(anyString()); // We don't want multiple invocations
     }
 
     // Test interface
@@ -260,7 +259,7 @@ public class ServletConfiguratorTest {
 
         ServletConfig config = mock(ServletConfig.class);
         when(config.getServletName()).thenReturn("FooServlet");
-        when(config.getInitParameterNames()).thenReturn(Collections.enumeration(Arrays.asList("foo")));
+        when(config.getInitParameterNames()).thenReturn(Collections.enumeration(Collections.singletonList("foo")));
         when(config.getInitParameter("foo")).thenReturn("Foo");
 
         ServletConfigurator.configure(servlet, config);
@@ -282,14 +281,14 @@ public class ServletConfiguratorTest {
 
         ServletConfig config = mock(ServletConfig.class);
         when(config.getServletName()).thenReturn("FooServlet");
-        when(config.getInitParameterNames()).thenReturn(Collections.enumeration(Arrays.asList("required")));
+        when(config.getInitParameterNames()).thenReturn(Collections.enumeration(Collections.singletonList("required")));
         when(config.getInitParameter("required")).thenReturn("the required value");
 
         ServletConfigurator.configure(servlet, config);
 
         // Verify
         verify(servlet, times(1)).setRequired("the required value");
-        verify(servlet, times(1)).setRequired(Matchers.<String>any()); // We don't want multiple invocations
+        verify(servlet, times(1)).setRequired(anyString()); // We don't want multiple invocations
     }
 
     @Test
@@ -303,12 +302,12 @@ public class ServletConfiguratorTest {
 
         ServletConfig config = mock(ServletConfig.class);
         when(config.getServletName()).thenReturn("FooServlet");
-        when(config.getInitParameterNames()).thenReturn(Collections.enumeration(Collections.<Object>emptyList()));
+        when(config.getInitParameterNames()).thenReturn(Collections.enumeration(Collections.emptyList()));
 
         ServletConfigurator.configure(servlet, config);
 
         // Verify
-        verify(servlet, never()).setNonRequired(Matchers.<String>any()); // Simply not configured
+        verify(servlet, never()).setNonRequired(anyString()); // Simply not configured
     }
 
     @Test(expected = ServletConfigException.class)
@@ -323,7 +322,7 @@ public class ServletConfiguratorTest {
 
         ServletConfig config = mock(ServletConfig.class);
         when(config.getServletName()).thenReturn("FooServlet");
-        when(config.getInitParameterNames()).thenReturn(Collections.enumeration(Collections.<Object>emptyList()));
+        when(config.getInitParameterNames()).thenReturn(Collections.enumeration(Collections.emptyList()));
 
         ServletConfigurator.configure(servlet, config); // Should throw exception
     }
@@ -339,19 +338,19 @@ public class ServletConfiguratorTest {
 
         ServletConfig config = mock(ServletConfig.class);
         when(config.getServletName()).thenReturn("FooServlet");
-        when(config.getInitParameterNames()).thenReturn(Collections.enumeration(Collections.<Object>emptyList()));
+        when(config.getInitParameterNames()).thenReturn(Collections.enumeration(Collections.emptyList()));
 
         ServletConfigurator.configure(servlet, config);
 
         // Verify
         verify(servlet, times(1)).setNonRequired(new int[] {1, 2, 3});
-        verify(servlet, times(1)).setNonRequired(Matchers.<int[]>any());
+        verify(servlet, times(1)).setNonRequired((int[]) any());
     }
 
 
     public interface Annotated {
         @InitParam(name = "foo")
-        public void annotated(String an);
+        void annotated(String an);
     }
 
     public abstract class AnnotatedServlet implements Servlet, Filter {
diff --git a/servlet/src/test/java/com/twelvemonkeys/servlet/ServletHeadersMapAdapterTest.java b/servlet/src/test/java/com/twelvemonkeys/servlet/ServletHeadersMapAdapterTest.java
index 94521605..c930aac3 100755
--- a/servlet/src/test/java/com/twelvemonkeys/servlet/ServletHeadersMapAdapterTest.java
+++ b/servlet/src/test/java/com/twelvemonkeys/servlet/ServletHeadersMapAdapterTest.java
@@ -48,8 +48,8 @@ import static org.mockito.Mockito.when;
  * @version $Id: ServletHeadersMapAdapterTest.java#1 $
  */
 public class ServletHeadersMapAdapterTest extends MapAbstractTest {
-    private static final List<String> HEADER_VALUE_ETAG = Arrays.asList("\"1234567890abcdef\"");
-    private static final List<String> HEADER_VALUE_DATE = Arrays.asList(new Date().toString());
+    private static final List<String> HEADER_VALUE_ETAG = Collections.singletonList("\"1234567890abcdef\"");
+    private static final List<String> HEADER_VALUE_DATE = Collections.singletonList(new Date().toString());
     private static final List<String> HEADER_VALUE_FOO = Arrays.asList("one", "two");
 
     public boolean isPutAddSupported() {
@@ -108,7 +108,7 @@ public class ServletHeadersMapAdapterTest extends MapAbstractTest {
     }
 
     protected static <T> ReturnNewEnumeration<T> returnEnumeration(final Collection<T> collection) {
-        return new ReturnNewEnumeration<T>(collection);
+        return new ReturnNewEnumeration<>(collection);
     }
 
     private static class ReturnNewEnumeration<T> implements Answer<Enumeration<T>> {
diff --git a/servlet/src/test/java/com/twelvemonkeys/servlet/ServletParametersMapAdapterTest.java b/servlet/src/test/java/com/twelvemonkeys/servlet/ServletParametersMapAdapterTest.java
index 934ddb8f..5ea4c4f5 100755
--- a/servlet/src/test/java/com/twelvemonkeys/servlet/ServletParametersMapAdapterTest.java
+++ b/servlet/src/test/java/com/twelvemonkeys/servlet/ServletParametersMapAdapterTest.java
@@ -48,8 +48,8 @@ import static org.mockito.Mockito.when;
  * @version $Id: //depot/branches/personal/haraldk/twelvemonkeys/release-2/twelvemonkeys-servlet/src/test/java/com/twelvemonkeys/servlet/ServletParametersMapAdapterTest.java#1 $
  */
 public class ServletParametersMapAdapterTest extends MapAbstractTest {
-    private static final List<String> PARAM_VALUE_ETAG = Arrays.asList("\"1234567890abcdef\"");
-    private static final List<String> PARAM_VALUE_DATE = Arrays.asList(new Date().toString());
+    private static final List<String> PARAM_VALUE_ETAG = Collections.singletonList("\"1234567890abcdef\"");
+    private static final List<String> PARAM_VALUE_DATE = Collections.singletonList(new Date().toString());
     private static final List<String> PARAM_VALUE_FOO = Arrays.asList("one", "two");
 
     public boolean isPutAddSupported() {
@@ -109,7 +109,7 @@ public class ServletParametersMapAdapterTest extends MapAbstractTest {
     }
 
     protected static <T> ReturnNewEnumeration<T> returnEnumeration(final Collection<T> collection) {
-        return new ReturnNewEnumeration<T>(collection);
+        return new ReturnNewEnumeration<>(collection);
     }
 
     private static class ReturnNewEnumeration<T> implements Answer<Enumeration<T>> {