diff --git a/java/core/src/main/java/com/google/protobuf/ByteString.java b/java/core/src/main/java/com/google/protobuf/ByteString.java
index 7b2455f12d..801347e0fd 100644
--- a/java/core/src/main/java/com/google/protobuf/ByteString.java
+++ b/java/core/src/main/java/com/google/protobuf/ByteString.java
@@ -287,13 +287,12 @@ public abstract class ByteString implements Iterable<Byte>, Serializable {
 
           while (formerBytes.hasNext() && latterBytes.hasNext()) {
             int result =
-                Integer.valueOf(toInt(formerBytes.nextByte()))
-                    .compareTo(toInt(latterBytes.nextByte()));
+                Integer.compare(toInt(formerBytes.nextByte()), toInt(latterBytes.nextByte()));
             if (result != 0) {
               return result;
             }
           }
-          return Integer.valueOf(former.size()).compareTo(Integer.valueOf(latter.size()));
+          return Integer.compare(former.size(), latter.size());
         }
       };
 
diff --git a/java/core/src/main/java/com/google/protobuf/Descriptors.java b/java/core/src/main/java/com/google/protobuf/Descriptors.java
index 569fa26e0e..bade681e1d 100644
--- a/java/core/src/main/java/com/google/protobuf/Descriptors.java
+++ b/java/core/src/main/java/com/google/protobuf/Descriptors.java
@@ -2343,7 +2343,7 @@ public final class Descriptors {
         new Comparator<EnumValueDescriptor>() {
           @Override
           public int compare(EnumValueDescriptor o1, EnumValueDescriptor o2) {
-            return Integer.valueOf(o1.getNumber()).compareTo(o2.getNumber());
+            return Integer.compare(o1.getNumber(), o2.getNumber());
           }
         };