diff --git a/uaa/src/test/java/org/cloudfoundry/identity/uaa/integration/PasswordGrantIntegrationTests.java b/uaa/src/test/java/org/cloudfoundry/identity/uaa/integration/PasswordGrantIntegrationTests.java
index 0e4caa210a4..e6fc8e19919 100644
--- a/uaa/src/test/java/org/cloudfoundry/identity/uaa/integration/PasswordGrantIntegrationTests.java
+++ b/uaa/src/test/java/org/cloudfoundry/identity/uaa/integration/PasswordGrantIntegrationTests.java
@@ -110,7 +110,7 @@ protected UaaClientDetails addUserGroupsRequiredClient() {
         HttpEntity<String> request = new HttpEntity<>(JsonUtils.writeValueAsString(client), headers);
 
         ResponseEntity<String> response = new RestTemplate().postForEntity(serverRunning.getUrl("/oauth/clients"), request, String.class);
-        assertThat(response.getStatusCodeValue()).isEqualTo(201);
+        assertThat(response.getStatusCode().value()).isEqualTo(201);
 
         return JsonUtils.readValue(response.getBody(), UaaClientDetails.class);
     }
diff --git a/uaa/src/test/java/org/cloudfoundry/identity/uaa/integration/ScimGroupEndpointsIntegrationTests.java b/uaa/src/test/java/org/cloudfoundry/identity/uaa/integration/ScimGroupEndpointsIntegrationTests.java
index 8c7330e230b..7b9074c31cb 100644
--- a/uaa/src/test/java/org/cloudfoundry/identity/uaa/integration/ScimGroupEndpointsIntegrationTests.java
+++ b/uaa/src/test/java/org/cloudfoundry/identity/uaa/integration/ScimGroupEndpointsIntegrationTests.java
@@ -258,7 +258,7 @@ void createNotAllowedGroupFailsCorrectly() throws URISyntaxException {
             fail("must fail");
         } catch (HttpClientErrorException e) {
             assertThat(e.getStatusCode().is4xxClientError()).isTrue();
-            assertThat(e.getRawStatusCode()).isEqualTo(400);
+            assertThat(e.getStatusCode().value()).isEqualTo(400);
             assertThat(e.getMessage()).contains("The group with displayName: " + g1.getDisplayName() + " is not allowed in Identity Zone " + testZoneId);
         } finally {
             IntegrationTestUtils.deleteZone(serverRunning.getBaseUrl(), testZoneId, adminToken);
diff --git a/uaa/src/test/java/org/cloudfoundry/identity/uaa/integration/feature/PasswordIT.java b/uaa/src/test/java/org/cloudfoundry/identity/uaa/integration/feature/PasswordIT.java
index 510ced39e9a..5d18a5d514d 100644
--- a/uaa/src/test/java/org/cloudfoundry/identity/uaa/integration/feature/PasswordIT.java
+++ b/uaa/src/test/java/org/cloudfoundry/identity/uaa/integration/feature/PasswordIT.java
@@ -63,7 +63,7 @@ void getClientCredentials() {
                 "/oauth/token?client_id=client_with_bcrypt_prefix&client_secret=password&grant_type=client_credentials");
         ResponseEntity<Void> responseEntity = restTemplate.exchange(requestEntity, Void.class);
 
-        assertThat(responseEntity.getStatusCodeValue()).as("Status 200 expected").isEqualTo(200);
+        assertThat(responseEntity.getStatusCode().value()).as("Status 200 expected").isEqualTo(200);
     }
 
     @Test