diff --git a/gson/gson/src/main/java/com/google/gson/internal/ConstructorConstructor.java b/gson/gson/src/main/java/com/google/gson/internal/ConstructorConstructor.java
index 81fc8e205d1790e08419d4dbb3343338a4b2e370..fc4ff7d617708b14cff6e59e1d83ff63e51837e3 100644
--- a/gson/gson/src/main/java/com/google/gson/internal/ConstructorConstructor.java
+++ b/gson/gson/src/main/java/com/google/gson/internal/ConstructorConstructor.java
@@ -182,7 +182,7 @@ public final class ConstructorConstructor {
               T set = (T) EnumSet.noneOf((Class) elementType);
               return set;
             } else {
-              throw new JsonIOException("Invalid EnumSet type: " + type.toString());
+              throw new JsonIOException("Invalid EnumSet type: " + type);
             }
           } else {
             throw new JsonIOException("Invalid EnumSet type: " + type.toString());
@@ -203,7 +203,7 @@ public final class ConstructorConstructor {
               T map = (T) new EnumMap((Class) elementType);
               return map;
             } else {
-              throw new JsonIOException("Invalid EnumMap type: " + type.toString());
+              throw new JsonIOException("Invalid EnumMap type: " + type);
             }
           } else {
             throw new JsonIOException("Invalid EnumMap type: " + type.toString());
diff --git a/gson/gson/src/test/java/com/google/gson/ParameterizedTypeFixtures.java b/gson/gson/src/test/java/com/google/gson/ParameterizedTypeFixtures.java
index 34b7adc70cc292972391c01a2a417046e2af17e2..42256381b3dad795566251ae6ba770c0c1baf7c0 100644
--- a/gson/gson/src/test/java/com/google/gson/ParameterizedTypeFixtures.java
+++ b/gson/gson/src/test/java/com/google/gson/ParameterizedTypeFixtures.java
@@ -55,7 +55,7 @@ public class ParameterizedTypeFixtures {
       if (Primitives.isWrapperType(Primitives.wrap(clazz))) {
         return obj.toString();
       } else if (obj.getClass().equals(String.class)) {
-        return "\"" + obj.toString() + "\"";
+        return "\"" + obj + "\"";
       } else {
         // Try invoking a getExpectedJson() method if it exists
         try {