diff --git a/gson/src/test/java/com/google/gson/FieldNamingPolicyTest.java b/gson/src/test/java/com/google/gson/FieldNamingPolicyTest.java
index 0d085269f8..160ab656f7 100644
--- a/gson/src/test/java/com/google/gson/FieldNamingPolicyTest.java
+++ b/gson/src/test/java/com/google/gson/FieldNamingPolicyTest.java
@@ -19,13 +19,12 @@
 import static com.google.common.truth.Truth.assertThat;
 import static com.google.common.truth.Truth.assertWithMessage;
 
-import com.google.gson.functional.FieldNamingTest;
 import java.lang.reflect.Field;
 import java.util.Locale;
 import org.junit.Test;
 
 /**
- * Performs tests directly against {@link FieldNamingPolicy}; for integration tests see {@link
+ * Performs tests directly against {@link FieldNamingPolicy}; for integration tests see {@code
  * FieldNamingTest}.
  */
 public class FieldNamingPolicyTest {
diff --git a/gson/src/test/java/com/google/gson/ParameterizedTypeFixtures.java b/gson/src/test/java/com/google/gson/ParameterizedTypeFixtures.java
index 34b7adc70c..f606ec44d1 100644
--- a/gson/src/test/java/com/google/gson/ParameterizedTypeFixtures.java
+++ b/gson/src/test/java/com/google/gson/ParameterizedTypeFixtures.java
@@ -16,12 +16,12 @@
 
 package com.google.gson;
 
-import com.google.common.base.Objects;
 import com.google.gson.internal.$Gson$Types;
 import com.google.gson.internal.Primitives;
 import java.lang.reflect.Method;
 import java.lang.reflect.ParameterizedType;
 import java.lang.reflect.Type;
+import java.util.Objects;
 
 /**
  * This class contains some test fixtures for Parameterized types. These classes should ideally
@@ -82,7 +82,7 @@ public boolean equals(Object obj) {
         return false;
       }
       MyParameterizedType<?> that = (MyParameterizedType<?>) obj;
-      return Objects.equal(getValue(), that.getValue());
+      return Objects.equals(getValue(), that.getValue());
     }
   }
 
diff --git a/gson/src/test/java/com/google/gson/common/TestTypes.java b/gson/src/test/java/com/google/gson/common/TestTypes.java
index 234acb0cc6..6041bdd863 100644
--- a/gson/src/test/java/com/google/gson/common/TestTypes.java
+++ b/gson/src/test/java/com/google/gson/common/TestTypes.java
@@ -16,7 +16,6 @@
 
 package com.google.gson.common;
 
-import com.google.common.base.Objects;
 import com.google.gson.JsonDeserializationContext;
 import com.google.gson.JsonDeserializer;
 import com.google.gson.JsonElement;
@@ -28,6 +27,7 @@
 import com.google.gson.annotations.SerializedName;
 import java.lang.reflect.Type;
 import java.util.Collection;
+import java.util.Objects;
 
 /**
  * Types used for testing JSON serialization and deserialization
@@ -165,7 +165,7 @@ public boolean equals(Object o) {
       return longValue == that.longValue
           && getIntValue() == that.getIntValue()
           && booleanValue == that.booleanValue
-          && Objects.equal(stringValue, that.stringValue);
+          && Objects.equals(stringValue, that.stringValue);
     }
 
     @Override