diff --git a/src/com/sun/jna/Structure.java b/src/com/sun/jna/Structure.java
index 57866df46..2a6810f6b 100644
--- a/src/com/sun/jna/Structure.java
+++ b/src/com/sun/jna/Structure.java
@@ -476,7 +476,7 @@ public Pointer getPointer() {
 
     // Keep track of ByReference reads to avoid redundant reads of the same
     // address
-    private static final ThreadLocal<Map<Pointer, Structure>> reads = new ThreadLocal<>() {
+    private static final ThreadLocal<Map<Pointer, Structure>> reads = new ThreadLocal<Map<Pointer, Structure>>() {
         @Override
         protected synchronized Map<Pointer, Structure> initialValue() {
             return new HashMap<>();
diff --git a/test/com/sun/jna/NativeTest.java b/test/com/sun/jna/NativeTest.java
index a77d812f8..55eb94595 100644
--- a/test/com/sun/jna/NativeTest.java
+++ b/test/com/sun/jna/NativeTest.java
@@ -476,8 +476,8 @@ public void testGetBytesWithCharset() throws Exception {
 
     public void testGetBytesBadEncoding() throws Exception {
         byte[] buf = Native.getBytes(getName(), "unsupported");
-        assertEquals("Incorrect fallback bytes with bad encoding",
-        getName(), new String(buf, Charset.defaultCharset().displayName()));
+        assertEquals("Incorrect fallback bytes with bad encoding", getName(),
+            new String(buf, Charset.defaultCharset().displayName()));
     }
 
     public void testFindDirectMappedClassFailure() {