diff --git a/equalsverifier-core/src/main/java/nl/jqno/equalsverifier/internal/prefabvalues/JavaApiPrefabValues.java b/equalsverifier-core/src/main/java/nl/jqno/equalsverifier/internal/prefabvalues/JavaApiPrefabValues.java
index ecab7beea..8e725220c 100644
--- a/equalsverifier-core/src/main/java/nl/jqno/equalsverifier/internal/prefabvalues/JavaApiPrefabValues.java
+++ b/equalsverifier-core/src/main/java/nl/jqno/equalsverifier/internal/prefabvalues/JavaApiPrefabValues.java
@@ -138,14 +138,14 @@ private void addPrimitiveClasses() {
         addValues(long.class, 1L, 2L, 1L);
         addValues(short.class, (short) 1, (short) 2, (short) 1);
 
-        addValues(Boolean.class, true, false, new Boolean(true));
-        addValues(Byte.class, (byte) 1, (byte) 2, new Byte((byte) 1));
-        addValues(Character.class, 'a', 'b', new Character('a'));
-        addValues(Double.class, 0.5D, 1.0D, new Double(0.5D));
-        addValues(Float.class, 0.5F, 1.0F, new Float(0.5F));
-        addValues(Integer.class, 1, 2, new Integer(1));
-        addValues(Long.class, 1L, 2L, new Long(1L));
-        addValues(Short.class, (short) 1, (short) 2, new Short((short) 1));
+        addValues(Boolean.class, true, false, true);
+        addValues(Byte.class, (byte) 1, (byte) 2, (byte) 1);
+        addValues(Character.class, 'α', 'ω', Character.valueOf('α'));
+        addValues(Double.class, 0.5D, 1.0D, Double.valueOf(0.5D));
+        addValues(Float.class, 0.5F, 1.0F, Float.valueOf(0.5F));
+        addValues(Integer.class, 1000, 2000, Integer.valueOf(1000));
+        addValues(Long.class, 1000L, 2000L, Long.valueOf(1000L));
+        addValues(Short.class, (short) 1000, (short) 2000, Short.valueOf((short) 1000));
 
         addValues(Object.class, new Object(), new Object(), new Object());
         addValues(String.class, "one", "two", new String("one"));
diff --git a/equalsverifier-core/src/test/java/nl/jqno/equalsverifier/integration/extended_contract/ExtendedReflexivityTest.java b/equalsverifier-core/src/test/java/nl/jqno/equalsverifier/integration/extended_contract/ExtendedReflexivityTest.java
index bf0683c55..4ad0cc3f3 100644
--- a/equalsverifier-core/src/test/java/nl/jqno/equalsverifier/integration/extended_contract/ExtendedReflexivityTest.java
+++ b/equalsverifier-core/src/test/java/nl/jqno/equalsverifier/integration/extended_contract/ExtendedReflexivityTest.java
@@ -33,17 +33,73 @@ public void succeed_whenEqualsUsesDoubleEqualSignForObject_givenDoubleEqualWarni
     }
 
     @Test
-    public void fail_whenEqualsUsesDoubleEqualSignForBoxedPrimitives() {
+    public void fail_whenEqualsUsesDoubleEqualSignForBoxedCharacterPrimitives() {
         ExpectedException
-            .when(() -> EqualsVerifier.forClass(UsesDoubleEqualSignOnBoxedPrimitive.class).verify())
+            .when(() ->
+                EqualsVerifier.forClass(UsesDoubleEqualSignOnBoxedCharacterPrimitive.class).verify()
+            )
+            .assertFailure()
+            .assertMessageContains("Reflexivity", "== used instead of .equals()", "characterField");
+    }
+
+    @Test
+    public void succeed_whenEqualsUsesDoubleEqualSignForBoxedCharacterPrimitives_givenDoubleEqualWarningIsSuppressed() {
+        EqualsVerifier
+            .forClass(UsesDoubleEqualSignOnBoxedCharacterPrimitive.class)
+            .suppress(Warning.REFERENCE_EQUALITY)
+            .verify();
+    }
+
+    @Test
+    public void fail_whenEqualsUsesDoubleEqualSignForBoxedIntegerPrimitives() {
+        ExpectedException
+            .when(() ->
+                EqualsVerifier.forClass(UsesDoubleEqualSignOnBoxedIntegerPrimitive.class).verify()
+            )
             .assertFailure()
             .assertMessageContains("Reflexivity", "== used instead of .equals()", "integerField");
     }
 
     @Test
-    public void succeed_whenEqualsUsesDoubleEqualSignForBoxedPrimitives_givenDoubleEqualWarningIsSuppressed() {
+    public void succeed_whenEqualsUsesDoubleEqualSignForBoxedIntegerPrimitives_givenDoubleEqualWarningIsSuppressed() {
         EqualsVerifier
-            .forClass(UsesDoubleEqualSignOnBoxedPrimitive.class)
+            .forClass(UsesDoubleEqualSignOnBoxedIntegerPrimitive.class)
+            .suppress(Warning.REFERENCE_EQUALITY)
+            .verify();
+    }
+
+    @Test
+    public void fail_whenEqualsUsesDoubleEqualSignForBoxedLongPrimitives() {
+        ExpectedException
+            .when(() ->
+                EqualsVerifier.forClass(UsesDoubleEqualSignOnBoxedLongPrimitive.class).verify()
+            )
+            .assertFailure()
+            .assertMessageContains("Reflexivity", "== used instead of .equals()", "longField");
+    }
+
+    @Test
+    public void succeed_whenEqualsUsesDoubleEqualSignForBoxedLongPrimitives_givenDoubleEqualWarningIsSuppressed() {
+        EqualsVerifier
+            .forClass(UsesDoubleEqualSignOnBoxedLongPrimitive.class)
+            .suppress(Warning.REFERENCE_EQUALITY)
+            .verify();
+    }
+
+    @Test
+    public void fail_whenEqualsUsesDoubleEqualSignForBoxedShortPrimitives() {
+        ExpectedException
+            .when(() ->
+                EqualsVerifier.forClass(UsesDoubleEqualSignOnBoxedShortPrimitive.class).verify()
+            )
+            .assertFailure()
+            .assertMessageContains("Reflexivity", "== used instead of .equals()", "shortField");
+    }
+
+    @Test
+    public void succeed_whenEqualsUsesDoubleEqualSignForBoxedShortPrimitives_givenDoubleEqualWarningIsSuppressed() {
+        EqualsVerifier
+            .forClass(UsesDoubleEqualSignOnBoxedShortPrimitive.class)
             .suppress(Warning.REFERENCE_EQUALITY)
             .verify();
     }
@@ -109,20 +165,45 @@ public int hashCode() {
         }
     }
 
-    static final class UsesDoubleEqualSignOnBoxedPrimitive {
+    static final class UsesDoubleEqualSignOnBoxedCharacterPrimitive {
+
+        private final Character characterField;
+
+        public UsesDoubleEqualSignOnBoxedCharacterPrimitive(Character c) {
+            this.characterField = c;
+        }
+
+        @Override
+        public boolean equals(Object obj) {
+            if (!(obj instanceof UsesDoubleEqualSignOnBoxedCharacterPrimitive)) {
+                return false;
+            }
+            UsesDoubleEqualSignOnBoxedCharacterPrimitive other =
+                (UsesDoubleEqualSignOnBoxedCharacterPrimitive) obj;
+            return characterField == other.characterField;
+        }
+
+        @Override
+        public int hashCode() {
+            return defaultHashCode(this);
+        }
+    }
+
+    static final class UsesDoubleEqualSignOnBoxedIntegerPrimitive {
 
         private final Integer integerField;
 
-        public UsesDoubleEqualSignOnBoxedPrimitive(Integer i) {
+        public UsesDoubleEqualSignOnBoxedIntegerPrimitive(Integer i) {
             this.integerField = i;
         }
 
         @Override
         public boolean equals(Object obj) {
-            if (!(obj instanceof UsesDoubleEqualSignOnBoxedPrimitive)) {
+            if (!(obj instanceof UsesDoubleEqualSignOnBoxedIntegerPrimitive)) {
                 return false;
             }
-            UsesDoubleEqualSignOnBoxedPrimitive other = (UsesDoubleEqualSignOnBoxedPrimitive) obj;
+            UsesDoubleEqualSignOnBoxedIntegerPrimitive other =
+                (UsesDoubleEqualSignOnBoxedIntegerPrimitive) obj;
             return integerField == other.integerField;
         }
 
@@ -132,6 +213,54 @@ public int hashCode() {
         }
     }
 
+    static final class UsesDoubleEqualSignOnBoxedLongPrimitive {
+
+        private final Long longField;
+
+        public UsesDoubleEqualSignOnBoxedLongPrimitive(Long l) {
+            this.longField = l;
+        }
+
+        @Override
+        public boolean equals(Object obj) {
+            if (!(obj instanceof UsesDoubleEqualSignOnBoxedLongPrimitive)) {
+                return false;
+            }
+            UsesDoubleEqualSignOnBoxedLongPrimitive other =
+                (UsesDoubleEqualSignOnBoxedLongPrimitive) obj;
+            return longField == other.longField;
+        }
+
+        @Override
+        public int hashCode() {
+            return defaultHashCode(this);
+        }
+    }
+
+    static final class UsesDoubleEqualSignOnBoxedShortPrimitive {
+
+        private final Short shortField;
+
+        public UsesDoubleEqualSignOnBoxedShortPrimitive(Short s) {
+            this.shortField = s;
+        }
+
+        @Override
+        public boolean equals(Object obj) {
+            if (!(obj instanceof UsesDoubleEqualSignOnBoxedShortPrimitive)) {
+                return false;
+            }
+            UsesDoubleEqualSignOnBoxedShortPrimitive other =
+                (UsesDoubleEqualSignOnBoxedShortPrimitive) obj;
+            return shortField == other.shortField;
+        }
+
+        @Override
+        public int hashCode() {
+            return defaultHashCode(this);
+        }
+    }
+
     static final class FieldHasNoEquals {
 
         @SuppressWarnings("unused")