diff --git a/hbase-http/src/test/java/org/apache/hadoop/hbase/http/TestHtmlQuoting.java b/hbase-http/src/test/java/org/apache/hadoop/hbase/http/TestHtmlQuoting.java
index e5835fd65b61..0fe46194083a 100644
--- a/hbase-http/src/test/java/org/apache/hadoop/hbase/http/TestHtmlQuoting.java
+++ b/hbase-http/src/test/java/org/apache/hadoop/hbase/http/TestHtmlQuoting.java
@@ -20,6 +20,7 @@
 import static org.junit.Assert.assertArrayEquals;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNull;
 import static org.junit.Assert.assertTrue;
 
 import javax.servlet.http.HttpServletRequest;
@@ -94,7 +95,7 @@ public void testRequestQuoting() throws Exception {
       quoter.getParameterValues("x"));
 
     Mockito.doReturn(null).when(mockReq).getParameterValues("x");
-    assertArrayEquals("Test that missing parameters dont cause NPE for array", null,
+    assertNull("Test that missing parameters dont cause NPE for array",
       quoter.getParameterValues("x"));
   }
 }
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestRegionInfo.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestRegionInfo.java
index de177ec3ace8..60fe39ecc77f 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestRegionInfo.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestRegionInfo.java
@@ -320,7 +320,7 @@ public void testComparator() {
     b = RegionInfoBuilder.newBuilder(t).setStartKey(midway).build();
     assertTrue(a.compareTo(b) < 0);
     assertTrue(b.compareTo(a) > 0);
-    assertEquals(a, a);
+    assertTrue(a.equals(a));
     assertEquals(0, a.compareTo(a));
     a = RegionInfoBuilder.newBuilder(t).setStartKey(Bytes.toBytes("a"))
       .setEndKey(Bytes.toBytes("d")).build();
diff --git a/hbase-thrift/src/test/java/org/apache/hadoop/hbase/thrift2/TestThriftHBaseServiceHandler.java b/hbase-thrift/src/test/java/org/apache/hadoop/hbase/thrift2/TestThriftHBaseServiceHandler.java
index 9e9e1554aac0..810bb87baa9e 100644
--- a/hbase-thrift/src/test/java/org/apache/hadoop/hbase/thrift2/TestThriftHBaseServiceHandler.java
+++ b/hbase-thrift/src/test/java/org/apache/hadoop/hbase/thrift2/TestThriftHBaseServiceHandler.java
@@ -536,7 +536,7 @@ public void testDeleteFamily() throws Exception {
 
     get = new TGet(wrap(rowName));
     result = handler.get(table, get);
-    assertArrayEquals(null, result.getRow());
+    assertNull(result.getRow());
     assertEquals(0, result.getColumnValuesSize());
   }
 
diff --git a/pom.xml b/pom.xml
index 635afe9b78ef..195d3d739474 100644
--- a/pom.xml
+++ b/pom.xml
@@ -892,7 +892,7 @@
     -->
     <checkstyle.version>8.29</checkstyle.version>
     <exec.maven.version>3.1.0</exec.maven.version>
-    <error-prone.version>2.16</error-prone.version>
+    <error-prone.version>2.26.1</error-prone.version>
     <jamon.plugin.version>2.4.2</jamon.plugin.version>
     <lifecycle.mapping.version>1.0.0</lifecycle.mapping.version>
     <maven.antrun.version>1.8</maven.antrun.version>