diff --git a/java/test/org/openqa/selenium/grid/distributor/AddingNodesTest.java b/java/test/org/openqa/selenium/grid/distributor/AddingNodesTest.java
index 2e1b8755eabc8..482f577d05d22 100644
--- a/java/test/org/openqa/selenium/grid/distributor/AddingNodesTest.java
+++ b/java/test/org/openqa/selenium/grid/distributor/AddingNodesTest.java
@@ -153,7 +153,7 @@ void shouldBeAbleToRegisterALocalNode() throws URISyntaxException {
     wait.until(obj -> distributor.getStatus().hasCapacity());
 
     NodeStatus status = getOnlyElement(distributor.getStatus().getNodes());
-    assertEquals(1, getStereotypes(status).get(CAPS).intValue());
+    assertEquals(1, getStereotypes(status).get(CAPS));
   }
 
   @Test
@@ -192,7 +192,7 @@ void shouldBeAbleToRegisterACustomNode() throws URISyntaxException {
       wait.until(obj -> distributor.getStatus().hasCapacity());
 
       NodeStatus status = getOnlyElement(distributor.getStatus().getNodes());
-      assertEquals(1, getStereotypes(status).get(CAPS).intValue());
+      assertEquals(1, getStereotypes(status).get(CAPS));
     }
   }
 
@@ -231,7 +231,7 @@ void shouldBeAbleToRegisterNodesByListeningForEvents() throws URISyntaxException
       wait.until(obj -> distributor.getStatus().hasCapacity());
 
       NodeStatus status = getOnlyElement(distributor.getStatus().getNodes());
-      assertEquals(1, getStereotypes(status).get(CAPS).intValue());
+      assertEquals(1, getStereotypes(status).get(CAPS));
     }
   }
 
@@ -323,7 +323,7 @@ void distributorShouldUpdateStateOfExistingNodeWhenNodePublishesStateChange()
       wait.until(obj -> distributor.getStatus().hasCapacity());
 
       NodeStatus nodeStatus = getOnlyElement(distributor.getStatus().getNodes());
-      assertEquals(1, getStereotypes(nodeStatus).get(CAPS).intValue());
+      assertEquals(1, getStereotypes(nodeStatus).get(CAPS));
 
       // Craft a status that makes it look like the node is busy, and post it on the bus.
       NodeStatus status = node.getStatus();
diff --git a/java/test/org/openqa/selenium/json/JsonOutputTest.java b/java/test/org/openqa/selenium/json/JsonOutputTest.java
index f85897e35b981..10d246d431b8f 100644
--- a/java/test/org/openqa/selenium/json/JsonOutputTest.java
+++ b/java/test/org/openqa/selenium/json/JsonOutputTest.java
@@ -419,7 +419,7 @@ void shouldConvertUnhandledAlertException() {
   @Test
   void shouldConvertDatesToMillisecondsInUtcTime() {
     String jsonStr = convert(new Date(0));
-    assertThat(valueOf(jsonStr).intValue()).isZero();
+    assertThat(valueOf(jsonStr)).isZero();
   }
 
   @Test
diff --git a/java/test/org/openqa/selenium/json/JsonTest.java b/java/test/org/openqa/selenium/json/JsonTest.java
index 7b02d3e3b767d..ad5e0c0ef1007 100644
--- a/java/test/org/openqa/selenium/json/JsonTest.java
+++ b/java/test/org/openqa/selenium/json/JsonTest.java
@@ -285,7 +285,7 @@ void canHandleValueBeingAnArray() {
 
     assertThat(response.getSessionId()).isEqualTo("bar");
     assertThat(((List<?>) converted.getValue())).hasSize(2);
-    assertThat(response.getStatus().intValue()).isEqualTo(1512);
+    assertThat(response.getStatus()).isEqualTo(1512);
   }
 
   @Test
@@ -426,7 +426,7 @@ void decodingResponseWithNumbersInValueObject() {
   void shouldRecognizeNumericStatus() {
     Response response = new Json().toType("{\"status\":0,\"value\":\"cheese\"}", Response.class);
 
-    assertThat(response.getStatus().intValue()).isZero();
+    assertThat(response.getStatus()).isZero();
     assertThat(response.getState()).isEqualTo(new ErrorCodes().toState(0));
     String value = (String) response.getValue();
     assertThat(value).isEqualTo("cheese");
@@ -437,7 +437,7 @@ void shouldRecognizeStringStatus() {
     Response response =
         new Json().toType("{\"status\":\"success\",\"value\":\"cheese\"}", Response.class);
 
-    assertThat(response.getStatus().intValue()).isZero();
+    assertThat(response.getStatus()).isZero();
     assertThat(response.getState()).isEqualTo(new ErrorCodes().toState(0));
     String value = (String) response.getValue();
     assertThat(value).isEqualTo("cheese");
@@ -450,7 +450,7 @@ void shouldConvertInvalidSelectorError() {
             .toType(
                 "{\"state\":\"invalid selector\",\"message\":\"invalid xpath selector\"}",
                 Response.class);
-    assertThat(response.getStatus().intValue()).isEqualTo(32);
+    assertThat(response.getStatus()).isEqualTo(32);
     assertThat(response.getState()).isEqualTo(new ErrorCodes().toState(32));
   }
 
@@ -459,7 +459,7 @@ void shouldRecognizeStringState() {
     Response response =
         new Json().toType("{\"state\":\"success\",\"value\":\"cheese\"}", Response.class);
     assertThat(response.getState()).isEqualTo("success");
-    assertThat(response.getStatus().intValue()).isZero();
+    assertThat(response.getStatus()).isZero();
     String value = (String) response.getValue();
     assertThat(value).isEqualTo("cheese");
   }
diff --git a/java/test/org/openqa/selenium/remote/codec/w3c/W3CHttpResponseCodecTest.java b/java/test/org/openqa/selenium/remote/codec/w3c/W3CHttpResponseCodecTest.java
index 11c4007194978..df480c356a99c 100644
--- a/java/test/org/openqa/selenium/remote/codec/w3c/W3CHttpResponseCodecTest.java
+++ b/java/test/org/openqa/selenium/remote/codec/w3c/W3CHttpResponseCodecTest.java
@@ -78,7 +78,7 @@ void shouldBeAbleToHandleGatewayTimeoutError() {
 
     Response decoded = new W3CHttpResponseCodec().decode(response);
 
-    assertThat(decoded.getStatus().intValue()).isEqualTo(ErrorCodes.UNHANDLED_ERROR);
+    assertThat(decoded.getStatus()).isEqualTo(ErrorCodes.UNHANDLED_ERROR);
     assertThat(decoded.getValue()).isEqualTo(responseString);
   }
 
@@ -104,7 +104,7 @@ void shouldBeAbleToHandleBadGatewayError() {
 
     Response decoded = new W3CHttpResponseCodec().decode(response);
 
-    assertThat(decoded.getStatus().intValue()).isEqualTo(ErrorCodes.UNHANDLED_ERROR);
+    assertThat(decoded.getStatus()).isEqualTo(ErrorCodes.UNHANDLED_ERROR);
     assertThat(decoded.getValue()).isEqualTo(responseString);
   }
 
@@ -120,7 +120,7 @@ void decodingAnErrorWithoutAStacktraceIsDecodedProperlyForNonCompliantImplementa
     Response decoded = new W3CHttpResponseCodec().decode(response);
 
     assertThat(decoded.getState()).isEqualTo("unsupported operation");
-    assertThat(decoded.getStatus().intValue()).isEqualTo(METHOD_NOT_ALLOWED);
+    assertThat(decoded.getStatus()).isEqualTo(METHOD_NOT_ALLOWED);
 
     assertThat(decoded.getValue()).isInstanceOf(UnsupportedCommandException.class);
     assertThat(((WebDriverException) decoded.getValue()).getMessage()).contains("I like peas");
@@ -140,7 +140,7 @@ void decodingAnErrorWithoutAStacktraceIsDecodedProperlyForConformingImplementati
     Response decoded = new W3CHttpResponseCodec().decode(response);
 
     assertThat(decoded.getState()).isEqualTo("unsupported operation");
-    assertThat(decoded.getStatus().intValue()).isEqualTo(METHOD_NOT_ALLOWED);
+    assertThat(decoded.getStatus()).isEqualTo(METHOD_NOT_ALLOWED);
 
     assertThat(decoded.getValue()).isInstanceOf(UnsupportedCommandException.class);
     assertThat(((WebDriverException) decoded.getValue()).getMessage()).contains("I like peas");