diff --git a/.github/workflows/ci-java-8-and-11.yml b/.github/workflows/ci-java-8-and-11.yml
index 27082a618a..b0eda0b9b9 100644
--- a/.github/workflows/ci-java-8-and-11.yml
+++ b/.github/workflows/ci-java-8-and-11.yml
@@ -33,6 +33,8 @@ jobs:
           restore-keys: ${{ runner.os }}-m2
       - name: Build with Maven
         run: ./mvnw clean package -Dgpg.skip
+      - name: Compile integration tests
+        run:  ./mvnw -Pintegration-test test-compile compile
       - if: ${{ matrix.java != 8 }}
         name: Check style with Spotless
         run: ./mvnw spotless:check
diff --git a/.idea/kotlinc.xml b/.idea/kotlinc.xml
deleted file mode 100644
index 1c24f9a8de..0000000000
--- a/.idea/kotlinc.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="KotlinCommonCompilerArguments">
-    <option name="languageVersion" value="1.1" />
-    <option name="apiVersion" value="1.1" />
-  </component>
-</project>
\ No newline at end of file
diff --git a/.idea/misc.xml b/.idea/misc.xml
index a1043f8449..d904ec99c1 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -15,7 +15,7 @@
     </option>
     <option name="workspaceImportForciblyTurnedOn" value="true" />
   </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_21" project-jdk-name="graalvm-21" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_21" project-jdk-name="corretto-11" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/out" />
   </component>
   <component name="ProjectType">
diff --git a/integration-test/pom.xml b/integration-test/pom.xml
index e1b541e150..8e092a4f53 100644
--- a/integration-test/pom.xml
+++ b/integration-test/pom.xml
@@ -76,6 +76,18 @@
             <version>${project.version}</version>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>org.hamcrest</groupId>
+            <artifactId>hamcrest-junit</artifactId>
+            <version>2.0.0.0</version>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>junit</groupId>
+                    <artifactId>junit</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
         <dependency>
             <groupId>org.immutables</groupId>
             <artifactId>value</artifactId>
@@ -91,11 +103,6 @@
             <artifactId>spring-boot-starter-test</artifactId>
             <scope>test</scope>
         </dependency>
-        <dependency>
-            <groupId>org.junit.vintage</groupId>
-            <artifactId>junit-vintage-engine</artifactId>
-            <scope>test</scope>
-        </dependency>
     </dependencies>
 
     <build>
diff --git a/integration-test/src/test/java/org/cloudfoundry/AbstractIntegrationTest.java b/integration-test/src/test/java/org/cloudfoundry/AbstractIntegrationTest.java
index b84496bff2..80c22f1849 100644
--- a/integration-test/src/test/java/org/cloudfoundry/AbstractIntegrationTest.java
+++ b/integration-test/src/test/java/org/cloudfoundry/AbstractIntegrationTest.java
@@ -16,16 +16,13 @@
 
 package org.cloudfoundry;
 
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Rule;
-import org.junit.rules.TestName;
-import org.junit.runner.RunWith;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.TestInfo;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.test.context.ContextConfiguration;
-import org.springframework.test.context.junit4.SpringRunner;
+import org.springframework.test.context.junit.jupiter.SpringJUnitConfig;
 import reactor.core.publisher.Mono;
 import reactor.util.function.Tuple2;
 
@@ -34,33 +31,33 @@
 import java.io.FileInputStream;
 import java.io.IOException;
 import java.io.InputStream;
+import java.lang.reflect.Method;
+import java.util.Optional;
 import java.util.function.Consumer;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.cloudfoundry.util.tuple.TupleUtils.consumer;
 
-@RunWith(SpringRunner.class)
-@ContextConfiguration(classes = IntegrationTestConfiguration.class)
+@SpringJUnitConfig(classes = IntegrationTestConfiguration.class)
 public abstract class AbstractIntegrationTest {
 
     private final Logger logger = LoggerFactory.getLogger("cloudfoundry-client.test");
 
-    @Rule
-    public final TestName testName = new TestName();
-
-    @Autowired
-    @Rule
-    public CloudFoundryVersionConditionalRule cloudFoundryVersion;
+    public String testName;
 
     @Autowired
     protected NameFactory nameFactory;
 
-    @Before
-    public void testEntry() {
+    @BeforeEach
+    public void testEntry(TestInfo testInfo) {
+        Optional<Method> testMethod = testInfo.getTestMethod();
+        if (testMethod.isPresent()) {
+            this.testName = testMethod.get().getName();
+        }
         this.logger.debug(">> {} <<", getTestName());
     }
 
-    @After
+    @AfterEach
     public final void testExit() {
         this.logger.debug("<< {} >>", getTestName());
     }
@@ -85,7 +82,7 @@ protected static <T> Consumer<Tuple2<T, T>> tupleEquality() {
     }
 
     private String getTestName() {
-        return String.format("%s.%s", this.getClass().getSimpleName(), this.testName.getMethodName());
+        return String.format("%s.%s", this.getClass().getSimpleName(), this.testName);
     }
 
 }
diff --git a/integration-test/src/test/java/org/cloudfoundry/CloudFoundryVersionConditionalRule.java b/integration-test/src/test/java/org/cloudfoundry/CloudFoundryVersionConditionalRule.java
deleted file mode 100644
index 173b68bbe8..0000000000
--- a/integration-test/src/test/java/org/cloudfoundry/CloudFoundryVersionConditionalRule.java
+++ /dev/null
@@ -1,84 +0,0 @@
-/*
- * Copyright 2013-2021 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.cloudfoundry;
-
-import com.github.zafarkhaja.semver.Version;
-import org.junit.Assume;
-import org.junit.rules.MethodRule;
-import org.junit.runners.model.FrameworkMethod;
-import org.junit.runners.model.Statement;
-import org.springframework.core.annotation.AnnotationUtils;
-
-import java.util.Optional;
-
-import static org.cloudfoundry.CloudFoundryVersion.UNSPECIFIED;
-
-final class CloudFoundryVersionConditionalRule implements MethodRule {
-
-    private final Version server;
-
-    CloudFoundryVersionConditionalRule(Version server) {
-        this.server = server;
-    }
-
-    @Override
-    public Statement apply(Statement base, FrameworkMethod method, Object target) {
-        return new Statement() {
-
-            @Override
-            public void evaluate() throws Throwable {
-                IfCloudFoundryVersion annotation = Optional.ofNullable(AnnotationUtils.findAnnotation(method.getMethod(), IfCloudFoundryVersion.class))
-                    .orElse(AnnotationUtils.findAnnotation(method.getDeclaringClass(), IfCloudFoundryVersion.class));
-
-                boolean enabled = Optional.ofNullable(annotation)
-                    .map(c -> isTestEnabled(c, CloudFoundryVersionConditionalRule.this.server))
-                    .orElse(true);
-
-                Assume.assumeTrue(String.format("Cloud Foundry version required by @IfCloudFoundryVersion is not valid for test method [%s].", method.getMethod()), enabled);
-
-                base.evaluate();
-            }
-        };
-    }
-
-    private static boolean isTestEnabled(IfCloudFoundryVersion condition, Version server) {
-        boolean enabled = true;
-
-        if (condition.lessThan() != UNSPECIFIED) {
-            enabled = enabled && server.lessThan(condition.lessThan().getVersion());
-        }
-
-        if (condition.lessThanOrEqualTo() != UNSPECIFIED) {
-            enabled = enabled && server.lessThanOrEqualTo(condition.lessThanOrEqualTo().getVersion());
-        }
-
-        if (condition.equalTo() != UNSPECIFIED) {
-            enabled = enabled && server.equals(condition.equalTo().getVersion());
-        }
-
-        if (condition.greaterThanOrEqualTo() != UNSPECIFIED) {
-            enabled = enabled && server.greaterThanOrEqualTo(condition.greaterThanOrEqualTo().getVersion());
-        }
-
-        if (condition.greaterThan() != UNSPECIFIED) {
-            enabled = enabled && server.greaterThan(condition.greaterThan().getVersion());
-        }
-
-        return enabled;
-    }
-
-}
diff --git a/integration-test/src/test/java/org/cloudfoundry/IntegrationTestConfiguration.java b/integration-test/src/test/java/org/cloudfoundry/IntegrationTestConfiguration.java
index 0263c1003d..18b318ae63 100644
--- a/integration-test/src/test/java/org/cloudfoundry/IntegrationTestConfiguration.java
+++ b/integration-test/src/test/java/org/cloudfoundry/IntegrationTestConfiguration.java
@@ -237,11 +237,6 @@ DefaultCloudFoundryOperations cloudFoundryOperations(CloudFoundryClient cloudFou
             .build();
     }
 
-    @Bean
-    CloudFoundryVersionConditionalRule cloudFoundryVersionConditionalRule(Version serverVersion) {
-        return new CloudFoundryVersionConditionalRule(serverVersion);
-    }
-
     @Bean
     DefaultConnectionContext connectionContext(@Value("${test.apiHost}") String apiHost,
                                                @Value("${test.proxy.host:}") String proxyHost,
diff --git a/integration-test/src/test/java/org/cloudfoundry/client/v2/ApplicationsTest.java b/integration-test/src/test/java/org/cloudfoundry/client/v2/ApplicationsTest.java
index 32e273c10e..1704293b18 100644
--- a/integration-test/src/test/java/org/cloudfoundry/client/v2/ApplicationsTest.java
+++ b/integration-test/src/test/java/org/cloudfoundry/client/v2/ApplicationsTest.java
@@ -69,6 +69,7 @@
 import org.cloudfoundry.util.OperationUtils;
 import org.cloudfoundry.util.PaginationUtils;
 import org.cloudfoundry.util.ResourceUtils;
+import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.core.io.ClassPathResource;
 import org.springframework.util.Assert;
@@ -96,7 +97,7 @@
 import static org.cloudfoundry.util.tuple.TupleUtils.consumer;
 import static org.cloudfoundry.util.tuple.TupleUtils.function;
 
-public final class ApplicationsTest extends AbstractIntegrationTest {
+final class ApplicationsTest extends AbstractIntegrationTest {
 
     @Autowired
     private CloudFoundryClient cloudFoundryClient;
@@ -111,7 +112,7 @@ public final class ApplicationsTest extends AbstractIntegrationTest {
     private Mono<String> stackId;
 
     @Test
-    public void associateRoute() {
+    void associateRoute() {
         String applicationName = this.nameFactory.getApplicationName();
         String domainName = this.nameFactory.getDomainName();
 
@@ -134,7 +135,7 @@ public void associateRoute() {
     }
 
     @Test
-    public void copy() {
+    void copy() {
         String applicationName = this.nameFactory.getApplicationName();
         String copyApplicationName = this.nameFactory.getApplicationName();
 
@@ -163,7 +164,7 @@ public void copy() {
     }
 
     @Test
-    public void create() {
+    void create() {
         String applicationName = this.nameFactory.getApplicationName();
 
         this.spaceId
@@ -182,7 +183,7 @@ public void create() {
     }
 
     @Test
-    public void createDocker() {
+    void createDocker() {
         String applicationName = this.nameFactory.getApplicationName();
 
         this.spaceId
@@ -206,7 +207,7 @@ public void createDocker() {
     }
 
     @Test
-    public void delete() {
+    void delete() {
         String applicationName = this.nameFactory.getApplicationName();
 
         this.spaceId
@@ -222,7 +223,7 @@ public void delete() {
     }
 
     @Test
-    public void downloadDroplet() {
+    void downloadDroplet() {
         String applicationName = this.nameFactory.getApplicationName();
 
         this.spaceId
@@ -240,7 +241,7 @@ public void downloadDroplet() {
     }
 
     @Test
-    public void environment() {
+    void environment() {
         String applicationName = this.nameFactory.getApplicationName();
 
         this.spaceId
@@ -260,7 +261,7 @@ public void environment() {
     }
 
     @Test
-    public void get() {
+    void get() {
         String applicationName = this.nameFactory.getApplicationName();
 
         this.spaceId
@@ -277,7 +278,7 @@ public void get() {
 
     @IfCloudFoundryVersion(greaterThanOrEqualTo = CloudFoundryVersion.PCF_1_9)
     @Test
-    public void getPermissions() {
+    void getPermissions() {
         String applicationName = this.nameFactory.getApplicationName();
 
         this.spaceId
@@ -296,7 +297,7 @@ public void getPermissions() {
     }
 
     @Test
-    public void instances() {
+    void instances() {
         String applicationName = this.nameFactory.getApplicationName();
 
         this.spaceId
@@ -314,7 +315,7 @@ public void instances() {
     }
 
     @Test
-    public void list() {
+    void list() {
         String applicationName = this.nameFactory.getApplicationName();
 
         this.spaceId
@@ -337,7 +338,7 @@ public void list() {
     }
 
     @Test
-    public void listFilterByDiego() {
+    void listFilterByDiego() {
         String applicationName = this.nameFactory.getApplicationName();
 
         this.spaceId
@@ -361,7 +362,7 @@ public void listFilterByDiego() {
     }
 
     @Test
-    public void listFilterByName() {
+    void listFilterByName() {
         String applicationName = this.nameFactory.getApplicationName();
 
         this.spaceId
@@ -385,7 +386,7 @@ public void listFilterByName() {
     }
 
     @Test
-    public void listFilterByOrganizationId() {
+    void listFilterByOrganizationId() {
         String applicationName = this.nameFactory.getApplicationName();
 
         Mono
@@ -413,7 +414,7 @@ public void listFilterByOrganizationId() {
     }
 
     @Test
-    public void listFilterBySpaceId() {
+    void listFilterBySpaceId() {
         String applicationName = this.nameFactory.getApplicationName();
 
         this.spaceId
@@ -440,7 +441,7 @@ public void listFilterBySpaceId() {
     }
 
     @Test
-    public void listFilterByStackId() {
+    void listFilterByStackId() {
         String applicationName = this.nameFactory.getApplicationName();
 
         Mono.zip(this.spaceId, this.stackId)
@@ -466,7 +467,7 @@ public void listFilterByStackId() {
     }
 
     @Test
-    public void listRoutes() {
+    void listRoutes() {
         String applicationName = this.nameFactory.getApplicationName();
         String domainName = this.nameFactory.getDomainName();
 
@@ -499,7 +500,7 @@ public void listRoutes() {
     }
 
     @Test
-    public void listRoutesFilterByDomainId() {
+    void listRoutesFilterByDomainId() {
         String applicationName = this.nameFactory.getApplicationName();
         String domainName = this.nameFactory.getDomainName();
 
@@ -533,7 +534,7 @@ public void listRoutesFilterByDomainId() {
     }
 
     @Test
-    public void listRoutesFilterByHost() {
+    void listRoutesFilterByHost() {
         String applicationName = this.nameFactory.getApplicationName();
         String domainName = this.nameFactory.getDomainName();
 
@@ -567,7 +568,7 @@ public void listRoutesFilterByHost() {
     }
 
     @Test
-    public void listRoutesFilterByPath() {
+    void listRoutesFilterByPath() {
         String applicationName = this.nameFactory.getApplicationName();
         String domainName = this.nameFactory.getDomainName();
 
@@ -601,7 +602,7 @@ public void listRoutesFilterByPath() {
     }
 
     @Test
-    public void listServiceBindings() {
+    void listServiceBindings() {
         String applicationName = this.nameFactory.getApplicationName();
         String serviceInstanceName = this.nameFactory.getServiceInstanceName();
 
@@ -622,7 +623,7 @@ public void listServiceBindings() {
     }
 
     @Test
-    public void listServiceBindingsFilterByServiceInstanceId() {
+    void listServiceBindingsFilterByServiceInstanceId() {
         String applicationName = this.nameFactory.getApplicationName();
         String serviceInstanceName = this.nameFactory.getServiceInstanceName();
 
@@ -655,7 +656,7 @@ public void listServiceBindingsFilterByServiceInstanceId() {
     }
 
     @Test
-    public void removeRoute() {
+    void removeRoute() {
         String applicationName = this.nameFactory.getApplicationName();
         String domainName = this.nameFactory.getDomainName();
 
@@ -682,7 +683,7 @@ public void removeRoute() {
     }
 
     @Test
-    public void removeServiceBinding() {
+    void removeServiceBinding() {
         String applicationName = this.nameFactory.getApplicationName();
         String serviceInstanceName = this.nameFactory.getServiceInstanceName();
 
@@ -707,7 +708,7 @@ public void removeServiceBinding() {
     }
 
     @Test
-    public void restage() {
+    void restage() {
         String applicationName = this.nameFactory.getApplicationName();
 
         this.spaceId
@@ -726,7 +727,7 @@ public void restage() {
     }
 
     @Test
-    public void statistics() {
+    void statistics() {
         String applicationName = this.nameFactory.getApplicationName();
 
         this.spaceId
@@ -744,7 +745,7 @@ public void statistics() {
     }
 
     @Test
-    public void summary() {
+    void summary() {
         String applicationName = this.nameFactory.getApplicationName();
 
         this.spaceId
@@ -762,7 +763,7 @@ public void summary() {
     }
 
     @Test
-    public void terminateInstance() {
+    void terminateInstance() {
         String applicationName = this.nameFactory.getApplicationName();
 
         this.spaceId
@@ -786,7 +787,7 @@ public void terminateInstance() {
     }
 
     @Test
-    public void update() {
+    void update() {
         String applicationName = this.nameFactory.getApplicationName();
         String applicationName2 = this.nameFactory.getApplicationName();
 
@@ -827,7 +828,7 @@ public void update() {
     }
 
     @Test
-    public void uploadAndDownload() {
+    void uploadAndDownload() {
         String applicationName = this.nameFactory.getApplicationName();
 
         this.spaceId
@@ -844,7 +845,7 @@ public void uploadAndDownload() {
     }
 
     @Test
-    public void uploadAndDownloadAsyncFalse() {
+    void uploadAndDownloadAsyncFalse() {
         String applicationName = this.nameFactory.getApplicationName();
 
         this.spaceId
@@ -861,7 +862,7 @@ public void uploadAndDownloadAsyncFalse() {
     }
 
     @Test
-    public void uploadDirectory() throws IOException {
+    void uploadDirectory() throws IOException {
         Path application = new ClassPathResource("test-application").getFile().toPath();
         String applicationName = this.nameFactory.getApplicationName();
 
@@ -881,7 +882,7 @@ public void uploadDirectory() throws IOException {
 
     @IfCloudFoundryVersion(greaterThanOrEqualTo = CloudFoundryVersion.PCF_1_9)
     @Test
-    public void uploadDroplet() throws IOException {
+    void uploadDroplet() throws IOException {
         Path droplet = new ClassPathResource("test-droplet.tgz").getFile().toPath();
         String applicationName = this.nameFactory.getApplicationName();
 
diff --git a/integration-test/src/test/java/org/cloudfoundry/client/v2/BlobstoresTest.java b/integration-test/src/test/java/org/cloudfoundry/client/v2/BlobstoresTest.java
index 444433cf9b..3b026cff1f 100644
--- a/integration-test/src/test/java/org/cloudfoundry/client/v2/BlobstoresTest.java
+++ b/integration-test/src/test/java/org/cloudfoundry/client/v2/BlobstoresTest.java
@@ -20,18 +20,19 @@
 import org.cloudfoundry.client.CloudFoundryClient;
 import org.cloudfoundry.client.v2.blobstores.DeleteBlobstoreBuildpackCachesRequest;
 import org.cloudfoundry.util.JobUtils;
+import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 import reactor.test.StepVerifier;
 
 import java.time.Duration;
 
-public final class BlobstoresTest extends AbstractIntegrationTest {
+final class BlobstoresTest extends AbstractIntegrationTest {
 
     @Autowired
     private CloudFoundryClient cloudFoundryClient;
 
     @Test
-    public void delete() {
+    void delete() {
         this.cloudFoundryClient.blobstores()
             .deleteBuildpackCaches(DeleteBlobstoreBuildpackCachesRequest.builder()
                 .build())
diff --git a/integration-test/src/test/java/org/cloudfoundry/client/v2/BuildpacksTest.java b/integration-test/src/test/java/org/cloudfoundry/client/v2/BuildpacksTest.java
index 947fa424e8..641b9f2fbe 100644
--- a/integration-test/src/test/java/org/cloudfoundry/client/v2/BuildpacksTest.java
+++ b/integration-test/src/test/java/org/cloudfoundry/client/v2/BuildpacksTest.java
@@ -30,6 +30,7 @@
 import org.cloudfoundry.util.JobUtils;
 import org.cloudfoundry.util.PaginationUtils;
 import org.cloudfoundry.util.ResourceUtils;
+import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.core.io.ClassPathResource;
 import reactor.core.publisher.Flux;
@@ -40,13 +41,13 @@
 import java.nio.file.Path;
 import java.time.Duration;
 
-public final class BuildpacksTest extends AbstractIntegrationTest {
+final class BuildpacksTest extends AbstractIntegrationTest {
 
     @Autowired
     private CloudFoundryClient cloudFoundryClient;
 
     @Test
-    public void create() {
+    void create() {
         String buildpackName = this.nameFactory.getBuildpackName();
 
         this.cloudFoundryClient.buildpacks()
@@ -69,7 +70,7 @@ public void create() {
     }
 
     @Test
-    public void delete() {
+    void delete() {
         String buildpackName = this.nameFactory.getBuildpackName();
 
         createBuildpackId(this.cloudFoundryClient, buildpackName)
@@ -85,7 +86,7 @@ public void delete() {
     }
 
     @Test
-    public void deleteAsync() {
+    void deleteAsync() {
         String buildpackName = this.nameFactory.getBuildpackName();
 
         createBuildpackId(this.cloudFoundryClient, buildpackName)
@@ -102,7 +103,7 @@ public void deleteAsync() {
     }
 
     @Test
-    public void get() {
+    void get() {
         String buildpackName = this.nameFactory.getBuildpackName();
 
         createBuildpackId(this.cloudFoundryClient, buildpackName)
@@ -123,7 +124,7 @@ public void get() {
     }
 
     @Test
-    public void list() {
+    void list() {
         String buildpackName = this.nameFactory.getBuildpackName();
 
         createBuildpackId(this.cloudFoundryClient, buildpackName)
@@ -145,7 +146,7 @@ public void list() {
     }
 
     @Test
-    public void listFilterByName() {
+    void listFilterByName() {
         String buildpackName = this.nameFactory.getBuildpackName();
 
         createBuildpackId(this.cloudFoundryClient, buildpackName)
@@ -167,7 +168,7 @@ public void listFilterByName() {
     }
 
     @Test
-    public void update() {
+    void update() {
         String buildpackName = this.nameFactory.getBuildpackName();
 
         createBuildpackId(this.cloudFoundryClient, buildpackName)
@@ -191,7 +192,7 @@ public void update() {
     }
 
     @Test
-    public void upload() throws IOException {
+    void upload() throws IOException {
         Path buildpack = new ClassPathResource("test-buildpack.zip").getFile().toPath();
         String buildpackName = this.nameFactory.getBuildpackName();
         String filename = buildpack.getFileName().toString();
@@ -217,7 +218,7 @@ public void upload() throws IOException {
     }
 
     @Test
-    public void uploadDirectory() throws IOException {
+    void uploadDirectory() throws IOException {
         Path buildpack = new ClassPathResource("test-buildpack").getFile().toPath();
         String buildpackName = this.nameFactory.getBuildpackName();
         String filename = buildpack.getFileName().toString();
diff --git a/integration-test/src/test/java/org/cloudfoundry/client/v2/DomainsTest.java b/integration-test/src/test/java/org/cloudfoundry/client/v2/DomainsTest.java
index 9042864216..730856441e 100644
--- a/integration-test/src/test/java/org/cloudfoundry/client/v2/DomainsTest.java
+++ b/integration-test/src/test/java/org/cloudfoundry/client/v2/DomainsTest.java
@@ -45,6 +45,7 @@
 import org.cloudfoundry.util.JobUtils;
 import org.cloudfoundry.util.PaginationUtils;
 import org.cloudfoundry.util.ResourceUtils;
+import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 import reactor.core.publisher.Flux;
 import reactor.core.publisher.Mono;
@@ -59,7 +60,7 @@
 import static org.cloudfoundry.util.tuple.TupleUtils.function;
 
 @SuppressWarnings("deprecation")
-public final class DomainsTest extends AbstractIntegrationTest {
+final class DomainsTest extends AbstractIntegrationTest {
 
     @Autowired
     private CloudFoundryClient cloudFoundryClient;
@@ -74,7 +75,7 @@ public final class DomainsTest extends AbstractIntegrationTest {
     private Mono<String> userId;
 
     @Test
-    public void create() {
+    void create() {
         String domainName = this.nameFactory.getDomainName();
 
         this.organizationId
@@ -89,7 +90,7 @@ public void create() {
     }
 
     @Test
-    public void delete() {
+    void delete() {
         String domainName = this.nameFactory.getDomainName();
 
         this.organizationId
@@ -103,7 +104,7 @@ public void delete() {
     }
 
     @Test
-    public void deleteNotAsync() {
+    void deleteNotAsync() {
         String domainName = this.nameFactory.getDomainName();
 
         this.organizationId
@@ -116,7 +117,7 @@ public void deleteNotAsync() {
     }
 
     @Test
-    public void get() {
+    void get() {
         String domainName = this.nameFactory.getDomainName();
 
         this.organizationId
@@ -135,7 +136,7 @@ public void get() {
     }
 
     @Test
-    public void list() {
+    void list() {
         String domainName = this.nameFactory.getDomainName();
 
         this.organizationId
@@ -157,7 +158,7 @@ public void list() {
     }
 
     @Test
-    public void listDomainSpaces() {
+    void listDomainSpaces() {
         String domainName = this.nameFactory.getDomainName();
 
         Mono.zip(this.organizationId, this.spaceId)
@@ -179,7 +180,7 @@ public void listDomainSpaces() {
     }
 
     @Test
-    public void listDomainSpacesFilterByApplicationId() {
+    void listDomainSpacesFilterByApplicationId() {
         String applicationName = this.nameFactory.getApplicationName();
         String domainName = this.nameFactory.getDomainName();
 
@@ -207,7 +208,7 @@ public void listDomainSpacesFilterByApplicationId() {
     }
 
     @Test
-    public void listDomainSpacesFilterByDeveloperId() {
+    void listDomainSpacesFilterByDeveloperId() {
         String domainName = this.nameFactory.getDomainName();
 
         Mono.zip(this.spaceId, this.organizationId, this.userId)
@@ -230,7 +231,7 @@ public void listDomainSpacesFilterByDeveloperId() {
     }
 
     @Test
-    public void listDomainSpacesFilterByName() {
+    void listDomainSpacesFilterByName() {
         String domainName = this.nameFactory.getDomainName();
 
         Mono.zip(this.organizationId, this.spaceId)
@@ -253,7 +254,7 @@ public void listDomainSpacesFilterByName() {
     }
 
     @Test
-    public void listDomainSpacesFilterByOrganizationId() {
+    void listDomainSpacesFilterByOrganizationId() {
         String domainName = this.nameFactory.getDomainName();
 
         Mono.zip(this.organizationId, this.spaceId)
@@ -276,7 +277,7 @@ public void listDomainSpacesFilterByOrganizationId() {
     }
 
     @Test
-    public void listFilterByName() {
+    void listFilterByName() {
         String domainName = this.nameFactory.getDomainName();
 
         this.organizationId
@@ -298,7 +299,7 @@ public void listFilterByName() {
     }
 
     @Test
-    public void listFilterByOwningOrganizationId() {
+    void listFilterByOwningOrganizationId() {
         String domainName = this.nameFactory.getDomainName();
 
         this.organizationId
diff --git a/integration-test/src/test/java/org/cloudfoundry/client/v2/EventsTest.java b/integration-test/src/test/java/org/cloudfoundry/client/v2/EventsTest.java
index f354682504..04a3e7cacb 100644
--- a/integration-test/src/test/java/org/cloudfoundry/client/v2/EventsTest.java
+++ b/integration-test/src/test/java/org/cloudfoundry/client/v2/EventsTest.java
@@ -22,6 +22,7 @@
 import org.cloudfoundry.client.v2.events.GetEventRequest;
 import org.cloudfoundry.client.v2.events.ListEventsRequest;
 import org.cloudfoundry.util.ResourceUtils;
+import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 import reactor.core.publisher.Flux;
 import reactor.core.publisher.Mono;
@@ -29,13 +30,13 @@
 
 import java.time.Duration;
 
-public final class EventsTest extends AbstractIntegrationTest {
+final class EventsTest extends AbstractIntegrationTest {
 
     @Autowired
     private CloudFoundryClient cloudFoundryClient;
 
     @Test
-    public void get() {
+    void get() {
         getFirstEvent(this.cloudFoundryClient)
             .flatMap(resource -> Mono.zip(
                 Mono.just(resource)
@@ -53,7 +54,7 @@ public void get() {
     }
 
     @Test
-    public void list() {
+    void list() {
         getFirstEvent(this.cloudFoundryClient)
             .flatMap(resource -> Mono.zip(
                 Mono.just(resource),
@@ -70,7 +71,7 @@ public void list() {
     }
 
     @Test
-    public void listFilterByActee() {
+    void listFilterByActee() {
         getFirstEvent(this.cloudFoundryClient)
             .flatMap(resource -> Mono.zip(
                 Mono.just(resource),
@@ -88,7 +89,7 @@ public void listFilterByActee() {
     }
 
     @Test
-    public void listFilterByOrganizationId() {
+    void listFilterByOrganizationId() {
         getFirstEvent(this.cloudFoundryClient)
             .flatMap(resource -> Mono.zip(
                 Mono.just(resource),
@@ -106,7 +107,7 @@ public void listFilterByOrganizationId() {
     }
 
     @Test
-    public void listFilterBySpaceId() {
+    void listFilterBySpaceId() {
         getFirstEvent(this.cloudFoundryClient)
             .flatMap(resource -> Mono.zip(
                 Mono.just(resource),
@@ -124,7 +125,7 @@ public void listFilterBySpaceId() {
     }
 
     @Test
-    public void listFilterByTimestamp() {
+    void listFilterByTimestamp() {
         getFirstEvent(this.cloudFoundryClient)
             .flatMap(resource -> Mono.zip(
                 Mono.just(resource),
@@ -142,7 +143,7 @@ public void listFilterByTimestamp() {
     }
 
     @Test
-    public void listFilterByType() {
+    void listFilterByType() {
         getFirstEvent(this.cloudFoundryClient)
             .flatMap(resource -> Mono.zip(
                 Mono.just(resource),
diff --git a/integration-test/src/test/java/org/cloudfoundry/client/v2/FeatureFlagsTest.java b/integration-test/src/test/java/org/cloudfoundry/client/v2/FeatureFlagsTest.java
index 4d65910362..ac02c6e164 100644
--- a/integration-test/src/test/java/org/cloudfoundry/client/v2/FeatureFlagsTest.java
+++ b/integration-test/src/test/java/org/cloudfoundry/client/v2/FeatureFlagsTest.java
@@ -22,6 +22,7 @@
 import org.cloudfoundry.client.v2.featureflags.GetFeatureFlagRequest;
 import org.cloudfoundry.client.v2.featureflags.ListFeatureFlagsRequest;
 import org.cloudfoundry.client.v2.featureflags.SetFeatureFlagRequest;
+import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 import reactor.core.publisher.Flux;
 import reactor.core.publisher.Mono;
@@ -38,7 +39,7 @@
 import static org.cloudfoundry.util.tuple.TupleUtils.consumer;
 import static org.cloudfoundry.util.tuple.TupleUtils.function;
 
-public final class FeatureFlagsTest extends AbstractIntegrationTest {
+final class FeatureFlagsTest extends AbstractIntegrationTest {
 
     private static final List<String> coreFeatureFlagNameList = Arrays.asList(
         "app_bits_upload",
@@ -56,7 +57,7 @@ public final class FeatureFlagsTest extends AbstractIntegrationTest {
     private CloudFoundryClient cloudFoundryClient;
 
     @Test
-    public void getEach() {
+    void getEach() {
         Flux
             .fromIterable(coreFeatureFlagNameList)
             .flatMap(flagName -> this.cloudFoundryClient.featureFlags()
@@ -72,7 +73,7 @@ public void getEach() {
     }
 
     @Test
-    public void list() {
+    void list() {
         this.cloudFoundryClient.featureFlags()
             .list(ListFeatureFlagsRequest.builder()
                 .build())
@@ -86,7 +87,7 @@ public void list() {
     }
 
     @Test
-    public void setAndResetEach() {
+    void setAndResetEach() {
         Flux.fromIterable(coreFeatureFlagNameList)
             .flatMap(flagName -> this.cloudFoundryClient.featureFlags()
                 .get(GetFeatureFlagRequest.builder()
diff --git a/integration-test/src/test/java/org/cloudfoundry/client/v2/InfoTest.java b/integration-test/src/test/java/org/cloudfoundry/client/v2/InfoTest.java
index 70b92b6615..1be8fda184 100644
--- a/integration-test/src/test/java/org/cloudfoundry/client/v2/InfoTest.java
+++ b/integration-test/src/test/java/org/cloudfoundry/client/v2/InfoTest.java
@@ -20,6 +20,7 @@
 import org.cloudfoundry.AbstractIntegrationTest;
 import org.cloudfoundry.client.CloudFoundryClient;
 import org.cloudfoundry.client.v2.info.GetInfoRequest;
+import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 import reactor.test.StepVerifier;
 
@@ -28,13 +29,13 @@
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.cloudfoundry.client.CloudFoundryClient.SUPPORTED_API_VERSION;
 
-public final class InfoTest extends AbstractIntegrationTest {
+final class InfoTest extends AbstractIntegrationTest {
 
     @Autowired
     private CloudFoundryClient cloudFoundryClient;
 
     @Test
-    public void info() {
+    void info() {
         this.cloudFoundryClient.info()
             .get(GetInfoRequest.builder()
                 .build())
diff --git a/integration-test/src/test/java/org/cloudfoundry/client/v2/JobsTest.java b/integration-test/src/test/java/org/cloudfoundry/client/v2/JobsTest.java
index 81df89392f..428f3715f5 100644
--- a/integration-test/src/test/java/org/cloudfoundry/client/v2/JobsTest.java
+++ b/integration-test/src/test/java/org/cloudfoundry/client/v2/JobsTest.java
@@ -23,6 +23,7 @@
 import org.cloudfoundry.client.v2.organizations.DeleteOrganizationRequest;
 import org.cloudfoundry.util.DelayUtils;
 import org.cloudfoundry.util.ResourceUtils;
+import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 import reactor.core.publisher.Mono;
 import reactor.test.StepVerifier;
@@ -31,13 +32,13 @@
 
 import static org.cloudfoundry.util.tuple.TupleUtils.predicate;
 
-public final class JobsTest extends AbstractIntegrationTest {
+final class JobsTest extends AbstractIntegrationTest {
 
     @Autowired
     private CloudFoundryClient cloudFoundryClient;
 
     @Test
-    public void getJob() {
+    void getJob() {
         String organizationName = this.nameFactory.getOrganizationName();
 
         this.cloudFoundryClient.organizations()
diff --git a/integration-test/src/test/java/org/cloudfoundry/client/v2/OrganizationQuotaDefinitionsTest.java b/integration-test/src/test/java/org/cloudfoundry/client/v2/OrganizationQuotaDefinitionsTest.java
index b9b1b0c1bf..90230a08f2 100644
--- a/integration-test/src/test/java/org/cloudfoundry/client/v2/OrganizationQuotaDefinitionsTest.java
+++ b/integration-test/src/test/java/org/cloudfoundry/client/v2/OrganizationQuotaDefinitionsTest.java
@@ -29,6 +29,7 @@
 import org.cloudfoundry.util.JobUtils;
 import org.cloudfoundry.util.PaginationUtils;
 import org.cloudfoundry.util.ResourceUtils;
+import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 import reactor.core.publisher.Mono;
 import reactor.test.StepVerifier;
@@ -37,14 +38,14 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-public final class OrganizationQuotaDefinitionsTest extends AbstractIntegrationTest {
+final class OrganizationQuotaDefinitionsTest extends AbstractIntegrationTest {
 
     @Autowired
     private CloudFoundryClient cloudFoundryClient;
 
     @SuppressWarnings("deprecation")
     @Test
-    public void create() {
+    void create() {
         String quotaDefinitionName = this.nameFactory.getQuotaDefinitionName();
 
         this.cloudFoundryClient.organizationQuotaDefinitions()
@@ -77,7 +78,7 @@ public void create() {
     }
 
     @Test
-    public void delete() {
+    void delete() {
         String quotaDefinitionName = this.nameFactory.getQuotaDefinitionName();
 
         requestCreateOrganizationQuotaDefinition(this.cloudFoundryClient, quotaDefinitionName)
@@ -96,7 +97,7 @@ public void delete() {
 
     @SuppressWarnings("deprecation")
     @Test
-    public void get() {
+    void get() {
         String quotaDefinitionName = this.nameFactory.getQuotaDefinitionName();
 
         requestCreateOrganizationQuotaDefinition(this.cloudFoundryClient, quotaDefinitionName)
@@ -126,7 +127,7 @@ public void get() {
     }
 
     @Test
-    public void list() {
+    void list() {
         String quotaDefinitionName = this.nameFactory.getQuotaDefinitionName();
 
         requestCreateOrganizationQuotaDefinition(this.cloudFoundryClient, quotaDefinitionName)
@@ -148,7 +149,7 @@ public void list() {
 
     @SuppressWarnings("deprecation")
     @Test
-    public void update() {
+    void update() {
         String quotaDefinitionName = this.nameFactory.getQuotaDefinitionName();
 
         requestCreateOrganizationQuotaDefinition(this.cloudFoundryClient, quotaDefinitionName)
diff --git a/integration-test/src/test/java/org/cloudfoundry/client/v2/OrganizationsTest.java b/integration-test/src/test/java/org/cloudfoundry/client/v2/OrganizationsTest.java
index fa18fc1d85..ab6b5c6f14 100644
--- a/integration-test/src/test/java/org/cloudfoundry/client/v2/OrganizationsTest.java
+++ b/integration-test/src/test/java/org/cloudfoundry/client/v2/OrganizationsTest.java
@@ -87,6 +87,7 @@
 import org.cloudfoundry.util.JobUtils;
 import org.cloudfoundry.util.PaginationUtils;
 import org.cloudfoundry.util.ResourceUtils;
+import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 import reactor.core.publisher.Flux;
 import reactor.core.publisher.Mono;
@@ -98,7 +99,7 @@
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.cloudfoundry.util.tuple.TupleUtils.function;
 
-public final class OrganizationsTest extends AbstractIntegrationTest {
+final class OrganizationsTest extends AbstractIntegrationTest {
 
     @Autowired
     private CloudFoundryClient cloudFoundryClient;
@@ -119,7 +120,7 @@ public final class OrganizationsTest extends AbstractIntegrationTest {
     private String username;
 
     @Test
-    public void associateAuditor() {
+    void associateAuditor() {
         String organizationName = this.nameFactory.getOrganizationName();
 
         Mono
@@ -143,7 +144,7 @@ public void associateAuditor() {
     }
 
     @Test
-    public void associateAuditorByUsername() {
+    void associateAuditorByUsername() {
         String organizationName = this.nameFactory.getOrganizationName();
 
         createOrganizationId(this.cloudFoundryClient, organizationName)
@@ -164,7 +165,7 @@ public void associateAuditorByUsername() {
     }
 
     @Test
-    public void associateBillingManager() {
+    void associateBillingManager() {
         String organizationName = this.nameFactory.getOrganizationName();
 
         Mono
@@ -188,7 +189,7 @@ public void associateBillingManager() {
     }
 
     @Test
-    public void associateBillingManagerByUsername() {
+    void associateBillingManagerByUsername() {
         String organizationName = this.nameFactory.getOrganizationName();
 
         createOrganizationId(this.cloudFoundryClient, organizationName)
@@ -208,7 +209,7 @@ public void associateBillingManagerByUsername() {
     }
 
     @Test
-    public void associateManager() {
+    void associateManager() {
         String organizationName = this.nameFactory.getOrganizationName();
 
         Mono
@@ -232,7 +233,7 @@ public void associateManager() {
     }
 
     @Test
-    public void associateManagerByUsername() {
+    void associateManagerByUsername() {
         String organizationName = this.nameFactory.getOrganizationName();
 
         createOrganizationId(this.cloudFoundryClient, organizationName)
@@ -252,7 +253,7 @@ public void associateManagerByUsername() {
     }
 
     @Test
-    public void associatePrivateDomain() {
+    void associatePrivateDomain() {
         String domainName = this.nameFactory.getDomainName();
         String organizationName = this.nameFactory.getOrganizationName();
 
@@ -277,7 +278,7 @@ public void associatePrivateDomain() {
     }
 
     @Test
-    public void associateUser() {
+    void associateUser() {
         String organizationName = this.nameFactory.getOrganizationName();
 
         Mono
@@ -301,7 +302,7 @@ public void associateUser() {
     }
 
     @Test
-    public void associateUserByUsername() {
+    void associateUserByUsername() {
         String organizationName = this.nameFactory.getOrganizationName();
 
         createOrganizationId(this.cloudFoundryClient, organizationName)
@@ -321,7 +322,7 @@ public void associateUserByUsername() {
     }
 
     @Test
-    public void create() {
+    void create() {
         String organizationName = this.nameFactory.getOrganizationName();
 
         this.cloudFoundryClient.organizations()
@@ -337,7 +338,7 @@ public void create() {
     }
 
     @Test
-    public void delete() {
+    void delete() {
         String organizationName = this.nameFactory.getOrganizationName();
 
         createOrganizationId(this.cloudFoundryClient, organizationName)
@@ -354,7 +355,7 @@ public void delete() {
     }
 
     @Test
-    public void deleteAsyncFalse() {
+    void deleteAsyncFalse() {
         String organizationName = this.nameFactory.getOrganizationName();
 
         createOrganizationId(this.cloudFoundryClient, organizationName)
@@ -370,7 +371,7 @@ public void deleteAsyncFalse() {
     }
 
     @Test
-    public void get() {
+    void get() {
         String organizationName = this.nameFactory.getOrganizationName();
 
         createOrganizationId(this.cloudFoundryClient, organizationName)
@@ -387,7 +388,7 @@ public void get() {
     }
 
     @Test
-    public void getInstanceUsage() {
+    void getInstanceUsage() {
         String organizationName = this.nameFactory.getOrganizationName();
 
         createOrganizationId(this.cloudFoundryClient, organizationName)
@@ -403,7 +404,7 @@ public void getInstanceUsage() {
     }
 
     @Test
-    public void getMemoryUsage() {
+    void getMemoryUsage() {
         String organizationName = this.nameFactory.getOrganizationName();
 
         createOrganizationId(this.cloudFoundryClient, organizationName)
@@ -419,7 +420,7 @@ public void getMemoryUsage() {
     }
 
     @Test
-    public void getUserRoles() {
+    void getUserRoles() {
         String organizationName = this.nameFactory.getOrganizationName();
 
         Mono
@@ -443,7 +444,7 @@ public void getUserRoles() {
     }
 
     @Test
-    public void list() {
+    void list() {
         String organizationName = this.nameFactory.getOrganizationName();
 
         createOrganizationId(this.cloudFoundryClient, organizationName)
@@ -457,7 +458,7 @@ public void list() {
     }
 
     @Test
-    public void listAuditors() {
+    void listAuditors() {
         String organizationName = this.nameFactory.getOrganizationName();
 
         Mono
@@ -479,7 +480,7 @@ public void listAuditors() {
     }
 
     @Test
-    public void listAuditorsFilterByAuditedOrganizationId() {
+    void listAuditorsFilterByAuditedOrganizationId() {
         String organizationName1 = this.nameFactory.getOrganizationName();
         String organizationName2 = this.nameFactory.getOrganizationName();
 
@@ -506,7 +507,7 @@ public void listAuditorsFilterByAuditedOrganizationId() {
     }
 
     @Test
-    public void listAuditorsFilterByAuditedSpaceId() {
+    void listAuditorsFilterByAuditedSpaceId() {
         String organizationName1 = this.nameFactory.getOrganizationName();
         String organizationName2 = this.nameFactory.getOrganizationName();
         String spaceName = this.nameFactory.getSpaceName();
@@ -540,7 +541,7 @@ public void listAuditorsFilterByAuditedSpaceId() {
     }
 
     @Test
-    public void listAuditorsFilterByBillingManagedOrganizationId() {
+    void listAuditorsFilterByBillingManagedOrganizationId() {
         String organizationName1 = this.nameFactory.getOrganizationName();
         String organizationName2 = this.nameFactory.getOrganizationName();
 
@@ -567,7 +568,7 @@ public void listAuditorsFilterByBillingManagedOrganizationId() {
     }
 
     @Test
-    public void listAuditorsFilterByManagedOrganizationId() {
+    void listAuditorsFilterByManagedOrganizationId() {
         String organizationName1 = this.nameFactory.getOrganizationName();
         String organizationName2 = this.nameFactory.getOrganizationName();
 
@@ -594,7 +595,7 @@ public void listAuditorsFilterByManagedOrganizationId() {
     }
 
     @Test
-    public void listAuditorsFilterByManagedSpaceId() {
+    void listAuditorsFilterByManagedSpaceId() {
         String organizationName1 = this.nameFactory.getOrganizationName();
         String organizationName2 = this.nameFactory.getOrganizationName();
         String spaceName = this.nameFactory.getSpaceName();
@@ -628,7 +629,7 @@ public void listAuditorsFilterByManagedSpaceId() {
     }
 
     @Test
-    public void listAuditorsFilterBySpaceId() {
+    void listAuditorsFilterBySpaceId() {
         String organizationName1 = this.nameFactory.getOrganizationName();
         String organizationName2 = this.nameFactory.getOrganizationName();
         String spaceName = this.nameFactory.getSpaceName();
@@ -662,7 +663,7 @@ public void listAuditorsFilterBySpaceId() {
     }
 
     @Test
-    public void listBillingManagers() {
+    void listBillingManagers() {
         String organizationName = this.nameFactory.getOrganizationName();
 
         Mono
@@ -684,7 +685,7 @@ public void listBillingManagers() {
     }
 
     @Test
-    public void listBillingManagersFilterByAuditedOrganizationId() {
+    void listBillingManagersFilterByAuditedOrganizationId() {
         String organizationName1 = this.nameFactory.getOrganizationName();
         String organizationName2 = this.nameFactory.getOrganizationName();
 
@@ -711,7 +712,7 @@ public void listBillingManagersFilterByAuditedOrganizationId() {
     }
 
     @Test
-    public void listBillingManagersFilterByAuditedSpaceId() {
+    void listBillingManagersFilterByAuditedSpaceId() {
         String organizationName1 = this.nameFactory.getOrganizationName();
         String organizationName2 = this.nameFactory.getOrganizationName();
         String spaceName = this.nameFactory.getSpaceName();
@@ -745,7 +746,7 @@ public void listBillingManagersFilterByAuditedSpaceId() {
     }
 
     @Test
-    public void listBillingManagersFilterByBillingManagedOrganizationId() {
+    void listBillingManagersFilterByBillingManagedOrganizationId() {
         String organizationName1 = this.nameFactory.getOrganizationName();
         String organizationName2 = this.nameFactory.getOrganizationName();
 
@@ -772,7 +773,7 @@ public void listBillingManagersFilterByBillingManagedOrganizationId() {
     }
 
     @Test
-    public void listBillingManagersFilterByManagedOrganizationId() {
+    void listBillingManagersFilterByManagedOrganizationId() {
         String organizationName1 = this.nameFactory.getOrganizationName();
         String organizationName2 = this.nameFactory.getOrganizationName();
 
@@ -799,7 +800,7 @@ public void listBillingManagersFilterByManagedOrganizationId() {
     }
 
     @Test
-    public void listBillingManagersFilterByManagedSpaceId() {
+    void listBillingManagersFilterByManagedSpaceId() {
         String organizationName1 = this.nameFactory.getOrganizationName();
         String organizationName2 = this.nameFactory.getOrganizationName();
         String spaceName = this.nameFactory.getSpaceName();
@@ -833,7 +834,7 @@ public void listBillingManagersFilterByManagedSpaceId() {
     }
 
     @Test
-    public void listBillingManagersFilterBySpaceId() {
+    void listBillingManagersFilterBySpaceId() {
         String organizationName1 = this.nameFactory.getOrganizationName();
         String organizationName2 = this.nameFactory.getOrganizationName();
         String spaceName = this.nameFactory.getSpaceName();
@@ -868,7 +869,7 @@ public void listBillingManagersFilterBySpaceId() {
 
     @SuppressWarnings("deprecation")
     @Test
-    public void listDomains() {
+    void listDomains() {
         String organizationName = this.nameFactory.getOrganizationName();
         String privateDomainName = this.nameFactory.getDomainName();
 
@@ -890,7 +891,7 @@ public void listDomains() {
 
     @SuppressWarnings("deprecation")
     @Test
-    public void listDomainsFilterByName() {
+    void listDomainsFilterByName() {
         String organizationName = this.nameFactory.getOrganizationName();
         String privateDomainName = this.nameFactory.getDomainName();
 
@@ -911,7 +912,7 @@ public void listDomainsFilterByName() {
     }
 
     @Test
-    public void listFilterByAuditorId() {
+    void listFilterByAuditorId() {
         String organizationName = this.nameFactory.getOrganizationName();
 
         Mono
@@ -930,7 +931,7 @@ public void listFilterByAuditorId() {
     }
 
     @Test
-    public void listFilterByBillingManagerId() {
+    void listFilterByBillingManagerId() {
         String organizationName = this.nameFactory.getOrganizationName();
 
         Mono
@@ -949,7 +950,7 @@ public void listFilterByBillingManagerId() {
     }
 
     @Test
-    public void listFilterByManagerId() {
+    void listFilterByManagerId() {
         String organizationName = this.nameFactory.getOrganizationName();
 
         Mono
@@ -968,7 +969,7 @@ public void listFilterByManagerId() {
     }
 
     @Test
-    public void listFilterByName() {
+    void listFilterByName() {
         String organizationName = this.nameFactory.getOrganizationName();
 
         requestCreateOrganization(this.cloudFoundryClient, organizationName)
@@ -980,7 +981,7 @@ public void listFilterByName() {
     }
 
     @Test
-    public void listFilterBySpaceId() {
+    void listFilterBySpaceId() {
         String organizationName = this.nameFactory.getOrganizationName();
         String spaceName = this.nameFactory.getSpaceName();
 
@@ -1002,7 +1003,7 @@ public void listFilterBySpaceId() {
     }
 
     @Test
-    public void listFilterByStatus() {
+    void listFilterByStatus() {
         String organizationName = this.nameFactory.getOrganizationName();
         String organizationStatus = "suspended";
 
@@ -1019,7 +1020,7 @@ public void listFilterByStatus() {
     }
 
     @Test
-    public void listFilterByUserId() {
+    void listFilterByUserId() {
         String organizationName = this.nameFactory.getOrganizationName();
 
         Mono
@@ -1038,7 +1039,7 @@ public void listFilterByUserId() {
     }
 
     @Test
-    public void listManagers() {
+    void listManagers() {
         String organizationName = this.nameFactory.getOrganizationName();
 
         Mono
@@ -1060,7 +1061,7 @@ public void listManagers() {
     }
 
     @Test
-    public void listManagersFilterByAuditedOrganizationId() {
+    void listManagersFilterByAuditedOrganizationId() {
         String organizationName1 = this.nameFactory.getOrganizationName();
         String organizationName2 = this.nameFactory.getOrganizationName();
 
@@ -1087,7 +1088,7 @@ public void listManagersFilterByAuditedOrganizationId() {
     }
 
     @Test
-    public void listManagersFilterByAuditedSpaceId() {
+    void listManagersFilterByAuditedSpaceId() {
         String organizationName1 = this.nameFactory.getOrganizationName();
         String organizationName2 = this.nameFactory.getOrganizationName();
         String spaceName = this.nameFactory.getSpaceName();
@@ -1121,7 +1122,7 @@ public void listManagersFilterByAuditedSpaceId() {
     }
 
     @Test
-    public void listManagersFilterByBillingManagedOrganizationId() {
+    void listManagersFilterByBillingManagedOrganizationId() {
         String organizationName1 = this.nameFactory.getOrganizationName();
         String organizationName2 = this.nameFactory.getOrganizationName();
 
@@ -1148,7 +1149,7 @@ public void listManagersFilterByBillingManagedOrganizationId() {
     }
 
     @Test
-    public void listManagersFilterByManagedOrganizationId() {
+    void listManagersFilterByManagedOrganizationId() {
         String organizationName1 = this.nameFactory.getOrganizationName();
         String organizationName2 = this.nameFactory.getOrganizationName();
 
@@ -1175,7 +1176,7 @@ public void listManagersFilterByManagedOrganizationId() {
     }
 
     @Test
-    public void listManagersFilterByManagedSpaceId() {
+    void listManagersFilterByManagedSpaceId() {
         String organizationName1 = this.nameFactory.getOrganizationName();
         String organizationName2 = this.nameFactory.getOrganizationName();
         String spaceName = this.nameFactory.getSpaceName();
@@ -1209,7 +1210,7 @@ public void listManagersFilterByManagedSpaceId() {
     }
 
     @Test
-    public void listManagersFilterBySpaceId() {
+    void listManagersFilterBySpaceId() {
         String organizationName1 = this.nameFactory.getOrganizationName();
         String organizationName2 = this.nameFactory.getOrganizationName();
         String spaceName = this.nameFactory.getSpaceName();
@@ -1243,7 +1244,7 @@ public void listManagersFilterBySpaceId() {
     }
 
     @Test
-    public void listPrivateDomains() {
+    void listPrivateDomains() {
         String domainName = this.nameFactory.getDomainName();
         String defaultOrganizationName = this.nameFactory.getOrganizationName();
         String organizationName = this.nameFactory.getOrganizationName();
@@ -1271,7 +1272,7 @@ public void listPrivateDomains() {
     }
 
     @Test
-    public void listPrivateDomainsFilterByName() {
+    void listPrivateDomainsFilterByName() {
         String organizationName = this.nameFactory.getOrganizationName();
         String privateDomainName = this.nameFactory.getDomainName();
 
@@ -1293,7 +1294,7 @@ public void listPrivateDomainsFilterByName() {
     }
 
     @Test
-    public void listServices() {
+    void listServices() {
         Mono
             .zip(this.organizationId, this.serviceBrokerId)
             .flatMapMany(function((organizationId, serviceBrokerId) -> requestListOrganizationServices(this.cloudFoundryClient, organizationId)
@@ -1307,7 +1308,7 @@ public void listServices() {
     }
 
     @Test
-    public void listServicesFilterByActive() {
+    void listServicesFilterByActive() {
         Mono
             .zip(this.organizationId, this.serviceBrokerId)
             .flatMapMany(function((organizationId, serviceBrokerId) -> requestListOrganizationServices(this.cloudFoundryClient, organizationId, builder -> builder.active(true))
@@ -1321,7 +1322,7 @@ public void listServicesFilterByActive() {
     }
 
     @Test
-    public void listServicesFilterByLabel() {
+    void listServicesFilterByLabel() {
         Mono
             .zip(this.organizationId, this.serviceBrokerId)
             .flatMapMany(function((organizationId, serviceBrokerId) -> requestListOrganizationServices(this.cloudFoundryClient, organizationId, builder -> builder.label(this.serviceName))
@@ -1334,7 +1335,7 @@ public void listServicesFilterByLabel() {
     }
 
     @Test
-    public void listServicesFilterByServiceBrokerId() {
+    void listServicesFilterByServiceBrokerId() {
         Mono
             .zip(this.organizationId, this.serviceBrokerId)
             .flatMapMany(function((organizationId, serviceBrokerId) -> requestListOrganizationServices(this.cloudFoundryClient, organizationId, builder -> builder.serviceBrokerId(serviceBrokerId))))
@@ -1347,7 +1348,7 @@ public void listServicesFilterByServiceBrokerId() {
     }
 
     @Test
-    public void listSpaceQuotaDefinitions() {
+    void listSpaceQuotaDefinitions() {
         String organizationName = this.nameFactory.getOrganizationName();
 
         createOrganizationId(this.cloudFoundryClient, organizationName)
@@ -1363,7 +1364,7 @@ public void listSpaceQuotaDefinitions() {
     }
 
     @Test
-    public void listSpaces() {
+    void listSpaces() {
         String organizationName = this.nameFactory.getOrganizationName();
         String spaceName = this.nameFactory.getSpaceName();
 
@@ -1377,7 +1378,7 @@ public void listSpaces() {
     }
 
     @Test
-    public void listSpacesFilterByApplicationId() {
+    void listSpacesFilterByApplicationId() {
         String organizationName = this.nameFactory.getOrganizationName();
         String spaceName = this.nameFactory.getSpaceName();
         String applicationName = this.nameFactory.getApplicationName();
@@ -1405,7 +1406,7 @@ public void listSpacesFilterByApplicationId() {
     }
 
     @Test
-    public void listSpacesFilterByDeveloperId() {
+    void listSpacesFilterByDeveloperId() {
         String organizationName = this.nameFactory.getOrganizationName();
         String spaceName = this.nameFactory.getSpaceName();
 
@@ -1434,7 +1435,7 @@ public void listSpacesFilterByDeveloperId() {
     }
 
     @Test
-    public void listSpacesFilterByName() {
+    void listSpacesFilterByName() {
         String organizationName = this.nameFactory.getOrganizationName();
         String spaceName = this.nameFactory.getSpaceName();
 
@@ -1456,7 +1457,7 @@ public void listSpacesFilterByName() {
     }
 
     @Test
-    public void listUsers() {
+    void listUsers() {
         String organizationName = this.nameFactory.getOrganizationName();
 
         Mono
@@ -1478,7 +1479,7 @@ public void listUsers() {
     }
 
     @Test
-    public void listUsersFilterByAuditedOrganizationId() {
+    void listUsersFilterByAuditedOrganizationId() {
         String organizationName1 = this.nameFactory.getOrganizationName();
         String organizationName2 = this.nameFactory.getOrganizationName();
 
@@ -1505,7 +1506,7 @@ public void listUsersFilterByAuditedOrganizationId() {
     }
 
     @Test
-    public void listUsersFilterByAuditedSpaceId() {
+    void listUsersFilterByAuditedSpaceId() {
         String organizationName1 = this.nameFactory.getOrganizationName();
         String organizationName2 = this.nameFactory.getOrganizationName();
         String spaceName = this.nameFactory.getSpaceName();
@@ -1539,7 +1540,7 @@ public void listUsersFilterByAuditedSpaceId() {
     }
 
     @Test
-    public void listUsersFilterByBillingManagedOrganizationId() {
+    void listUsersFilterByBillingManagedOrganizationId() {
         String organizationName1 = this.nameFactory.getOrganizationName();
         String organizationName2 = this.nameFactory.getOrganizationName();
 
@@ -1566,7 +1567,7 @@ public void listUsersFilterByBillingManagedOrganizationId() {
     }
 
     @Test
-    public void listUsersFilterByManagedOrganizationId() {
+    void listUsersFilterByManagedOrganizationId() {
         String organizationName1 = this.nameFactory.getOrganizationName();
         String organizationName2 = this.nameFactory.getOrganizationName();
 
@@ -1593,7 +1594,7 @@ public void listUsersFilterByManagedOrganizationId() {
     }
 
     @Test
-    public void listUsersFilterByManagedSpaceId() {
+    void listUsersFilterByManagedSpaceId() {
         String organizationName1 = this.nameFactory.getOrganizationName();
         String organizationName2 = this.nameFactory.getOrganizationName();
         String spaceName = this.nameFactory.getSpaceName();
@@ -1627,7 +1628,7 @@ public void listUsersFilterByManagedSpaceId() {
     }
 
     @Test
-    public void listUsersFilterBySpaceId() {
+    void listUsersFilterBySpaceId() {
         String organizationName1 = this.nameFactory.getOrganizationName();
         String organizationName2 = this.nameFactory.getOrganizationName();
         String spaceName = this.nameFactory.getSpaceName();
@@ -1661,7 +1662,7 @@ public void listUsersFilterBySpaceId() {
     }
 
     @Test
-    public void removeAuditor() {
+    void removeAuditor() {
         String organizationName = this.nameFactory.getOrganizationName();
 
         Mono
@@ -1682,7 +1683,7 @@ public void removeAuditor() {
     }
 
     @Test
-    public void removeAuditorByUsername() {
+    void removeAuditorByUsername() {
         String organizationName = this.nameFactory.getOrganizationName();
 
         Mono
@@ -1703,7 +1704,7 @@ public void removeAuditorByUsername() {
     }
 
     @Test
-    public void removeBillingManager() {
+    void removeBillingManager() {
         String organizationName = this.nameFactory.getOrganizationName();
 
         Mono
@@ -1724,7 +1725,7 @@ public void removeBillingManager() {
     }
 
     @Test
-    public void removeBillingManagerByUsername() {
+    void removeBillingManagerByUsername() {
         String organizationName = this.nameFactory.getOrganizationName();
 
         Mono
@@ -1746,7 +1747,7 @@ public void removeBillingManagerByUsername() {
     }
 
     @Test
-    public void removeManager() {
+    void removeManager() {
         String organizationName = this.nameFactory.getOrganizationName();
 
         Mono
@@ -1767,7 +1768,7 @@ public void removeManager() {
     }
 
     @Test
-    public void removeManagerByUsername() {
+    void removeManagerByUsername() {
         String organizationName = this.nameFactory.getOrganizationName();
 
         Mono
@@ -1788,7 +1789,7 @@ public void removeManagerByUsername() {
     }
 
     @Test
-    public void removePrivateDomain() {
+    void removePrivateDomain() {
         String domainName = this.nameFactory.getDomainName();
         String defaultOrganizationName = this.nameFactory.getOrganizationName();
         String organizationName = this.nameFactory.getOrganizationName();
@@ -1815,7 +1816,7 @@ public void removePrivateDomain() {
     }
 
     @Test
-    public void removeUser() {
+    void removeUser() {
         String organizationName = this.nameFactory.getOrganizationName();
 
         Mono
@@ -1836,7 +1837,7 @@ public void removeUser() {
     }
 
     @Test
-    public void removeUserByUsername() {
+    void removeUserByUsername() {
         String organizationName = this.nameFactory.getOrganizationName();
 
         Mono
@@ -1857,7 +1858,7 @@ public void removeUserByUsername() {
     }
 
     @Test
-    public void summary() {
+    void summary() {
         String organizationName = this.nameFactory.getOrganizationName();
 
         createOrganizationId(this.cloudFoundryClient, organizationName)
@@ -1873,7 +1874,7 @@ public void summary() {
     }
 
     @Test
-    public void update() {
+    void update() {
         String organizationName = this.nameFactory.getOrganizationName();
         String organizationName2 = this.nameFactory.getOrganizationName();
 
diff --git a/integration-test/src/test/java/org/cloudfoundry/client/v2/PrivateDomainsTest.java b/integration-test/src/test/java/org/cloudfoundry/client/v2/PrivateDomainsTest.java
index d1fd29709d..f35a6efd50 100644
--- a/integration-test/src/test/java/org/cloudfoundry/client/v2/PrivateDomainsTest.java
+++ b/integration-test/src/test/java/org/cloudfoundry/client/v2/PrivateDomainsTest.java
@@ -44,6 +44,7 @@
 import org.cloudfoundry.util.JobUtils;
 import org.cloudfoundry.util.PaginationUtils;
 import org.cloudfoundry.util.ResourceUtils;
+import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 import reactor.core.publisher.Flux;
 import reactor.core.publisher.Mono;
@@ -57,7 +58,7 @@
 import static org.cloudfoundry.util.tuple.TupleUtils.consumer;
 import static org.cloudfoundry.util.tuple.TupleUtils.function;
 
-public final class PrivateDomainsTest extends AbstractIntegrationTest {
+final class PrivateDomainsTest extends AbstractIntegrationTest {
 
     @Autowired
     private CloudFoundryClient cloudFoundryClient;
@@ -69,7 +70,7 @@ public final class PrivateDomainsTest extends AbstractIntegrationTest {
     private Mono<String> userId;
 
     @Test
-    public void create() {
+    void create() {
         String privateDomainName = this.nameFactory.getDomainName();
 
         this.organizationId
@@ -84,7 +85,7 @@ public void create() {
     }
 
     @Test
-    public void delete() {
+    void delete() {
         String privateDomainName = this.nameFactory.getDomainName();
 
         this.organizationId
@@ -98,7 +99,7 @@ public void delete() {
     }
 
     @Test
-    public void get() {
+    void get() {
         String privateDomainName = this.nameFactory.getDomainName();
 
         this.organizationId
@@ -117,7 +118,7 @@ public void get() {
     }
 
     @Test
-    public void list() {
+    void list() {
         String privateDomainName = this.nameFactory.getDomainName();
 
         this.organizationId
@@ -138,7 +139,7 @@ public void list() {
     }
 
     @Test
-    public void listFilterByName() {
+    void listFilterByName() {
         String privateDomainName = this.nameFactory.getDomainName();
 
         this.organizationId
@@ -159,7 +160,7 @@ public void listFilterByName() {
     }
 
     @Test
-    public void listSharedOrganizations() {
+    void listSharedOrganizations() {
         String sharedOrganizationName = this.nameFactory.getOrganizationName();
         String privateDomainName = this.nameFactory.getDomainName();
 
@@ -185,7 +186,7 @@ public void listSharedOrganizations() {
     }
 
     @Test
-    public void listSharedOrganizationsFilterByAuditorId() {
+    void listSharedOrganizationsFilterByAuditorId() {
         String sharedOrganizationName = this.nameFactory.getOrganizationName();
         String privateDomainName = this.nameFactory.getDomainName();
 
@@ -216,7 +217,7 @@ public void listSharedOrganizationsFilterByAuditorId() {
     }
 
     @Test
-    public void listSharedOrganizationsFilterByBillingManagerId() {
+    void listSharedOrganizationsFilterByBillingManagerId() {
         String sharedOrganizationName = this.nameFactory.getOrganizationName();
         String privateDomainName = this.nameFactory.getDomainName();
 
@@ -247,7 +248,7 @@ public void listSharedOrganizationsFilterByBillingManagerId() {
     }
 
     @Test
-    public void listSharedOrganizationsFilterByManagerId() {
+    void listSharedOrganizationsFilterByManagerId() {
         String sharedOrganizationName = this.nameFactory.getOrganizationName();
         String privateDomainName = this.nameFactory.getDomainName();
 
@@ -278,7 +279,7 @@ public void listSharedOrganizationsFilterByManagerId() {
     }
 
     @Test
-    public void listSharedOrganizationsFilterByName() {
+    void listSharedOrganizationsFilterByName() {
         String sharedOrganizationName = this.nameFactory.getOrganizationName();
         String privateDomainName = this.nameFactory.getDomainName();
 
@@ -304,7 +305,7 @@ public void listSharedOrganizationsFilterByName() {
     }
 
     @Test
-    public void listSharedOrganizationsFilterBySpaceId() {
+    void listSharedOrganizationsFilterBySpaceId() {
         String sharedOrganizationName = this.nameFactory.getOrganizationName();
         String privateDomainName = this.nameFactory.getDomainName();
         String spaceName = this.nameFactory.getSpaceName();
@@ -334,7 +335,7 @@ public void listSharedOrganizationsFilterBySpaceId() {
     }
 
     @Test
-    public void listSharedOrganizationsFilterByStatus() {
+    void listSharedOrganizationsFilterByStatus() {
         String sharedOrganizationName = this.nameFactory.getOrganizationName();
         String privateDomainName = this.nameFactory.getDomainName();
 
@@ -360,7 +361,7 @@ public void listSharedOrganizationsFilterByStatus() {
     }
 
     @Test
-    public void listSharedOrganizationsFilterByUserId() {
+    void listSharedOrganizationsFilterByUserId() {
         String sharedOrganizationName = this.nameFactory.getOrganizationName();
         String privateDomainName = this.nameFactory.getDomainName();
 
diff --git a/integration-test/src/test/java/org/cloudfoundry/client/v2/RouteMappingsTest.java b/integration-test/src/test/java/org/cloudfoundry/client/v2/RouteMappingsTest.java
index d56a526afa..eaee84f562 100644
--- a/integration-test/src/test/java/org/cloudfoundry/client/v2/RouteMappingsTest.java
+++ b/integration-test/src/test/java/org/cloudfoundry/client/v2/RouteMappingsTest.java
@@ -33,6 +33,7 @@
 import org.cloudfoundry.util.JobUtils;
 import org.cloudfoundry.util.PaginationUtils;
 import org.cloudfoundry.util.ResourceUtils;
+import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 import reactor.core.publisher.Mono;
 import reactor.test.StepVerifier;
@@ -43,7 +44,7 @@
 import static org.cloudfoundry.util.tuple.TupleUtils.consumer;
 import static org.cloudfoundry.util.tuple.TupleUtils.function;
 
-public final class RouteMappingsTest extends AbstractIntegrationTest {
+final class RouteMappingsTest extends AbstractIntegrationTest {
 
     @Autowired
     private CloudFoundryClient cloudFoundryClient;
@@ -52,7 +53,7 @@ public final class RouteMappingsTest extends AbstractIntegrationTest {
     private Mono<String> spaceId;
 
     @Test
-    public void createSharedDomain() {
+    void createSharedDomain() {
         String applicationName = this.nameFactory.getApplicationName();
         String domainName = this.nameFactory.getDomainName();
         String hostName = this.nameFactory.getHostName();
@@ -86,7 +87,7 @@ public void createSharedDomain() {
     }
 
     @Test
-    public void deleteAsyncFalse() {
+    void deleteAsyncFalse() {
         String applicationName = this.nameFactory.getApplicationName();
         String domainName = this.nameFactory.getDomainName();
         String hostName = this.nameFactory.getHostName();
@@ -105,7 +106,7 @@ public void deleteAsyncFalse() {
     }
 
     @Test
-    public void deleteAsyncTrue() {
+    void deleteAsyncTrue() {
         String applicationName = this.nameFactory.getApplicationName();
         String domainName = this.nameFactory.getDomainName();
         String hostName = this.nameFactory.getHostName();
@@ -125,7 +126,7 @@ public void deleteAsyncTrue() {
     }
 
     @Test
-    public void get() {
+    void get() {
         String applicationName = this.nameFactory.getApplicationName();
         String domainName = this.nameFactory.getDomainName();
         String hostName = this.nameFactory.getHostName();
@@ -146,7 +147,7 @@ public void get() {
     }
 
     @Test
-    public void listFilterByApplicationId() {
+    void listFilterByApplicationId() {
         String applicationName = this.nameFactory.getApplicationName();
         String domainName = this.nameFactory.getDomainName();
         String hostName = this.nameFactory.getHostName();
@@ -177,7 +178,7 @@ public void listFilterByApplicationId() {
     }
 
     @Test
-    public void listFilterByRouteId() {
+    void listFilterByRouteId() {
         String applicationName = this.nameFactory.getApplicationName();
         String domainName = this.nameFactory.getDomainName();
         String hostName = this.nameFactory.getHostName();
diff --git a/integration-test/src/test/java/org/cloudfoundry/client/v2/RoutesTest.java b/integration-test/src/test/java/org/cloudfoundry/client/v2/RoutesTest.java
index 7232e7aaab..2ee4f01182 100644
--- a/integration-test/src/test/java/org/cloudfoundry/client/v2/RoutesTest.java
+++ b/integration-test/src/test/java/org/cloudfoundry/client/v2/RoutesTest.java
@@ -41,6 +41,7 @@
 import org.cloudfoundry.util.JobUtils;
 import org.cloudfoundry.util.PaginationUtils;
 import org.cloudfoundry.util.ResourceUtils;
+import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 import reactor.core.publisher.Mono;
 import reactor.test.StepVerifier;
@@ -53,7 +54,7 @@
 import static org.cloudfoundry.util.tuple.TupleUtils.consumer;
 import static org.cloudfoundry.util.tuple.TupleUtils.function;
 
-public final class RoutesTest extends AbstractIntegrationTest {
+final class RoutesTest extends AbstractIntegrationTest {
 
     @Autowired
     private CloudFoundryClient cloudFoundryClient;
@@ -68,7 +69,7 @@ public final class RoutesTest extends AbstractIntegrationTest {
     private Mono<String> stackId;
 
     @Test
-    public void associateApplication() {
+    void associateApplication() {
         String applicationName = this.nameFactory.getApplicationName();
         String domainName = this.nameFactory.getDomainName();
 
@@ -96,7 +97,7 @@ public void associateApplication() {
     }
 
     @Test
-    public void create() {
+    void create() {
         String domainName = this.nameFactory.getDomainName();
 
         Mono
@@ -122,7 +123,7 @@ public void create() {
     }
 
     @Test
-    public void delete() {
+    void delete() {
         String domainName = this.nameFactory.getDomainName();
 
         Mono
@@ -145,7 +146,7 @@ public void delete() {
     }
 
     @Test
-    public void deleteAsyncFalse() {
+    void deleteAsyncFalse() {
         String domainName = this.nameFactory.getDomainName();
 
         Mono
@@ -167,7 +168,7 @@ public void deleteAsyncFalse() {
     }
 
     @Test
-    public void exists() {
+    void exists() {
         String domainName = this.nameFactory.getDomainName();
         String hostName = this.nameFactory.getHostName();
 
@@ -190,7 +191,7 @@ public void exists() {
     }
 
     @Test
-    public void existsDoesNotExist() {
+    void existsDoesNotExist() {
         String domainName = this.nameFactory.getDomainName();
         String hostName1 = this.nameFactory.getHostName();
         String hostName2 = this.nameFactory.getHostName();
@@ -219,7 +220,7 @@ public void existsDoesNotExist() {
     }
 
     @Test
-    public void get() {
+    void get() {
         String domainName = this.nameFactory.getDomainName();
 
         Mono
@@ -249,7 +250,7 @@ public void get() {
     }
 
     @Test
-    public void listApplications() {
+    void listApplications() {
         String applicationName = this.nameFactory.getApplicationName();
         String domainName = this.nameFactory.getDomainName();
 
@@ -277,7 +278,7 @@ public void listApplications() {
     }
 
     @Test
-    public void listApplicationsFilterByDiego() {
+    void listApplicationsFilterByDiego() {
         String applicationName = this.nameFactory.getApplicationName();
         String domainName = this.nameFactory.getDomainName();
 
@@ -306,7 +307,7 @@ public void listApplicationsFilterByDiego() {
     }
 
     @Test
-    public void listApplicationsFilterByName() {
+    void listApplicationsFilterByName() {
         String applicationName = this.nameFactory.getApplicationName();
         String domainName = this.nameFactory.getDomainName();
 
@@ -335,7 +336,7 @@ public void listApplicationsFilterByName() {
     }
 
     @Test
-    public void listApplicationsFilterByOrganizationId() {
+    void listApplicationsFilterByOrganizationId() {
         String applicationName = this.nameFactory.getApplicationName();
         String domainName = this.nameFactory.getDomainName();
 
@@ -365,7 +366,7 @@ public void listApplicationsFilterByOrganizationId() {
     }
 
     @Test
-    public void listApplicationsFilterBySpaceId() {
+    void listApplicationsFilterBySpaceId() {
         String applicationName = this.nameFactory.getApplicationName();
         String domainName = this.nameFactory.getDomainName();
 
@@ -395,7 +396,7 @@ public void listApplicationsFilterBySpaceId() {
     }
 
     @Test
-    public void listApplicationsFilterByStackId() {
+    void listApplicationsFilterByStackId() {
         String applicationName = this.nameFactory.getApplicationName();
         String domainName = this.nameFactory.getDomainName();
 
@@ -427,7 +428,7 @@ public void listApplicationsFilterByStackId() {
     }
 
     @Test
-    public void listFilterByDomainId() {
+    void listFilterByDomainId() {
         String domainName = this.nameFactory.getDomainName();
 
         Mono
@@ -450,7 +451,7 @@ public void listFilterByDomainId() {
     }
 
     @Test
-    public void listFilterByHost() {
+    void listFilterByHost() {
         String domainName = this.nameFactory.getDomainName();
         String host = this.nameFactory.getHostName();
 
@@ -474,7 +475,7 @@ public void listFilterByHost() {
     }
 
     @Test
-    public void listFilterByOrganizationId() {
+    void listFilterByOrganizationId() {
         String domainName = this.nameFactory.getDomainName();
 
         this.organizationId
@@ -498,7 +499,7 @@ public void listFilterByOrganizationId() {
     }
 
     @Test
-    public void listFilterByPath() {
+    void listFilterByPath() {
         String domainName = this.nameFactory.getDomainName();
         String path = this.nameFactory.getPath();
 
@@ -527,7 +528,7 @@ public void listFilterByPath() {
     }
 
     @Test
-    public void listMappings() {
+    void listMappings() {
         String applicationName = this.nameFactory.getApplicationName();
         String domainName = this.nameFactory.getDomainName();
 
@@ -559,7 +560,7 @@ public void listMappings() {
     }
 
     @Test
-    public void listMappingsFilterByApplicationId() {
+    void listMappingsFilterByApplicationId() {
         String applicationName = this.nameFactory.getApplicationName();
         String domainName = this.nameFactory.getDomainName();
 
@@ -592,7 +593,7 @@ public void listMappingsFilterByApplicationId() {
     }
 
     @Test
-    public void removeApplication() {
+    void removeApplication() {
         String applicationName = this.nameFactory.getApplicationName();
         String domainName = this.nameFactory.getDomainName();
 
@@ -624,7 +625,7 @@ public void removeApplication() {
     }
 
     @Test
-    public void update() {
+    void update() {
         String domainName = this.nameFactory.getDomainName();
 
         Mono
diff --git a/integration-test/src/test/java/org/cloudfoundry/client/v2/SecurityGroupsTest.java b/integration-test/src/test/java/org/cloudfoundry/client/v2/SecurityGroupsTest.java
index a3256df3c4..3bcc7e7c97 100644
--- a/integration-test/src/test/java/org/cloudfoundry/client/v2/SecurityGroupsTest.java
+++ b/integration-test/src/test/java/org/cloudfoundry/client/v2/SecurityGroupsTest.java
@@ -45,6 +45,7 @@
 import org.cloudfoundry.util.JobUtils;
 import org.cloudfoundry.util.PaginationUtils;
 import org.cloudfoundry.util.ResourceUtils;
+import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 import reactor.core.publisher.Flux;
 import reactor.core.publisher.Mono;
@@ -55,7 +56,7 @@
 import static org.cloudfoundry.client.v2.securitygroups.Protocol.TCP;
 import static org.cloudfoundry.util.tuple.TupleUtils.function;
 
-public final class SecurityGroupsTest extends AbstractIntegrationTest {
+final class SecurityGroupsTest extends AbstractIntegrationTest {
 
     @Autowired
     private CloudFoundryClient cloudFoundryClient;
@@ -64,7 +65,7 @@ public final class SecurityGroupsTest extends AbstractIntegrationTest {
     private Mono<String> organizationId;
 
     @Test
-    public void associateSpace() {
+    void associateSpace() {
         String securityGroupName = this.nameFactory.getSecurityGroupName();
         String spaceName = this.nameFactory.getSpaceName();
 
@@ -87,7 +88,7 @@ public void associateSpace() {
     }
 
     @Test
-    public void create() {
+    void create() {
         String securityGroupName = this.nameFactory.getSecurityGroupName();
 
         this.cloudFoundryClient.securityGroups()
@@ -109,7 +110,7 @@ public void create() {
     }
 
     @Test
-    public void delete() {
+    void delete() {
         String securityGroupName = this.nameFactory.getSecurityGroupName();
 
         createSecurityGroupId(this.cloudFoundryClient, securityGroupName)
@@ -125,7 +126,7 @@ public void delete() {
     }
 
     @Test
-    public void deleteSpace() {
+    void deleteSpace() {
         String securityGroupName = this.nameFactory.getSecurityGroupName();
         String spaceName = this.nameFactory.getSpaceName();
 
@@ -147,7 +148,7 @@ public void deleteSpace() {
     }
 
     @Test
-    public void get() {
+    void get() {
         String securityGroupName = this.nameFactory.getSecurityGroupName();
 
         createSecurityGroupId(this.cloudFoundryClient, securityGroupName)
@@ -164,7 +165,7 @@ public void get() {
     }
 
     @Test
-    public void list() {
+    void list() {
         String securityGroupName = this.nameFactory.getSecurityGroupName();
 
         requestCreateSecurityGroup(this.cloudFoundryClient, securityGroupName)
@@ -183,7 +184,7 @@ public void list() {
     }
 
     @Test
-    public void listRunningDefaults() {
+    void listRunningDefaults() {
         String securityGroupName1 = this.nameFactory.getSecurityGroupName();
         String securityGroupName2 = this.nameFactory.getSecurityGroupName();
 
@@ -200,7 +201,7 @@ public void listRunningDefaults() {
     }
 
     @Test
-    public void listSpaces() {
+    void listSpaces() {
         String securityGroupName = this.nameFactory.getSecurityGroupName();
         String spaceName = this.nameFactory.getSpaceName();
 
@@ -227,7 +228,7 @@ public void listSpaces() {
     }
 
     @Test
-    public void listStagingDefaults() {
+    void listStagingDefaults() {
         String securityGroupName1 = this.nameFactory.getSecurityGroupName();
         String securityGroupName2 = this.nameFactory.getSecurityGroupName();
 
@@ -244,7 +245,7 @@ public void listStagingDefaults() {
     }
 
     @Test
-    public void setRunningDefault() {
+    void setRunningDefault() {
         String securityGroupName = this.nameFactory.getSecurityGroupName();
 
         createSecurityGroupId(this.cloudFoundryClient, securityGroupName)
@@ -261,7 +262,7 @@ public void setRunningDefault() {
     }
 
     @Test
-    public void setStagingDefault() {
+    void setStagingDefault() {
         String securityGroupName = this.nameFactory.getSecurityGroupName();
 
         createSecurityGroupId(this.cloudFoundryClient, securityGroupName)
@@ -278,7 +279,7 @@ public void setStagingDefault() {
     }
 
     @Test
-    public void unsetRunningDefault() {
+    void unsetRunningDefault() {
         String securityGroupName = this.nameFactory.getSecurityGroupName();
 
         createSecurityGroupId(this.cloudFoundryClient, securityGroupName)
@@ -295,7 +296,7 @@ public void unsetRunningDefault() {
     }
 
     @Test
-    public void unsetStagingDefault() {
+    void unsetStagingDefault() {
         String securityGroupName = this.nameFactory.getSecurityGroupName();
 
         createSecurityGroupId(this.cloudFoundryClient, securityGroupName)
@@ -312,7 +313,7 @@ public void unsetStagingDefault() {
     }
 
     @Test
-    public void update() {
+    void update() {
         String oldSecurityGroupName = this.nameFactory.getSecurityGroupName();
         String newSecurityGroupName = this.nameFactory.getSecurityGroupName();
 
diff --git a/integration-test/src/test/java/org/cloudfoundry/client/v2/ServiceBindingsTest.java b/integration-test/src/test/java/org/cloudfoundry/client/v2/ServiceBindingsTest.java
index f9a482729f..62c12e114f 100644
--- a/integration-test/src/test/java/org/cloudfoundry/client/v2/ServiceBindingsTest.java
+++ b/integration-test/src/test/java/org/cloudfoundry/client/v2/ServiceBindingsTest.java
@@ -34,6 +34,7 @@
 import org.cloudfoundry.util.JobUtils;
 import org.cloudfoundry.util.PaginationUtils;
 import org.cloudfoundry.util.ResourceUtils;
+import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 import reactor.core.publisher.Flux;
 import reactor.core.publisher.Mono;
@@ -49,7 +50,7 @@
 import static org.cloudfoundry.util.tuple.TupleUtils.consumer;
 import static org.cloudfoundry.util.tuple.TupleUtils.function;
 
-public final class ServiceBindingsTest extends AbstractIntegrationTest {
+final class ServiceBindingsTest extends AbstractIntegrationTest {
 
     @Autowired
     private CloudFoundryClient cloudFoundryClient;
@@ -58,7 +59,7 @@ public final class ServiceBindingsTest extends AbstractIntegrationTest {
     private Mono<String> spaceId;
 
     @Test
-    public void create() {
+    void create() {
         String applicationName = this.nameFactory.getApplicationName();
         String serviceInstanceName = this.nameFactory.getServiceInstanceName();
 
@@ -75,7 +76,7 @@ public void create() {
     }
 
     @Test
-    public void delete() {
+    void delete() {
         String applicationName = this.nameFactory.getApplicationName();
         String serviceInstanceName = this.nameFactory.getServiceInstanceName();
 
@@ -93,7 +94,7 @@ public void delete() {
     }
 
     @Test
-    public void get() {
+    void get() {
         String applicationName = this.nameFactory.getApplicationName();
         String serviceInstanceName = this.nameFactory.getServiceInstanceName();
 
@@ -115,7 +116,7 @@ public void get() {
     }
 
     @Test
-    public void list() {
+    void list() {
         String applicationName = this.nameFactory.getApplicationName();
         String serviceInstanceName = this.nameFactory.getServiceInstanceName();
 
@@ -139,7 +140,7 @@ public void list() {
     }
 
     @Test
-    public void listFilterByApplicationId() {
+    void listFilterByApplicationId() {
         String applicationName = this.nameFactory.getApplicationName();
         String serviceInstanceName = this.nameFactory.getServiceInstanceName();
 
@@ -163,7 +164,7 @@ public void listFilterByApplicationId() {
     }
 
     @Test
-    public void listFilterByServiceInstanceId() {
+    void listFilterByServiceInstanceId() {
         String applicationName = this.nameFactory.getApplicationName();
         String serviceInstanceName = this.nameFactory.getServiceInstanceName();
 
diff --git a/integration-test/src/test/java/org/cloudfoundry/client/v2/ServiceBrokersTest.java b/integration-test/src/test/java/org/cloudfoundry/client/v2/ServiceBrokersTest.java
index 96e7fc3118..8a80e3f141 100644
--- a/integration-test/src/test/java/org/cloudfoundry/client/v2/ServiceBrokersTest.java
+++ b/integration-test/src/test/java/org/cloudfoundry/client/v2/ServiceBrokersTest.java
@@ -29,6 +29,7 @@
 import org.cloudfoundry.client.v2.spaces.CreateSpaceResponse;
 import org.cloudfoundry.util.PaginationUtils;
 import org.cloudfoundry.util.ResourceUtils;
+import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.core.io.ClassPathResource;
 import reactor.core.Exceptions;
@@ -43,7 +44,7 @@
 import static org.cloudfoundry.ServiceBrokerUtils.createServiceBroker;
 import static org.cloudfoundry.ServiceBrokerUtils.deleteServiceBroker;
 
-public final class ServiceBrokersTest extends AbstractIntegrationTest {
+final class ServiceBrokersTest extends AbstractIntegrationTest {
 
     @Autowired
     private CloudFoundryClient cloudFoundryClient;
@@ -58,7 +59,7 @@ public final class ServiceBrokersTest extends AbstractIntegrationTest {
     private String serviceBrokerName;
 
     @Test
-    public void create() {
+    void create() {
         String planName = this.nameFactory.getPlanName();
         String serviceBrokerName = this.nameFactory.getServiceBrokerName();
         String serviceName = this.nameFactory.getServiceName();
@@ -100,7 +101,7 @@ public void create() {
     }
 
     @Test
-    public void delete() {
+    void delete() {
         String planName = this.nameFactory.getPlanName();
         String serviceBrokerName = this.nameFactory.getServiceBrokerName();
         String serviceName = this.nameFactory.getServiceName();
@@ -130,7 +131,7 @@ public void delete() {
     }
 
     @Test
-    public void get() {
+    void get() {
         this.serviceBrokerId
             .flatMap(serviceBrokerId -> this.cloudFoundryClient.serviceBrokers()
                 .get(GetServiceBrokerRequest.builder()
@@ -143,7 +144,7 @@ public void get() {
     }
 
     @Test
-    public void list() {
+    void list() {
         PaginationUtils
             .requestClientV2Resources(page -> this.cloudFoundryClient.serviceBrokers()
                 .list(ListServiceBrokersRequest.builder()
@@ -157,7 +158,7 @@ public void list() {
     }
 
     @Test
-    public void update() {
+    void update() {
         String planName = this.nameFactory.getPlanName();
         String serviceBrokerName1 = this.nameFactory.getServiceBrokerName();
         String serviceBrokerName2 = this.nameFactory.getServiceBrokerName();
diff --git a/integration-test/src/test/java/org/cloudfoundry/client/v2/ServiceInstancesTest.java b/integration-test/src/test/java/org/cloudfoundry/client/v2/ServiceInstancesTest.java
index 021d6e1a03..20c20505de 100644
--- a/integration-test/src/test/java/org/cloudfoundry/client/v2/ServiceInstancesTest.java
+++ b/integration-test/src/test/java/org/cloudfoundry/client/v2/ServiceInstancesTest.java
@@ -53,6 +53,7 @@
 import org.cloudfoundry.util.LastOperationUtils;
 import org.cloudfoundry.util.PaginationUtils;
 import org.cloudfoundry.util.ResourceUtils;
+import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 import reactor.core.publisher.Flux;
 import reactor.core.publisher.Mono;
@@ -65,7 +66,7 @@
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.cloudfoundry.util.tuple.TupleUtils.function;
 
-public final class ServiceInstancesTest extends AbstractIntegrationTest {
+final class ServiceInstancesTest extends AbstractIntegrationTest {
 
     private static final String DEFAULT_ROUTER_GROUP = "default-tcp";
 
@@ -88,7 +89,7 @@ public final class ServiceInstancesTest extends AbstractIntegrationTest {
     private Mono<String> spaceId;
 
     @Test
-    public void bindRoute() {
+    void bindRoute() {
         String domainName = this.nameFactory.getDomainName();
         String hostName = this.nameFactory.getHostName();
         String serviceInstanceName = this.nameFactory.getServiceInstanceName();
@@ -120,7 +121,7 @@ public void bindRoute() {
     }
 
     @Test
-    public void create() {
+    void create() {
         String serviceInstanceName = this.nameFactory.getServiceInstanceName();
 
         Mono
@@ -143,7 +144,7 @@ public void create() {
     }
 
     @Test
-    public void createAcceptsIncomplete() {
+    void createAcceptsIncomplete() {
         String serviceInstanceName = this.nameFactory.getServiceInstanceName();
 
         Mono
@@ -166,7 +167,7 @@ public void createAcceptsIncomplete() {
     }
 
     @Test
-    public void delete() {
+    void delete() {
         String serviceInstanceName = this.nameFactory.getServiceInstanceName();
 
         this.spaceId
@@ -184,7 +185,7 @@ public void delete() {
     }
 
     @Test
-    public void deleteAcceptsIncomplete() {
+    void deleteAcceptsIncomplete() {
         String serviceInstanceName = this.nameFactory.getServiceInstanceName();
 
         this.spaceId
@@ -207,7 +208,7 @@ public void deleteAcceptsIncomplete() {
     }
 
     @Test
-    public void deleteAcceptsIncompleteAsyncFalse() {
+    void deleteAcceptsIncompleteAsyncFalse() {
         String serviceInstanceName = this.nameFactory.getServiceInstanceName();
 
         this.spaceId
@@ -230,7 +231,7 @@ public void deleteAcceptsIncompleteAsyncFalse() {
     }
 
     @Test
-    public void deleteAsyncFalse() {
+    void deleteAsyncFalse() {
         String serviceInstanceName = this.nameFactory.getServiceInstanceName();
 
         this.spaceId
@@ -247,7 +248,7 @@ public void deleteAsyncFalse() {
     }
 
     @Test
-    public void deletePurge() {
+    void deletePurge() {
         String domainName = this.nameFactory.getDomainName();
         String serviceInstanceName = this.nameFactory.getServiceInstanceName();
 
@@ -276,7 +277,7 @@ public void deletePurge() {
     }
 
     @Test
-    public void deleteRecursive() {
+    void deleteRecursive() {
         String domainName = this.nameFactory.getDomainName();
         String serviceInstanceName = this.nameFactory.getServiceInstanceName();
 
@@ -305,7 +306,7 @@ public void deleteRecursive() {
     }
 
     @Test
-    public void get() {
+    void get() {
         String serviceInstanceName = this.nameFactory.getServiceInstanceName();
 
         this.spaceId
@@ -322,7 +323,7 @@ public void get() {
     }
 
     @Test
-    public void getNotFound() {
+    void getNotFound() {
         this.cloudFoundryClient.serviceInstances()
             .get(GetServiceInstanceRequest.builder()
                 .serviceInstanceId("test-service-instance-id")
@@ -333,7 +334,7 @@ public void getNotFound() {
     }
 
     @Test
-    public void list() {
+    void list() {
         String serviceInstanceName = this.nameFactory.getServiceInstanceName();
 
         this.spaceId
@@ -351,7 +352,7 @@ public void list() {
     }
 
     @Test
-    public void listFilterByName() {
+    void listFilterByName() {
         String serviceInstanceName = this.nameFactory.getServiceInstanceName();
 
         this.spaceId
@@ -370,7 +371,7 @@ public void listFilterByName() {
     }
 
     @Test
-    public void listFilterByOrganizationId() {
+    void listFilterByOrganizationId() {
         String serviceInstanceName = this.nameFactory.getServiceInstanceName();
 
         Mono
@@ -392,7 +393,7 @@ public void listFilterByOrganizationId() {
     }
 
     @Test
-    public void listFilterByServiceBindingId() {
+    void listFilterByServiceBindingId() {
         String applicationName = this.nameFactory.getApplicationName();
         String serviceInstanceName = this.nameFactory.getServiceInstanceName();
 
@@ -416,7 +417,7 @@ public void listFilterByServiceBindingId() {
     }
 
     @Test
-    public void listFilterByServiceKeyId() {
+    void listFilterByServiceKeyId() {
         String serviceInstanceName = this.nameFactory.getServiceInstanceName();
         String serviceKeyName = this.nameFactory.getServiceKeyName();
 
@@ -437,7 +438,7 @@ public void listFilterByServiceKeyId() {
     }
 
     @Test
-    public void listFilterByServicePlanId() {
+    void listFilterByServicePlanId() {
         String serviceInstanceName = this.nameFactory.getServiceInstanceName();
 
         Mono
@@ -462,7 +463,7 @@ public void listFilterByServicePlanId() {
     }
 
     @Test
-    public void listFilterBySpaceId() {
+    void listFilterBySpaceId() {
         String serviceInstanceName = this.nameFactory.getServiceInstanceName();
 
         this.spaceId
@@ -482,7 +483,7 @@ public void listFilterBySpaceId() {
     }
 
     @Test
-    public void listRoutes() {
+    void listRoutes() {
         String domainName = this.nameFactory.getDomainName();
         String hostName = this.nameFactory.getHostName();
         String serviceInstanceName = this.nameFactory.getServiceInstanceName();
@@ -515,7 +516,7 @@ public void listRoutes() {
     }
 
     @Test
-    public void listRoutesFilterByDomainId() {
+    void listRoutesFilterByDomainId() {
         String domainName = this.nameFactory.getDomainName();
         String hostName = this.nameFactory.getHostName();
         String serviceInstanceName = this.nameFactory.getServiceInstanceName();
@@ -550,7 +551,7 @@ public void listRoutesFilterByDomainId() {
     }
 
     @Test
-    public void listRoutesFilterByHost() {
+    void listRoutesFilterByHost() {
         String domainName = this.nameFactory.getDomainName();
         String hostName = this.nameFactory.getHostName();
         String serviceInstanceName = this.nameFactory.getServiceInstanceName();
@@ -584,7 +585,7 @@ public void listRoutesFilterByHost() {
     }
 
     @Test
-    public void listRoutesFilterByPath() {
+    void listRoutesFilterByPath() {
         String domainName = this.nameFactory.getDomainName();
         String serviceInstanceName = this.nameFactory.getServiceInstanceName();
         String path = this.nameFactory.getPath();
@@ -618,7 +619,7 @@ public void listRoutesFilterByPath() {
     }
 
     @Test
-    public void listServiceBindings() {
+    void listServiceBindings() {
         String applicationName = this.nameFactory.getApplicationName();
         String serviceInstanceName = this.nameFactory.getServiceInstanceName();
 
@@ -646,7 +647,7 @@ public void listServiceBindings() {
     }
 
     @Test
-    public void listServiceBindingsFilterByApplicationId() {
+    void listServiceBindingsFilterByApplicationId() {
         String applicationName = this.nameFactory.getApplicationName();
         String serviceInstanceName = this.nameFactory.getServiceInstanceName();
 
@@ -670,7 +671,7 @@ public void listServiceBindingsFilterByApplicationId() {
     }
 
     @Test
-    public void unbindRoute() {
+    void unbindRoute() {
         String domainName = this.nameFactory.getDomainName();
         String hostName = this.nameFactory.getHostName();
         String serviceInstanceName = this.nameFactory.getServiceInstanceName();
@@ -701,7 +702,7 @@ public void unbindRoute() {
     }
 
     @Test
-    public void update() {
+    void update() {
         String oldServiceInstanceName = this.nameFactory.getServiceInstanceName();
         String newServiceInstanceName = this.nameFactory.getServiceInstanceName();
 
@@ -720,7 +721,7 @@ public void update() {
     }
 
     @Test
-    public void updateEmptyCollections() {
+    void updateEmptyCollections() {
         String oldServiceInstanceName = this.nameFactory.getServiceInstanceName();
         String newServiceInstanceName = this.nameFactory.getServiceInstanceName();
 
@@ -741,7 +742,7 @@ public void updateEmptyCollections() {
 
     @IfCloudFoundryVersion(greaterThanOrEqualTo = CloudFoundryVersion.PCF_2_7)
     @Test
-    public void upgrade() {
+    void upgrade() {
         String serviceInstanceName = this.nameFactory.getServiceInstanceName();
 
         this.spaceId
diff --git a/integration-test/src/test/java/org/cloudfoundry/client/v2/ServiceKeysTest.java b/integration-test/src/test/java/org/cloudfoundry/client/v2/ServiceKeysTest.java
index ae12918d5c..992662cc93 100644
--- a/integration-test/src/test/java/org/cloudfoundry/client/v2/ServiceKeysTest.java
+++ b/integration-test/src/test/java/org/cloudfoundry/client/v2/ServiceKeysTest.java
@@ -33,6 +33,7 @@
 import org.cloudfoundry.client.v2.services.ServiceResource;
 import org.cloudfoundry.util.PaginationUtils;
 import org.cloudfoundry.util.ResourceUtils;
+import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 import reactor.core.publisher.Flux;
 import reactor.core.publisher.Mono;
@@ -42,7 +43,7 @@
 
 import static org.cloudfoundry.util.tuple.TupleUtils.function;
 
-public final class ServiceKeysTest extends AbstractIntegrationTest {
+final class ServiceKeysTest extends AbstractIntegrationTest {
 
     @Autowired
     private CloudFoundryClient cloudFoundryClient;
@@ -58,7 +59,7 @@ public final class ServiceKeysTest extends AbstractIntegrationTest {
 
     @SuppressWarnings("unchecked")
     @Test
-    public void create() {
+    void create() {
         String serviceInstanceName = this.nameFactory.getServiceInstanceName();
         String serviceKeyName = this.nameFactory.getServiceKeyName();
 
@@ -81,7 +82,7 @@ public void create() {
     }
 
     @Test
-    public void delete() {
+    void delete() {
         String serviceInstanceName = this.nameFactory.getServiceInstanceName();
         String serviceKeyName = this.nameFactory.getServiceKeyName();
 
@@ -101,7 +102,7 @@ public void delete() {
     }
 
     @Test
-    public void get() {
+    void get() {
         String serviceInstanceName = this.nameFactory.getServiceInstanceName();
         String serviceKeyName = this.nameFactory.getServiceKeyName();
 
@@ -121,7 +122,7 @@ public void get() {
     }
 
     @Test
-    public void list() {
+    void list() {
         String serviceInstanceName = this.nameFactory.getServiceInstanceName();
         String serviceKeyName = this.nameFactory.getServiceKeyName();
 
@@ -143,7 +144,7 @@ public void list() {
     }
 
     @Test
-    public void listFilterByName() {
+    void listFilterByName() {
         String serviceInstanceName = this.nameFactory.getServiceInstanceName();
         String serviceKeyName = this.nameFactory.getServiceKeyName();
 
@@ -165,7 +166,7 @@ public void listFilterByName() {
     }
 
     @Test
-    public void listFilterByServiceInstanceId() {
+    void listFilterByServiceInstanceId() {
         String serviceInstanceName = this.nameFactory.getServiceInstanceName();
         String serviceKeyName = this.nameFactory.getServiceKeyName();
 
diff --git a/integration-test/src/test/java/org/cloudfoundry/client/v2/ServicePlanVisibilitiesTest.java b/integration-test/src/test/java/org/cloudfoundry/client/v2/ServicePlanVisibilitiesTest.java
index 88a2d31b1c..2826259197 100644
--- a/integration-test/src/test/java/org/cloudfoundry/client/v2/ServicePlanVisibilitiesTest.java
+++ b/integration-test/src/test/java/org/cloudfoundry/client/v2/ServicePlanVisibilitiesTest.java
@@ -35,6 +35,7 @@
 import org.cloudfoundry.util.JobUtils;
 import org.cloudfoundry.util.PaginationUtils;
 import org.cloudfoundry.util.ResourceUtils;
+import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 import reactor.core.publisher.Flux;
 import reactor.core.publisher.Mono;
@@ -47,7 +48,7 @@
 import static org.cloudfoundry.ServiceBrokerUtils.deleteServiceBroker;
 import static org.cloudfoundry.util.tuple.TupleUtils.function;
 
-public final class ServicePlanVisibilitiesTest extends AbstractIntegrationTest {
+final class ServicePlanVisibilitiesTest extends AbstractIntegrationTest {
 
     @Autowired
     private CloudFoundryClient cloudFoundryClient;
@@ -56,7 +57,7 @@ public final class ServicePlanVisibilitiesTest extends AbstractIntegrationTest {
     private Mono<String> organizationId;
 
     @Test
-    public void create() {
+    void create() {
         String planName = this.nameFactory.getPlanName();
         String serviceBrokerName = this.nameFactory.getServiceBrokerName();
         String serviceName = this.nameFactory.getServiceName();
@@ -90,7 +91,7 @@ public void create() {
     }
 
     @Test
-    public void delete() {
+    void delete() {
         String planName = this.nameFactory.getPlanName();
         String serviceBrokerName = this.nameFactory.getServiceBrokerName();
         String serviceName = this.nameFactory.getServiceName();
@@ -127,7 +128,7 @@ public void delete() {
     }
 
     @Test
-    public void deleteAsyncFalse() {
+    void deleteAsyncFalse() {
         String planName = this.nameFactory.getPlanName();
         String serviceBrokerName = this.nameFactory.getServiceBrokerName();
         String serviceName = this.nameFactory.getServiceName();
@@ -163,7 +164,7 @@ public void deleteAsyncFalse() {
     }
 
     @Test
-    public void get() {
+    void get() {
         String planName = this.nameFactory.getPlanName();
         String serviceBrokerName = this.nameFactory.getServiceBrokerName();
         String serviceName = this.nameFactory.getServiceName();
@@ -201,7 +202,7 @@ public void get() {
     }
 
     @Test
-    public void list() {
+    void list() {
         String planName = this.nameFactory.getPlanName();
         String serviceBrokerName = this.nameFactory.getServiceBrokerName();
         String serviceName = this.nameFactory.getServiceName();
@@ -242,7 +243,7 @@ public void list() {
     }
 
     @Test
-    public void listFilterByOrganizationId() {
+    void listFilterByOrganizationId() {
         String planName = this.nameFactory.getPlanName();
         String serviceBrokerName = this.nameFactory.getServiceBrokerName();
         String serviceName = this.nameFactory.getServiceName();
@@ -284,7 +285,7 @@ public void listFilterByOrganizationId() {
     }
 
     @Test
-    public void listFilterByServicePlanId() {
+    void listFilterByServicePlanId() {
         String planName = this.nameFactory.getPlanName();
         String serviceBrokerName = this.nameFactory.getServiceBrokerName();
         String serviceName = this.nameFactory.getServiceName();
@@ -325,7 +326,7 @@ public void listFilterByServicePlanId() {
     }
 
     @Test
-    public void update() {
+    void update() {
         String organizationName = this.nameFactory.getOrganizationName();
         String planName = this.nameFactory.getPlanName();
         String serviceBrokerName = this.nameFactory.getServiceBrokerName();
diff --git a/integration-test/src/test/java/org/cloudfoundry/client/v2/ServicePlansTest.java b/integration-test/src/test/java/org/cloudfoundry/client/v2/ServicePlansTest.java
index 1c60929057..157e8253c8 100644
--- a/integration-test/src/test/java/org/cloudfoundry/client/v2/ServicePlansTest.java
+++ b/integration-test/src/test/java/org/cloudfoundry/client/v2/ServicePlansTest.java
@@ -42,6 +42,7 @@
 import org.cloudfoundry.util.JobUtils;
 import org.cloudfoundry.util.PaginationUtils;
 import org.cloudfoundry.util.ResourceUtils;
+import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 import reactor.core.publisher.Flux;
 import reactor.core.publisher.Mono;
@@ -53,7 +54,7 @@
 import static org.cloudfoundry.ServiceBrokerUtils.deleteServiceBroker;
 import static org.cloudfoundry.util.tuple.TupleUtils.function;
 
-public final class ServicePlansTest extends AbstractIntegrationTest {
+final class ServicePlansTest extends AbstractIntegrationTest {
 
     @Autowired
     private CloudFoundryClient cloudFoundryClient;
@@ -74,7 +75,7 @@ public final class ServicePlansTest extends AbstractIntegrationTest {
     private Mono<String> spaceId;
 
     @Test
-    public void delete() {
+    void delete() {
         String planName = this.nameFactory.getPlanName();
         String serviceBrokerName = this.nameFactory.getServiceBrokerName();
         String serviceName = this.nameFactory.getServiceName();
@@ -103,7 +104,7 @@ public void delete() {
     }
 
     @Test
-    public void deleteAsyncFalse() {
+    void deleteAsyncFalse() {
         String planName = this.nameFactory.getPlanName();
         String serviceBrokerName = this.nameFactory.getServiceBrokerName();
         String serviceName = this.nameFactory.getServiceName();
@@ -131,7 +132,7 @@ public void deleteAsyncFalse() {
     }
 
     @Test
-    public void get() {
+    void get() {
         this.serviceBrokerId
             .flatMap(serviceBrokerId -> getServicePlanId(this.cloudFoundryClient, serviceBrokerId))
             .flatMap(servicePlanId -> this.cloudFoundryClient.servicePlans()
@@ -146,7 +147,7 @@ public void get() {
     }
 
     @Test
-    public void list() {
+    void list() {
         PaginationUtils
             .requestClientV2Resources(page -> this.cloudFoundryClient.servicePlans()
                 .list(ListServicePlansRequest.builder()
@@ -161,7 +162,7 @@ public void list() {
     }
 
     @Test
-    public void listFilterByActive() {
+    void listFilterByActive() {
         PaginationUtils
             .requestClientV2Resources(page -> this.cloudFoundryClient.servicePlans()
                 .list(ListServicePlansRequest.builder()
@@ -177,7 +178,7 @@ public void listFilterByActive() {
     }
 
     @Test
-    public void listFilterByServiceBrokerId() {
+    void listFilterByServiceBrokerId() {
         this.serviceBrokerId
             .flatMapMany(serviceBrokerId -> PaginationUtils
                 .requestClientV2Resources(page -> this.cloudFoundryClient.servicePlans()
@@ -194,7 +195,7 @@ public void listFilterByServiceBrokerId() {
     }
 
     @Test
-    public void listFilterByServiceId() {
+    void listFilterByServiceId() {
         this.serviceBrokerId
             .flatMap(serviceBrokerId -> getServiceId(this.cloudFoundryClient, this.serviceName))
             .flatMapMany(serviceId -> PaginationUtils
@@ -211,7 +212,7 @@ public void listFilterByServiceId() {
     }
 
     @Test
-    public void listFilterByServiceInstanceId() {
+    void listFilterByServiceInstanceId() {
         String serviceInstanceName = this.nameFactory.getServiceInstanceName();
 
         this.serviceBrokerId
@@ -234,7 +235,7 @@ public void listFilterByServiceInstanceId() {
     }
 
     @Test
-    public void listServiceInstances() {
+    void listServiceInstances() {
         String serviceInstanceName = this.nameFactory.getServiceInstanceName();
 
         this.serviceBrokerId
@@ -259,7 +260,7 @@ public void listServiceInstances() {
     }
 
     @Test
-    public void listServiceInstancesFilterByName() {
+    void listServiceInstancesFilterByName() {
         String serviceInstanceName = this.nameFactory.getServiceInstanceName();
 
         this.serviceBrokerId
@@ -284,7 +285,7 @@ public void listServiceInstancesFilterByName() {
     }
 
     @Test
-    public void listServiceInstancesFilterByServiceBindingId() {
+    void listServiceInstancesFilterByServiceBindingId() {
         String applicationName = this.nameFactory.getApplicationName();
         String serviceInstanceName = this.nameFactory.getServiceInstanceName();
 
@@ -317,7 +318,7 @@ public void listServiceInstancesFilterByServiceBindingId() {
     }
 
     @Test
-    public void listServiceInstancesFilterByServiceKeyId() {
+    void listServiceInstancesFilterByServiceKeyId() {
         String serviceKeyName = this.nameFactory.getServiceKeyName();
         String serviceInstanceName = this.nameFactory.getServiceInstanceName();
 
@@ -349,7 +350,7 @@ public void listServiceInstancesFilterByServiceKeyId() {
     }
 
     @Test
-    public void listServiceInstancesFilterBySpaceId() {
+    void listServiceInstancesFilterBySpaceId() {
         String serviceInstanceName = this.nameFactory.getServiceInstanceName();
 
         this.serviceBrokerId
@@ -374,7 +375,7 @@ public void listServiceInstancesFilterBySpaceId() {
     }
 
     @Test
-    public void update() {
+    void update() {
         String planName = this.nameFactory.getPlanName();
         String serviceBrokerName = this.nameFactory.getServiceBrokerName();
         String serviceName = this.nameFactory.getServiceName();
diff --git a/integration-test/src/test/java/org/cloudfoundry/client/v2/ServiceUsageEventsTest.java b/integration-test/src/test/java/org/cloudfoundry/client/v2/ServiceUsageEventsTest.java
index cdfd9f1f4b..4098770d89 100644
--- a/integration-test/src/test/java/org/cloudfoundry/client/v2/ServiceUsageEventsTest.java
+++ b/integration-test/src/test/java/org/cloudfoundry/client/v2/ServiceUsageEventsTest.java
@@ -31,6 +31,7 @@
 import org.cloudfoundry.client.v2.serviceusageevents.ServiceUsageEventResource;
 import org.cloudfoundry.util.PaginationUtils;
 import org.cloudfoundry.util.ResourceUtils;
+import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 import reactor.core.publisher.Flux;
 import reactor.core.publisher.Mono;
@@ -40,7 +41,7 @@
 
 import static org.cloudfoundry.util.tuple.TupleUtils.function;
 
-public final class ServiceUsageEventsTest extends AbstractIntegrationTest {
+final class ServiceUsageEventsTest extends AbstractIntegrationTest {
 
     @Autowired
     private CloudFoundryClient cloudFoundryClient;
@@ -55,7 +56,7 @@ public final class ServiceUsageEventsTest extends AbstractIntegrationTest {
     private Mono<String> spaceId;
 
     @Test
-    public void get() {
+    void get() {
         Mono
             .zip(this.serviceBrokerId, this.spaceId)
             .flatMap(function((serviceBrokerId, spaceId) -> seedEvents(this.cloudFoundryClient, this.nameFactory, serviceBrokerId, this.serviceName, spaceId)))
@@ -76,7 +77,7 @@ public void get() {
     }
 
     @Test
-    public void list() {
+    void list() {
         Mono
             .zip(this.serviceBrokerId, this.spaceId)
             .flatMap(function((serviceBrokerId, spaceId) -> seedEvents(this.cloudFoundryClient, this.nameFactory, serviceBrokerId, this.serviceName, spaceId)))
@@ -96,7 +97,7 @@ public void list() {
     }
 
     @Test
-    public void listAfterServiceUsageEventId() {
+    void listAfterServiceUsageEventId() {
         Mono
             .zip(this.serviceBrokerId, this.spaceId)
             .flatMap(function((serviceBrokerId, spaceId) -> seedEvents(this.cloudFoundryClient, this.nameFactory, serviceBrokerId, this.serviceName, spaceId)))
@@ -117,7 +118,7 @@ public void listAfterServiceUsageEventId() {
     }
 
     @Test
-    public void listFilterByServiceId() {
+    void listFilterByServiceId() {
         Mono
             .zip(this.serviceBrokerId, this.spaceId)
             .flatMap(function((serviceBrokerId, spaceId) -> seedEvents(this.cloudFoundryClient, this.nameFactory, serviceBrokerId, this.serviceName, spaceId)))
@@ -138,7 +139,7 @@ public void listFilterByServiceId() {
     }
 
     @Test
-    public void listFilterByServiceInstanceType() {
+    void listFilterByServiceInstanceType() {
         Mono
             .zip(this.serviceBrokerId, this.spaceId)
             .flatMap(function((serviceBrokerId, spaceId) -> seedEvents(this.cloudFoundryClient, this.nameFactory, serviceBrokerId, this.serviceName, spaceId)))
@@ -159,7 +160,7 @@ public void listFilterByServiceInstanceType() {
     }
 
     @Test
-    public void listNoneFound() {
+    void listNoneFound() {
         this.cloudFoundryClient.serviceUsageEvents()
             .list(ListServiceUsageEventsRequest.builder()
                 .serviceId("test-service-id")
@@ -171,7 +172,7 @@ public void listNoneFound() {
     }
 
     @Test
-    public void purgeAndReseed() {
+    void purgeAndReseed() {
         this.cloudFoundryClient.serviceUsageEvents()
             .purgeAndReseed(PurgeAndReseedServiceUsageEventsRequest.builder()
                 .build())
diff --git a/integration-test/src/test/java/org/cloudfoundry/client/v2/ServicesTest.java b/integration-test/src/test/java/org/cloudfoundry/client/v2/ServicesTest.java
index 1b0b4b9a8d..95268dd565 100644
--- a/integration-test/src/test/java/org/cloudfoundry/client/v2/ServicesTest.java
+++ b/integration-test/src/test/java/org/cloudfoundry/client/v2/ServicesTest.java
@@ -35,6 +35,7 @@
 import org.cloudfoundry.util.JobUtils;
 import org.cloudfoundry.util.PaginationUtils;
 import org.cloudfoundry.util.ResourceUtils;
+import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 import reactor.core.publisher.Flux;
 import reactor.core.publisher.Mono;
@@ -46,7 +47,7 @@
 import static org.cloudfoundry.ServiceBrokerUtils.deleteServiceBroker;
 import static org.cloudfoundry.util.tuple.TupleUtils.function;
 
-public final class ServicesTest extends AbstractIntegrationTest {
+final class ServicesTest extends AbstractIntegrationTest {
 
     @Autowired
     private CloudFoundryClient cloudFoundryClient;
@@ -67,7 +68,7 @@ public final class ServicesTest extends AbstractIntegrationTest {
     private Mono<String> spaceId;
 
     @Test
-    public void delete() {
+    void delete() {
         String planName = this.nameFactory.getPlanName();
         String serviceBrokerName = this.nameFactory.getServiceBrokerName();
         String serviceName = this.nameFactory.getServiceName();
@@ -98,7 +99,7 @@ public void delete() {
     }
 
     @Test
-    public void deleteAsyncFalse() {
+    void deleteAsyncFalse() {
         String planName = this.nameFactory.getPlanName();
         String serviceBrokerName = this.nameFactory.getServiceBrokerName();
         String serviceName = this.nameFactory.getServiceName();
@@ -129,7 +130,7 @@ public void deleteAsyncFalse() {
     }
 
     @Test
-    public void deletePurge() {
+    void deletePurge() {
         String planName = this.nameFactory.getPlanName();
         String serviceBrokerName = this.nameFactory.getServiceBrokerName();
         String serviceName = this.nameFactory.getServiceName();
@@ -159,7 +160,7 @@ public void deletePurge() {
     }
 
     @Test
-    public void get() {
+    void get() {
         this.serviceBrokerId
             .flatMap(serviceBrokerId -> getServiceId(this.cloudFoundryClient, this.serviceName))
             .flatMap(serviceId -> this.cloudFoundryClient.services()
@@ -174,7 +175,7 @@ public void get() {
     }
 
     @Test
-    public void list() {
+    void list() {
         this.serviceBrokerId
             .flatMapMany(serviceBrokerId -> PaginationUtils
                 .requestClientV2Resources(page -> this.cloudFoundryClient.services()
@@ -191,7 +192,7 @@ public void list() {
     }
 
     @Test
-    public void listFilterByActive() {
+    void listFilterByActive() {
         this.serviceBrokerId
             .flatMapMany(serviceBrokerId -> PaginationUtils
                 .requestClientV2Resources(page -> this.cloudFoundryClient.services()
@@ -209,7 +210,7 @@ public void listFilterByActive() {
     }
 
     @Test
-    public void listFilterByLabels() {
+    void listFilterByLabels() {
         this.serviceBrokerId
             .flatMapMany(serviceBrokerId -> PaginationUtils
                 .requestClientV2Resources(page -> this.cloudFoundryClient.services()
@@ -226,7 +227,7 @@ public void listFilterByLabels() {
     }
 
     @Test
-    public void listFilterByServiceBrokerIds() {
+    void listFilterByServiceBrokerIds() {
         this.serviceBrokerId
             .flatMapMany(serviceBrokerId -> PaginationUtils
                 .requestClientV2Resources(page -> this.cloudFoundryClient.services()
@@ -243,7 +244,7 @@ public void listFilterByServiceBrokerIds() {
     }
 
     @Test
-    public void listNoneFound() {
+    void listNoneFound() {
         PaginationUtils.requestClientV2Resources(page -> this.cloudFoundryClient.services()
             .list(ListServicesRequest.builder()
                 .label("unmatched-filter")
@@ -256,7 +257,7 @@ public void listNoneFound() {
     }
 
     @Test
-    public void listServicePlans() {
+    void listServicePlans() {
         this.serviceBrokerId
             .flatMap(serviceBrokerId -> getServiceId(this.cloudFoundryClient, this.serviceName))
             .flatMapMany(serviceId -> PaginationUtils
@@ -273,7 +274,7 @@ public void listServicePlans() {
     }
 
     @Test
-    public void listServicePlansFilterByActive() {
+    void listServicePlansFilterByActive() {
         this.serviceBrokerId
             .flatMap(serviceBrokerId -> getServiceId(this.cloudFoundryClient, this.serviceName))
             .flatMapMany(serviceId -> PaginationUtils
@@ -291,7 +292,7 @@ public void listServicePlansFilterByActive() {
     }
 
     @Test
-    public void listServicePlansFilterByServiceInstanceIds() {
+    void listServicePlansFilterByServiceInstanceIds() {
         String serviceInstanceName = this.nameFactory.getServiceInstanceName();
 
         this.serviceBrokerId
@@ -318,7 +319,7 @@ public void listServicePlansFilterByServiceInstanceIds() {
     }
 
     @Test
-    public void listServicePlansNoneFound() {
+    void listServicePlansNoneFound() {
         this.serviceBrokerId
             .flatMap(serviceBrokerId -> getServiceId(this.cloudFoundryClient, this.serviceName))
             .flatMapMany(serviceId -> PaginationUtils
diff --git a/integration-test/src/test/java/org/cloudfoundry/client/v2/SharedDomainsTest.java b/integration-test/src/test/java/org/cloudfoundry/client/v2/SharedDomainsTest.java
index 94c484f906..bfb9353f40 100644
--- a/integration-test/src/test/java/org/cloudfoundry/client/v2/SharedDomainsTest.java
+++ b/integration-test/src/test/java/org/cloudfoundry/client/v2/SharedDomainsTest.java
@@ -29,6 +29,7 @@
 import org.cloudfoundry.util.JobUtils;
 import org.cloudfoundry.util.PaginationUtils;
 import org.cloudfoundry.util.ResourceUtils;
+import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 import reactor.core.publisher.Flux;
 import reactor.core.publisher.Mono;
@@ -37,13 +38,13 @@
 import java.time.Duration;
 import java.util.Optional;
 
-public final class SharedDomainsTest extends AbstractIntegrationTest {
+final class SharedDomainsTest extends AbstractIntegrationTest {
 
     @Autowired
     private CloudFoundryClient cloudFoundryClient;
 
     @Test
-    public void create() {
+    void create() {
         String domainName = this.nameFactory.getDomainName();
 
         this.cloudFoundryClient.sharedDomains()
@@ -60,7 +61,7 @@ public void create() {
     }
 
     @Test
-    public void deleteAsyncFalse() {
+    void deleteAsyncFalse() {
         String domainName = this.nameFactory.getDomainName();
 
         getSharedDomainId(this.cloudFoundryClient, domainName)
@@ -77,7 +78,7 @@ public void deleteAsyncFalse() {
     }
 
     @Test
-    public void deleteAsyncTrue() {
+    void deleteAsyncTrue() {
         String domainName = this.nameFactory.getDomainName();
 
         getSharedDomainId(this.cloudFoundryClient, domainName)
@@ -95,7 +96,7 @@ public void deleteAsyncTrue() {
     }
 
     @Test
-    public void get() {
+    void get() {
         String domainName = this.nameFactory.getDomainName();
 
         getSharedDomainId(this.cloudFoundryClient, domainName)
@@ -112,7 +113,7 @@ public void get() {
     }
 
     @Test
-    public void list() {
+    void list() {
         String domainName = this.nameFactory.getDomainName();
 
         getSharedDomainId(this.cloudFoundryClient, domainName)
@@ -127,7 +128,7 @@ public void list() {
     }
 
     @Test
-    public void listFilterByName() {
+    void listFilterByName() {
         String domainName = this.nameFactory.getDomainName();
 
         getSharedDomainId(this.cloudFoundryClient, domainName)
diff --git a/integration-test/src/test/java/org/cloudfoundry/client/v2/SpaceQuotaDefinitionsTest.java b/integration-test/src/test/java/org/cloudfoundry/client/v2/SpaceQuotaDefinitionsTest.java
index e66fccb24f..f9d67ea385 100644
--- a/integration-test/src/test/java/org/cloudfoundry/client/v2/SpaceQuotaDefinitionsTest.java
+++ b/integration-test/src/test/java/org/cloudfoundry/client/v2/SpaceQuotaDefinitionsTest.java
@@ -37,7 +37,8 @@
 import org.cloudfoundry.util.JobUtils;
 import org.cloudfoundry.util.PaginationUtils;
 import org.cloudfoundry.util.ResourceUtils;
-import org.junit.Ignore;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 import reactor.core.publisher.Flux;
 import reactor.core.publisher.Mono;
@@ -48,7 +49,7 @@
 
 import static org.cloudfoundry.util.tuple.TupleUtils.function;
 
-public final class SpaceQuotaDefinitionsTest extends AbstractIntegrationTest {
+final class SpaceQuotaDefinitionsTest extends AbstractIntegrationTest {
 
     @Autowired
     private CloudFoundryClient cloudFoundryClient;
@@ -57,7 +58,7 @@ public final class SpaceQuotaDefinitionsTest extends AbstractIntegrationTest {
     private Mono<String> organizationId;
 
     @Test
-    public void associateSpace() {
+    void associateSpace() {
         String quotaName = this.nameFactory.getQuotaDefinitionName();
         String spaceName = this.nameFactory.getSpaceName();
 
@@ -80,7 +81,7 @@ public void associateSpace() {
     }
 
     @Test
-    public void create() {
+    void create() {
         String quotaName = this.nameFactory.getQuotaDefinitionName();
 
         this.organizationId
@@ -102,7 +103,7 @@ public void create() {
     }
 
     @Test
-    public void delete() {
+    void delete() {
         String quotaName = this.nameFactory.getQuotaDefinitionName();
 
         this.organizationId
@@ -120,7 +121,7 @@ public void delete() {
     }
 
     @Test
-    public void get() {
+    void get() {
         String quotaName = this.nameFactory.getQuotaDefinitionName();
 
         this.organizationId
@@ -138,7 +139,7 @@ public void get() {
     }
 
     @Test
-    public void list() {
+    void list() {
         String quotaName = this.nameFactory.getQuotaDefinitionName();
 
         this.organizationId
@@ -157,7 +158,7 @@ public void list() {
     }
 
     @Test
-    public void listSpaces() {
+    void listSpaces() {
         String quotaName = this.nameFactory.getQuotaDefinitionName();
         String spaceName = this.nameFactory.getSpaceName();
 
@@ -183,7 +184,7 @@ public void listSpaces() {
     }
 
     @Test
-    public void listSpacesFilterByApplicationId() {
+    void listSpacesFilterByApplicationId() {
         String applicationName = this.nameFactory.getApplicationName();
         String quotaName = this.nameFactory.getQuotaDefinitionName();
         String spaceName = this.nameFactory.getSpaceName();
@@ -214,14 +215,14 @@ public void listSpacesFilterByApplicationId() {
     }
 
     //TODO: Await https://github.com/cloudfoundry/cf-java-client/issues/643
-    @Ignore("Await https://github.com/cloudfoundry/cf-java-client/issues/643")
+    @Disabled("Await https://github.com/cloudfoundry/cf-java-client/issues/643")
     @Test
-    public void listSpacesFilterByDeveloperId() {
+    void listSpacesFilterByDeveloperId() {
 
     }
 
     @Test
-    public void listSpacesFilterByName() {
+    void listSpacesFilterByName() {
         String quotaName = this.nameFactory.getQuotaDefinitionName();
         String spaceName = this.nameFactory.getSpaceName();
 
@@ -248,7 +249,7 @@ public void listSpacesFilterByName() {
     }
 
     @Test
-    public void listSpacesFilterByOrganizationId() {
+    void listSpacesFilterByOrganizationId() {
         String quotaName = this.nameFactory.getQuotaDefinitionName();
         String spaceName = this.nameFactory.getSpaceName();
 
@@ -276,7 +277,7 @@ public void listSpacesFilterByOrganizationId() {
     }
 
     @Test
-    public void listSpacesNotFound() {
+    void listSpacesNotFound() {
         String quotaName = this.nameFactory.getQuotaDefinitionName();
 
         this.organizationId
@@ -292,7 +293,7 @@ public void listSpacesNotFound() {
     }
 
     @Test
-    public void listSpacesQueryBySpaceId() {
+    void listSpacesQueryBySpaceId() {
         String quotaName = this.nameFactory.getQuotaDefinitionName();
         String spaceName = this.nameFactory.getSpaceName();
 
@@ -318,7 +319,7 @@ public void listSpacesQueryBySpaceId() {
     }
 
     @Test
-    public void removeSpace() {
+    void removeSpace() {
         String quotaName = this.nameFactory.getQuotaDefinitionName();
         String spaceName = this.nameFactory.getSpaceName();
 
@@ -340,7 +341,7 @@ public void removeSpace() {
     }
 
     @Test
-    public void update() {
+    void update() {
         String quotaName1 = this.nameFactory.getQuotaDefinitionName();
         String quotaName2 = this.nameFactory.getQuotaDefinitionName();
 
diff --git a/integration-test/src/test/java/org/cloudfoundry/client/v2/SpacesTest.java b/integration-test/src/test/java/org/cloudfoundry/client/v2/SpacesTest.java
index fe2cb72c40..491f03dabc 100644
--- a/integration-test/src/test/java/org/cloudfoundry/client/v2/SpacesTest.java
+++ b/integration-test/src/test/java/org/cloudfoundry/client/v2/SpacesTest.java
@@ -98,7 +98,8 @@
 import org.cloudfoundry.util.JobUtils;
 import org.cloudfoundry.util.PaginationUtils;
 import org.cloudfoundry.util.ResourceUtils;
-import org.junit.Ignore;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 import reactor.core.publisher.Flux;
 import reactor.core.publisher.Mono;
@@ -116,7 +117,7 @@
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.cloudfoundry.util.tuple.TupleUtils.function;
 
-public final class SpacesTest extends AbstractIntegrationTest {
+final class SpacesTest extends AbstractIntegrationTest {
 
     @Autowired
     private CloudFoundryClient cloudFoundryClient;
@@ -140,7 +141,7 @@ public final class SpacesTest extends AbstractIntegrationTest {
     private UaaClient uaaClient;
 
     @Test
-    public void associateAuditor() {
+    void associateAuditor() {
         String organizationName = this.nameFactory.getOrganizationName();
         String spaceName = this.nameFactory.getSpaceName();
         String userName = this.nameFactory.getUserName();
@@ -162,7 +163,7 @@ public void associateAuditor() {
     }
 
     @Test
-    public void associateAuditorByUsername() {
+    void associateAuditorByUsername() {
         String organizationName = this.nameFactory.getOrganizationName();
         String spaceName = this.nameFactory.getSpaceName();
         String userName = this.nameFactory.getUserName();
@@ -183,7 +184,7 @@ public void associateAuditorByUsername() {
     }
 
     @Test
-    public void associateDeveloper() {
+    void associateDeveloper() {
         String organizationName = this.nameFactory.getOrganizationName();
         String spaceName = this.nameFactory.getSpaceName();
         String userName = this.nameFactory.getUserName();
@@ -205,7 +206,7 @@ public void associateDeveloper() {
     }
 
     @Test
-    public void associateDeveloperByUsername() {
+    void associateDeveloperByUsername() {
         String organizationName = this.nameFactory.getOrganizationName();
         String spaceName = this.nameFactory.getSpaceName();
         String userName = this.nameFactory.getUserName();
@@ -225,7 +226,7 @@ public void associateDeveloperByUsername() {
     }
 
     @Test
-    public void associateManager() {
+    void associateManager() {
         String organizationName = this.nameFactory.getOrganizationName();
         String spaceName = this.nameFactory.getSpaceName();
         String userName = this.nameFactory.getUserName();
@@ -247,7 +248,7 @@ public void associateManager() {
     }
 
     @Test
-    public void associateManagerByUsername() {
+    void associateManagerByUsername() {
         String organizationName = this.nameFactory.getOrganizationName();
         String spaceName = this.nameFactory.getSpaceName();
         String userName = this.nameFactory.getUserName();
@@ -267,7 +268,7 @@ public void associateManagerByUsername() {
     }
 
     @Test
-    public void associateSecurityGroup() {
+    void associateSecurityGroup() {
         String securityGroupName = this.nameFactory.getSecurityGroupName();
         String spaceName = this.nameFactory.getSpaceName();
 
@@ -291,7 +292,7 @@ public void associateSecurityGroup() {
     }
 
     @Test
-    public void create() {
+    void create() {
         String spaceName = this.nameFactory.getSpaceName();
 
         this.organizationId
@@ -308,7 +309,7 @@ public void create() {
     }
 
     @Test
-    public void delete() {
+    void delete() {
         String spaceName = this.nameFactory.getSpaceName();
 
         this.organizationId
@@ -328,7 +329,7 @@ public void delete() {
     }
 
     @Test
-    public void deleteAsyncFalse() {
+    void deleteAsyncFalse() {
         String spaceName = this.nameFactory.getSpaceName();
 
         this.organizationId
@@ -347,7 +348,7 @@ public void deleteAsyncFalse() {
     }
 
     @Test
-    public void get() {
+    void get() {
         String spaceName = this.nameFactory.getSpaceName();
 
         this.organizationId
@@ -364,7 +365,7 @@ public void get() {
     }
 
     @Test
-    public void getSummary() {
+    void getSummary() {
         String spaceName = this.nameFactory.getSpaceName();
 
         this.organizationId
@@ -381,7 +382,7 @@ public void getSummary() {
     }
 
     @Test
-    public void list() {
+    void list() {
         String organizationName = this.nameFactory.getOrganizationName();
         String spaceName = this.nameFactory.getSpaceName();
 
@@ -401,7 +402,7 @@ public void list() {
     }
 
     @Test
-    public void listApplications() {
+    void listApplications() {
         String applicationName = this.nameFactory.getApplicationName();
         String spaceName = this.nameFactory.getSpaceName();
 
@@ -418,7 +419,7 @@ public void listApplications() {
     }
 
     @Test
-    public void listApplicationsFilterByDiego() {
+    void listApplicationsFilterByDiego() {
         String applicationName = this.nameFactory.getApplicationName();
         String spaceName = this.nameFactory.getSpaceName();
 
@@ -435,7 +436,7 @@ public void listApplicationsFilterByDiego() {
     }
 
     @Test
-    public void listApplicationsFilterByName() {
+    void listApplicationsFilterByName() {
         String applicationName = this.nameFactory.getApplicationName();
         String spaceName = this.nameFactory.getSpaceName();
 
@@ -458,7 +459,7 @@ public void listApplicationsFilterByName() {
     }
 
     @Test
-    public void listApplicationsFilterByOrganizationId() {
+    void listApplicationsFilterByOrganizationId() {
         String applicationName = this.nameFactory.getApplicationName();
         String spaceName = this.nameFactory.getSpaceName();
 
@@ -477,7 +478,7 @@ public void listApplicationsFilterByOrganizationId() {
     }
 
     @Test
-    public void listApplicationsFilterByStackId() {
+    void listApplicationsFilterByStackId() {
         String applicationName = this.nameFactory.getApplicationName();
         String spaceName = this.nameFactory.getSpaceName();
 
@@ -496,7 +497,7 @@ public void listApplicationsFilterByStackId() {
     }
 
     @Test
-    public void listAuditors() {
+    void listAuditors() {
         String organizationName = this.nameFactory.getOrganizationName();
         String spaceName = this.nameFactory.getSpaceName();
         String userName = this.nameFactory.getUserName();
@@ -521,7 +522,7 @@ public void listAuditors() {
     }
 
     @Test
-    public void listDevelopers() {
+    void listDevelopers() {
         String organizationName = this.nameFactory.getOrganizationName();
         String spaceName = this.nameFactory.getSpaceName();
         String userName = this.nameFactory.getUserName();
@@ -547,7 +548,7 @@ public void listDevelopers() {
 
     @SuppressWarnings("deprecation")
     @Test
-    public void listDomains() {
+    void listDomains() {
         String domainName = this.nameFactory.getDomainName();
         String spaceName = this.nameFactory.getSpaceName();
 
@@ -563,7 +564,7 @@ public void listDomains() {
 
     @SuppressWarnings("deprecation")
     @Test
-    public void listDomainsFilterByName() {
+    void listDomainsFilterByName() {
         String domainName = this.nameFactory.getDomainName();
         String spaceName = this.nameFactory.getSpaceName();
 
@@ -578,7 +579,7 @@ public void listDomainsFilterByName() {
     }
 
     @Test
-    public void listEvents() {
+    void listEvents() {
         String spaceName = this.nameFactory.getSpaceName();
 
         this.organizationId
@@ -592,7 +593,7 @@ public void listEvents() {
     }
 
     @Test
-    public void listEventsFilterByActee() {
+    void listEventsFilterByActee() {
         String spaceName = this.nameFactory.getSpaceName();
 
         this.organizationId
@@ -606,7 +607,7 @@ public void listEventsFilterByActee() {
     }
 
     @Test
-    public void listEventsFilterByTimestamp() {
+    void listEventsFilterByTimestamp() {
         String spaceName = this.nameFactory.getSpaceName();
         String timestamp = getPastTimestamp();
 
@@ -621,7 +622,7 @@ public void listEventsFilterByTimestamp() {
     }
 
     @Test
-    public void listEventsFilterByType() {
+    void listEventsFilterByType() {
         String spaceName = this.nameFactory.getSpaceName();
 
         this.organizationId
@@ -639,7 +640,7 @@ public void listEventsFilterByType() {
     }
 
     @Test
-    public void listFilterByApplicationId() {
+    void listFilterByApplicationId() {
         String applicationName = this.nameFactory.getApplicationName();
         String spaceName = this.nameFactory.getSpaceName();
 
@@ -662,7 +663,7 @@ public void listFilterByApplicationId() {
     }
 
     @Test
-    public void listFilterByDeveloperId() {
+    void listFilterByDeveloperId() {
         String organizationName = this.nameFactory.getOrganizationName();
         String spaceName = this.nameFactory.getSpaceName();
         String userName = this.nameFactory.getUserName();
@@ -682,7 +683,7 @@ public void listFilterByDeveloperId() {
     }
 
     @Test
-    public void listFilterByName() {
+    void listFilterByName() {
         String spaceName = this.nameFactory.getSpaceName();
 
         this.organizationId
@@ -700,7 +701,7 @@ public void listFilterByName() {
     }
 
     @Test
-    public void listFilterByOrganizationId() {
+    void listFilterByOrganizationId() {
         String organizationName = this.nameFactory.getOrganizationName();
         String spaceName = this.nameFactory.getSpaceName();
 
@@ -718,7 +719,7 @@ public void listFilterByOrganizationId() {
     }
 
     @Test
-    public void listManagers() {
+    void listManagers() {
         String organizationName = this.nameFactory.getOrganizationName();
         String spaceName = this.nameFactory.getSpaceName();
         String userName = this.nameFactory.getUserName();
@@ -734,7 +735,7 @@ public void listManagers() {
     }
 
     @Test
-    public void listManagersFilterByAuditedOrganizationId() {
+    void listManagersFilterByAuditedOrganizationId() {
         String organizationName = this.nameFactory.getOrganizationName();
         String spaceName = this.nameFactory.getSpaceName();
         String userName = this.nameFactory.getUserName();
@@ -761,7 +762,7 @@ public void listManagersFilterByAuditedOrganizationId() {
     }
 
     @Test
-    public void listManagersFilterByAuditedSpaceId() {
+    void listManagersFilterByAuditedSpaceId() {
         String organizationName = this.nameFactory.getOrganizationName();
         String spaceName = this.nameFactory.getSpaceName();
         String userName = this.nameFactory.getUserName();
@@ -780,7 +781,7 @@ public void listManagersFilterByAuditedSpaceId() {
     }
 
     @Test
-    public void listManagersFilterByBillingManagedOrganizationId() {
+    void listManagersFilterByBillingManagedOrganizationId() {
         String organizationName = this.nameFactory.getOrganizationName();
         String spaceName = this.nameFactory.getSpaceName();
         String userName = this.nameFactory.getUserName();
@@ -812,7 +813,7 @@ public void listManagersFilterByBillingManagedOrganizationId() {
     }
 
     @Test
-    public void listManagersFilterByManagedOrganizationId() {
+    void listManagersFilterByManagedOrganizationId() {
         String organizationName = this.nameFactory.getOrganizationName();
         String spaceName = this.nameFactory.getSpaceName();
         String userName = this.nameFactory.getUserName();
@@ -844,7 +845,7 @@ public void listManagersFilterByManagedOrganizationId() {
     }
 
     @Test
-    public void listManagersFilterByManagedSpaceId() {
+    void listManagersFilterByManagedSpaceId() {
         String organizationName = this.nameFactory.getOrganizationName();
         String spaceName = this.nameFactory.getSpaceName();
         String userName = this.nameFactory.getUserName();
@@ -860,7 +861,7 @@ public void listManagersFilterByManagedSpaceId() {
     }
 
     @Test
-    public void listManagersFilterByOrganizationId() {
+    void listManagersFilterByOrganizationId() {
         String organizationName = this.nameFactory.getOrganizationName();
         String spaceName = this.nameFactory.getSpaceName();
         String userName = this.nameFactory.getUserName();
@@ -885,7 +886,7 @@ public void listManagersFilterByOrganizationId() {
     }
 
     @Test
-    public void listRoutes() {
+    void listRoutes() {
         String domainName = this.nameFactory.getDomainName();
         String hostName = this.nameFactory.getHostName();
         String spaceName = this.nameFactory.getSpaceName();
@@ -909,7 +910,7 @@ public void listRoutes() {
     }
 
     @Test
-    public void listRoutesFilterByDomainId() {
+    void listRoutesFilterByDomainId() {
         String domainName = this.nameFactory.getDomainName();
         String hostName = this.nameFactory.getHostName();
         String spaceName = this.nameFactory.getSpaceName();
@@ -934,7 +935,7 @@ public void listRoutesFilterByDomainId() {
     }
 
     @Test
-    public void listRoutesFilterByHost() {
+    void listRoutesFilterByHost() {
         String domainName = this.nameFactory.getDomainName();
         String hostName = this.nameFactory.getHostName();
         String spaceName = this.nameFactory.getSpaceName();
@@ -958,7 +959,7 @@ public void listRoutesFilterByHost() {
     }
 
     @Test
-    public void listRoutesFilterByPath() {
+    void listRoutesFilterByPath() {
         String domainName = this.nameFactory.getDomainName();
         String hostName = this.nameFactory.getHostName();
         String spaceName = this.nameFactory.getSpaceName();
@@ -982,7 +983,7 @@ public void listRoutesFilterByPath() {
     }
 
     @Test
-    public void listSecurityGroups() {
+    void listSecurityGroups() {
         String securityGroupName = this.nameFactory.getSecurityGroupName();
         String spaceName = this.nameFactory.getSpaceName();
 
@@ -1007,7 +1008,7 @@ public void listSecurityGroups() {
     }
 
     @Test
-    public void listSecurityGroupsFilterByName() {
+    void listSecurityGroupsFilterByName() {
         String securityGroupName = this.nameFactory.getSecurityGroupName();
         String spaceName = this.nameFactory.getSpaceName();
 
@@ -1032,7 +1033,7 @@ public void listSecurityGroupsFilterByName() {
     }
 
     @Test
-    public void listServiceInstances() {
+    void listServiceInstances() {
         String serviceInstanceName = this.nameFactory.getServiceInstanceName();
         String spaceName = this.nameFactory.getSpaceName();
 
@@ -1052,7 +1053,7 @@ public void listServiceInstances() {
     }
 
     @Test
-    public void listServiceInstancesFilterByGatewayName() {
+    void listServiceInstancesFilterByGatewayName() {
         String serviceInstanceName = this.nameFactory.getServiceInstanceName();
         String spaceName = this.nameFactory.getSpaceName();
 
@@ -1071,7 +1072,7 @@ public void listServiceInstancesFilterByGatewayName() {
     }
 
     @Test
-    public void listServiceInstancesFilterByName() {
+    void listServiceInstancesFilterByName() {
         String serviceInstanceName = this.nameFactory.getServiceInstanceName();
         String spaceName = this.nameFactory.getSpaceName();
 
@@ -1090,7 +1091,7 @@ public void listServiceInstancesFilterByName() {
     }
 
     @Test
-    public void listServiceInstancesFilterByServiceBindingId() {
+    void listServiceInstancesFilterByServiceBindingId() {
         String applicationName = this.nameFactory.getApplicationName();
         String serviceInstanceName = this.nameFactory.getServiceInstanceName();
         String spaceName = this.nameFactory.getSpaceName();
@@ -1117,7 +1118,7 @@ public void listServiceInstancesFilterByServiceBindingId() {
     }
 
     @Test
-    public void listServiceInstancesFilterByServiceKeyId() {
+    void listServiceInstancesFilterByServiceKeyId() {
         String serviceInstanceName = this.nameFactory.getServiceInstanceName();
         String serviceKeyName = this.nameFactory.getServiceKeyName();
         String spaceName = this.nameFactory.getSpaceName();
@@ -1143,7 +1144,7 @@ public void listServiceInstancesFilterByServiceKeyId() {
     }
 
     @Test
-    public void listServiceInstancesFilterByServicePlanId() {
+    void listServiceInstancesFilterByServicePlanId() {
         String serviceInstanceName = this.nameFactory.getServiceInstanceName();
         String spaceName = this.nameFactory.getSpaceName();
 
@@ -1165,7 +1166,7 @@ public void listServiceInstancesFilterByServicePlanId() {
     }
 
     @Test
-    public void listServices() {
+    void listServices() {
         this.spaceId
             .flatMapMany(spaceId -> requestListSpaceServices(this.cloudFoundryClient, spaceId)
                 .filter(resource -> this.serviceName.equals(ResourceUtils.getEntity(resource).getLabel())))
@@ -1176,7 +1177,7 @@ public void listServices() {
     }
 
     @Test
-    public void listServicesFilterByActive() {
+    void listServicesFilterByActive() {
         this.spaceId
             .flatMapMany(spaceId -> requestListSpaceServices(this.cloudFoundryClient, spaceId)
                 .filter(resource -> this.serviceName.equals(ResourceUtils.getEntity(resource).getLabel())))
@@ -1188,7 +1189,7 @@ public void listServicesFilterByActive() {
     }
 
     @Test
-    public void listServicesFilterByLabel() {
+    void listServicesFilterByLabel() {
         Mono
             .zip(this.serviceBrokerId, this.spaceId)
             .flatMapMany(function((serviceBrokerId, spaceId) -> requestListSpaceServices(this.cloudFoundryClient, spaceId, builder -> builder.label(this.serviceName))
@@ -1201,9 +1202,9 @@ public void listServicesFilterByLabel() {
     }
 
     //TODO: Await https://github.com/cloudfoundry/cloud_controller_ng/issues/856 for this test to work
-    @Ignore("Await https://github.com/cloudfoundry/cloud_controller_ng/issues/856 for this test to work")
+    @Disabled("Await https://github.com/cloudfoundry/cloud_controller_ng/issues/856 for this test to work")
     @Test
-    public void listServicesFilterByServiceBrokerId() {
+    void listServicesFilterByServiceBrokerId() {
         Mono
             .zip(this.serviceBrokerId, this.spaceId)
             .flatMapMany(function((serviceBrokerId, spaceId) -> requestListSpaceServices(this.cloudFoundryClient, spaceId, builder -> builder.serviceBrokerId(serviceBrokerId))))
@@ -1215,7 +1216,7 @@ public void listServicesFilterByServiceBrokerId() {
     }
 
     @Test
-    public void listUserRoles() {
+    void listUserRoles() {
         String organizationName = this.nameFactory.getOrganizationName();
         String spaceName = this.nameFactory.getSpaceName();
         String userName = this.nameFactory.getUserName();
@@ -1239,7 +1240,7 @@ public void listUserRoles() {
     }
 
     @Test
-    public void removeAuditor() {
+    void removeAuditor() {
         String organizationName = this.nameFactory.getOrganizationName();
         String spaceName = this.nameFactory.getSpaceName();
         String userName = this.nameFactory.getUserName();
@@ -1258,7 +1259,7 @@ public void removeAuditor() {
     }
 
     @Test
-    public void removeAuditorByUsername() {
+    void removeAuditorByUsername() {
         String organizationName = this.nameFactory.getOrganizationName();
         String spaceName = this.nameFactory.getSpaceName();
         String userName = this.nameFactory.getUserName();
@@ -1277,7 +1278,7 @@ public void removeAuditorByUsername() {
     }
 
     @Test
-    public void removeDeveloper() {
+    void removeDeveloper() {
         String organizationName = this.nameFactory.getOrganizationName();
         String spaceName = this.nameFactory.getSpaceName();
         String userName = this.nameFactory.getUserName();
@@ -1296,7 +1297,7 @@ public void removeDeveloper() {
     }
 
     @Test
-    public void removeDeveloperByUsername() {
+    void removeDeveloperByUsername() {
         String organizationName = this.nameFactory.getOrganizationName();
         String spaceName = this.nameFactory.getSpaceName();
         String userName = this.nameFactory.getUserName();
@@ -1315,7 +1316,7 @@ public void removeDeveloperByUsername() {
     }
 
     @Test
-    public void removeManager() {
+    void removeManager() {
         String organizationName = this.nameFactory.getOrganizationName();
         String spaceName = this.nameFactory.getSpaceName();
         String userName = this.nameFactory.getUserName();
@@ -1334,7 +1335,7 @@ public void removeManager() {
     }
 
     @Test
-    public void removeManagerByUsername() {
+    void removeManagerByUsername() {
         String organizationName = this.nameFactory.getOrganizationName();
         String spaceName = this.nameFactory.getSpaceName();
         String userName = this.nameFactory.getUserName();
@@ -1353,7 +1354,7 @@ public void removeManagerByUsername() {
     }
 
     @Test
-    public void removeSecurityGroup() {
+    void removeSecurityGroup() {
         String securityGroupName = this.nameFactory.getSecurityGroupName();
         String spaceName = this.nameFactory.getSpaceName();
 
@@ -1377,7 +1378,7 @@ public void removeSecurityGroup() {
     }
 
     @Test
-    public void update() {
+    void update() {
         String spaceName = this.nameFactory.getSpaceName();
         String spaceName2 = this.nameFactory.getSpaceName();
 
@@ -1400,7 +1401,7 @@ public void update() {
     }
 
     @Test
-    public void updateEmptyManagers() {
+    void updateEmptyManagers() {
         String organizationName = this.nameFactory.getOrganizationName();
         String spaceName = this.nameFactory.getSpaceName();
         String userName = this.nameFactory.getUserName();
diff --git a/integration-test/src/test/java/org/cloudfoundry/client/v2/StacksTest.java b/integration-test/src/test/java/org/cloudfoundry/client/v2/StacksTest.java
index cb86a6274e..1f9beeab1a 100644
--- a/integration-test/src/test/java/org/cloudfoundry/client/v2/StacksTest.java
+++ b/integration-test/src/test/java/org/cloudfoundry/client/v2/StacksTest.java
@@ -28,6 +28,7 @@
 import org.cloudfoundry.util.JobUtils;
 import org.cloudfoundry.util.PaginationUtils;
 import org.cloudfoundry.util.ResourceUtils;
+import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 import reactor.core.publisher.Flux;
 import reactor.core.publisher.Mono;
@@ -37,7 +38,7 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-public final class StacksTest extends AbstractIntegrationTest {
+final class StacksTest extends AbstractIntegrationTest {
 
     @Autowired
     private CloudFoundryClient cloudFoundryClient;
@@ -46,7 +47,7 @@ public final class StacksTest extends AbstractIntegrationTest {
     private String stackName;
 
     @Test
-    public void create() {
+    void create() {
         String stackName = this.nameFactory.getStackName();
 
         this.cloudFoundryClient.stacks()
@@ -63,7 +64,7 @@ public void create() {
     }
 
     @Test
-    public void delete() {
+    void delete() {
         String stackName = this.nameFactory.getStackName();
 
         createStackId(this.cloudFoundryClient, stackName)
@@ -79,7 +80,7 @@ public void delete() {
     }
 
     @Test
-    public void deleteAsync() {
+    void deleteAsync() {
         String stackName = this.nameFactory.getStackName();
 
         createStackId(this.cloudFoundryClient, stackName)
@@ -96,7 +97,7 @@ public void deleteAsync() {
     }
 
     @Test
-    public void get() {
+    void get() {
         getStackId(this.cloudFoundryClient, this.stackName)
             .flatMap(stackId -> this.cloudFoundryClient.stacks()
                 .get(GetStackRequest.builder()
@@ -110,7 +111,7 @@ public void get() {
     }
 
     @Test
-    public void list() {
+    void list() {
         getStackId(this.cloudFoundryClient, this.stackName)
             .flatMapMany(stackId -> PaginationUtils
                 .requestClientV2Resources(page -> this.cloudFoundryClient.stacks()
@@ -126,7 +127,7 @@ public void list() {
     }
 
     @Test
-    public void listFilterByName() {
+    void listFilterByName() {
         PaginationUtils
             .requestClientV2Resources(page -> this.cloudFoundryClient.stacks()
                 .list(ListStacksRequest.builder()
diff --git a/integration-test/src/test/java/org/cloudfoundry/client/v2/UserProvidedServicesTest.java b/integration-test/src/test/java/org/cloudfoundry/client/v2/UserProvidedServicesTest.java
index 3561e835c1..1ce83165e4 100644
--- a/integration-test/src/test/java/org/cloudfoundry/client/v2/UserProvidedServicesTest.java
+++ b/integration-test/src/test/java/org/cloudfoundry/client/v2/UserProvidedServicesTest.java
@@ -41,6 +41,7 @@
 import org.cloudfoundry.routing.RoutingClient;
 import org.cloudfoundry.util.PaginationUtils;
 import org.cloudfoundry.util.ResourceUtils;
+import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 import reactor.core.publisher.Flux;
 import reactor.core.publisher.Mono;
@@ -56,7 +57,7 @@
 import static org.cloudfoundry.util.tuple.TupleUtils.consumer;
 import static org.cloudfoundry.util.tuple.TupleUtils.function;
 
-public final class UserProvidedServicesTest extends AbstractIntegrationTest {
+final class UserProvidedServicesTest extends AbstractIntegrationTest {
 
     private static final String DEFAULT_ROUTER_GROUP = "default-tcp";
 
@@ -73,7 +74,7 @@ public final class UserProvidedServicesTest extends AbstractIntegrationTest {
     private Mono<String> spaceId;
 
     @Test
-    public void create() {
+    void create() {
         String instanceName = this.nameFactory.getServiceInstanceName();
 
         this.spaceId
@@ -90,7 +91,7 @@ public void create() {
     }
 
     @Test
-    public void delete() {
+    void delete() {
         String instanceName = this.nameFactory.getServiceInstanceName();
 
         this.spaceId
@@ -106,7 +107,7 @@ public void delete() {
     }
 
     @Test
-    public void get() {
+    void get() {
         String instanceName = this.nameFactory.getServiceInstanceName();
 
         this.spaceId
@@ -123,7 +124,7 @@ public void get() {
     }
 
     @Test
-    public void list() {
+    void list() {
         String instanceName = this.nameFactory.getServiceInstanceName();
 
         this.spaceId
@@ -143,7 +144,7 @@ public void list() {
     }
 
     @Test
-    public void listRoutes() {
+    void listRoutes() {
         String domainName = this.nameFactory.getDomainName();
         String instanceName = this.nameFactory.getServiceInstanceName();
 
@@ -174,7 +175,7 @@ public void listRoutes() {
     }
 
     @Test
-    public void listRoutesFilterByDomainId() {
+    void listRoutesFilterByDomainId() {
         String domainName = this.nameFactory.getDomainName();
         String instanceName = this.nameFactory.getServiceInstanceName();
 
@@ -207,7 +208,7 @@ public void listRoutesFilterByDomainId() {
     }
 
     @Test
-    public void listRoutesFilterByHost() {
+    void listRoutesFilterByHost() {
         String domainName = this.nameFactory.getDomainName();
         String hostName = this.nameFactory.getHostName();
         String instanceName = this.nameFactory.getServiceInstanceName();
@@ -240,7 +241,7 @@ public void listRoutesFilterByHost() {
     }
 
     @Test
-    public void listRoutesFilterByPath() {
+    void listRoutesFilterByPath() {
         String domainName = this.nameFactory.getDomainName();
         String instanceName = this.nameFactory.getServiceInstanceName();
         String path = this.nameFactory.getPath();
@@ -273,7 +274,7 @@ public void listRoutesFilterByPath() {
     }
 
     @Test
-    public void listServiceBindings() {
+    void listServiceBindings() {
         String applicationName = this.nameFactory.getApplicationName();
         String instanceName = this.nameFactory.getServiceInstanceName();
 
@@ -305,7 +306,7 @@ public void listServiceBindings() {
     }
 
     @Test
-    public void update() {
+    void update() {
         String instanceName = this.nameFactory.getServiceInstanceName();
         String newInstanceName = this.nameFactory.getServiceInstanceName();
 
diff --git a/integration-test/src/test/java/org/cloudfoundry/client/v2/UsersTest.java b/integration-test/src/test/java/org/cloudfoundry/client/v2/UsersTest.java
index 7b97e0b650..dcf4ce30c0 100644
--- a/integration-test/src/test/java/org/cloudfoundry/client/v2/UsersTest.java
+++ b/integration-test/src/test/java/org/cloudfoundry/client/v2/UsersTest.java
@@ -70,6 +70,7 @@
 import org.cloudfoundry.util.JobUtils;
 import org.cloudfoundry.util.PaginationUtils;
 import org.cloudfoundry.util.ResourceUtils;
+import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 import reactor.core.publisher.Flux;
 import reactor.core.publisher.Mono;
@@ -80,7 +81,7 @@
 
 import static org.cloudfoundry.util.tuple.TupleUtils.function;
 
-public final class UsersTest extends AbstractIntegrationTest {
+final class UsersTest extends AbstractIntegrationTest {
 
     private static final String STATUS_FILTER = "active";
 
@@ -91,7 +92,7 @@ public final class UsersTest extends AbstractIntegrationTest {
     private Mono<String> organizationId;
 
     @Test
-    public void associateAuditedOrganization() {
+    void associateAuditedOrganization() {
         String organizationName = this.nameFactory.getOrganizationName();
         String userId = this.nameFactory.getUserId();
 
@@ -114,7 +115,7 @@ public void associateAuditedOrganization() {
     }
 
     @Test
-    public void associateAuditedSpace() {
+    void associateAuditedSpace() {
         String spaceName = this.nameFactory.getSpaceName();
         String userId = this.nameFactory.getUserId();
 
@@ -136,7 +137,7 @@ public void associateAuditedSpace() {
     }
 
     @Test
-    public void associateBillingManagedOrganization() {
+    void associateBillingManagedOrganization() {
         String organizationName = this.nameFactory.getOrganizationName();
         String userId = this.nameFactory.getUserId();
 
@@ -159,7 +160,7 @@ public void associateBillingManagedOrganization() {
     }
 
     @Test
-    public void associateManagedOrganization() {
+    void associateManagedOrganization() {
         String organizationName = this.nameFactory.getOrganizationName();
         String userId = this.nameFactory.getUserId();
 
@@ -182,7 +183,7 @@ public void associateManagedOrganization() {
     }
 
     @Test
-    public void associateManagedSpace() {
+    void associateManagedSpace() {
         String spaceName = this.nameFactory.getSpaceName();
         String userId = this.nameFactory.getUserId();
 
@@ -204,7 +205,7 @@ public void associateManagedSpace() {
     }
 
     @Test
-    public void associateOrganization() {
+    void associateOrganization() {
         String organizationName = this.nameFactory.getOrganizationName();
         String userId = this.nameFactory.getUserId();
 
@@ -226,7 +227,7 @@ public void associateOrganization() {
     }
 
     @Test
-    public void associateSpace() {
+    void associateSpace() {
         String spaceName = this.nameFactory.getSpaceName();
         String userId = this.nameFactory.getUserId();
 
@@ -248,7 +249,7 @@ public void associateSpace() {
     }
 
     @Test
-    public void create() {
+    void create() {
         String spaceName = this.nameFactory.getSpaceName();
         String userId = this.nameFactory.getUserId();
 
@@ -268,7 +269,7 @@ public void create() {
     }
 
     @Test
-    public void deleteAsync() {
+    void deleteAsync() {
         String userId = this.nameFactory.getUserId();
 
         requestCreateUser(this.cloudFoundryClient, userId)
@@ -286,7 +287,7 @@ public void deleteAsync() {
     }
 
     @Test
-    public void deleteNoAsync() {
+    void deleteNoAsync() {
         String userId = this.nameFactory.getUserId();
 
         requestCreateUser(this.cloudFoundryClient, userId)
@@ -304,7 +305,7 @@ public void deleteNoAsync() {
     }
 
     @Test
-    public void get() {
+    void get() {
         String spaceName = this.nameFactory.getSpaceName();
         String userId = this.nameFactory.getUserId();
 
@@ -323,7 +324,7 @@ public void get() {
     }
 
     @Test
-    public void list() {
+    void list() {
         String userId = this.nameFactory.getUserId();
 
         requestCreateUser(this.cloudFoundryClient, userId)
@@ -341,7 +342,7 @@ public void list() {
     }
 
     @Test
-    public void listAuditedOrganizations() {
+    void listAuditedOrganizations() {
         String organizationName = this.nameFactory.getOrganizationName();
         String userId = this.nameFactory.getUserId();
 
@@ -362,7 +363,7 @@ public void listAuditedOrganizations() {
     }
 
     @Test
-    public void listAuditedOrganizationsFilterByAuditorId() {
+    void listAuditedOrganizationsFilterByAuditorId() {
         String organizationName = this.nameFactory.getOrganizationName();
         String userId = this.nameFactory.getUserId();
 
@@ -384,7 +385,7 @@ public void listAuditedOrganizationsFilterByAuditorId() {
     }
 
     @Test
-    public void listAuditedOrganizationsFilterByBillingManagerId() {
+    void listAuditedOrganizationsFilterByBillingManagerId() {
         String organizationName = this.nameFactory.getOrganizationName();
         String userId = this.nameFactory.getUserId();
 
@@ -408,7 +409,7 @@ public void listAuditedOrganizationsFilterByBillingManagerId() {
     }
 
     @Test
-    public void listAuditedOrganizationsFilterByManagerId() {
+    void listAuditedOrganizationsFilterByManagerId() {
         String organizationName = this.nameFactory.getOrganizationName();
         String userId = this.nameFactory.getUserId();
 
@@ -432,7 +433,7 @@ public void listAuditedOrganizationsFilterByManagerId() {
     }
 
     @Test
-    public void listAuditedOrganizationsFilterByName() {
+    void listAuditedOrganizationsFilterByName() {
         String organizationName = this.nameFactory.getOrganizationName();
         String userId = this.nameFactory.getUserId();
 
@@ -454,7 +455,7 @@ public void listAuditedOrganizationsFilterByName() {
     }
 
     @Test
-    public void listAuditedOrganizationsFilterBySpaceId() {
+    void listAuditedOrganizationsFilterBySpaceId() {
         String organizationName = this.nameFactory.getOrganizationName();
         String spaceName = this.nameFactory.getSpaceName();
         String userId = this.nameFactory.getUserId();
@@ -481,7 +482,7 @@ public void listAuditedOrganizationsFilterBySpaceId() {
     }
 
     @Test
-    public void listAuditedOrganizationsFilterByStatus() {
+    void listAuditedOrganizationsFilterByStatus() {
         String organizationName = this.nameFactory.getOrganizationName();
         String userId = this.nameFactory.getUserId();
 
@@ -503,7 +504,7 @@ public void listAuditedOrganizationsFilterByStatus() {
     }
 
     @Test
-    public void listAuditedSpaces() {
+    void listAuditedSpaces() {
         String spaceName = this.nameFactory.getSpaceName();
         String userId = this.nameFactory.getUserId();
 
@@ -524,7 +525,7 @@ public void listAuditedSpaces() {
     }
 
     @Test
-    public void listAuditedSpacesFilterByApplicationId() {
+    void listAuditedSpacesFilterByApplicationId() {
         String applicationName = this.nameFactory.getApplicationName();
         String spaceName = this.nameFactory.getSpaceName();
         String userId = this.nameFactory.getUserId();
@@ -550,7 +551,7 @@ public void listAuditedSpacesFilterByApplicationId() {
     }
 
     @Test
-    public void listAuditedSpacesFilterByDeveloperId() {
+    void listAuditedSpacesFilterByDeveloperId() {
         String spaceName = this.nameFactory.getSpaceName();
         String userId = this.nameFactory.getUserId();
 
@@ -575,7 +576,7 @@ public void listAuditedSpacesFilterByDeveloperId() {
     }
 
     @Test
-    public void listAuditedSpacesFilterByName() {
+    void listAuditedSpacesFilterByName() {
         String spaceName = this.nameFactory.getSpaceName();
         String userId = this.nameFactory.getUserId();
 
@@ -597,7 +598,7 @@ public void listAuditedSpacesFilterByName() {
     }
 
     @Test
-    public void listAuditedSpacesFilterByOrganizationId() {
+    void listAuditedSpacesFilterByOrganizationId() {
         String spaceName = this.nameFactory.getSpaceName();
         String userId = this.nameFactory.getUserId();
 
@@ -623,7 +624,7 @@ public void listAuditedSpacesFilterByOrganizationId() {
     }
 
     @Test
-    public void listBillingManagedOrganizations() {
+    void listBillingManagedOrganizations() {
         String organizationName = this.nameFactory.getOrganizationName();
         String userId = this.nameFactory.getUserId();
 
@@ -644,7 +645,7 @@ public void listBillingManagedOrganizations() {
     }
 
     @Test
-    public void listBillingManagedOrganizationsFilterByAuditorId() {
+    void listBillingManagedOrganizationsFilterByAuditorId() {
         String organizationName = this.nameFactory.getOrganizationName();
         String userId = this.nameFactory.getUserId();
 
@@ -668,7 +669,7 @@ public void listBillingManagedOrganizationsFilterByAuditorId() {
     }
 
     @Test
-    public void listBillingManagedOrganizationsFilterByBillingManagerId() {
+    void listBillingManagedOrganizationsFilterByBillingManagerId() {
         String organizationName = this.nameFactory.getOrganizationName();
         String userId = this.nameFactory.getUserId();
 
@@ -690,7 +691,7 @@ public void listBillingManagedOrganizationsFilterByBillingManagerId() {
     }
 
     @Test
-    public void listBillingManagedOrganizationsFilterByManagerId() {
+    void listBillingManagedOrganizationsFilterByManagerId() {
         String organizationName = this.nameFactory.getOrganizationName();
         String userId = this.nameFactory.getUserId();
 
@@ -714,7 +715,7 @@ public void listBillingManagedOrganizationsFilterByManagerId() {
     }
 
     @Test
-    public void listBillingManagedOrganizationsFilterByName() {
+    void listBillingManagedOrganizationsFilterByName() {
         String organizationName = this.nameFactory.getOrganizationName();
         String userId = this.nameFactory.getUserId();
 
@@ -736,7 +737,7 @@ public void listBillingManagedOrganizationsFilterByName() {
     }
 
     @Test
-    public void listBillingManagedOrganizationsFilterBySpaceId() {
+    void listBillingManagedOrganizationsFilterBySpaceId() {
         String organizationName = this.nameFactory.getOrganizationName();
         String spaceName = this.nameFactory.getSpaceName();
         String userId = this.nameFactory.getUserId();
@@ -763,7 +764,7 @@ public void listBillingManagedOrganizationsFilterBySpaceId() {
     }
 
     @Test
-    public void listBillingManagedOrganizationsFilterByStatus() {
+    void listBillingManagedOrganizationsFilterByStatus() {
         String organizationName = this.nameFactory.getOrganizationName();
         String userId = this.nameFactory.getUserId();
 
@@ -785,7 +786,7 @@ public void listBillingManagedOrganizationsFilterByStatus() {
     }
 
     @Test
-    public void listFilterByOrganization() {
+    void listFilterByOrganization() {
         String userId = this.nameFactory.getUserId();
 
         this.organizationId
@@ -805,7 +806,7 @@ public void listFilterByOrganization() {
     }
 
     @Test
-    public void listFilterBySpace() {
+    void listFilterBySpace() {
         String spaceName = this.nameFactory.getSpaceName();
         String userId = this.nameFactory.getUserId();
 
@@ -827,7 +828,7 @@ public void listFilterBySpace() {
     }
 
     @Test
-    public void listManagedOrganizations() {
+    void listManagedOrganizations() {
         String organizationName = this.nameFactory.getOrganizationName();
         String userId = this.nameFactory.getUserId();
 
@@ -848,7 +849,7 @@ public void listManagedOrganizations() {
     }
 
     @Test
-    public void listManagedOrganizationsFilterByAuditorId() {
+    void listManagedOrganizationsFilterByAuditorId() {
         String organizationName = this.nameFactory.getOrganizationName();
         String userId = this.nameFactory.getUserId();
 
@@ -872,7 +873,7 @@ public void listManagedOrganizationsFilterByAuditorId() {
     }
 
     @Test
-    public void listManagedOrganizationsFilterByBillingManagerId() {
+    void listManagedOrganizationsFilterByBillingManagerId() {
         String organizationName = this.nameFactory.getOrganizationName();
         String userId = this.nameFactory.getUserId();
 
@@ -896,7 +897,7 @@ public void listManagedOrganizationsFilterByBillingManagerId() {
     }
 
     @Test
-    public void listManagedOrganizationsFilterByManagerId() {
+    void listManagedOrganizationsFilterByManagerId() {
         String organizationName = this.nameFactory.getOrganizationName();
         String userId = this.nameFactory.getUserId();
 
@@ -918,7 +919,7 @@ public void listManagedOrganizationsFilterByManagerId() {
     }
 
     @Test
-    public void listManagedOrganizationsFilterByName() {
+    void listManagedOrganizationsFilterByName() {
         String organizationName = this.nameFactory.getOrganizationName();
         String userId = this.nameFactory.getUserId();
 
@@ -940,7 +941,7 @@ public void listManagedOrganizationsFilterByName() {
     }
 
     @Test
-    public void listManagedOrganizationsFilterBySpaceId() {
+    void listManagedOrganizationsFilterBySpaceId() {
         String organizationName = this.nameFactory.getOrganizationName();
         String spaceName = this.nameFactory.getSpaceName();
         String userId = this.nameFactory.getUserId();
@@ -967,7 +968,7 @@ public void listManagedOrganizationsFilterBySpaceId() {
     }
 
     @Test
-    public void listManagedOrganizationsFilterByStatus() {
+    void listManagedOrganizationsFilterByStatus() {
         String organizationName = this.nameFactory.getOrganizationName();
         String userId = this.nameFactory.getUserId();
 
@@ -989,7 +990,7 @@ public void listManagedOrganizationsFilterByStatus() {
     }
 
     @Test
-    public void listManagedSpaces() {
+    void listManagedSpaces() {
         String spaceName = this.nameFactory.getSpaceName();
         String userId = this.nameFactory.getUserId();
 
@@ -1010,7 +1011,7 @@ public void listManagedSpaces() {
     }
 
     @Test
-    public void listManagedSpacesFilterByApplicationId() {
+    void listManagedSpacesFilterByApplicationId() {
         String applicationName = this.nameFactory.getApplicationName();
         String spaceName = this.nameFactory.getSpaceName();
         String userId = this.nameFactory.getUserId();
@@ -1036,7 +1037,7 @@ public void listManagedSpacesFilterByApplicationId() {
     }
 
     @Test
-    public void listManagedSpacesFilterByDeveloperId() {
+    void listManagedSpacesFilterByDeveloperId() {
         String spaceName = this.nameFactory.getSpaceName();
         String userId = this.nameFactory.getUserId();
 
@@ -1061,7 +1062,7 @@ public void listManagedSpacesFilterByDeveloperId() {
     }
 
     @Test
-    public void listManagedSpacesFilterByName() {
+    void listManagedSpacesFilterByName() {
         String spaceName = this.nameFactory.getSpaceName();
         String userId = this.nameFactory.getUserId();
 
@@ -1083,7 +1084,7 @@ public void listManagedSpacesFilterByName() {
     }
 
     @Test
-    public void listManagedSpacesFilterByOrganizationId() {
+    void listManagedSpacesFilterByOrganizationId() {
         String spaceName = this.nameFactory.getSpaceName();
         String userId = this.nameFactory.getUserId();
 
@@ -1109,7 +1110,7 @@ public void listManagedSpacesFilterByOrganizationId() {
     }
 
     @Test
-    public void listOrganizations() {
+    void listOrganizations() {
         String organizationName = this.nameFactory.getOrganizationName();
         String userId = this.nameFactory.getUserId();
 
@@ -1130,7 +1131,7 @@ public void listOrganizations() {
     }
 
     @Test
-    public void listOrganizationsFilterByAuditorId() {
+    void listOrganizationsFilterByAuditorId() {
         String organizationName = this.nameFactory.getOrganizationName();
         String userId = this.nameFactory.getUserId();
 
@@ -1154,7 +1155,7 @@ public void listOrganizationsFilterByAuditorId() {
     }
 
     @Test
-    public void listOrganizationsFilterByBillingManagerId() {
+    void listOrganizationsFilterByBillingManagerId() {
         String organizationName = this.nameFactory.getOrganizationName();
         String userId = this.nameFactory.getUserId();
 
@@ -1178,7 +1179,7 @@ public void listOrganizationsFilterByBillingManagerId() {
     }
 
     @Test
-    public void listOrganizationsFilterByManagerId() {
+    void listOrganizationsFilterByManagerId() {
         String organizationName = this.nameFactory.getOrganizationName();
         String userId = this.nameFactory.getUserId();
 
@@ -1202,7 +1203,7 @@ public void listOrganizationsFilterByManagerId() {
     }
 
     @Test
-    public void listOrganizationsFilterByName() {
+    void listOrganizationsFilterByName() {
         String organizationName = this.nameFactory.getOrganizationName();
         String userId = this.nameFactory.getUserId();
 
@@ -1224,7 +1225,7 @@ public void listOrganizationsFilterByName() {
     }
 
     @Test
-    public void listOrganizationsFilterBySpaceId() {
+    void listOrganizationsFilterBySpaceId() {
         String organizationName = this.nameFactory.getOrganizationName();
         String spaceName = this.nameFactory.getSpaceName();
         String userId = this.nameFactory.getUserId();
@@ -1251,7 +1252,7 @@ public void listOrganizationsFilterBySpaceId() {
     }
 
     @Test
-    public void listOrganizationsFilterByStatus() {
+    void listOrganizationsFilterByStatus() {
         String organizationName = this.nameFactory.getOrganizationName();
         String userId = this.nameFactory.getUserId();
 
@@ -1273,7 +1274,7 @@ public void listOrganizationsFilterByStatus() {
     }
 
     @Test
-    public void listSpaces() {
+    void listSpaces() {
         String spaceName = this.nameFactory.getSpaceName();
         String userId = this.nameFactory.getUserId();
 
@@ -1294,7 +1295,7 @@ public void listSpaces() {
     }
 
     @Test
-    public void listSpacesFilterByApplicationId() {
+    void listSpacesFilterByApplicationId() {
         String applicationName = this.nameFactory.getApplicationName();
         String spaceName = this.nameFactory.getSpaceName();
         String userId = this.nameFactory.getUserId();
@@ -1320,7 +1321,7 @@ public void listSpacesFilterByApplicationId() {
     }
 
     @Test
-    public void listSpacesFilterByDeveloperId() {
+    void listSpacesFilterByDeveloperId() {
         String spaceName = this.nameFactory.getSpaceName();
         String userId = this.nameFactory.getUserId();
 
@@ -1343,7 +1344,7 @@ public void listSpacesFilterByDeveloperId() {
     }
 
     @Test
-    public void listSpacesFilterByName() {
+    void listSpacesFilterByName() {
         String spaceName = this.nameFactory.getSpaceName();
         String userId = this.nameFactory.getUserId();
 
@@ -1366,7 +1367,7 @@ public void listSpacesFilterByName() {
     }
 
     @Test
-    public void listSpacesFilterByOrganizationId() {
+    void listSpacesFilterByOrganizationId() {
         String spaceName = this.nameFactory.getSpaceName();
         String userId = this.nameFactory.getUserId();
 
@@ -1393,7 +1394,7 @@ public void listSpacesFilterByOrganizationId() {
     }
 
     @Test
-    public void removeAuditedOrganization() {
+    void removeAuditedOrganization() {
         String userId = this.nameFactory.getUserId();
 
         this.organizationId
@@ -1413,7 +1414,7 @@ public void removeAuditedOrganization() {
     }
 
     @Test
-    public void removeAuditedSpace() {
+    void removeAuditedSpace() {
         String spaceName = this.nameFactory.getSpaceName();
         String userId = this.nameFactory.getUserId();
 
@@ -1434,7 +1435,7 @@ public void removeAuditedSpace() {
     }
 
     @Test
-    public void removeBillingManagedOrganization() {
+    void removeBillingManagedOrganization() {
         String userId = this.nameFactory.getUserId();
 
         this.organizationId
@@ -1454,7 +1455,7 @@ public void removeBillingManagedOrganization() {
     }
 
     @Test
-    public void removeManagedOrganization() {
+    void removeManagedOrganization() {
         String userId = this.nameFactory.getUserId();
 
         this.organizationId
@@ -1474,7 +1475,7 @@ public void removeManagedOrganization() {
     }
 
     @Test
-    public void removeManagedSpace() {
+    void removeManagedSpace() {
         String spaceName = this.nameFactory.getSpaceName();
         String userId = this.nameFactory.getUserId();
 
@@ -1495,7 +1496,7 @@ public void removeManagedSpace() {
     }
 
     @Test
-    public void removeOrganization() {
+    void removeOrganization() {
         String userId = this.nameFactory.getUserId();
 
         this.organizationId
@@ -1514,7 +1515,7 @@ public void removeOrganization() {
     }
 
     @Test
-    public void removeSpace() {
+    void removeSpace() {
         String spaceName = this.nameFactory.getSpaceName();
         String userId = this.nameFactory.getUserId();
 
@@ -1535,7 +1536,7 @@ public void removeSpace() {
     }
 
     @Test
-    public void summary() {
+    void summary() {
         String organizationName = this.nameFactory.getOrganizationName();
         String userId = this.nameFactory.getUserId();
 
@@ -1554,7 +1555,7 @@ public void summary() {
     }
 
     @Test
-    public void update() {
+    void update() {
         String spaceName = this.nameFactory.getSpaceName();
         String userId = this.nameFactory.getUserId();
 
diff --git a/integration-test/src/test/java/org/cloudfoundry/client/v3/AdminTest.java b/integration-test/src/test/java/org/cloudfoundry/client/v3/AdminTest.java
index 868ec17ca1..5af250352b 100644
--- a/integration-test/src/test/java/org/cloudfoundry/client/v3/AdminTest.java
+++ b/integration-test/src/test/java/org/cloudfoundry/client/v3/AdminTest.java
@@ -22,19 +22,20 @@
 import org.cloudfoundry.client.CloudFoundryClient;
 import org.cloudfoundry.client.v3.admin.ClearBuildpackCacheRequest;
 import org.cloudfoundry.util.JobUtils;
+import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 import reactor.test.StepVerifier;
 
 import java.time.Duration;
 
-public final class AdminTest extends AbstractIntegrationTest {
+final class AdminTest extends AbstractIntegrationTest {
 
     @Autowired
     private CloudFoundryClient cloudFoundryClient;
 
     @IfCloudFoundryVersion(greaterThanOrEqualTo = CloudFoundryVersion.PCF_2_10)
     @Test
-    public void clearBuildpackCache() {
+    void clearBuildpackCache() {
         this.cloudFoundryClient.adminV3()
             .clearBuildpackCache(ClearBuildpackCacheRequest.builder()
                 .build())
diff --git a/integration-test/src/test/java/org/cloudfoundry/client/v3/ApplicationsTest.java b/integration-test/src/test/java/org/cloudfoundry/client/v3/ApplicationsTest.java
index 40d937c0c7..d5e2a35342 100644
--- a/integration-test/src/test/java/org/cloudfoundry/client/v3/ApplicationsTest.java
+++ b/integration-test/src/test/java/org/cloudfoundry/client/v3/ApplicationsTest.java
@@ -88,6 +88,7 @@
 import org.cloudfoundry.util.DelayUtils;
 import org.cloudfoundry.util.JobUtils;
 import org.cloudfoundry.util.PaginationUtils;
+import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.core.io.ClassPathResource;
 import reactor.core.publisher.Mono;
@@ -106,7 +107,7 @@
 import static org.cloudfoundry.util.tuple.TupleUtils.consumer;
 import static org.cloudfoundry.util.tuple.TupleUtils.function;
 
-public final class ApplicationsTest extends AbstractIntegrationTest {
+final class ApplicationsTest extends AbstractIntegrationTest {
 
     @Autowired
     private CloudFoundryClient cloudFoundryClient;
@@ -118,7 +119,7 @@ public final class ApplicationsTest extends AbstractIntegrationTest {
     private Mono<String> spaceId;
 
     @Test
-    public void create() {
+    void create() {
         String applicationName = this.nameFactory.getApplicationName();
 
         this.spaceId
@@ -147,7 +148,7 @@ public void create() {
     }
 
     @Test
-    public void delete() {
+    void delete() {
         String applicationName = this.nameFactory.getApplicationName();
 
         this.spaceId
@@ -164,7 +165,7 @@ public void delete() {
     }
 
     @Test
-    public void get() {
+    void get() {
         String applicationName = this.nameFactory.getApplicationName();
 
         this.spaceId
@@ -181,7 +182,7 @@ public void get() {
     }
 
     @Test
-    public void getDropletAssociation() {
+    void getDropletAssociation() {
         String applicationName = this.nameFactory.getApplicationName();
 
         this.spaceId
@@ -207,7 +208,7 @@ public void getDropletAssociation() {
 
     @SuppressWarnings("unchecked")
     @Test
-    public void getEnvironment() {
+    void getEnvironment() {
         String applicationName = this.nameFactory.getApplicationName();
 
         this.spaceId
@@ -224,7 +225,7 @@ public void getEnvironment() {
     }
 
     @Test
-    public void getFeature() {
+    void getFeature() {
         String applicationName = this.nameFactory.getApplicationName();
 
         this.spaceId
@@ -246,7 +247,7 @@ public void getFeature() {
 
     @IfCloudFoundryVersion(greaterThanOrEqualTo = CloudFoundryVersion.PCF_2_10)
     @Test
-    public void getPermissions() {
+    void getPermissions() {
         String applicationName = this.nameFactory.getApplicationName();
 
         this.spaceId
@@ -265,7 +266,7 @@ public void getPermissions() {
     }
 
     @Test
-    public void getSshEnabled() {
+    void getSshEnabled() {
         String applicationName = this.nameFactory.getApplicationName();
 
         this.spaceId
@@ -284,7 +285,7 @@ public void getSshEnabled() {
     }
 
     @Test
-    public void list() {
+    void list() {
         String applicationName = this.nameFactory.getApplicationName();
 
         this.spaceId
@@ -304,7 +305,7 @@ public void list() {
 
     @IfCloudFoundryVersion(greaterThanOrEqualTo = CloudFoundryVersion.PCF_2_9)
     @Test
-    public void listApplicationRoutes() {
+    void listApplicationRoutes() {
         String applicationName = this.nameFactory.getApplicationName();
         String domainName = this.nameFactory.getDomainName();
 
@@ -335,7 +336,7 @@ public void listApplicationRoutes() {
 
     @IfCloudFoundryVersion(greaterThanOrEqualTo = CloudFoundryVersion.PCF_2_9)
     @Test
-    public void listApplicationRoutesByDomain() {
+    void listApplicationRoutesByDomain() {
         String applicationName = this.nameFactory.getApplicationName();
         String domainName = this.nameFactory.getDomainName();
 
@@ -367,7 +368,7 @@ public void listApplicationRoutesByDomain() {
 
     @IfCloudFoundryVersion(greaterThanOrEqualTo = CloudFoundryVersion.PCF_2_9)
     @Test
-    public void listApplicationRoutesByHost() {
+    void listApplicationRoutesByHost() {
         String applicationName = this.nameFactory.getApplicationName();
         String domainName = this.nameFactory.getDomainName();
         String hostName = this.nameFactory.getHostName();
@@ -401,7 +402,7 @@ public void listApplicationRoutesByHost() {
 
     @IfCloudFoundryVersion(greaterThanOrEqualTo = CloudFoundryVersion.PCF_2_9)
     @Test
-    public void listApplicationRoutesByLabelSelector() {
+    void listApplicationRoutesByLabelSelector() {
         String applicationName = this.nameFactory.getApplicationName();
         String domainName = this.nameFactory.getDomainName();
         String spaceName = this.nameFactory.getSpaceName();
@@ -434,7 +435,7 @@ public void listApplicationRoutesByLabelSelector() {
 
     @IfCloudFoundryVersion(greaterThanOrEqualTo = CloudFoundryVersion.PCF_2_9)
     @Test
-    public void listApplicationRoutesByOrganizationId() {
+    void listApplicationRoutesByOrganizationId() {
         String applicationName = this.nameFactory.getApplicationName();
         String domainName = this.nameFactory.getDomainName();
         String organizationName = this.nameFactory.getOrganizationName();
@@ -470,7 +471,7 @@ public void listApplicationRoutesByOrganizationId() {
 
     @IfCloudFoundryVersion(greaterThanOrEqualTo = CloudFoundryVersion.PCF_2_9)
     @Test
-    public void listApplicationRoutesByPath() {
+    void listApplicationRoutesByPath() {
         String applicationName = this.nameFactory.getApplicationName();
         String domainName = this.nameFactory.getDomainName();
         String path = this.nameFactory.getPath();
@@ -505,7 +506,7 @@ public void listApplicationRoutesByPath() {
 
     @IfCloudFoundryVersion(greaterThanOrEqualTo = CloudFoundryVersion.PCF_2_9)
     @Test
-    public void listApplicationRoutesBySpaceId() {
+    void listApplicationRoutesBySpaceId() {
         String applicationName = this.nameFactory.getApplicationName();
         String domainName = this.nameFactory.getDomainName();
         String spaceName = this.nameFactory.getSpaceName();
@@ -540,7 +541,7 @@ public void listApplicationRoutesBySpaceId() {
     }
 
     @Test
-    public void listFeatures() {
+    void listFeatures() {
         String applicationName = this.nameFactory.getApplicationName();
 
         this.spaceId
@@ -560,7 +561,7 @@ public void listFeatures() {
     }
 
     @Test
-    public void listFilterBySpaceId() {
+    void listFilterBySpaceId() {
         String applicationName = this.nameFactory.getApplicationName();
         String spaceName = this.nameFactory.getSpaceName();
 
@@ -586,7 +587,7 @@ public void listFilterBySpaceId() {
 
     @IfCloudFoundryVersion(greaterThanOrEqualTo = CloudFoundryVersion.PCF_2_9)
     @Test
-    public void scale() {
+    void scale() {
         String applicationName = this.nameFactory.getApplicationName();
 
         this.spaceId
@@ -607,7 +608,7 @@ public void scale() {
     }
 
     @Test
-    public void setAndGetDroplet() {
+    void setAndGetDroplet() {
         String applicationName = this.nameFactory.getApplicationName();
 
         this.spaceId
@@ -637,7 +638,7 @@ public void setAndGetDroplet() {
     }
 
     @Test
-    public void start() {
+    void start() {
         String applicationName = this.nameFactory.getApplicationName();
 
         this.spaceId
@@ -656,7 +657,7 @@ public void start() {
     }
 
     @Test
-    public void restart() {
+    void restart() {
         String applicationName = this.nameFactory.getApplicationName();
 
         this.spaceId
@@ -682,7 +683,7 @@ public void restart() {
     }
 
     @Test
-    public void stop() {
+    void stop() {
         String applicationName = this.nameFactory.getApplicationName();
 
         this.spaceId
@@ -702,7 +703,7 @@ public void stop() {
     }
 
     @Test
-    public void update() {
+    void update() {
         String applicationName = this.nameFactory.getApplicationName();
 
         this.spaceId
@@ -723,7 +724,7 @@ public void update() {
     }
 
     @Test
-    public void updateAndGetEnvironmentVariables() {
+    void updateAndGetEnvironmentVariables() {
         String applicationName = this.nameFactory.getApplicationName();
 
         this.spaceId
@@ -745,7 +746,7 @@ public void updateAndGetEnvironmentVariables() {
     }
 
     @Test
-    public void updateFeature() {
+    void updateFeature() {
         String applicationName = this.nameFactory.getApplicationName();
 
         this.spaceId
diff --git a/integration-test/src/test/java/org/cloudfoundry/client/v3/AuditEventsTest.java b/integration-test/src/test/java/org/cloudfoundry/client/v3/AuditEventsTest.java
index cb4246afbb..10d4aa3d22 100644
--- a/integration-test/src/test/java/org/cloudfoundry/client/v3/AuditEventsTest.java
+++ b/integration-test/src/test/java/org/cloudfoundry/client/v3/AuditEventsTest.java
@@ -30,6 +30,7 @@
 import org.cloudfoundry.client.v3.spaces.CreateSpaceResponse;
 import org.cloudfoundry.client.v3.spaces.SpaceRelationships;
 import org.cloudfoundry.util.PaginationUtils;
+import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 import reactor.core.publisher.Flux;
 import reactor.core.publisher.Mono;
@@ -38,7 +39,7 @@
 import java.time.Duration;
 
 @IfCloudFoundryVersion(greaterThanOrEqualTo = CloudFoundryVersion.PCF_2_8)
-public final class AuditEventsTest extends AbstractIntegrationTest {
+final class AuditEventsTest extends AbstractIntegrationTest {
 
     @Autowired
     private CloudFoundryClient cloudFoundryClient;
@@ -47,7 +48,7 @@ public final class AuditEventsTest extends AbstractIntegrationTest {
     private Mono<String> organizationId;
 
     @Test
-    public void get() {
+    void get() {
         String organizationName = this.nameFactory.getOrganizationName();
 
         createOrganizationId(this.cloudFoundryClient, organizationName)
@@ -66,7 +67,7 @@ public void get() {
     //Note: Basic list() test is omitted as the potential volume of data means it take several minutes, with little benefit over the listFilterBy... tests.
 
     @Test
-    public void lisFilterByOrganization() {
+    void lisFilterByOrganization() {
         String organizationName = this.nameFactory.getOrganizationName();
 
         createOrganizationId(this.cloudFoundryClient, organizationName)
@@ -83,7 +84,7 @@ public void lisFilterByOrganization() {
     }
 
     @Test
-    public void lisFilterByType() {
+    void lisFilterByType() {
         String organizationName = this.nameFactory.getOrganizationName();
 
         createOrganizationId(this.cloudFoundryClient, organizationName)
@@ -101,7 +102,7 @@ public void lisFilterByType() {
     }
 
     @Test
-    public void listFilterBySpace() {
+    void listFilterBySpace() {
         String spaceName = this.nameFactory.getSpaceName();
 
         this.organizationId
@@ -119,7 +120,7 @@ public void listFilterBySpace() {
     }
 
     @Test
-    public void listFilterByTarget() {
+    void listFilterByTarget() {
         String organizationName = this.nameFactory.getOrganizationName();
 
         createOrganizationId(this.cloudFoundryClient, organizationName)
diff --git a/integration-test/src/test/java/org/cloudfoundry/client/v3/BuildpacksTest.java b/integration-test/src/test/java/org/cloudfoundry/client/v3/BuildpacksTest.java
index 40c8628f50..ba015e3f3e 100644
--- a/integration-test/src/test/java/org/cloudfoundry/client/v3/BuildpacksTest.java
+++ b/integration-test/src/test/java/org/cloudfoundry/client/v3/BuildpacksTest.java
@@ -29,6 +29,7 @@
 import org.cloudfoundry.client.v3.buildpacks.UploadBuildpackRequest;
 import org.cloudfoundry.util.JobUtils;
 import org.cloudfoundry.util.PaginationUtils;
+import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.core.io.ClassPathResource;
 import reactor.core.publisher.Flux;
@@ -39,13 +40,13 @@
 import java.nio.file.Path;
 import java.time.Duration;
 
-public final class BuildpacksTest extends AbstractIntegrationTest {
+final class BuildpacksTest extends AbstractIntegrationTest {
 
     @Autowired
     private CloudFoundryClient cloudFoundryClient;
 
     @Test
-    public void create() {
+    void create() {
         String buildpackName = this.nameFactory.getBuildpackName();
 
         this.cloudFoundryClient.buildpacksV3()
@@ -64,7 +65,7 @@ public void create() {
     }
 
     @Test
-    public void delete() {
+    void delete() {
         String buildpackName = this.nameFactory.getBuildpackName();
 
         createBuildpackId(this.cloudFoundryClient, buildpackName)
@@ -80,7 +81,7 @@ public void delete() {
     }
 
     @Test
-    public void get() {
+    void get() {
         String buildpackName = this.nameFactory.getBuildpackName();
 
         createBuildpackId(this.cloudFoundryClient, buildpackName)
@@ -96,7 +97,7 @@ public void get() {
     }
 
     @Test
-    public void list() {
+    void list() {
         String buildpackName = this.nameFactory.getBuildpackName();
 
         createBuildpackId(this.cloudFoundryClient, buildpackName)
@@ -114,7 +115,7 @@ public void list() {
     }
 
     @Test
-    public void listFilterByName() {
+    void listFilterByName() {
         String buildpackName = this.nameFactory.getBuildpackName();
 
         createBuildpackId(this.cloudFoundryClient, buildpackName)
@@ -132,7 +133,7 @@ public void listFilterByName() {
     }
 
     @Test
-    public void update() {
+    void update() {
         String buildpackName = this.nameFactory.getBuildpackName();
 
         createBuildpackId(this.cloudFoundryClient, buildpackName)
@@ -152,7 +153,7 @@ public void update() {
     }
 
     @Test
-    public void upload() throws IOException {
+    void upload() throws IOException {
         Path buildpack = new ClassPathResource("test-buildpack.zip").getFile().toPath();
         String buildpackName = this.nameFactory.getBuildpackName();
 
@@ -171,7 +172,7 @@ public void upload() throws IOException {
     }
 
     @Test
-    public void uploadDirectory() throws IOException {
+    void uploadDirectory() throws IOException {
         Path buildpack = new ClassPathResource("test-buildpack").getFile().toPath();
         String buildpackName = this.nameFactory.getBuildpackName();
 
diff --git a/integration-test/src/test/java/org/cloudfoundry/client/v3/DeploymentsTest.java b/integration-test/src/test/java/org/cloudfoundry/client/v3/DeploymentsTest.java
index b37ab44927..def84400cb 100644
--- a/integration-test/src/test/java/org/cloudfoundry/client/v3/DeploymentsTest.java
+++ b/integration-test/src/test/java/org/cloudfoundry/client/v3/DeploymentsTest.java
@@ -38,6 +38,7 @@
 import org.cloudfoundry.operations.applications.GetApplicationRequest;
 import org.cloudfoundry.operations.applications.PushApplicationRequest;
 import org.cloudfoundry.util.PaginationUtils;
+import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.core.io.ClassPathResource;
 import reactor.core.publisher.Flux;
@@ -88,7 +89,7 @@ public void cancel_2_11() throws Exception {
     @SuppressWarnings("deprecation")
     @Test
     @IfCloudFoundryVersion(lessThanOrEqualTo = CloudFoundryVersion.PCF_2_10)
-    public void cancel() throws Exception {
+    void cancel() throws Exception {
         String name = this.nameFactory.getApplicationName();
         Path path = new ClassPathResource("test-application.zip").getFile().toPath();
 
@@ -114,7 +115,7 @@ public void cancel() throws Exception {
     }
 
     @Test
-    public void create() throws Exception {
+    void create() throws Exception {
         String name = this.nameFactory.getApplicationName();
         Path path = new ClassPathResource("test-application.zip").getFile().toPath();
 
@@ -145,7 +146,7 @@ public void create() throws Exception {
     }
 
     @Test
-    public void get() throws Exception {
+    void get() throws Exception {
         String name = this.nameFactory.getApplicationName();
         Path path = new ClassPathResource("test-application.zip").getFile().toPath();
 
@@ -166,7 +167,7 @@ public void get() throws Exception {
     }
 
     @Test
-    public void list() throws Exception {
+    void list() throws Exception {
         String name = this.nameFactory.getApplicationName();
         Path path = new ClassPathResource("test-application.zip").getFile().toPath();
 
@@ -188,7 +189,7 @@ public void list() throws Exception {
     }
 
     @Test
-    public void listFilterByApplication() throws Exception {
+    void listFilterByApplication() throws Exception {
         String name = this.nameFactory.getApplicationName();
         Path path = new ClassPathResource("test-application.zip").getFile().toPath();
 
@@ -211,7 +212,7 @@ public void listFilterByApplication() throws Exception {
     }
 
     @Test
-    public void listFilterByState() throws Exception {
+    void listFilterByState() throws Exception {
         String name = this.nameFactory.getApplicationName();
         Path path = new ClassPathResource("test-application.zip").getFile().toPath();
 
@@ -235,7 +236,7 @@ public void listFilterByState() throws Exception {
 
     @IfCloudFoundryVersion(greaterThanOrEqualTo = CloudFoundryVersion.PCF_2_7)
     @Test
-    public void listFilterByStatusValues() throws Exception {
+    void listFilterByStatusValues() throws Exception {
         String name = this.nameFactory.getApplicationName();
         Path path = new ClassPathResource("test-application.zip").getFile().toPath();
 
diff --git a/integration-test/src/test/java/org/cloudfoundry/client/v3/DomainsTest.java b/integration-test/src/test/java/org/cloudfoundry/client/v3/DomainsTest.java
index 654e3d1fb0..996b2b19f6 100644
--- a/integration-test/src/test/java/org/cloudfoundry/client/v3/DomainsTest.java
+++ b/integration-test/src/test/java/org/cloudfoundry/client/v3/DomainsTest.java
@@ -43,6 +43,7 @@
 import org.cloudfoundry.client.v3.routes.RouteRelationships;
 import org.cloudfoundry.util.JobUtils;
 import org.cloudfoundry.util.PaginationUtils;
+import org.junit.jupiter.api.Test;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -73,7 +74,7 @@ public final class DomainsTest extends AbstractIntegrationTest {
 
     @IfCloudFoundryVersion(greaterThanOrEqualTo = CloudFoundryVersion.PCF_2_7)
     @Test
-    public void checkReservedRoutes() {
+    void checkReservedRoutes() {
         String domainName = this.nameFactory.getDomainName();
 
         this.organizationId
@@ -93,7 +94,7 @@ public void checkReservedRoutes() {
 
     @IfCloudFoundryVersion(greaterThanOrEqualTo = CloudFoundryVersion.PCF_2_7)
     @Test
-    public void checkReservedRoutesByHost() {
+    void checkReservedRoutesByHost() {
         String domainName = this.nameFactory.getDomainName();
         String hostName = this.nameFactory.getHostName();
 
@@ -119,7 +120,7 @@ public void checkReservedRoutesByHost() {
 
     @IfCloudFoundryVersion(greaterThanOrEqualTo = CloudFoundryVersion.PCF_2_7)
     @Test
-    public void checkReservedRoutesByPath() {
+    void checkReservedRoutesByPath() {
         String domainName = this.nameFactory.getDomainName();
         String path = this.nameFactory.getPath();
 
@@ -192,7 +193,7 @@ private static Mono<CreateRouteResponse> requestCreateRoute(CloudFoundryClient c
 
     @IfCloudFoundryVersion(greaterThanOrEqualTo = CloudFoundryVersion.PCF_2_6)
     @Test
-    public void create() {
+    void create() {
         String domainName = this.nameFactory.getDomainName();
 
         this.cloudFoundryClient.domainsV3()
@@ -208,7 +209,7 @@ public void create() {
 
     @IfCloudFoundryVersion(greaterThanOrEqualTo = CloudFoundryVersion.PCF_2_6)
     @Test
-    public void createForAnOrganization() {
+    void createForAnOrganization() {
         String domainName = this.nameFactory.getDomainName();
 
         this.organizationId
@@ -238,7 +239,7 @@ public void createForAnOrganization() {
 
     @IfCloudFoundryVersion(greaterThanOrEqualTo = CloudFoundryVersion.PCF_2_7)
     @Test
-    public void delete() {
+    void delete() {
         String domainName = this.nameFactory.getDomainName();
 
         createDomainId(this.cloudFoundryClient, domainName)
@@ -255,7 +256,7 @@ public void delete() {
 
     @IfCloudFoundryVersion(greaterThanOrEqualTo = CloudFoundryVersion.PCF_2_6)
     @Test
-    public void get() {
+    void get() {
         String domainName = this.nameFactory.getDomainName();
 
         createDomainId(this.cloudFoundryClient, domainName)
@@ -271,7 +272,7 @@ public void get() {
 
     @IfCloudFoundryVersion(greaterThanOrEqualTo = CloudFoundryVersion.PCF_2_6)
     @Test
-    public void list() {
+    void list() {
         String domainName = this.nameFactory.getDomainName();
 
         createDomainId(this.cloudFoundryClient, domainName)
@@ -290,7 +291,7 @@ public void list() {
 
     @IfCloudFoundryVersion(greaterThanOrEqualTo = CloudFoundryVersion.PCF_2_7)
     @Test
-    public void listFilterById() {
+    void listFilterById() {
         String domainName = this.nameFactory.getDomainName();
 
         createDomainId(this.cloudFoundryClient, domainName)
@@ -308,7 +309,7 @@ public void listFilterById() {
 
     @IfCloudFoundryVersion(greaterThanOrEqualTo = CloudFoundryVersion.PCF_2_7)
     @Test
-    public void listFilterByName() {
+    void listFilterByName() {
         String domainName = this.nameFactory.getDomainName();
 
         createDomainId(this.cloudFoundryClient, domainName)
@@ -329,7 +330,7 @@ public void listFilterByName() {
 
     @IfCloudFoundryVersion(greaterThanOrEqualTo = CloudFoundryVersion.PCF_2_7)
     @Test
-    public void listFilterByOwningOrganizationId() {
+    void listFilterByOwningOrganizationId() {
         String domainName = this.nameFactory.getDomainName();
 
         this.organizationId
@@ -359,7 +360,7 @@ public void listFilterByOwningOrganizationId() {
 
     @IfCloudFoundryVersion(greaterThanOrEqualTo = CloudFoundryVersion.PCF_2_7)
     @Test
-    public void share() {
+    void share() {
         String domainName = this.nameFactory.getDomainName();
         String organizationName = this.nameFactory.getOrganizationName();
 
@@ -393,7 +394,7 @@ public void share() {
 
     @IfCloudFoundryVersion(greaterThanOrEqualTo = CloudFoundryVersion.PCF_2_7)
     @Test
-    public void unshare() {
+    void unshare() {
         String domainName = this.nameFactory.getDomainName();
         String organizationName = this.nameFactory.getOrganizationName();
 
@@ -423,7 +424,7 @@ public void unshare() {
 
     @IfCloudFoundryVersion(greaterThanOrEqualTo = CloudFoundryVersion.PCF_2_7)
     @Test
-    public void update() {
+    void update() {
         String domainName = this.nameFactory.getDomainName();
 
         createDomainId(this.cloudFoundryClient, domainName)
diff --git a/integration-test/src/test/java/org/cloudfoundry/client/v3/IsolationSegmentsTest.java b/integration-test/src/test/java/org/cloudfoundry/client/v3/IsolationSegmentsTest.java
index 5d6970ef09..de8604954a 100644
--- a/integration-test/src/test/java/org/cloudfoundry/client/v3/IsolationSegmentsTest.java
+++ b/integration-test/src/test/java/org/cloudfoundry/client/v3/IsolationSegmentsTest.java
@@ -43,6 +43,7 @@
 import org.cloudfoundry.client.v3.spaces.AssignSpaceIsolationSegmentResponse;
 import org.cloudfoundry.util.PaginationUtils;
 import org.cloudfoundry.util.ResourceUtils;
+import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 import reactor.core.publisher.Flux;
 import reactor.core.publisher.Mono;
@@ -53,13 +54,13 @@
 import static org.cloudfoundry.util.tuple.TupleUtils.function;
 
 @IfCloudFoundryVersion(greaterThanOrEqualTo = CloudFoundryVersion.PCF_1_11)
-public final class IsolationSegmentsTest extends AbstractIntegrationTest {
+final class IsolationSegmentsTest extends AbstractIntegrationTest {
 
     @Autowired
     private CloudFoundryClient cloudFoundryClient;
 
     @Test
-    public void addOrganizationEntitlement() {
+    void addOrganizationEntitlement() {
         String isolationSegmentName = this.nameFactory.getIsolationSegmentName();
         String organizationName = this.nameFactory.getOrganizationName();
 
@@ -85,7 +86,7 @@ public void addOrganizationEntitlement() {
     }
 
     @Test
-    public void create() {
+    void create() {
         String isolationSegmentName = this.nameFactory.getIsolationSegmentName();
 
         this.cloudFoundryClient.isolationSegments()
@@ -102,7 +103,7 @@ public void create() {
     }
 
     @Test
-    public void delete() {
+    void delete() {
         String isolationSegmentName = this.nameFactory.getIsolationSegmentName();
 
         createIsolationSegmentId(this.cloudFoundryClient, isolationSegmentName)
@@ -117,7 +118,7 @@ public void delete() {
     }
 
     @Test
-    public void get() {
+    void get() {
         String isolationSegmentName = this.nameFactory.getIsolationSegmentName();
 
         createIsolationSegmentId(this.cloudFoundryClient, isolationSegmentName)
@@ -133,7 +134,7 @@ public void get() {
     }
 
     @Test
-    public void list() {
+    void list() {
         String isolationSegmentName = this.nameFactory.getIsolationSegmentName();
 
         requestCreateIsolationSegment(this.cloudFoundryClient, isolationSegmentName)
@@ -149,7 +150,7 @@ public void list() {
     }
 
     @Test
-    public void listEntitledOrganizations() {
+    void listEntitledOrganizations() {
         String isolationSegmentName = this.nameFactory.getIsolationSegmentName();
         String organizationName = this.nameFactory.getOrganizationName();
 
@@ -175,7 +176,7 @@ public void listEntitledOrganizations() {
     }
 
     @Test
-    public void listEntitledOrganizationsFilterByName() {
+    void listEntitledOrganizationsFilterByName() {
         String isolationSegmentName = this.nameFactory.getIsolationSegmentName();
         String organizationName = this.nameFactory.getOrganizationName();
 
@@ -202,7 +203,7 @@ public void listEntitledOrganizationsFilterByName() {
     }
 
     @Test
-    public void listFilterById() {
+    void listFilterById() {
         String isolationSegmentName = this.nameFactory.getIsolationSegmentName();
 
         createIsolationSegmentId(this.cloudFoundryClient, isolationSegmentName)
@@ -219,7 +220,7 @@ public void listFilterById() {
     }
 
     @Test
-    public void listFilterByName() {
+    void listFilterByName() {
         String isolationSegmentName = this.nameFactory.getIsolationSegmentName();
 
         requestCreateIsolationSegment(this.cloudFoundryClient, isolationSegmentName)
@@ -235,7 +236,7 @@ public void listFilterByName() {
     }
 
     @Test
-    public void listFilterByOrganizationId() {
+    void listFilterByOrganizationId() {
         String isolationSegmentName = this.nameFactory.getIsolationSegmentName();
         String organizationName = this.nameFactory.getOrganizationName();
 
@@ -256,7 +257,7 @@ public void listFilterByOrganizationId() {
     }
 
     @Test
-    public void listOrganizationsRelationship() {
+    void listOrganizationsRelationship() {
         String isolationSegmentName = this.nameFactory.getIsolationSegmentName();
         String organizationName = this.nameFactory.getOrganizationName();
         String spaceName = this.nameFactory.getSpaceName();
@@ -290,7 +291,7 @@ public void listOrganizationsRelationship() {
     }
 
     @Test
-    public void listSpacesRelationship() {
+    void listSpacesRelationship() {
         String isolationSegmentName = this.nameFactory.getIsolationSegmentName();
         String organizationName = this.nameFactory.getOrganizationName();
         String spaceName = this.nameFactory.getSpaceName();
@@ -319,7 +320,7 @@ public void listSpacesRelationship() {
     }
 
     @Test
-    public void removeOrganizationEntitlement() {
+    void removeOrganizationEntitlement() {
         String isolationSegmentName = this.nameFactory.getIsolationSegmentName();
         String organizationName = this.nameFactory.getOrganizationName();
 
@@ -345,7 +346,7 @@ public void removeOrganizationEntitlement() {
     }
 
     @Test
-    public void update() {
+    void update() {
         String isolationSegmentName1 = this.nameFactory.getIsolationSegmentName();
         String isolationSegmentName2 = this.nameFactory.getIsolationSegmentName();
 
diff --git a/integration-test/src/test/java/org/cloudfoundry/client/v3/OrganizationsTest.java b/integration-test/src/test/java/org/cloudfoundry/client/v3/OrganizationsTest.java
index f5a2cdc3f3..9310d4293e 100644
--- a/integration-test/src/test/java/org/cloudfoundry/client/v3/OrganizationsTest.java
+++ b/integration-test/src/test/java/org/cloudfoundry/client/v3/OrganizationsTest.java
@@ -45,6 +45,7 @@
 import org.cloudfoundry.client.v3.organizations.UpdateOrganizationRequest;
 import org.cloudfoundry.util.JobUtils;
 import org.cloudfoundry.util.PaginationUtils;
+import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 import reactor.core.publisher.Flux;
 import reactor.core.publisher.Mono;
@@ -56,7 +57,7 @@
 import static org.cloudfoundry.util.tuple.TupleUtils.function;
 
 @IfCloudFoundryVersion(greaterThanOrEqualTo = CloudFoundryVersion.PCF_1_12)
-public final class OrganizationsTest extends AbstractIntegrationTest {
+final class OrganizationsTest extends AbstractIntegrationTest {
 
     @Autowired
     private CloudFoundryClient cloudFoundryClient;
@@ -65,7 +66,7 @@ public final class OrganizationsTest extends AbstractIntegrationTest {
     private Mono<String> organizationId;
 
     @Test
-    public void assignDefaultIsolationSegment() {
+    void assignDefaultIsolationSegment() {
         String isolationSegmentName = this.nameFactory.getIsolationSegmentName();
         String organizationName = this.nameFactory.getOrganizationName();
 
@@ -91,7 +92,7 @@ public void assignDefaultIsolationSegment() {
     }
 
     @Test
-    public void create() {
+    void create() {
         String organizationName = this.nameFactory.getOrganizationName();
 
         this.cloudFoundryClient.organizationsV3()
@@ -108,7 +109,7 @@ public void create() {
 
     @IfCloudFoundryVersion(greaterThanOrEqualTo = CloudFoundryVersion.PCF_2_8)
     @Test
-    public void delete() {
+    void delete() {
         String organizationName = this.nameFactory.getOrganizationName();
 
         createOrganizationId(this.cloudFoundryClient, organizationName)
@@ -124,7 +125,7 @@ public void delete() {
     }
 
     @Test
-    public void get() {
+    void get() {
         String organizationName = this.nameFactory.getOrganizationName();
 
         createOrganizationId(this.cloudFoundryClient, organizationName)
@@ -141,7 +142,7 @@ public void get() {
 
     @IfCloudFoundryVersion(greaterThanOrEqualTo = CloudFoundryVersion.PCF_2_7)
     @Test
-    public void getDefaultDomain() {
+    void getDefaultDomain() {
         String organizationName = this.nameFactory.getOrganizationName();
 
         createOrganizationId(this.cloudFoundryClient, organizationName)
@@ -157,7 +158,7 @@ public void getDefaultDomain() {
     }
 
     @Test
-    public void getDefaultIsolationSegment() {
+    void getDefaultIsolationSegment() {
         String isolationSegmentName = this.nameFactory.getIsolationSegmentName();
         String organizationName = this.nameFactory.getOrganizationName();
 
@@ -182,7 +183,7 @@ public void getDefaultIsolationSegment() {
 
     @IfCloudFoundryVersion(greaterThanOrEqualTo = CloudFoundryVersion.PCF_2_8)
     @Test
-    public void getUsageSummary() {
+    void getUsageSummary() {
         this.organizationId
             .flatMap(organizationId -> this.cloudFoundryClient.organizationsV3()
                 .getUsageSummary(GetOrganizationUsageSummaryRequest.builder()
@@ -199,7 +200,7 @@ public void getUsageSummary() {
     }
 
     @Test
-    public void list() {
+    void list() {
         String organizationName = this.nameFactory.getOrganizationName();
 
         requestCreateOrganization(this.cloudFoundryClient, organizationName)
@@ -216,7 +217,7 @@ public void list() {
 
     @IfCloudFoundryVersion(greaterThanOrEqualTo = CloudFoundryVersion.PCF_2_9)
     @Test
-    public void listDomains() {
+    void listDomains() {
         String domainName = this.nameFactory.getDomainName();
         String organizationName = this.nameFactory.getOrganizationName();
 
@@ -236,7 +237,7 @@ public void listDomains() {
 
     @IfCloudFoundryVersion(greaterThanOrEqualTo = CloudFoundryVersion.PCF_2_9)
     @Test
-    public void listDomainsFilterById() {
+    void listDomainsFilterById() {
         String domainName = this.nameFactory.getDomainName();
         String organizationName = this.nameFactory.getOrganizationName();
 
@@ -259,7 +260,7 @@ public void listDomainsFilterById() {
 
     @IfCloudFoundryVersion(greaterThanOrEqualTo = CloudFoundryVersion.PCF_2_9)
     @Test
-    public void listDomainsFilterByName() {
+    void listDomainsFilterByName() {
         String domainName = this.nameFactory.getDomainName();
         String organizationName = this.nameFactory.getOrganizationName();
 
@@ -279,7 +280,7 @@ public void listDomainsFilterByName() {
 
     @IfCloudFoundryVersion(greaterThanOrEqualTo = CloudFoundryVersion.PCF_2_9)
     @Test
-    public void listDomainsFilterByOwningOrganizationIds() {
+    void listDomainsFilterByOwningOrganizationIds() {
         String domainName = this.nameFactory.getDomainName();
         String globalDomainName = this.nameFactory.getDomainName();
         String organizationName = this.nameFactory.getOrganizationName();
@@ -303,7 +304,7 @@ public void listDomainsFilterByOwningOrganizationIds() {
 
     @IfCloudFoundryVersion(greaterThanOrEqualTo = CloudFoundryVersion.PCF_2_6)
     @Test
-    public void listDomainsReturningGlobalDomains() {
+    void listDomainsReturningGlobalDomains() {
         String globalDomainName = this.nameFactory.getDomainName();
         String organizationName = this.nameFactory.getOrganizationName();
 
@@ -323,7 +324,7 @@ public void listDomainsReturningGlobalDomains() {
 
     @IfCloudFoundryVersion(greaterThanOrEqualTo = CloudFoundryVersion.PCF_2_9)
     @Test
-    public void listDomainsReturningSharedDomains() {
+    void listDomainsReturningSharedDomains() {
         String domainName1 = this.nameFactory.getDomainName();
         String domainName2 = this.nameFactory.getDomainName();
         String organizationName1 = this.nameFactory.getOrganizationName();
@@ -350,7 +351,7 @@ public void listDomainsReturningSharedDomains() {
     }
 
     @Test
-    public void listFilterByName() {
+    void listFilterByName() {
         String organizationName = this.nameFactory.getOrganizationName();
 
         requestCreateOrganization(this.cloudFoundryClient, organizationName)
@@ -367,7 +368,7 @@ public void listFilterByName() {
 
     @IfCloudFoundryVersion(greaterThanOrEqualTo = CloudFoundryVersion.PCF_2_8)
     @Test
-    public void update() {
+    void update() {
         String organizationName = this.nameFactory.getOrganizationName();
 
         createOrganizationId(this.cloudFoundryClient, organizationName)
diff --git a/integration-test/src/test/java/org/cloudfoundry/client/v3/PackagesTest.java b/integration-test/src/test/java/org/cloudfoundry/client/v3/PackagesTest.java
index 689c1fd841..433db22257 100644
--- a/integration-test/src/test/java/org/cloudfoundry/client/v3/PackagesTest.java
+++ b/integration-test/src/test/java/org/cloudfoundry/client/v3/PackagesTest.java
@@ -26,7 +26,8 @@
 import org.cloudfoundry.client.v3.packages.Package;
 import org.cloudfoundry.client.v3.packages.PackageType;
 import org.cloudfoundry.client.v3.packages.UploadPackageRequest;
-import org.junit.Ignore;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.core.io.ClassPathResource;
 import reactor.core.Exceptions;
@@ -40,8 +41,8 @@
 import static org.cloudfoundry.client.v3.packages.PackageState.PROCESSING_UPLOAD;
 import static org.cloudfoundry.client.v3.packages.PackageState.READY;
 
-@Ignore("Until Packages are no longer experimental")
-public final class PackagesTest extends AbstractIntegrationTest {
+@Disabled("Until Packages are no longer experimental")
+final class PackagesTest extends AbstractIntegrationTest {
 
     @Autowired
     private CloudFoundryClient cloudFoundryClient;
@@ -50,7 +51,7 @@ public final class PackagesTest extends AbstractIntegrationTest {
     private Mono<String> spaceId;
 
     @Test
-    public void upload() {
+    void upload() {
         String applicationName = this.nameFactory.getApplicationName();
 
         this.spaceId
diff --git a/integration-test/src/test/java/org/cloudfoundry/client/v3/ProcessesTest.java b/integration-test/src/test/java/org/cloudfoundry/client/v3/ProcessesTest.java
index b6500c7d4b..fe165a38e5 100644
--- a/integration-test/src/test/java/org/cloudfoundry/client/v3/ProcessesTest.java
+++ b/integration-test/src/test/java/org/cloudfoundry/client/v3/ProcessesTest.java
@@ -41,6 +41,7 @@
 import org.cloudfoundry.operations.applications.GetApplicationRequest;
 import org.cloudfoundry.operations.applications.PushApplicationRequest;
 import org.cloudfoundry.util.PaginationUtils;
+import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.core.io.ClassPathResource;
 import reactor.core.publisher.Mono;
@@ -53,7 +54,7 @@
 import static org.assertj.core.api.Assertions.assertThat;
 
 @IfCloudFoundryVersion(greaterThanOrEqualTo = CloudFoundryVersion.PCF_2_0)
-public final class ProcessesTest extends AbstractIntegrationTest {
+final class ProcessesTest extends AbstractIntegrationTest {
 
     @Autowired
     private CloudFoundryClient cloudFoundryClient;
@@ -62,7 +63,7 @@ public final class ProcessesTest extends AbstractIntegrationTest {
     private CloudFoundryOperations cloudFoundryOperations;
 
     @Test
-    public void get() throws IOException {
+    void get() throws IOException {
         String applicationName = this.nameFactory.getApplicationName();
         Path path =  new ClassPathResource("test-application.zip").getFile().toPath();
 
@@ -81,7 +82,7 @@ public void get() throws IOException {
     }
 
     @Test
-    public void getStatistics() throws IOException {
+    void getStatistics() throws IOException {
         String applicationName = this.nameFactory.getApplicationName();
         Path path =  new ClassPathResource("test-application.zip").getFile().toPath();
 
@@ -101,7 +102,7 @@ public void getStatistics() throws IOException {
     }
 
     @Test
-    public void list() throws IOException {
+    void list() throws IOException {
         String applicationName = this.nameFactory.getApplicationName();
         Path path =  new ClassPathResource("test-application.zip").getFile().toPath();
 
@@ -121,7 +122,7 @@ public void list() throws IOException {
     }
 
     @Test
-    public void scale() throws IOException {
+    void scale() throws IOException {
         String applicationName = this.nameFactory.getApplicationName();
         Path path =  new ClassPathResource("test-application.zip").getFile().toPath();
 
@@ -143,7 +144,7 @@ public void scale() throws IOException {
     }
 
     @Test
-    public void terminateInstance() throws IOException {
+    void terminateInstance() throws IOException {
         String applicationName = this.nameFactory.getApplicationName();
         Path path =  new ClassPathResource("test-application.zip").getFile().toPath();
 
@@ -163,7 +164,7 @@ public void terminateInstance() throws IOException {
     }
 
     @Test
-    public void update() throws IOException {
+    void update() throws IOException {
         String applicationName = this.nameFactory.getApplicationName();
         Path path =  new ClassPathResource("test-application.zip").getFile().toPath();
 
diff --git a/integration-test/src/test/java/org/cloudfoundry/client/v3/ResourceMatchTest.java b/integration-test/src/test/java/org/cloudfoundry/client/v3/ResourceMatchTest.java
index 6f847e9b22..c6b4a4a420 100644
--- a/integration-test/src/test/java/org/cloudfoundry/client/v3/ResourceMatchTest.java
+++ b/integration-test/src/test/java/org/cloudfoundry/client/v3/ResourceMatchTest.java
@@ -34,7 +34,8 @@
 import org.cloudfoundry.util.DelayTimeoutException;
 import org.cloudfoundry.util.ExceptionUtils;
 import org.cloudfoundry.util.ResourceMatchingUtilsV3;
-import org.junit.Ignore;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.core.io.ClassPathResource;
 import reactor.core.Exceptions;
@@ -48,7 +49,7 @@
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.cloudfoundry.util.DelayUtils.exponentialBackOff;
 
-public class ResourceMatchTest extends AbstractIntegrationTest {
+class ResourceMatchTest extends AbstractIntegrationTest {
 
     @Autowired
     private CloudFoundryClient cloudFoundryClient;
@@ -58,8 +59,8 @@ public class ResourceMatchTest extends AbstractIntegrationTest {
 
     @IfCloudFoundryVersion(greaterThanOrEqualTo = CloudFoundryVersion.PCF_2_9)
     @Test
-    @Ignore("Cloud Controller is configured not to cache resource smaller than 4k - Find a better way to test this")
-    public void upload() throws IOException {
+    @Disabled("Cloud Controller is configured not to cache resource smaller than 4k - Find a better way to test this")
+    void upload() throws IOException {
         createAndUploadPackage()
             .flatMap(this::waitForReady)
             .then(ResourceMatchingUtilsV3.getMatchedResources(this.cloudFoundryClient, new ClassPathResource("test-application.zip").getFile().toPath()))
diff --git a/integration-test/src/test/java/org/cloudfoundry/client/v3/RolesTest.java b/integration-test/src/test/java/org/cloudfoundry/client/v3/RolesTest.java
index a04ae0685e..e53a099664 100644
--- a/integration-test/src/test/java/org/cloudfoundry/client/v3/RolesTest.java
+++ b/integration-test/src/test/java/org/cloudfoundry/client/v3/RolesTest.java
@@ -31,6 +31,7 @@
 import org.cloudfoundry.client.v3.roles.RoleResource;
 import org.cloudfoundry.util.JobUtils;
 import org.cloudfoundry.util.PaginationUtils;
+import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 import reactor.core.publisher.Flux;
 import reactor.core.publisher.Mono;
@@ -41,13 +42,13 @@
 import static org.cloudfoundry.client.v3.roles.RoleType.ORGANIZATION_USER;
 
 @IfCloudFoundryVersion(greaterThanOrEqualTo = CloudFoundryVersion.PCF_2_9)
-public final class RolesTest extends AbstractIntegrationTest {
+final class RolesTest extends AbstractIntegrationTest {
 
     @Autowired
     private CloudFoundryClient cloudFoundryClient;
 
     @Test
-    public void create() {
+    void create() {
         String organizationName = this.nameFactory.getOrganizationName();
         String userId = this.nameFactory.getUserId();
 
@@ -86,7 +87,7 @@ public void create() {
     }
 
     @Test
-    public void delete() {
+    void delete() {
         String organizationName = this.nameFactory.getOrganizationName();
         String userId = this.nameFactory.getUserId();
 
@@ -106,7 +107,7 @@ public void delete() {
     }
 
     @Test
-    public void get() {
+    void get() {
         String organizationName = this.nameFactory.getOrganizationName();
         String userId = this.nameFactory.getUserId();
 
@@ -125,7 +126,7 @@ public void get() {
     }
 
     @Test
-    public void listFilterByOrganizationId() {
+    void listFilterByOrganizationId() {
         String organizationName = this.nameFactory.getOrganizationName();
         String userId = this.nameFactory.getUserId();
 
diff --git a/integration-test/src/test/java/org/cloudfoundry/client/v3/RoutesTest.java b/integration-test/src/test/java/org/cloudfoundry/client/v3/RoutesTest.java
index 5f7545a101..bc828237d8 100644
--- a/integration-test/src/test/java/org/cloudfoundry/client/v3/RoutesTest.java
+++ b/integration-test/src/test/java/org/cloudfoundry/client/v3/RoutesTest.java
@@ -48,6 +48,7 @@
 import org.cloudfoundry.client.v3.spaces.CreateSpaceResponse;
 import org.cloudfoundry.client.v3.spaces.SpaceRelationships;
 import org.cloudfoundry.util.PaginationUtils;
+import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 import reactor.core.publisher.Flux;
 import reactor.core.publisher.Mono;
@@ -59,7 +60,7 @@
 
 import static org.cloudfoundry.util.tuple.TupleUtils.function;
 
-public final class RoutesTest extends AbstractIntegrationTest {
+final class RoutesTest extends AbstractIntegrationTest {
 
     @Autowired
     private CloudFoundryClient cloudFoundryClient;
@@ -72,7 +73,7 @@ public final class RoutesTest extends AbstractIntegrationTest {
 
     @IfCloudFoundryVersion(greaterThanOrEqualTo = CloudFoundryVersion.PCF_2_9)
     @Test
-    public void create() {
+    void create() {
         String domainName = this.nameFactory.getDomainName();
 
         this.organizationId
@@ -111,7 +112,7 @@ public void create() {
 
     @IfCloudFoundryVersion(greaterThanOrEqualTo = CloudFoundryVersion.PCF_2_9)
     @Test
-    public void get() {
+    void get() {
         String domainName = this.nameFactory.getDomainName();
 
         this.organizationId
@@ -135,7 +136,7 @@ public void get() {
 
     @IfCloudFoundryVersion(greaterThanOrEqualTo = CloudFoundryVersion.PCF_2_9)
     @Test
-    public void insertDestinations() {
+    void insertDestinations() {
         String applicationName = this.nameFactory.getApplicationName();
         String domainName = this.nameFactory.getDomainName();
         Integer port = this.nameFactory.getPort();
@@ -172,7 +173,7 @@ public void insertDestinations() {
 
     @IfCloudFoundryVersion(greaterThanOrEqualTo = CloudFoundryVersion.PCF_2_9)
     @Test
-    public void list() {
+    void list() {
         String domainName = this.nameFactory.getDomainName();
 
         this.organizationId
@@ -198,7 +199,7 @@ public void list() {
     //TODO: Test has not been validated
     @IfCloudFoundryVersion(greaterThan = CloudFoundryVersion.PCF_2_9)
     @Test
-    public void listByApplicationId() {
+    void listByApplicationId() {
         String applicationName = this.nameFactory.getApplicationName();
         String domainName = this.nameFactory.getDomainName();
 
@@ -229,7 +230,7 @@ public void listByApplicationId() {
 
     @IfCloudFoundryVersion(greaterThanOrEqualTo = CloudFoundryVersion.PCF_2_9)
     @Test
-    public void listByDomain() {
+    void listByDomain() {
         String domainName = this.nameFactory.getDomainName();
 
         this.organizationId
@@ -255,7 +256,7 @@ public void listByDomain() {
 
     @IfCloudFoundryVersion(greaterThanOrEqualTo = CloudFoundryVersion.PCF_2_9)
     @Test
-    public void listByHost() {
+    void listByHost() {
         String domainName = this.nameFactory.getDomainName();
         String hostName = this.nameFactory.getHostName();
 
@@ -282,7 +283,7 @@ public void listByHost() {
 
     @IfCloudFoundryVersion(greaterThanOrEqualTo = CloudFoundryVersion.PCF_2_9)
     @Test
-    public void listByLabelSelector() {
+    void listByLabelSelector() {
         String domainName = this.nameFactory.getDomainName();
         String spaceName = this.nameFactory.getSpaceName();
 
@@ -309,7 +310,7 @@ public void listByLabelSelector() {
 
     @IfCloudFoundryVersion(greaterThanOrEqualTo = CloudFoundryVersion.PCF_2_9)
     @Test
-    public void listByOrganizationId() {
+    void listByOrganizationId() {
         String domainName = this.nameFactory.getDomainName();
         String organizationName = this.nameFactory.getOrganizationName();
         String spaceName = this.nameFactory.getSpaceName();
@@ -338,7 +339,7 @@ public void listByOrganizationId() {
 
     @IfCloudFoundryVersion(greaterThanOrEqualTo = CloudFoundryVersion.PCF_2_9)
     @Test
-    public void listByPath() {
+    void listByPath() {
         String domainName = this.nameFactory.getDomainName();
         String path = this.nameFactory.getPath();
 
@@ -365,7 +366,7 @@ public void listByPath() {
 
     @IfCloudFoundryVersion(greaterThanOrEqualTo = CloudFoundryVersion.PCF_2_9)
     @Test
-    public void listBySpaceId() {
+    void listBySpaceId() {
         String domainName = this.nameFactory.getDomainName();
         String spaceName = this.nameFactory.getSpaceName();
 
@@ -393,7 +394,7 @@ public void listBySpaceId() {
 
     @IfCloudFoundryVersion(greaterThanOrEqualTo = CloudFoundryVersion.PCF_2_9)
     @Test
-    public void listDestinations() {
+    void listDestinations() {
         String applicationName = this.nameFactory.getApplicationName();
         String domainName = this.nameFactory.getDomainName();
 
@@ -428,7 +429,7 @@ public void listDestinations() {
 
     @IfCloudFoundryVersion(greaterThanOrEqualTo = CloudFoundryVersion.PCF_2_9)
     @Test
-    public void listDestinationsByApplicationId() {
+    void listDestinationsByApplicationId() {
         String applicationName = this.nameFactory.getApplicationName();
         String domainName = this.nameFactory.getDomainName();
 
@@ -464,7 +465,7 @@ public void listDestinationsByApplicationId() {
 
     @IfCloudFoundryVersion(greaterThanOrEqualTo = CloudFoundryVersion.PCF_2_9)
     @Test
-    public void listDestinationsById() {
+    void listDestinationsById() {
         String applicationName = this.nameFactory.getApplicationName();
         String domainName = this.nameFactory.getDomainName();
 
@@ -500,7 +501,7 @@ public void listDestinationsById() {
 
     @IfCloudFoundryVersion(greaterThanOrEqualTo = CloudFoundryVersion.PCF_2_9)
     @Test
-    public void removeDestinations() {
+    void removeDestinations() {
         String applicationName = this.nameFactory.getApplicationName();
         String domainName = this.nameFactory.getDomainName();
 
@@ -534,7 +535,7 @@ public void removeDestinations() {
 
     @IfCloudFoundryVersion(greaterThanOrEqualTo = CloudFoundryVersion.PCF_2_9)
     @Test
-    public void replaceDestinations() {
+    void replaceDestinations() {
         String applicationName = this.nameFactory.getApplicationName();
         String domainName = this.nameFactory.getDomainName();
         Integer port = this.nameFactory.getPort();
@@ -571,7 +572,7 @@ public void replaceDestinations() {
 
     @IfCloudFoundryVersion(greaterThanOrEqualTo = CloudFoundryVersion.PCF_2_9)
     @Test
-    public void update() {
+    void update() {
         String domainName = this.nameFactory.getDomainName();
 
         this.organizationId
diff --git a/integration-test/src/test/java/org/cloudfoundry/client/v3/ServiceBindingsTest.java b/integration-test/src/test/java/org/cloudfoundry/client/v3/ServiceBindingsTest.java
index 96ee53685d..399e4fd95b 100644
--- a/integration-test/src/test/java/org/cloudfoundry/client/v3/ServiceBindingsTest.java
+++ b/integration-test/src/test/java/org/cloudfoundry/client/v3/ServiceBindingsTest.java
@@ -41,6 +41,7 @@
 import org.cloudfoundry.client.v3.serviceplans.ServicePlan;
 import org.cloudfoundry.util.JobUtils;
 import org.cloudfoundry.util.PaginationUtils;
+import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 import reactor.core.publisher.Flux;
 import reactor.core.publisher.Mono;
@@ -54,7 +55,7 @@
 import static org.cloudfoundry.util.tuple.TupleUtils.function;
 
 @IfCloudFoundryVersion(greaterThanOrEqualTo = CloudFoundryVersion.PCF_2_11)
-public class ServiceBindingsTest extends AbstractIntegrationTest {
+class ServiceBindingsTest extends AbstractIntegrationTest {
 
     @Autowired
     private CloudFoundryClient cloudFoundryClient;
@@ -69,7 +70,7 @@ public class ServiceBindingsTest extends AbstractIntegrationTest {
     private Mono<String> spaceId;
 
     @Test
-    public void createServiceKeyFromManagedServiceInstance() {
+    void createServiceKeyFromManagedServiceInstance() {
         String serviceInstanceName = this.nameFactory.getServiceInstanceName();
         String serviceKeyName = this.nameFactory.getServiceKeyName();
 
@@ -99,7 +100,7 @@ public void createServiceKeyFromManagedServiceInstance() {
     }
 
     @Test
-    public void createAppBindingFromUserProvidedServiceInstance() {
+    void createAppBindingFromUserProvidedServiceInstance() {
         String serviceInstanceName = this.nameFactory.getServiceInstanceName();
         String applicationName = this.nameFactory.getApplicationName();
 
@@ -138,7 +139,7 @@ public void createAppBindingFromUserProvidedServiceInstance() {
     }
 
     @Test
-    public void deleteForManagedService() {
+    void deleteForManagedService() {
         String serviceInstanceName = this.nameFactory.getServiceInstanceName();
         String serviceKeyName = this.nameFactory.getServiceKeyName();
 
@@ -158,7 +159,7 @@ public void deleteForManagedService() {
     }
 
     @Test
-    public void deleteForUserProvidedService() {
+    void deleteForUserProvidedService() {
         String serviceInstanceName = this.nameFactory.getServiceInstanceName();
         String applicationName = this.nameFactory.getApplicationName();
 
@@ -181,7 +182,7 @@ public void deleteForUserProvidedService() {
     }
 
     @Test
-    public void listForApplication() {
+    void listForApplication() {
         String serviceInstanceName = this.nameFactory.getServiceInstanceName();
         String applicationName = this.nameFactory.getApplicationName();
 
@@ -203,7 +204,7 @@ public void listForApplication() {
     }
 
     @Test
-    public void get() {
+    void get() {
         String serviceInstanceName = this.nameFactory.getServiceInstanceName();
         String applicationName = this.nameFactory.getApplicationName();
 
@@ -227,7 +228,7 @@ public void get() {
     }
 
     @Test
-    public void getDetails() {
+    void getDetails() {
         String serviceInstanceName = this.nameFactory.getServiceInstanceName();
         String applicationName = this.nameFactory.getApplicationName();
 
diff --git a/integration-test/src/test/java/org/cloudfoundry/client/v3/ServiceBrokersTest.java b/integration-test/src/test/java/org/cloudfoundry/client/v3/ServiceBrokersTest.java
index 2dcb88e463..0ec6a3dfb2 100644
--- a/integration-test/src/test/java/org/cloudfoundry/client/v3/ServiceBrokersTest.java
+++ b/integration-test/src/test/java/org/cloudfoundry/client/v3/ServiceBrokersTest.java
@@ -34,6 +34,7 @@
 import org.cloudfoundry.client.v3.spaces.SpaceRelationships;
 import org.cloudfoundry.util.JobUtils;
 import org.cloudfoundry.util.PaginationUtils;
+import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.core.io.ClassPathResource;
 import reactor.core.Exceptions;
@@ -49,7 +50,7 @@
 import static org.cloudfoundry.ServiceBrokerUtils.deleteServiceBroker;
 
 @IfCloudFoundryVersion(greaterThanOrEqualTo = CloudFoundryVersion.PCF_2_10)
-public final class ServiceBrokersTest extends AbstractIntegrationTest {
+final class ServiceBrokersTest extends AbstractIntegrationTest {
 
     @Autowired
     private CloudFoundryClient cloudFoundryClient;
@@ -64,7 +65,7 @@ public final class ServiceBrokersTest extends AbstractIntegrationTest {
     private String serviceBrokerName;
 
     @Test
-    public void create() {
+    void create() {
         String planName = this.nameFactory.getPlanName();
         String serviceBrokerName = this.nameFactory.getServiceBrokerName();
         String serviceName = this.nameFactory.getServiceName();
@@ -116,7 +117,7 @@ public void create() {
     }
 
     @Test
-    public void delete() {
+    void delete() {
         String planName = this.nameFactory.getPlanName();
         String serviceBrokerName = this.nameFactory.getServiceBrokerName();
         String serviceName = this.nameFactory.getServiceName();
@@ -148,7 +149,7 @@ public void delete() {
     }
 
     @Test
-    public void get() {
+    void get() {
         this.serviceBrokerId
             .flatMap(serviceBrokerId -> this.cloudFoundryClient.serviceBrokersV3()
                 .get(GetServiceBrokerRequest.builder()
@@ -161,7 +162,7 @@ public void get() {
     }
 
     @Test
-    public void list() {
+    void list() {
         PaginationUtils
             .requestClientV3Resources(page -> this.cloudFoundryClient.serviceBrokersV3()
                 .list(ListServiceBrokersRequest.builder()
@@ -175,7 +176,7 @@ public void list() {
     }
 
     @Test
-    public void update() {
+    void update() {
         String planName = this.nameFactory.getPlanName();
         String serviceBrokerName1 = this.nameFactory.getServiceBrokerName();
         String serviceBrokerName2 = this.nameFactory.getServiceBrokerName();
@@ -212,7 +213,7 @@ public void update() {
     }
 
     @Test
-    public void updateMetadata() {
+    void updateMetadata() {
         String planName = this.nameFactory.getPlanName();
         String serviceBrokerName = this.nameFactory.getServiceBrokerName();
         String serviceName = this.nameFactory.getServiceName();
diff --git a/integration-test/src/test/java/org/cloudfoundry/client/v3/ServiceInstancesTest.java b/integration-test/src/test/java/org/cloudfoundry/client/v3/ServiceInstancesTest.java
index 27ad2ffe1b..047592e1f8 100644
--- a/integration-test/src/test/java/org/cloudfoundry/client/v3/ServiceInstancesTest.java
+++ b/integration-test/src/test/java/org/cloudfoundry/client/v3/ServiceInstancesTest.java
@@ -44,6 +44,7 @@
 import org.cloudfoundry.client.v3.spaces.SpaceRelationships;
 import org.cloudfoundry.util.JobUtils;
 import org.cloudfoundry.util.PaginationUtils;
+import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 import reactor.core.publisher.Flux;
 import reactor.core.publisher.Mono;
@@ -57,7 +58,7 @@
 import static org.cloudfoundry.util.tuple.TupleUtils.function;
 
 @IfCloudFoundryVersion(greaterThanOrEqualTo = CloudFoundryVersion.PCF_2_1)
-public final class ServiceInstancesTest extends AbstractIntegrationTest {
+final class ServiceInstancesTest extends AbstractIntegrationTest {
 
     @Autowired
     private CloudFoundryClient cloudFoundryClient;
@@ -75,7 +76,7 @@ public final class ServiceInstancesTest extends AbstractIntegrationTest {
     private Mono<String> spaceId;
 
     @Test
-    public void createManagedServiceInstance() {
+    void createManagedServiceInstance() {
         String serviceInstanceName = this.nameFactory.getServiceInstanceName();
         this.spaceId
             .flatMap(spaceId -> createManagedServiceInstanceId(this.cloudFoundryClient, this.serviceBrokerId, serviceInstanceName, this.serviceName, spaceId))
@@ -91,7 +92,7 @@ public void createManagedServiceInstance() {
     }
 
     @Test
-    public void getUserProvidedServiceCredentials() {
+    void getUserProvidedServiceCredentials() {
         String serviceInstanceName = this.nameFactory.getServiceInstanceName();
         Map<String, Object> credentials = new HashMap<>();
         credentials.put("foo", "bar");
@@ -110,7 +111,7 @@ public void getUserProvidedServiceCredentials() {
     }
 
     @Test
-    public void delete() {
+    void delete() {
         String serviceInstanceName = this.nameFactory.getServiceInstanceName();
         this.spaceId
             .flatMap(spaceId -> createManagedServiceInstanceId(this.cloudFoundryClient, this.serviceBrokerId, serviceInstanceName, this.serviceName, spaceId))
@@ -133,7 +134,7 @@ public void delete() {
     }
 
     @Test
-    public void update() {
+    void update() {
         String serviceInstanceName = this.nameFactory.getServiceInstanceName();
         this.spaceId
             .flatMap(spaceId -> createManagedServiceInstanceId(this.cloudFoundryClient, this.serviceBrokerId, serviceInstanceName, this.serviceName, spaceId))
@@ -156,7 +157,7 @@ public void update() {
     }
 
     @Test
-    public void list() {
+    void list() {
         String serviceInstanceName = this.nameFactory.getServiceInstanceName();
         this.spaceId
             .flatMap(spaceId -> createManagedServiceInstanceId(this.cloudFoundryClient, this.serviceBrokerId, serviceInstanceName, this.serviceName, spaceId))
@@ -173,7 +174,7 @@ public void list() {
     }
 
     @Test
-    public void listSharedSpaces() {
+    void listSharedSpaces() {
         String serviceInstanceName = this.nameFactory.getServiceInstanceName();
         String spaceName = this.nameFactory.getSpaceName();
 
@@ -196,7 +197,7 @@ public void listSharedSpaces() {
     }
 
     @Test
-    public void share() {
+    void share() {
         String serviceInstanceName = this.nameFactory.getServiceInstanceName();
         String spaceName = this.nameFactory.getSpaceName();
 
@@ -224,7 +225,7 @@ public void share() {
     }
 
     @Test
-    public void unshare() {
+    void unshare() {
         String serviceInstanceName = this.nameFactory.getServiceInstanceName();
         String spaceName = this.nameFactory.getSpaceName();
 
diff --git a/integration-test/src/test/java/org/cloudfoundry/client/v3/ServiceOfferingsTest.java b/integration-test/src/test/java/org/cloudfoundry/client/v3/ServiceOfferingsTest.java
index 6b6bba6566..baa6b8e362 100644
--- a/integration-test/src/test/java/org/cloudfoundry/client/v3/ServiceOfferingsTest.java
+++ b/integration-test/src/test/java/org/cloudfoundry/client/v3/ServiceOfferingsTest.java
@@ -31,6 +31,7 @@
 import org.cloudfoundry.client.v3.spaces.CreateSpaceResponse;
 import org.cloudfoundry.client.v3.spaces.SpaceRelationships;
 import org.cloudfoundry.util.PaginationUtils;
+import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 import reactor.core.publisher.Flux;
 import reactor.core.publisher.Mono;
@@ -43,7 +44,7 @@
 import static org.cloudfoundry.ServiceBrokerUtils.deleteServiceBroker;
 
 @IfCloudFoundryVersion(greaterThanOrEqualTo = CloudFoundryVersion.PCF_2_10)
-public final class ServiceOfferingsTest extends AbstractIntegrationTest {
+final class ServiceOfferingsTest extends AbstractIntegrationTest {
 
     @Autowired
     private CloudFoundryClient cloudFoundryClient;
@@ -58,7 +59,7 @@ public final class ServiceOfferingsTest extends AbstractIntegrationTest {
     private String serviceName;
 
     @Test
-    public void delete() {
+    void delete() {
         String planName = this.nameFactory.getPlanName();
         String serviceBrokerName = this.nameFactory.getServiceBrokerName();
         String serviceName = this.nameFactory.getServiceName();
@@ -86,7 +87,7 @@ public void delete() {
     }
 
     @Test
-    public void get() {
+    void get() {
         this.serviceBrokerId
             .flatMap(serviceBrokerId -> getServiceOfferingId(this.cloudFoundryClient, this.serviceName, serviceBrokerId))
             .flatMap(serviceOfferingId -> this.cloudFoundryClient.serviceOfferingsV3()
@@ -101,7 +102,7 @@ public void get() {
     }
 
     @Test
-    public void list() {
+    void list() {
         PaginationUtils.requestClientV3Resources(page -> this.cloudFoundryClient.serviceOfferingsV3()
             .list(ListServiceOfferingsRequest.builder()
                 .page(page)
@@ -115,7 +116,7 @@ public void list() {
     }
 
     @Test
-    public void listFilterBy() {
+    void listFilterBy() {
         this.serviceBrokerId
             .flatMapMany(serviceBrokerId -> PaginationUtils.requestClientV3Resources(page ->
                 this.cloudFoundryClient.serviceOfferingsV3()
@@ -132,7 +133,7 @@ public void listFilterBy() {
     }
 
     @Test
-    public void update() {
+    void update() {
         String planName = this.nameFactory.getPlanName();
         String serviceBrokerName = this.nameFactory.getServiceBrokerName();
         String serviceName = this.nameFactory.getServiceName();
diff --git a/integration-test/src/test/java/org/cloudfoundry/client/v3/ServicePlansTest.java b/integration-test/src/test/java/org/cloudfoundry/client/v3/ServicePlansTest.java
index c828215702..00809b0b76 100644
--- a/integration-test/src/test/java/org/cloudfoundry/client/v3/ServicePlansTest.java
+++ b/integration-test/src/test/java/org/cloudfoundry/client/v3/ServicePlansTest.java
@@ -33,6 +33,7 @@
 import org.cloudfoundry.client.v3.spaces.CreateSpaceResponse;
 import org.cloudfoundry.client.v3.spaces.SpaceRelationships;
 import org.cloudfoundry.util.PaginationUtils;
+import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 import reactor.core.publisher.Flux;
 import reactor.core.publisher.Mono;
@@ -45,7 +46,7 @@
 import static org.cloudfoundry.ServiceBrokerUtils.deleteServiceBroker;
 
 @IfCloudFoundryVersion(greaterThanOrEqualTo = CloudFoundryVersion.PCF_2_10)
-public final class ServicePlansTest extends AbstractIntegrationTest {
+final class ServicePlansTest extends AbstractIntegrationTest {
 
     @Autowired
     private CloudFoundryClient cloudFoundryClient;
@@ -60,7 +61,7 @@ public final class ServicePlansTest extends AbstractIntegrationTest {
     private Mono<String> serviceBrokerId;
 
     @Test
-    public void delete() {
+    void delete() {
         String planName = this.nameFactory.getPlanName();
         String serviceBrokerName = this.nameFactory.getServiceBrokerName();
         String serviceName = this.nameFactory.getServiceName();
@@ -87,7 +88,7 @@ public void delete() {
     }
 
     @Test
-    public void get() {
+    void get() {
         this.serviceBrokerId
             .flatMap(serviceBrokerId -> getServicePlanId(this.cloudFoundryClient, serviceBrokerId))
             .flatMap(servicePlanId -> this.cloudFoundryClient.servicePlansV3()
@@ -102,7 +103,7 @@ public void get() {
     }
 
     @Test
-    public void list() {
+    void list() {
         PaginationUtils.requestClientV3Resources(page -> this.cloudFoundryClient.servicePlansV3()
                 .list(ListServicePlansRequest.builder()
                     .page(page)
@@ -116,7 +117,7 @@ public void list() {
     }
 
     @Test
-    public void listFilterByServiceBrokerId() {
+    void listFilterByServiceBrokerId() {
         this.serviceBrokerId
             .flatMapMany(serviceBrokerId -> PaginationUtils
                 .requestClientV3Resources(page -> this.cloudFoundryClient.servicePlansV3()
@@ -133,7 +134,7 @@ public void listFilterByServiceBrokerId() {
     }
 
     @Test
-    public void updateServicePlanVisibilityWithSame() {
+    void updateServicePlanVisibilityWithSame() {
         this.serviceBrokerId
             .flatMap(serviceBrokerId -> getServicePlanId(this.cloudFoundryClient, serviceBrokerId))
             .flatMap(servicePlanId -> this.cloudFoundryClient
@@ -147,7 +148,7 @@ public void updateServicePlanVisibilityWithSame() {
     }
 
     @Test
-    public void listUsingLabelSelector() {
+    void listUsingLabelSelector() {
         String planName = this.nameFactory.getPlanName();
         String serviceBrokerName = this.nameFactory.getServiceBrokerName();
         String serviceName = this.nameFactory.getServiceName();
@@ -191,7 +192,7 @@ public void listUsingLabelSelector() {
     }
 
     @Test
-    public void update() {
+    void update() {
         String planName = this.nameFactory.getPlanName();
         String serviceBrokerName = this.nameFactory.getServiceBrokerName();
         String serviceName = this.nameFactory.getServiceName();
diff --git a/integration-test/src/test/java/org/cloudfoundry/client/v3/SpacesTest.java b/integration-test/src/test/java/org/cloudfoundry/client/v3/SpacesTest.java
index 5693df0825..b55543e048 100644
--- a/integration-test/src/test/java/org/cloudfoundry/client/v3/SpacesTest.java
+++ b/integration-test/src/test/java/org/cloudfoundry/client/v3/SpacesTest.java
@@ -47,7 +47,8 @@
 import org.cloudfoundry.client.v3.spaces.UpdateSpaceRequest;
 import org.cloudfoundry.util.JobUtils;
 import org.cloudfoundry.util.PaginationUtils;
-import org.junit.Ignore;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.core.io.ClassPathResource;
 import org.springframework.util.StreamUtils;
@@ -63,7 +64,7 @@
 import static org.cloudfoundry.util.tuple.TupleUtils.function;
 
 @IfCloudFoundryVersion(greaterThanOrEqualTo = CloudFoundryVersion.PCF_1_12)
-public final class SpacesTest extends AbstractIntegrationTest {
+final class SpacesTest extends AbstractIntegrationTest {
 
     @Autowired
     private CloudFoundryClient cloudFoundryClient;
@@ -72,7 +73,7 @@ public final class SpacesTest extends AbstractIntegrationTest {
     private Mono<String> organizationId;
 
     @Test
-    public void assignIsolationSegment() {
+    void assignIsolationSegment() {
         String isolationSegmentName = this.nameFactory.getIsolationSegmentName();
         String spaceName = this.nameFactory.getSpaceName();
 
@@ -99,7 +100,7 @@ public void assignIsolationSegment() {
     }
 
     @Test
-    public void create() {
+    void create() {
         String spaceName = this.nameFactory.getSpaceName();
 
         this.organizationId
@@ -124,7 +125,7 @@ public void create() {
 
     @IfCloudFoundryVersion(greaterThanOrEqualTo = CloudFoundryVersion.PCF_2_8)
     @Test
-    public void delete() {
+    void delete() {
         String spaceName = this.nameFactory.getSpaceName();
 
         this.organizationId
@@ -142,9 +143,9 @@ public void delete() {
 
     //TODO: Await resolution of https://github.com/cloudfoundry/cloud_controller_ng/issues/1876
     @IfCloudFoundryVersion(greaterThan = CloudFoundryVersion.PCF_2_9)
-    @Ignore("Await https://github.com/cloudfoundry/cf-java-client/issues/1876")
+    @Disabled("Await https://github.com/cloudfoundry/cf-java-client/issues/1876")
     @Test
-    public void deleteUnmappedRoutes() {
+    void deleteUnmappedRoutes() {
         String domainName = this.nameFactory.getDomainName();
         String spaceName = this.nameFactory.getSpaceName();
 
@@ -167,7 +168,7 @@ public void deleteUnmappedRoutes() {
     }
 
     @Test
-    public void getIsolationSegment() {
+    void getIsolationSegment() {
         String isolationSegmentName = this.nameFactory.getIsolationSegmentName();
         String spaceName = this.nameFactory.getSpaceName();
 
@@ -191,7 +192,7 @@ public void getIsolationSegment() {
     }
 
     @Test
-    public void list() {
+    void list() {
         String spaceName = this.nameFactory.getSpaceName();
 
         this.organizationId
@@ -208,7 +209,7 @@ public void list() {
     }
 
     @Test
-    public void listFilterByName() {
+    void listFilterByName() {
         String spaceName = this.nameFactory.getSpaceName();
 
         this.organizationId
@@ -226,7 +227,7 @@ public void listFilterByName() {
     }
 
     @Test
-    public void listFilterByOrganization() {
+    void listFilterByOrganization() {
         String spaceName = this.nameFactory.getSpaceName();
 
         this.organizationId
@@ -246,7 +247,7 @@ public void listFilterByOrganization() {
 
     @IfCloudFoundryVersion(greaterThanOrEqualTo = CloudFoundryVersion.PCF_2_8)
     @Test
-    public void update() {
+    void update() {
         String spaceName = this.nameFactory.getSpaceName();
         String newSpaceName = this.nameFactory.getSpaceName();
 
@@ -273,7 +274,7 @@ public void update() {
 
     @IfCloudFoundryVersion(greaterThanOrEqualTo = CloudFoundryVersion.UNSPECIFIED) //TODO how to select this version?
     @Test
-    public void applyManifest() throws IOException {
+    void applyManifest() throws IOException {
         String spaceName = this.nameFactory.getSpaceName();
 
         byte[] manifest;
diff --git a/integration-test/src/test/java/org/cloudfoundry/client/v3/StacksTest.java b/integration-test/src/test/java/org/cloudfoundry/client/v3/StacksTest.java
index 287ecf0647..e15efafa01 100644
--- a/integration-test/src/test/java/org/cloudfoundry/client/v3/StacksTest.java
+++ b/integration-test/src/test/java/org/cloudfoundry/client/v3/StacksTest.java
@@ -27,6 +27,7 @@
 import org.cloudfoundry.client.v3.stacks.StackResource;
 import org.cloudfoundry.client.v3.stacks.Stack;
 import org.cloudfoundry.util.PaginationUtils;
+import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 import reactor.core.publisher.Flux;
 import reactor.core.publisher.Mono;
@@ -36,7 +37,7 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-public final class StacksTest extends AbstractIntegrationTest {
+final class StacksTest extends AbstractIntegrationTest {
 
     @Autowired
     private CloudFoundryClient cloudFoundryClient;
@@ -45,7 +46,7 @@ public final class StacksTest extends AbstractIntegrationTest {
     private String stackName;
 
     @Test
-    public void create() {
+    void create() {
         String stackName = this.nameFactory.getStackName();
 
         this.cloudFoundryClient.stacksV3()
@@ -62,7 +63,7 @@ public void create() {
     }
 
     @Test
-    public void delete() {
+    void delete() {
         String stackName = this.nameFactory.getStackName();
 
         createStackId(this.cloudFoundryClient, stackName)
@@ -77,7 +78,7 @@ public void delete() {
     }
 
     @Test
-    public void get() {
+    void get() {
         getStackId(this.cloudFoundryClient, this.stackName)
             .flatMap(stackId -> this.cloudFoundryClient.stacksV3()
                 .get(GetStackRequest.builder()
@@ -91,7 +92,7 @@ public void get() {
     }
 
     @Test
-    public void list() {
+    void list() {
         getStackId(this.cloudFoundryClient, this.stackName)
             .flatMapMany(stackId -> PaginationUtils
                 .requestClientV3Resources(page -> this.cloudFoundryClient.stacksV3()
@@ -107,7 +108,7 @@ public void list() {
     }
 
     @Test
-    public void listFilterByName() {
+    void listFilterByName() {
         PaginationUtils
             .requestClientV3Resources(page -> this.cloudFoundryClient.stacksV3()
                 .list(ListStacksRequest.builder()
diff --git a/integration-test/src/test/java/org/cloudfoundry/client/v3/TasksTest.java b/integration-test/src/test/java/org/cloudfoundry/client/v3/TasksTest.java
index db548472d4..b57f216a82 100644
--- a/integration-test/src/test/java/org/cloudfoundry/client/v3/TasksTest.java
+++ b/integration-test/src/test/java/org/cloudfoundry/client/v3/TasksTest.java
@@ -37,6 +37,7 @@
 import org.cloudfoundry.operations.applications.ApplicationHealthCheck;
 import org.cloudfoundry.operations.applications.PushApplicationRequest;
 import org.cloudfoundry.util.PaginationUtils;
+import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.core.io.ClassPathResource;
 import reactor.core.publisher.Flux;
@@ -50,7 +51,7 @@
 import static org.cloudfoundry.util.tuple.TupleUtils.function;
 
 @IfCloudFoundryVersion(greaterThanOrEqualTo = CloudFoundryVersion.PCF_1_12)
-public final class TasksTest extends AbstractIntegrationTest {
+final class TasksTest extends AbstractIntegrationTest {
 
     @Autowired
     private CloudFoundryClient cloudFoundryClient;
@@ -59,7 +60,7 @@ public final class TasksTest extends AbstractIntegrationTest {
     private CloudFoundryOperations cloudFoundryOperations;
 
     @Test
-    public void cancel() throws IOException {
+    void cancel() throws IOException {
         String applicationName = this.nameFactory.getApplicationName();
 
         createApplication(this.cloudFoundryOperations, applicationName)
@@ -80,7 +81,7 @@ public void cancel() throws IOException {
     }
 
     @Test
-    public void create() throws IOException {
+    void create() throws IOException {
         String applicationName = this.nameFactory.getApplicationName();
 
         createApplication(this.cloudFoundryOperations, applicationName)
@@ -103,7 +104,7 @@ public void create() throws IOException {
     }
 
     @Test
-    public void get() throws IOException {
+    void get() throws IOException {
         String applicationName = this.nameFactory.getApplicationName();
 
         createApplication(this.cloudFoundryOperations, applicationName)
@@ -124,7 +125,7 @@ public void get() throws IOException {
     }
 
     @Test
-    public void list() throws IOException {
+    void list() throws IOException {
         String applicationName = this.nameFactory.getApplicationName();
 
         createApplication(this.cloudFoundryOperations, applicationName)
@@ -147,7 +148,7 @@ public void list() throws IOException {
     }
 
     @Test
-    public void listFilterByApplication() throws IOException {
+    void listFilterByApplication() throws IOException {
         String applicationName = this.nameFactory.getApplicationName();
 
         createApplication(this.cloudFoundryOperations, applicationName)
@@ -170,7 +171,7 @@ public void listFilterByApplication() throws IOException {
     }
 
     @Test
-    public void listFilterByName() throws IOException {
+    void listFilterByName() throws IOException {
         String applicationName = this.nameFactory.getApplicationName();
 
         createApplication(this.cloudFoundryOperations, applicationName)
@@ -193,7 +194,7 @@ public void listFilterByName() throws IOException {
     }
 
     @Test
-    public void listFilterByState() throws IOException {
+    void listFilterByState() throws IOException {
         String applicationName = this.nameFactory.getApplicationName();
 
         createApplication(this.cloudFoundryOperations, applicationName)
diff --git a/integration-test/src/test/java/org/cloudfoundry/logcache/v1/LogCacheTest.java b/integration-test/src/test/java/org/cloudfoundry/logcache/v1/LogCacheTest.java
index 2d0cedf36c..bca46cca25 100644
--- a/integration-test/src/test/java/org/cloudfoundry/logcache/v1/LogCacheTest.java
+++ b/integration-test/src/test/java/org/cloudfoundry/logcache/v1/LogCacheTest.java
@@ -20,6 +20,7 @@
 import org.cloudfoundry.ApplicationUtils;
 import org.cloudfoundry.CloudFoundryVersion;
 import org.cloudfoundry.IfCloudFoundryVersion;
+import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.InitializingBean;
 import org.springframework.beans.factory.annotation.Autowired;
 import reactor.core.publisher.Mono;
@@ -57,7 +58,7 @@ public void afterPropertiesSet() {
     }
 
     @Test
-    public void info() {
+    void info() {
         this.logCacheClient.info(InfoRequest.builder().build())
             .as(StepVerifier::create)
             .assertNext(response -> {
@@ -73,7 +74,7 @@ public void info() {
     }
 
     @Test
-    public void meta() {
+    void meta() {
         this.logCacheClient.meta(MetaRequest.builder().build())
             .as(StepVerifier::create)
             .assertNext(response -> {
@@ -86,7 +87,7 @@ public void meta() {
     }
 
     @Test
-    public void readCounter() {
+    void readCounter() {
         final String name = this.nameFactory.getName("counter-");
         final int delta = this.random.nextInt(1000);
 
@@ -99,7 +100,7 @@ public void readCounter() {
     }
 
     @Test
-    public void readEvent() {
+    void readEvent() {
         final String title = this.nameFactory.getName("event-");
         final String body = "This is the body. " + new BigInteger(1024, this.random).toString(32);
 
@@ -112,7 +113,7 @@ public void readEvent() {
     }
 
     @Test
-    public void readGauge() {
+    void readGauge() {
         final String gaugeName = this.nameFactory.getName("gauge-");
         final Double value = this.random.nextDouble() % 100;
 
@@ -125,7 +126,7 @@ public void readGauge() {
     }
 
     @Test
-    public void readLogs() {
+    void readLogs() {
         final String logMessage = this.nameFactory.getName("log-");
 
         this.testLogCacheEndpoints.log(logMessage)
diff --git a/integration-test/src/test/java/org/cloudfoundry/networking/v1/PoliciesTest.java b/integration-test/src/test/java/org/cloudfoundry/networking/v1/PoliciesTest.java
index fcefb58ced..7a5f254a63 100644
--- a/integration-test/src/test/java/org/cloudfoundry/networking/v1/PoliciesTest.java
+++ b/integration-test/src/test/java/org/cloudfoundry/networking/v1/PoliciesTest.java
@@ -32,6 +32,7 @@
 import org.cloudfoundry.networking.v1.policies.Ports;
 import org.cloudfoundry.networking.v1.policies.Source;
 import org.cloudfoundry.util.ResourceUtils;
+import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 import reactor.core.publisher.Mono;
 import reactor.test.StepVerifier;
@@ -40,7 +41,7 @@
 
 import static org.cloudfoundry.util.tuple.TupleUtils.function;
 
-public final class PoliciesTest extends AbstractIntegrationTest {
+final class PoliciesTest extends AbstractIntegrationTest {
 
     @Autowired
     private CloudFoundryClient cloudFoundryClient;
@@ -53,7 +54,7 @@ public final class PoliciesTest extends AbstractIntegrationTest {
 
     @IfCloudFoundryVersion(greaterThanOrEqualTo = CloudFoundryVersion.PCF_1_12)
     @Test
-    public void create() {
+    void create() {
         String destinationApplicationName = this.nameFactory.getApplicationName();
         String sourceApplicationName = this.nameFactory.getApplicationName();
         Integer startPort = this.nameFactory.getPort();
@@ -94,7 +95,7 @@ public void create() {
 
     @IfCloudFoundryVersion(greaterThanOrEqualTo = CloudFoundryVersion.PCF_1_12)
     @Test
-    public void delete() {
+    void delete() {
         String destinationApplicationName = this.nameFactory.getApplicationName();
         String sourceApplicationName = this.nameFactory.getApplicationName();
         Integer port = this.nameFactory.getPort();
@@ -132,7 +133,7 @@ public void delete() {
 
     @IfCloudFoundryVersion(greaterThanOrEqualTo = CloudFoundryVersion.PCF_1_12)
     @Test
-    public void list() {
+    void list() {
         String destinationApplicationName = this.nameFactory.getApplicationName();
         String sourceApplicationName = this.nameFactory.getApplicationName();
         Integer port = this.nameFactory.getPort();
@@ -158,7 +159,7 @@ public void list() {
 
     @IfCloudFoundryVersion(greaterThanOrEqualTo = CloudFoundryVersion.PCF_1_12)
     @Test
-    public void listFiltered() {
+    void listFiltered() {
         String destinationApplicationName = this.nameFactory.getApplicationName();
         String sourceApplicationName = this.nameFactory.getApplicationName();
         Integer port = this.nameFactory.getPort();
diff --git a/integration-test/src/test/java/org/cloudfoundry/networking/v1/TagsTest.java b/integration-test/src/test/java/org/cloudfoundry/networking/v1/TagsTest.java
index bfb95cf326..eb8d417760 100644
--- a/integration-test/src/test/java/org/cloudfoundry/networking/v1/TagsTest.java
+++ b/integration-test/src/test/java/org/cloudfoundry/networking/v1/TagsTest.java
@@ -31,6 +31,7 @@
 import org.cloudfoundry.networking.v1.tags.ListTagsRequest;
 import org.cloudfoundry.networking.v1.tags.ListTagsResponse;
 import org.cloudfoundry.util.ResourceUtils;
+import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 import reactor.core.publisher.Mono;
 import reactor.test.StepVerifier;
@@ -39,7 +40,7 @@
 
 import static org.cloudfoundry.util.tuple.TupleUtils.function;
 
-public final class TagsTest extends AbstractIntegrationTest {
+final class TagsTest extends AbstractIntegrationTest {
 
     @Autowired
     private CloudFoundryClient cloudFoundryClient;
@@ -52,7 +53,7 @@ public final class TagsTest extends AbstractIntegrationTest {
 
     @IfCloudFoundryVersion(greaterThanOrEqualTo = CloudFoundryVersion.PCF_1_12)
     @Test
-    public void create() {
+    void create() {
         String destinationApplicationName = this.nameFactory.getApplicationName();
         String sourceApplicationName = this.nameFactory.getApplicationName();
         Integer port = this.nameFactory.getPort();
diff --git a/integration-test/src/test/java/org/cloudfoundry/operations/AdvancedTest.java b/integration-test/src/test/java/org/cloudfoundry/operations/AdvancedTest.java
index 99d4b842eb..ab9a359971 100644
--- a/integration-test/src/test/java/org/cloudfoundry/operations/AdvancedTest.java
+++ b/integration-test/src/test/java/org/cloudfoundry/operations/AdvancedTest.java
@@ -17,6 +17,7 @@
 package org.cloudfoundry.operations;
 
 import org.cloudfoundry.AbstractIntegrationTest;
+import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 import reactor.test.StepVerifier;
 
@@ -24,13 +25,13 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-public final class AdvancedTest extends AbstractIntegrationTest {
+final class AdvancedTest extends AbstractIntegrationTest {
 
     @Autowired
     private CloudFoundryOperations cloudFoundryOperations;
 
     @Test
-    public void sshCode() {
+    void sshCode() {
         this.cloudFoundryOperations.advanced()
             .sshCode()
             .as(StepVerifier::create)
diff --git a/integration-test/src/test/java/org/cloudfoundry/operations/ApplicationsTest.java b/integration-test/src/test/java/org/cloudfoundry/operations/ApplicationsTest.java
index 62238e0c74..2b327685f1 100644
--- a/integration-test/src/test/java/org/cloudfoundry/operations/ApplicationsTest.java
+++ b/integration-test/src/test/java/org/cloudfoundry/operations/ApplicationsTest.java
@@ -68,6 +68,7 @@
 import org.cloudfoundry.operations.services.GetServiceInstanceRequest;
 import org.cloudfoundry.operations.services.ServiceInstance;
 import org.cloudfoundry.util.FluentMap;
+import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.core.io.ClassPathResource;
 import reactor.core.publisher.Flux;
@@ -84,7 +85,7 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-public final class ApplicationsTest extends AbstractIntegrationTest {
+final class ApplicationsTest extends AbstractIntegrationTest {
 
     private static final String DEFAULT_ROUTER_GROUP = "default-tcp";
 
@@ -101,7 +102,7 @@ public final class ApplicationsTest extends AbstractIntegrationTest {
     private String serviceName;
 
     @Test
-    public void copySource() throws IOException {
+    void copySource() throws IOException {
         String sourceName = this.nameFactory.getApplicationName();
         String targetName = this.nameFactory.getApplicationName();
 
@@ -124,7 +125,7 @@ public void copySource() throws IOException {
     }
 
     @Test
-    public void deleteApplication() throws IOException {
+    void deleteApplication() throws IOException {
         String applicationName = this.nameFactory.getApplicationName();
 
         createApplication(this.cloudFoundryOperations, new ClassPathResource("test-application.zip").getFile().toPath(), applicationName, false)
@@ -140,7 +141,7 @@ public void deleteApplication() throws IOException {
     }
 
     @Test
-    public void deleteApplicationAndRoutes() throws IOException {
+    void deleteApplicationAndRoutes() throws IOException {
         String applicationName = this.nameFactory.getApplicationName();
 
         createApplication(this.cloudFoundryOperations, new ClassPathResource("test-application.zip").getFile().toPath(), applicationName, false)
@@ -158,7 +159,7 @@ public void deleteApplicationAndRoutes() throws IOException {
     }
 
     @Test
-    public void deleteApplicationWithServiceBindings() throws IOException {
+    void deleteApplicationWithServiceBindings() throws IOException {
         String applicationName = this.nameFactory.getApplicationName();
         String serviceInstanceName = this.nameFactory.getServiceInstanceName();
 
@@ -174,7 +175,7 @@ public void deleteApplicationWithServiceBindings() throws IOException {
     }
 
     @Test
-    public void disableSsh() throws IOException {
+    void disableSsh() throws IOException {
         String applicationName = this.nameFactory.getApplicationName();
 
         createApplication(this.cloudFoundryOperations, new ClassPathResource("test-application.zip").getFile().toPath(), applicationName, false)
@@ -190,7 +191,7 @@ public void disableSsh() throws IOException {
     }
 
     @Test
-    public void enableSsh() throws IOException {
+    void enableSsh() throws IOException {
         String applicationName = this.nameFactory.getApplicationName();
 
         createApplication(this.cloudFoundryOperations, new ClassPathResource("test-application.zip").getFile().toPath(), applicationName, false)
@@ -206,7 +207,7 @@ public void enableSsh() throws IOException {
     }
 
     @Test
-    public void get() throws IOException {
+    void get() throws IOException {
         String applicationName = this.nameFactory.getApplicationName();
 
         createApplication(this.cloudFoundryOperations, new ClassPathResource("test-application.zip").getFile().toPath(), applicationName, false)
@@ -222,7 +223,7 @@ public void get() throws IOException {
     }
 
     @Test
-    public void getEvents() throws IOException {
+    void getEvents() throws IOException {
         String applicationName = this.nameFactory.getApplicationName();
 
         createApplication(this.cloudFoundryOperations, new ClassPathResource("test-application.zip").getFile().toPath(), applicationName, true)
@@ -239,7 +240,7 @@ public void getEvents() throws IOException {
     }
 
     @Test
-    public void getHealthCheck() throws IOException {
+    void getHealthCheck() throws IOException {
         String applicationName = this.nameFactory.getApplicationName();
 
         createApplication(this.cloudFoundryOperations, new ClassPathResource("test-application.zip").getFile().toPath(), applicationName, true)
@@ -254,7 +255,7 @@ public void getHealthCheck() throws IOException {
     }
 
     @Test
-    public void getManifest() throws IOException {
+    void getManifest() throws IOException {
         String applicationName = this.nameFactory.getApplicationName();
 
         createApplication(this.cloudFoundryOperations, new ClassPathResource("test-application.zip").getFile().toPath(), applicationName, true)
@@ -270,7 +271,7 @@ public void getManifest() throws IOException {
     }
 
     @Test
-    public void getManifestForTcpRoute() throws IOException {
+    void getManifestForTcpRoute() throws IOException {
         String applicationName = this.nameFactory.getApplicationName();
 
         createApplication(this.cloudFoundryOperations, new ClassPathResource("test-application.zip").getFile().toPath(), applicationName, true)
@@ -286,7 +287,7 @@ public void getManifestForTcpRoute() throws IOException {
     }
 
     @Test
-    public void getMultipleBuildpacks() throws IOException {
+    void getMultipleBuildpacks() throws IOException {
         String applicationName = this.nameFactory.getApplicationName();
 
         createApplicationPhp(this.cloudFoundryOperations, new ClassPathResource("test-php.zip").getFile().toPath(), applicationName, true)
@@ -302,7 +303,7 @@ public void getMultipleBuildpacks() throws IOException {
     }
 
     @Test
-    public void getMultipleBuildpacksManifest() throws IOException {
+    void getMultipleBuildpacksManifest() throws IOException {
         String applicationName = this.nameFactory.getApplicationName();
 
         createApplicationPhp(this.cloudFoundryOperations, new ClassPathResource("test-php.zip").getFile().toPath(), applicationName, true)
@@ -318,7 +319,7 @@ public void getMultipleBuildpacksManifest() throws IOException {
     }
 
     @Test
-    public void getStopped() throws IOException {
+    void getStopped() throws IOException {
         String applicationName = this.nameFactory.getApplicationName();
 
         createApplication(this.cloudFoundryOperations, new ClassPathResource("test-application.zip").getFile().toPath(), applicationName, true)
@@ -334,7 +335,7 @@ public void getStopped() throws IOException {
     }
 
     @Test
-    public void getTcp() throws IOException {
+    void getTcp() throws IOException {
         String applicationName = this.nameFactory.getApplicationName();
         String domainName = this.nameFactory.getDomainName();
 
@@ -352,7 +353,7 @@ public void getTcp() throws IOException {
     }
 
     @Test
-    public void list() throws IOException {
+    void list() throws IOException {
         String applicationName = this.nameFactory.getApplicationName();
 
         createApplication(this.cloudFoundryOperations, new ClassPathResource("test-application.zip").getFile().toPath(), applicationName, false)
@@ -367,7 +368,7 @@ public void list() throws IOException {
 
     @IfCloudFoundryVersion(greaterThanOrEqualTo = CloudFoundryVersion.PCF_1_11)
     @Test
-    public void listTasks() throws IOException {
+    void listTasks() throws IOException {
         String applicationName = this.nameFactory.getApplicationName();
         String taskName = this.nameFactory.getTaskName();
 
@@ -385,7 +386,7 @@ public void listTasks() throws IOException {
     }
 
     @Test
-    public void logs() throws IOException {
+    void logs() throws IOException {
         String applicationName = this.nameFactory.getApplicationName();
 
         createApplication(this.cloudFoundryOperations, new ClassPathResource("test-application.zip").getFile().toPath(), applicationName, false)
@@ -403,7 +404,7 @@ public void logs() throws IOException {
     }
 
     @Test
-    public void pushBindServices() throws IOException {
+    void pushBindServices() throws IOException {
         String applicationName = this.nameFactory.getApplicationName();
         String serviceInstanceName = this.nameFactory.getServiceInstanceName();
 
@@ -432,7 +433,7 @@ public void pushBindServices() throws IOException {
     }
 
     @Test
-    public void pushDirectory() throws IOException {
+    void pushDirectory() throws IOException {
         String applicationName = this.nameFactory.getApplicationName();
 
         createApplication(this.cloudFoundryOperations, new ClassPathResource("test-application").getFile().toPath(), applicationName, false)
@@ -442,7 +443,7 @@ public void pushDirectory() throws IOException {
     }
 
     @Test
-    public void pushDomainHostPathRoute() throws IOException {
+    void pushDomainHostPathRoute() throws IOException {
         String applicationName = this.nameFactory.getApplicationName();
         String domainName = this.nameFactory.getDomainName();
         String routePath = this.nameFactory.getPath();
@@ -473,7 +474,7 @@ public void pushDomainHostPathRoute() throws IOException {
     }
 
     @Test
-    public void pushDomainNotFound() throws IOException {
+    void pushDomainNotFound() throws IOException {
         String applicationName = this.nameFactory.getApplicationName();
         String domainName = this.nameFactory.getDomainName();
 
@@ -492,7 +493,7 @@ public void pushDomainNotFound() throws IOException {
     }
 
     @Test
-    public void pushExisting() throws IOException {
+    void pushExisting() throws IOException {
         String applicationName = this.nameFactory.getApplicationName();
 
         createApplication(this.cloudFoundryOperations, new ClassPathResource("test-application.zip").getFile().toPath(), applicationName, false)
@@ -510,7 +511,7 @@ public void pushExisting() throws IOException {
     }
 
     @Test
-    public void pushManifestMultipleBuildpacks() throws IOException {
+    void pushManifestMultipleBuildpacks() throws IOException {
         String applicationName = this.nameFactory.getApplicationName();
         List<String> buildpacks = Arrays.asList("staticfile_buildpack", "php_buildpack");
 
@@ -534,9 +535,10 @@ public void pushManifestMultipleBuildpacks() throws IOException {
             .verify(Duration.ofMinutes(5));
     }
 
+    //TODO how to select this version?
     @Test
-    @IfCloudFoundryVersion(greaterThanOrEqualTo = CloudFoundryVersion.UNSPECIFIED) //TODO how to select this version?
-    public void pushManifestV3() throws IOException {
+    @IfCloudFoundryVersion(greaterThanOrEqualTo = CloudFoundryVersion.UNSPECIFIED)
+    void pushManifestV3() throws IOException {
         String applicationName = this.nameFactory.getApplicationName();
 
         ManifestV3 manifest = ManifestV3.builder()
@@ -558,9 +560,10 @@ public void pushManifestV3() throws IOException {
             .verify(Duration.ofMinutes(5));
     }
 
+    //TODO how to select this version?
     @Test
-    @IfCloudFoundryVersion(greaterThanOrEqualTo = CloudFoundryVersion.UNSPECIFIED) //TODO how to select this version?
-    public void pushManifestV3MultipleApplications() throws IOException {
+    @IfCloudFoundryVersion(greaterThanOrEqualTo = CloudFoundryVersion.UNSPECIFIED)
+    void pushManifestV3MultipleApplications() throws IOException {
         String applicationName1 = this.nameFactory.getApplicationName();
         String applicationName2 = this.nameFactory.getApplicationName();
 
@@ -592,7 +595,7 @@ public void pushManifestV3MultipleApplications() throws IOException {
     }
 
     @Test
-    public void pushMultipleBuildpacks() throws IOException {
+    void pushMultipleBuildpacks() throws IOException {
         String applicationName = this.nameFactory.getApplicationName();
         List<String> buildpacks = Arrays.asList("staticfile_buildpack", "php_buildpack");
 
@@ -615,7 +618,7 @@ public void pushMultipleBuildpacks() throws IOException {
     }
 
     @Test
-    public void pushMultipleRoutes() throws IOException {
+    void pushMultipleRoutes() throws IOException {
         String applicationName = this.nameFactory.getApplicationName();
         String domainName = this.nameFactory.getDomainName();
 
@@ -650,7 +653,7 @@ public void pushMultipleRoutes() throws IOException {
     }
 
     @Test
-    public void pushNew() throws IOException {
+    void pushNew() throws IOException {
         String applicationName = this.nameFactory.getApplicationName();
 
         createApplication(this.cloudFoundryOperations, new ClassPathResource("test-application.zip").getFile().toPath(), applicationName, false)
@@ -660,7 +663,7 @@ public void pushNew() throws IOException {
     }
 
     @Test
-    public void pushNewDocker() {
+    void pushNewDocker() {
         String applicationName = this.nameFactory.getApplicationName();
 
         createDockerApplication(this.cloudFoundryOperations, applicationName, false)
@@ -670,7 +673,7 @@ public void pushNewDocker() {
     }
 
     @Test
-    public void pushNoHostName() throws IOException {
+    void pushNoHostName() throws IOException {
         String applicationName = this.nameFactory.getApplicationName();
         String domainName = this.nameFactory.getDomainName();
 
@@ -699,7 +702,7 @@ public void pushNoHostName() throws IOException {
     }
 
     @Test
-    public void pushNoRoute() throws IOException {
+    void pushNoRoute() throws IOException {
         String applicationName = this.nameFactory.getApplicationName();
         String domainName = this.nameFactory.getDomainName();
 
@@ -733,7 +736,7 @@ public void pushNoRoute() throws IOException {
     }
 
     @Test
-    public void pushPrivateDomain() throws IOException {
+    void pushPrivateDomain() throws IOException {
         String applicationName = this.nameFactory.getApplicationName();
         String domainName = this.nameFactory.getDomainName();
 
@@ -753,7 +756,7 @@ public void pushPrivateDomain() throws IOException {
     }
 
     @Test
-    public void pushRouteAndRoutePath() throws IOException {
+    void pushRouteAndRoutePath() throws IOException {
         String applicationName = this.nameFactory.getApplicationName();
         String domainName = this.nameFactory.getDomainName();
         String routePath1 = this.nameFactory.getPath();
@@ -786,7 +789,7 @@ public void pushRouteAndRoutePath() throws IOException {
     }
 
     @Test
-    public void pushRoutePath() throws IOException {
+    void pushRoutePath() throws IOException {
         String applicationName = this.nameFactory.getApplicationName();
         String routePath = this.nameFactory.getPath();
 
@@ -811,7 +814,7 @@ public void pushRoutePath() throws IOException {
     }
 
     @Test
-    public void pushTcpRoute() throws IOException {
+    void pushTcpRoute() throws IOException {
         String applicationName = this.nameFactory.getApplicationName();
         String domainName = this.nameFactory.getDomainName();
 
@@ -841,7 +844,7 @@ public void pushTcpRoute() throws IOException {
     }
 
     @Test
-    public void pushUpdateRoute() throws IOException {
+    void pushUpdateRoute() throws IOException {
         String applicationName = this.nameFactory.getApplicationName();
         String domainName = this.nameFactory.getDomainName();
         String originalHostName = this.nameFactory.getHostName();
@@ -890,7 +893,7 @@ public void pushUpdateRoute() throws IOException {
     }
 
     @Test
-    public void pushUpdateTcpRoute() throws IOException {
+    void pushUpdateTcpRoute() throws IOException {
         String applicationName = this.nameFactory.getApplicationName();
         String domainName = this.nameFactory.getDomainName();
 
@@ -940,7 +943,7 @@ public void pushUpdateTcpRoute() throws IOException {
     }
 
     @Test
-    public void pushWithHost() throws IOException {
+    void pushWithHost() throws IOException {
         String applicationName = this.nameFactory.getApplicationName();
         String host = this.nameFactory.getHostName();
 
@@ -960,7 +963,7 @@ public void pushWithHost() throws IOException {
     }
 
     @Test
-    public void rename() throws IOException {
+    void rename() throws IOException {
         String applicationName = this.nameFactory.getApplicationName();
         String newName = this.nameFactory.getApplicationName();
 
@@ -978,7 +981,7 @@ public void rename() throws IOException {
     }
 
     @Test
-    public void restage() throws IOException {
+    void restage() throws IOException {
         String applicationName = this.nameFactory.getApplicationName();
 
         createApplication(this.cloudFoundryOperations, new ClassPathResource("test-application.zip").getFile().toPath(), applicationName, false)
@@ -992,7 +995,7 @@ public void restage() throws IOException {
     }
 
     @Test
-    public void restartInstance() throws IOException {
+    void restartInstance() throws IOException {
         String applicationName = this.nameFactory.getApplicationName();
 
         createApplication(this.cloudFoundryOperations, new ClassPathResource("test-application.zip").getFile().toPath(), applicationName, false)
@@ -1007,7 +1010,7 @@ public void restartInstance() throws IOException {
     }
 
     @Test
-    public void restartNotStarted() throws IOException {
+    void restartNotStarted() throws IOException {
         String applicationName = this.nameFactory.getApplicationName();
 
         createApplication(this.cloudFoundryOperations, new ClassPathResource("test-application.zip").getFile().toPath(), applicationName, true)
@@ -1021,7 +1024,7 @@ public void restartNotStarted() throws IOException {
     }
 
     @Test
-    public void restartStarted() throws IOException {
+    void restartStarted() throws IOException {
         String applicationName = this.nameFactory.getApplicationName();
 
         createApplication(this.cloudFoundryOperations, new ClassPathResource("test-application.zip").getFile().toPath(), applicationName, false)
@@ -1036,7 +1039,7 @@ public void restartStarted() throws IOException {
 
     @IfCloudFoundryVersion(greaterThanOrEqualTo = CloudFoundryVersion.PCF_1_11)
     @Test
-    public void runTask() throws IOException {
+    void runTask() throws IOException {
         String applicationName = this.nameFactory.getApplicationName();
         String taskName = this.nameFactory.getTaskName();
 
@@ -1057,7 +1060,7 @@ public void runTask() throws IOException {
     }
 
     @Test
-    public void scale() throws IOException {
+    void scale() throws IOException {
         String applicationName = this.nameFactory.getApplicationName();
 
         createApplication(this.cloudFoundryOperations, new ClassPathResource("test-application.zip").getFile().toPath(), applicationName, false)
@@ -1077,7 +1080,7 @@ public void scale() throws IOException {
 
     @SuppressWarnings("unchecked")
     @Test
-    public void setEnvironmentVariable() throws IOException {
+    void setEnvironmentVariable() throws IOException {
         String applicationName = this.nameFactory.getApplicationName();
         String variableName1 = this.nameFactory.getVariableName();
         String variableName2 = this.nameFactory.getVariableName();
@@ -1114,7 +1117,7 @@ public void setEnvironmentVariable() throws IOException {
     }
 
     @Test
-    public void setHealthCheck() throws IOException {
+    void setHealthCheck() throws IOException {
         String applicationName = this.nameFactory.getApplicationName();
 
         createApplication(this.cloudFoundryOperations, new ClassPathResource("test-application.zip").getFile().toPath(), applicationName, false)
@@ -1131,7 +1134,7 @@ public void setHealthCheck() throws IOException {
     }
 
     @Test
-    public void sshEnabled() throws IOException {
+    void sshEnabled() throws IOException {
         String applicationName = this.nameFactory.getApplicationName();
 
         createApplication(this.cloudFoundryOperations, new ClassPathResource("test-application.zip").getFile().toPath(), applicationName, false)
@@ -1146,7 +1149,7 @@ public void sshEnabled() throws IOException {
     }
 
     @Test
-    public void startNotStarted() throws IOException {
+    void startNotStarted() throws IOException {
         String applicationName = this.nameFactory.getApplicationName();
 
         createApplication(this.cloudFoundryOperations, new ClassPathResource("test-application.zip").getFile().toPath(), applicationName, true)
@@ -1160,7 +1163,7 @@ public void startNotStarted() throws IOException {
     }
 
     @Test
-    public void startStarted() throws IOException {
+    void startStarted() throws IOException {
         String applicationName = this.nameFactory.getApplicationName();
 
         createApplication(this.cloudFoundryOperations, new ClassPathResource("test-application.zip").getFile().toPath(), applicationName, false)
@@ -1174,7 +1177,7 @@ public void startStarted() throws IOException {
     }
 
     @Test
-    public void stop() throws IOException {
+    void stop() throws IOException {
         String applicationName = this.nameFactory.getApplicationName();
 
         createApplication(this.cloudFoundryOperations, new ClassPathResource("test-application.zip").getFile().toPath(), applicationName, false)
@@ -1192,7 +1195,7 @@ public void stop() throws IOException {
 
     @IfCloudFoundryVersion(greaterThanOrEqualTo = CloudFoundryVersion.PCF_1_11)
     @Test
-    public void terminateTask() throws IOException {
+    void terminateTask() throws IOException {
         String applicationName = this.nameFactory.getApplicationName();
         String taskName = this.nameFactory.getTaskName();
 
@@ -1215,7 +1218,7 @@ public void terminateTask() throws IOException {
 
     @SuppressWarnings("unchecked")
     @Test
-    public void unsetEnvironmentVariableComplete() throws IOException {
+    void unsetEnvironmentVariableComplete() throws IOException {
         String applicationName = this.nameFactory.getApplicationName();
         String variableName1 = this.nameFactory.getVariableName();
         String variableName2 = this.nameFactory.getVariableName();
@@ -1258,7 +1261,7 @@ public void unsetEnvironmentVariableComplete() throws IOException {
 
     @SuppressWarnings("unchecked")
     @Test
-    public void unsetEnvironmentVariablePartial() throws IOException {
+    void unsetEnvironmentVariablePartial() throws IOException {
         String applicationName = this.nameFactory.getApplicationName();
         String variableName1 = this.nameFactory.getVariableName();
         String variableName2 = this.nameFactory.getVariableName();
diff --git a/integration-test/src/test/java/org/cloudfoundry/operations/BuildpacksTest.java b/integration-test/src/test/java/org/cloudfoundry/operations/BuildpacksTest.java
index 869f00a924..d64e7e6da8 100644
--- a/integration-test/src/test/java/org/cloudfoundry/operations/BuildpacksTest.java
+++ b/integration-test/src/test/java/org/cloudfoundry/operations/BuildpacksTest.java
@@ -21,6 +21,7 @@
 import org.cloudfoundry.operations.buildpacks.CreateBuildpackRequest;
 import org.cloudfoundry.operations.buildpacks.DeleteBuildpackRequest;
 import org.cloudfoundry.operations.buildpacks.UpdateBuildpackRequest;
+import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.core.io.ClassPathResource;
 import reactor.core.publisher.Mono;
@@ -31,13 +32,13 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-public final class BuildpacksTest extends AbstractIntegrationTest {
+final class BuildpacksTest extends AbstractIntegrationTest {
 
     @Autowired
     private CloudFoundryOperations cloudFoundryOperations;
 
     @Test
-    public void create() throws IOException {
+    void create() throws IOException {
         String buildpackName = this.nameFactory.getBuildpackName();
 
         this.cloudFoundryOperations.buildpacks()
@@ -56,7 +57,7 @@ public void create() throws IOException {
     }
 
     @Test
-    public void createFromDirectory() throws IOException {
+    void createFromDirectory() throws IOException {
         String buildpackName = this.nameFactory.getBuildpackName();
 
         this.cloudFoundryOperations.buildpacks()
@@ -76,7 +77,7 @@ public void createFromDirectory() throws IOException {
     }
 
     @Test
-    public void delete() throws IOException {
+    void delete() throws IOException {
         String buildpackName = this.nameFactory.getBuildpackName();
 
         createBuildpack(this.cloudFoundryOperations, buildpackName)
@@ -93,7 +94,7 @@ public void delete() throws IOException {
     }
 
     @Test
-    public void deleteBuildpackNotFound() {
+    void deleteBuildpackNotFound() {
         String buildpackName = this.nameFactory.getBuildpackName();
 
         this.cloudFoundryOperations.buildpacks()
@@ -106,7 +107,7 @@ public void deleteBuildpackNotFound() {
     }
 
     @Test
-    public void list() throws IOException {
+    void list() throws IOException {
         String buildpackName = this.nameFactory.getBuildpackName();
 
         createBuildpack(this.cloudFoundryOperations, buildpackName)
@@ -121,7 +122,7 @@ public void list() throws IOException {
     }
 
     @Test
-    public void update() throws IOException {
+    void update() throws IOException {
         String buildpackName = this.nameFactory.getBuildpackName();
 
         createBuildpack(this.cloudFoundryOperations, buildpackName)
@@ -141,7 +142,7 @@ public void update() throws IOException {
     }
 
     @Test
-    public void updateFromDirectory() throws IOException {
+    void updateFromDirectory() throws IOException {
         String buildpackName = this.nameFactory.getBuildpackName();
 
         createBuildpack(this.cloudFoundryOperations, buildpackName)
diff --git a/integration-test/src/test/java/org/cloudfoundry/operations/DomainsTest.java b/integration-test/src/test/java/org/cloudfoundry/operations/DomainsTest.java
index f42129db40..4467304a0c 100644
--- a/integration-test/src/test/java/org/cloudfoundry/operations/DomainsTest.java
+++ b/integration-test/src/test/java/org/cloudfoundry/operations/DomainsTest.java
@@ -24,6 +24,7 @@
 import org.cloudfoundry.operations.domains.ShareDomainRequest;
 import org.cloudfoundry.operations.domains.UnshareDomainRequest;
 import org.cloudfoundry.operations.organizations.CreateOrganizationRequest;
+import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 import reactor.core.publisher.Flux;
 import reactor.core.publisher.Mono;
@@ -35,7 +36,7 @@
 import static org.cloudfoundry.operations.domains.Status.OWNED;
 import static org.cloudfoundry.operations.domains.Status.SHARED;
 
-public final class DomainsTest extends AbstractIntegrationTest {
+final class DomainsTest extends AbstractIntegrationTest {
 
     private static final String DEFAULT_ROUTER_GROUP = "default-tcp";
 
@@ -46,7 +47,7 @@ public final class DomainsTest extends AbstractIntegrationTest {
     private String organizationName;
 
     @Test
-    public void createInvalidDomain() {
+    void createInvalidDomain() {
         this.cloudFoundryOperations.domains()
             .create(CreateDomainRequest.builder()
                 .domain("invalid-domain")
@@ -58,7 +59,7 @@ public void createInvalidDomain() {
     }
 
     @Test
-    public void createPrivate() {
+    void createPrivate() {
         String domainName = this.nameFactory.getDomainName();
 
         this.cloudFoundryOperations.domains()
@@ -76,7 +77,7 @@ public void createPrivate() {
     }
 
     @Test
-    public void createShared() {
+    void createShared() {
         String domainName = this.nameFactory.getDomainName();
 
         this.cloudFoundryOperations.domains()
@@ -93,7 +94,7 @@ public void createShared() {
     }
 
     @Test
-    public void createSharedTcp() {
+    void createSharedTcp() {
         String domainName = this.nameFactory.getDomainName();
 
         this.cloudFoundryOperations.domains()
@@ -111,7 +112,7 @@ public void createSharedTcp() {
     }
 
     @Test
-    public void list() {
+    void list() {
         String domainName = this.nameFactory.getDomainName();
 
         requestCreateDomain(this.cloudFoundryOperations, domainName, this.organizationName)
@@ -126,7 +127,7 @@ public void list() {
     }
 
     @Test
-    public void listRouterGroups() {
+    void listRouterGroups() {
         this.cloudFoundryOperations.domains()
             .listRouterGroups()
             .filter(response -> DEFAULT_ROUTER_GROUP.equals(response.getName()))
@@ -137,7 +138,7 @@ public void listRouterGroups() {
     }
 
     @Test
-    public void listTcp() {
+    void listTcp() {
         String domainName = this.nameFactory.getDomainName();
 
         requestCreateTcpDomain(this.cloudFoundryOperations, domainName)
@@ -152,7 +153,7 @@ public void listTcp() {
     }
 
     @Test
-    public void share() {
+    void share() {
         String domainName = this.nameFactory.getDomainName();
         String targetOrganizationName = this.nameFactory.getOrganizationName();
 
@@ -169,7 +170,7 @@ public void share() {
     }
 
     @Test
-    public void unshare() {
+    void unshare() {
         String domainName = this.nameFactory.getDomainName();
         String targetOrganizationName = this.nameFactory.getOrganizationName();
 
diff --git a/integration-test/src/test/java/org/cloudfoundry/operations/NetworkPoliciesTest.java b/integration-test/src/test/java/org/cloudfoundry/operations/NetworkPoliciesTest.java
index 1ed827a157..d1a90d4cf7 100644
--- a/integration-test/src/test/java/org/cloudfoundry/operations/NetworkPoliciesTest.java
+++ b/integration-test/src/test/java/org/cloudfoundry/operations/NetworkPoliciesTest.java
@@ -27,6 +27,7 @@
 import org.cloudfoundry.operations.networkpolicies.Policy;
 import org.cloudfoundry.operations.networkpolicies.RemoveNetworkPolicyRequest;
 import org.cloudfoundry.util.ResourceUtils;
+import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 import reactor.core.publisher.Flux;
 import reactor.core.publisher.Mono;
@@ -34,7 +35,7 @@
 
 import java.time.Duration;
 
-public final class NetworkPoliciesTest extends AbstractIntegrationTest {
+final class NetworkPoliciesTest extends AbstractIntegrationTest {
 
     @Autowired
     private CloudFoundryClient cloudFoundryClient;
@@ -47,7 +48,7 @@ public final class NetworkPoliciesTest extends AbstractIntegrationTest {
 
     @IfCloudFoundryVersion(greaterThanOrEqualTo = CloudFoundryVersion.PCF_1_12)
     @Test
-    public void add() {
+    void add() {
         String destinationApplicationName = this.nameFactory.getApplicationName();
         String sourceApplicationName = this.nameFactory.getApplicationName();
         Integer port = this.nameFactory.getPort();
@@ -73,7 +74,7 @@ public void add() {
 
     @IfCloudFoundryVersion(greaterThanOrEqualTo = CloudFoundryVersion.PCF_1_12)
     @Test
-    public void list() {
+    void list() {
         String destinationApplicationName = this.nameFactory.getApplicationName();
         String sourceApplicationName = this.nameFactory.getApplicationName();
         Integer port = this.nameFactory.getPort();
@@ -97,7 +98,7 @@ public void list() {
 
     @IfCloudFoundryVersion(greaterThanOrEqualTo = CloudFoundryVersion.PCF_1_12)
     @Test
-    public void remove() {
+    void remove() {
         String destinationApplicationName = this.nameFactory.getApplicationName();
         String sourceApplicationName = this.nameFactory.getApplicationName();
         Integer port = this.nameFactory.getPort();
diff --git a/integration-test/src/test/java/org/cloudfoundry/operations/OrganizationAdminTest.java b/integration-test/src/test/java/org/cloudfoundry/operations/OrganizationAdminTest.java
index ee5623b423..fe3ec4020b 100644
--- a/integration-test/src/test/java/org/cloudfoundry/operations/OrganizationAdminTest.java
+++ b/integration-test/src/test/java/org/cloudfoundry/operations/OrganizationAdminTest.java
@@ -25,6 +25,7 @@
 import org.cloudfoundry.operations.organizationadmin.UpdateQuotaRequest;
 import org.cloudfoundry.operations.organizations.CreateOrganizationRequest;
 import org.cloudfoundry.operations.organizations.OrganizationInfoRequest;
+import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 import reactor.core.publisher.Mono;
 import reactor.test.StepVerifier;
@@ -33,13 +34,13 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-public final class OrganizationAdminTest extends AbstractIntegrationTest {
+final class OrganizationAdminTest extends AbstractIntegrationTest {
 
     @Autowired
     private CloudFoundryOperations cloudFoundryOperations;
 
     @Test
-    public void createQuota() {
+    void createQuota() {
         String quotaName = this.nameFactory.getQuotaDefinitionName();
 
         this.cloudFoundryOperations.organizationAdmin()
@@ -59,7 +60,7 @@ public void createQuota() {
     }
 
     @Test
-    public void deleteQuota() {
+    void deleteQuota() {
         String quotaName = this.nameFactory.getQuotaDefinitionName();
 
         requestCreateQuota(this.cloudFoundryOperations, quotaName)
@@ -74,7 +75,7 @@ public void deleteQuota() {
     }
 
     @Test
-    public void getQuota() {
+    void getQuota() {
         String quotaName = this.nameFactory.getQuotaDefinitionName();
 
         requestCreateQuota(this.cloudFoundryOperations, quotaName)
@@ -90,7 +91,7 @@ public void getQuota() {
     }
 
     @Test
-    public void listQuotas() {
+    void listQuotas() {
         String quotaName = this.nameFactory.getQuotaDefinitionName();
 
         requestCreateQuota(this.cloudFoundryOperations, quotaName)
@@ -105,7 +106,7 @@ public void listQuotas() {
     }
 
     @Test
-    public void setQuota() {
+    void setQuota() {
         String organizationName = this.nameFactory.getOrganizationName();
         String quotaName = this.nameFactory.getQuotaDefinitionName();
 
@@ -130,7 +131,7 @@ public void setQuota() {
     }
 
     @Test
-    public void updateQuota() {
+    void updateQuota() {
         String quotaName = this.nameFactory.getQuotaDefinitionName();
 
         requestCreateQuota(this.cloudFoundryOperations, quotaName)
diff --git a/integration-test/src/test/java/org/cloudfoundry/operations/OrganizationsTest.java b/integration-test/src/test/java/org/cloudfoundry/operations/OrganizationsTest.java
index 0ec28ddf50..a2646dba13 100644
--- a/integration-test/src/test/java/org/cloudfoundry/operations/OrganizationsTest.java
+++ b/integration-test/src/test/java/org/cloudfoundry/operations/OrganizationsTest.java
@@ -18,6 +18,7 @@
 
 import org.cloudfoundry.AbstractIntegrationTest;
 import org.cloudfoundry.operations.organizations.CreateOrganizationRequest;
+import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 import reactor.core.publisher.Mono;
 import reactor.test.StepVerifier;
@@ -25,7 +26,7 @@
 import java.time.Duration;
 
 
-public final class OrganizationsTest extends AbstractIntegrationTest {
+final class OrganizationsTest extends AbstractIntegrationTest {
 
     @Autowired
     private CloudFoundryOperations cloudFoundryOperations;
@@ -34,7 +35,7 @@ public final class OrganizationsTest extends AbstractIntegrationTest {
     private Mono<String> organizationId;
 
     @Test
-    public void create() {
+    void create() {
         String organizationName = this.nameFactory.getOrganizationName();
 
         this.cloudFoundryOperations.organizations()
@@ -51,7 +52,7 @@ public void create() {
     }
 
     @Test
-    public void list() {
+    void list() {
         this.organizationId
             .flatMapMany(organizationId -> this.cloudFoundryOperations.organizations()
                 .list()
diff --git a/integration-test/src/test/java/org/cloudfoundry/operations/RoutesTest.java b/integration-test/src/test/java/org/cloudfoundry/operations/RoutesTest.java
index e5a2c3757c..2bfa7f7abb 100644
--- a/integration-test/src/test/java/org/cloudfoundry/operations/RoutesTest.java
+++ b/integration-test/src/test/java/org/cloudfoundry/operations/RoutesTest.java
@@ -31,6 +31,7 @@
 import org.cloudfoundry.operations.routes.UnmapRouteRequest;
 import org.cloudfoundry.operations.services.BindRouteServiceInstanceRequest;
 import org.cloudfoundry.operations.services.CreateUserProvidedServiceInstanceRequest;
+import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.core.io.ClassPathResource;
 import reactor.core.publisher.Flux;
@@ -48,7 +49,7 @@
 import static org.cloudfoundry.operations.routes.Level.ORGANIZATION;
 import static org.cloudfoundry.operations.routes.Level.SPACE;
 
-public final class RoutesTest extends AbstractIntegrationTest {
+final class RoutesTest extends AbstractIntegrationTest {
 
     private static final String DEFAULT_ROUTER_GROUP = "default-tcp";
 
@@ -62,7 +63,7 @@ public final class RoutesTest extends AbstractIntegrationTest {
     private String spaceName;
 
     @Test
-    public void checkFalse() {
+    void checkFalse() {
         String domainName = this.nameFactory.getDomainName();
         String host = this.nameFactory.getHostName();
         String path = this.nameFactory.getPath();
@@ -80,7 +81,7 @@ public void checkFalse() {
     }
 
     @Test
-    public void checkTruePrivateDomainNoHost() {
+    void checkTruePrivateDomainNoHost() {
         String domainName = this.nameFactory.getDomainName();
         String hostName = null;
         String path = this.nameFactory.getPath();
@@ -98,7 +99,7 @@ public void checkTruePrivateDomainNoHost() {
     }
 
     @Test
-    public void checkTrueSharedDomain() {
+    void checkTrueSharedDomain() {
         String domainName = this.nameFactory.getDomainName();
         String hostName = this.nameFactory.getHostName();
         String path = this.nameFactory.getPath();
@@ -117,7 +118,7 @@ public void checkTrueSharedDomain() {
     }
 
     @Test
-    public void create() {
+    void create() {
         String domainName = this.nameFactory.getDomainName();
         String hostName = this.nameFactory.getHostName();
         String path = this.nameFactory.getPath();
@@ -136,7 +137,7 @@ public void create() {
     }
 
     @Test
-    public void createRouteTcpAssignedPort() {
+    void createRouteTcpAssignedPort() {
         String domainName = this.nameFactory.getDomainName();
         Integer port = this.nameFactory.getPort();
 
@@ -151,7 +152,7 @@ public void createRouteTcpAssignedPort() {
     }
 
     @Test
-    public void createRouteTcpRandomPort() {
+    void createRouteTcpRandomPort() {
         String domainName = this.nameFactory.getDomainName();
 
         requestCreateSharedDomain(this.cloudFoundryOperations, domainName, DEFAULT_ROUTER_GROUP)
@@ -165,7 +166,7 @@ public void createRouteTcpRandomPort() {
     }
 
     @Test
-    public void createRouteWithNonExistentDomain() {
+    void createRouteWithNonExistentDomain() {
         String domainName = this.nameFactory.getDomainName();
         String hostName = this.nameFactory.getHostName();
         String path = this.nameFactory.getPath();
@@ -183,7 +184,7 @@ public void createRouteWithNonExistentDomain() {
     }
 
     @Test
-    public void delete() {
+    void delete() {
         String domainName = this.nameFactory.getDomainName();
         String hostName = this.nameFactory.getHostName();
         String path = this.nameFactory.getPath();
@@ -208,7 +209,7 @@ public void delete() {
     }
 
     @Test
-    public void deleteInvalidDomain() {
+    void deleteInvalidDomain() {
         String domainName = this.nameFactory.getDomainName();
         String hostName = this.nameFactory.getHostName();
         String path = this.nameFactory.getPath();
@@ -225,7 +226,7 @@ public void deleteInvalidDomain() {
     }
 
     @Test
-    public void deleteOrphanedRoutes() {
+    void deleteOrphanedRoutes() {
         String domainName = this.nameFactory.getDomainName();
         String hostName = this.nameFactory.getHostName();
         String path = this.nameFactory.getPath();
@@ -247,7 +248,7 @@ public void deleteOrphanedRoutes() {
     }
 
     @Test
-    public void deleteTcpRoute() {
+    void deleteTcpRoute() {
         String domainName = this.nameFactory.getDomainName();
 
         requestCreateSharedDomain(this.cloudFoundryOperations, domainName, DEFAULT_ROUTER_GROUP)
@@ -265,7 +266,7 @@ public void deleteTcpRoute() {
     }
 
     @Test
-    public void listWithOrganizationLevel() {
+    void listWithOrganizationLevel() {
         String domainName = this.nameFactory.getDomainName();
         String hostName = this.nameFactory.getHostName();
         String path = this.nameFactory.getPath();
@@ -283,7 +284,7 @@ public void listWithOrganizationLevel() {
     }
 
     @Test
-    public void listWithService() {
+    void listWithService() {
         String domainName = this.nameFactory.getDomainName();
         String hostName = this.nameFactory.getHostName();
         String path = this.nameFactory.getPath();
@@ -305,7 +306,7 @@ public void listWithService() {
     }
 
     @Test
-    public void listWithSpaceLevel() {
+    void listWithSpaceLevel() {
         String domainName = this.nameFactory.getDomainName();
         String hostName = this.nameFactory.getHostName();
         String path = this.nameFactory.getPath();
@@ -323,7 +324,7 @@ public void listWithSpaceLevel() {
     }
 
     @Test
-    public void map() throws IOException {
+    void map() throws IOException {
         String applicationName = this.nameFactory.getApplicationName();
         String domainName = this.nameFactory.getDomainName();
         String hostName = this.nameFactory.getHostName();
@@ -350,7 +351,7 @@ public void map() throws IOException {
     }
 
     @Test
-    public void mapNoHost() throws IOException {
+    void mapNoHost() throws IOException {
         String applicationName = this.nameFactory.getApplicationName();
         String domainName = this.nameFactory.getDomainName();
         String hostName = null;
@@ -377,7 +378,7 @@ public void mapNoHost() throws IOException {
     }
 
     @Test
-    public void mapNoPath() throws IOException {
+    void mapNoPath() throws IOException {
         String applicationName = this.nameFactory.getApplicationName();
         String domainName = this.nameFactory.getDomainName();
         String hostName = this.nameFactory.getHostName();
@@ -404,7 +405,7 @@ public void mapNoPath() throws IOException {
     }
 
     @Test
-    public void mapTcpRoute() throws IOException {
+    void mapTcpRoute() throws IOException {
         String applicationName = this.nameFactory.getApplicationName();
         String domainName = this.nameFactory.getDomainName();
 
@@ -429,7 +430,7 @@ public void mapTcpRoute() throws IOException {
     }
 
     @Test
-    public void mapTcpRouteTwice() throws IOException {
+    void mapTcpRouteTwice() throws IOException {
         String applicationName = this.nameFactory.getApplicationName();
         String domainName = this.nameFactory.getDomainName();
 
@@ -459,7 +460,7 @@ public void mapTcpRouteTwice() throws IOException {
     }
 
     @Test
-    public void unmap() throws IOException {
+    void unmap() throws IOException {
         String applicationName = this.nameFactory.getApplicationName();
         String domainName = this.nameFactory.getDomainName();
         String hostName = this.nameFactory.getHostName();
@@ -486,7 +487,7 @@ public void unmap() throws IOException {
     }
 
     @Test
-    public void unmapNoPath() throws IOException {
+    void unmapNoPath() throws IOException {
         String applicationName = this.nameFactory.getApplicationName();
         String domainName = this.nameFactory.getDomainName();
         String hostName = this.nameFactory.getHostName();
@@ -513,7 +514,7 @@ public void unmapNoPath() throws IOException {
     }
 
     @Test
-    public void unmapTcpRoute() throws IOException {
+    void unmapTcpRoute() throws IOException {
         String applicationName = this.nameFactory.getApplicationName();
         String domainName = this.nameFactory.getDomainName();
 
diff --git a/integration-test/src/test/java/org/cloudfoundry/operations/ServiceAdminTest.java b/integration-test/src/test/java/org/cloudfoundry/operations/ServiceAdminTest.java
index 3fb44a0eeb..a56b181703 100644
--- a/integration-test/src/test/java/org/cloudfoundry/operations/ServiceAdminTest.java
+++ b/integration-test/src/test/java/org/cloudfoundry/operations/ServiceAdminTest.java
@@ -27,6 +27,7 @@
 import org.cloudfoundry.operations.serviceadmin.ListServiceAccessSettingsRequest;
 import org.cloudfoundry.operations.serviceadmin.ServiceAccess;
 import org.cloudfoundry.util.ResourceUtils;
+import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 import reactor.core.publisher.Flux;
 import reactor.core.publisher.Mono;
@@ -37,7 +38,7 @@
 import static org.cloudfoundry.ServiceBrokerUtils.createServiceBroker;
 import static org.cloudfoundry.ServiceBrokerUtils.deleteServiceBroker;
 
-public final class ServiceAdminTest extends AbstractIntegrationTest {
+final class ServiceAdminTest extends AbstractIntegrationTest {
 
     @Autowired
     private CloudFoundryClient cloudFoundryClient;
@@ -61,7 +62,7 @@ public final class ServiceAdminTest extends AbstractIntegrationTest {
     private String serviceName;
 
     @Test
-    public void disableServiceAccess() {
+    void disableServiceAccess() {
         String planName = this.nameFactory.getPlanName();
         String serviceBrokerName = this.nameFactory.getServiceBrokerName();
         String serviceName = this.nameFactory.getServiceName();
@@ -95,7 +96,7 @@ public void disableServiceAccess() {
     }
 
     @Test
-    public void disableServiceAccessSpecifyAll() {
+    void disableServiceAccessSpecifyAll() {
         String planName = this.nameFactory.getPlanName();
         String serviceBrokerName = this.nameFactory.getServiceBrokerName();
         String serviceName = this.nameFactory.getServiceName();
@@ -131,7 +132,7 @@ public void disableServiceAccessSpecifyAll() {
     }
 
     @Test
-    public void disableServiceAccessSpecifyOrganization() {
+    void disableServiceAccessSpecifyOrganization() {
         String planName = this.nameFactory.getPlanName();
         String serviceBrokerName = this.nameFactory.getServiceBrokerName();
         String serviceName = this.nameFactory.getServiceName();
@@ -166,7 +167,7 @@ public void disableServiceAccessSpecifyOrganization() {
     }
 
     @Test
-    public void disableServiceAccessSpecifyServicePlan() {
+    void disableServiceAccessSpecifyServicePlan() {
         String planName = this.nameFactory.getPlanName();
         String serviceBrokerName = this.nameFactory.getServiceBrokerName();
         String serviceName = this.nameFactory.getServiceName();
@@ -201,7 +202,7 @@ public void disableServiceAccessSpecifyServicePlan() {
     }
 
     @Test
-    public void enableServiceAccess() {
+    void enableServiceAccess() {
         String planName = this.nameFactory.getPlanName();
         String serviceBrokerName = this.nameFactory.getServiceBrokerName();
         String serviceName = this.nameFactory.getServiceName();
@@ -235,7 +236,7 @@ public void enableServiceAccess() {
     }
 
     @Test
-    public void enableServiceAccessSpecifyAll() {
+    void enableServiceAccessSpecifyAll() {
         String planName = this.nameFactory.getPlanName();
         String serviceBrokerName = this.nameFactory.getServiceBrokerName();
         String serviceName = this.nameFactory.getServiceName();
@@ -271,7 +272,7 @@ public void enableServiceAccessSpecifyAll() {
     }
 
     @Test
-    public void enableServiceAccessSpecifyOrganization() {
+    void enableServiceAccessSpecifyOrganization() {
         String planName = this.nameFactory.getPlanName();
         String serviceBrokerName = this.nameFactory.getServiceBrokerName();
         String serviceName = this.nameFactory.getServiceName();
@@ -306,7 +307,7 @@ public void enableServiceAccessSpecifyOrganization() {
     }
 
     @Test
-    public void enableServiceAccessSpecifyServicePlan() {
+    void enableServiceAccessSpecifyServicePlan() {
         String planName = this.nameFactory.getPlanName();
         String serviceBrokerName = this.nameFactory.getServiceBrokerName();
         String serviceName = this.nameFactory.getServiceName();
@@ -341,7 +342,7 @@ public void enableServiceAccessSpecifyServicePlan() {
     }
 
     @Test
-    public void listServiceAccessSettings() {
+    void listServiceAccessSettings() {
         resetToEnabled(this.cloudFoundryOperations, this.serviceName)
             .thenMany(this.cloudFoundryOperations.serviceAdmin()
                 .listServiceAccessSettings(ListServiceAccessSettingsRequest.builder()
@@ -360,7 +361,7 @@ public void listServiceAccessSettings() {
     }
 
     @Test
-    public void listServiceAccessSettingsSpecifyBroker() {
+    void listServiceAccessSettingsSpecifyBroker() {
         resetToEnabled(this.cloudFoundryOperations, this.serviceName)
             .thenMany(this.cloudFoundryOperations.serviceAdmin()
                 .listServiceAccessSettings(ListServiceAccessSettingsRequest.builder()
@@ -381,7 +382,7 @@ public void listServiceAccessSettingsSpecifyBroker() {
     }
 
     @Test
-    public void listServiceAccessSettingsSpecifyOrganization() {
+    void listServiceAccessSettingsSpecifyOrganization() {
         resetToEnabled(this.cloudFoundryOperations, this.serviceName)
             .thenMany(this.cloudFoundryOperations.serviceAdmin()
                 .listServiceAccessSettings(ListServiceAccessSettingsRequest.builder()
@@ -401,7 +402,7 @@ public void listServiceAccessSettingsSpecifyOrganization() {
     }
 
     @Test
-    public void listServiceAccessSettingsSpecifyService() {
+    void listServiceAccessSettingsSpecifyService() {
         resetToEnabled(this.cloudFoundryOperations, this.serviceName)
             .thenMany(this.cloudFoundryOperations.serviceAdmin()
                 .listServiceAccessSettings(ListServiceAccessSettingsRequest.builder()
diff --git a/integration-test/src/test/java/org/cloudfoundry/operations/ServicesTest.java b/integration-test/src/test/java/org/cloudfoundry/operations/ServicesTest.java
index b55a3bd469..d6f36d8e31 100644
--- a/integration-test/src/test/java/org/cloudfoundry/operations/ServicesTest.java
+++ b/integration-test/src/test/java/org/cloudfoundry/operations/ServicesTest.java
@@ -51,6 +51,7 @@
 import org.cloudfoundry.operations.services.UpdateServiceInstanceRequest;
 import org.cloudfoundry.operations.services.UpdateUserProvidedServiceInstanceRequest;
 import org.cloudfoundry.util.PaginationUtils;
+import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.core.io.ClassPathResource;
 import reactor.core.publisher.Flux;
@@ -64,7 +65,7 @@
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.cloudfoundry.operations.routes.Level.SPACE;
 
-public final class ServicesTest extends AbstractIntegrationTest {
+final class ServicesTest extends AbstractIntegrationTest {
 
     @Autowired
     private CloudFoundryClient cloudFoundryClient;
@@ -88,7 +89,7 @@ public final class ServicesTest extends AbstractIntegrationTest {
     private String spaceName;
 
     @Test
-    public void bindRoutePrivateDomain() {
+    void bindRoutePrivateDomain() {
         String domainName = this.nameFactory.getDomainName();
         String hostName = this.nameFactory.getHostName();
         String path = this.nameFactory.getPath();
@@ -118,7 +119,7 @@ public void bindRoutePrivateDomain() {
     }
 
     @Test
-    public void bindService() throws IOException {
+    void bindService() throws IOException {
         String applicationName = this.nameFactory.getApplicationName();
         String serviceInstanceName = this.nameFactory.getServiceInstanceName();
 
@@ -141,7 +142,7 @@ public void bindService() throws IOException {
     }
 
     @Test
-    public void create() {
+    void create() {
         String serviceInstanceName = this.nameFactory.getServiceInstanceName();
 
         this.cloudFoundryOperations.services()
@@ -161,7 +162,7 @@ public void create() {
 
     @SuppressWarnings("unchecked")
     @Test
-    public void createServiceKey() {
+    void createServiceKey() {
         String serviceInstanceName = this.nameFactory.getServiceInstanceName();
         String serviceKeyName = this.nameFactory.getServiceKeyName();
 
@@ -181,7 +182,7 @@ public void createServiceKey() {
     }
 
     @Test
-    public void createUserProvidedServiceInstance() {
+    void createUserProvidedServiceInstance() {
         String serviceInstanceName = this.nameFactory.getServiceInstanceName();
 
         this.cloudFoundryOperations.services()
@@ -201,7 +202,7 @@ public void createUserProvidedServiceInstance() {
     }
 
     @Test
-    public void delete() {
+    void delete() {
         String serviceInstanceName = this.nameFactory.getServiceInstanceName();
 
         this.serviceBrokerId
@@ -219,7 +220,7 @@ public void delete() {
     }
 
     @Test
-    public void deleteServiceKey() {
+    void deleteServiceKey() {
         String serviceInstanceName = this.nameFactory.getServiceInstanceName();
         String serviceKeyName = this.nameFactory.getServiceKeyName();
 
@@ -237,7 +238,7 @@ public void deleteServiceKey() {
     }
 
     @Test
-    public void getManagedService() {
+    void getManagedService() {
         String serviceInstanceName = this.nameFactory.getServiceInstanceName();
 
         requestCreateServiceInstance(this.cloudFoundryOperations, this.planName, serviceInstanceName, this.serviceName)
@@ -253,7 +254,7 @@ public void getManagedService() {
     }
 
     @Test
-    public void getServiceKey() {
+    void getServiceKey() {
         String serviceInstanceName = this.nameFactory.getServiceInstanceName();
         String serviceKeyName = this.nameFactory.getServiceKeyName();
 
@@ -272,7 +273,7 @@ public void getServiceKey() {
     }
 
     @Test
-    public void listServiceKey() {
+    void listServiceKey() {
         String serviceInstanceName = this.nameFactory.getServiceInstanceName();
         String serviceKeyName = this.nameFactory.getServiceKeyName();
 
@@ -290,7 +291,7 @@ public void listServiceKey() {
     }
 
     @Test
-    public void listServiceOfferings() {
+    void listServiceOfferings() {
         String serviceInstanceName = this.nameFactory.getServiceInstanceName();
 
         requestCreateServiceInstance(this.cloudFoundryOperations, this.planName, serviceInstanceName, this.serviceName)
@@ -306,7 +307,7 @@ public void listServiceOfferings() {
     }
 
     @Test
-    public void rename() {
+    void rename() {
         String serviceInstanceName1 = this.nameFactory.getServiceInstanceName();
         String serviceInstanceName2 = this.nameFactory.getServiceInstanceName();
 
@@ -326,7 +327,7 @@ public void rename() {
     }
 
     @Test
-    public void unbindRoute() {
+    void unbindRoute() {
         String domainName = this.nameFactory.getDomainName();
         String hostName = this.nameFactory.getHostName();
         String path = this.nameFactory.getPath();
@@ -354,7 +355,7 @@ public void unbindRoute() {
     }
 
     @Test
-    public void unbindService() throws IOException {
+    void unbindService() throws IOException {
         String applicationName = this.nameFactory.getApplicationName();
         String serviceInstanceName = this.nameFactory.getServiceInstanceName();
 
@@ -377,7 +378,7 @@ public void unbindService() throws IOException {
     }
 
     @Test
-    public void updateInstance() {
+    void updateInstance() {
         String serviceInstanceName = this.nameFactory.getServiceInstanceName();
 
         this.serviceBrokerId
@@ -396,7 +397,7 @@ public void updateInstance() {
     }
 
     @Test
-    public void updateUserProvidedInstance() {
+    void updateUserProvidedInstance() {
         String serviceInstanceName = this.nameFactory.getServiceInstanceName();
 
         this.serviceBrokerId
diff --git a/integration-test/src/test/java/org/cloudfoundry/operations/SpacesTest.java b/integration-test/src/test/java/org/cloudfoundry/operations/SpacesTest.java
index 73418136a8..68b0295d33 100644
--- a/integration-test/src/test/java/org/cloudfoundry/operations/SpacesTest.java
+++ b/integration-test/src/test/java/org/cloudfoundry/operations/SpacesTest.java
@@ -20,6 +20,7 @@
 import org.cloudfoundry.operations.spaces.CreateSpaceRequest;
 import org.cloudfoundry.operations.spaces.GetSpaceRequest;
 import org.cloudfoundry.operations.spaces.SpaceDetail;
+import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 import reactor.test.StepVerifier;
 
@@ -27,7 +28,7 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-public final class SpacesTest extends AbstractIntegrationTest {
+final class SpacesTest extends AbstractIntegrationTest {
 
     @Autowired
     private CloudFoundryOperations cloudFoundryOperations;
@@ -36,7 +37,7 @@ public final class SpacesTest extends AbstractIntegrationTest {
     private String organizationName;
 
     @Test
-    public void create() {
+    void create() {
         String spaceName = this.nameFactory.getSpaceName();
 
         this.cloudFoundryOperations.spaces()
@@ -54,7 +55,7 @@ public void create() {
     }
 
     @Test
-    public void getWithURLReservedCharacterInName() {
+    void getWithURLReservedCharacterInName() {
         String spaceName = this.nameFactory.getSpaceName() + "+test";
 
         this.cloudFoundryOperations.spaces()
@@ -74,7 +75,7 @@ public void getWithURLReservedCharacterInName() {
     }
 
     @Test
-    public void list() {
+    void list() {
         this.cloudFoundryOperations.spaces()
             .list()
             .count()
diff --git a/integration-test/src/test/java/org/cloudfoundry/operations/UserAdminTest.java b/integration-test/src/test/java/org/cloudfoundry/operations/UserAdminTest.java
index 402017b47b..4e2c865274 100644
--- a/integration-test/src/test/java/org/cloudfoundry/operations/UserAdminTest.java
+++ b/integration-test/src/test/java/org/cloudfoundry/operations/UserAdminTest.java
@@ -38,6 +38,7 @@
 import org.cloudfoundry.operations.useradmin.UnsetSpaceRoleRequest;
 import org.cloudfoundry.util.PaginationUtils;
 import org.cloudfoundry.util.ResourceUtils;
+import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 import reactor.core.publisher.Flux;
 import reactor.core.publisher.Mono;
@@ -47,7 +48,7 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-public final class UserAdminTest extends AbstractIntegrationTest {
+final class UserAdminTest extends AbstractIntegrationTest {
 
     @Autowired
     private CloudFoundryClient cloudFoundryClient;
@@ -56,7 +57,7 @@ public final class UserAdminTest extends AbstractIntegrationTest {
     private CloudFoundryOperations cloudFoundryOperations;
 
     @Test
-    public void create() {
+    void create() {
         String username = this.nameFactory.getUserName();
 
         this.cloudFoundryOperations.userAdmin()
@@ -73,7 +74,7 @@ public void create() {
     }
 
     @Test
-    public void createDuplicate() {
+    void createDuplicate() {
         String username = this.nameFactory.getUserName();
 
         createUser(this.cloudFoundryOperations, username)
@@ -84,7 +85,7 @@ public void createDuplicate() {
     }
 
     @Test
-    public void delete() {
+    void delete() {
         String username = this.nameFactory.getUserName();
 
         createUser(this.cloudFoundryOperations, username)
@@ -100,7 +101,7 @@ public void delete() {
     }
 
     @Test
-    public void deleteNotFound() {
+    void deleteNotFound() {
         this.cloudFoundryOperations.userAdmin()
             .delete(DeleteUserRequest.builder()
                 .username("not-found")
@@ -111,7 +112,7 @@ public void deleteNotFound() {
     }
 
     @Test
-    public void listOrganizationUsers() {
+    void listOrganizationUsers() {
         String organizationName = this.nameFactory.getOrganizationName();
         String username = this.nameFactory.getUserName();
 
@@ -132,7 +133,7 @@ public void listOrganizationUsers() {
     }
 
     @Test
-    public void listSpaceUsers() {
+    void listSpaceUsers() {
         String organizationName = this.nameFactory.getOrganizationName();
         String spaceName = this.nameFactory.getSpaceName();
         String username = this.nameFactory.getUserName();
@@ -156,7 +157,7 @@ public void listSpaceUsers() {
     }
 
     @Test
-    public void setOrganizationUser() {
+    void setOrganizationUser() {
         String organizationName = this.nameFactory.getOrganizationName();
         String username = this.nameFactory.getUserName();
 
@@ -180,7 +181,7 @@ public void setOrganizationUser() {
     }
 
     @Test
-    public void setSpaceUser() {
+    void setSpaceUser() {
         String organizationName = this.nameFactory.getOrganizationName();
         String spaceName = this.nameFactory.getSpaceName();
         String username = this.nameFactory.getUserName();
@@ -206,7 +207,7 @@ public void setSpaceUser() {
     }
 
     @Test
-    public void unsetOrganizationUser() {
+    void unsetOrganizationUser() {
         String organizationName = this.nameFactory.getOrganizationName();
         String username = this.nameFactory.getUserName();
 
@@ -230,7 +231,7 @@ public void unsetOrganizationUser() {
     }
 
     @Test
-    public void unsetSpaceUser() {
+    void unsetSpaceUser() {
         String organizationName = this.nameFactory.getOrganizationName();
         String spaceName = this.nameFactory.getSpaceName();
         String username = this.nameFactory.getUserName();
diff --git a/integration-test/src/test/java/org/cloudfoundry/routing/v1/RouterGroupsTest.java b/integration-test/src/test/java/org/cloudfoundry/routing/v1/RouterGroupsTest.java
index b46b38612c..7de0e73344 100644
--- a/integration-test/src/test/java/org/cloudfoundry/routing/v1/RouterGroupsTest.java
+++ b/integration-test/src/test/java/org/cloudfoundry/routing/v1/RouterGroupsTest.java
@@ -23,13 +23,14 @@
 import org.cloudfoundry.routing.v1.routergroups.RouterGroup;
 import org.cloudfoundry.routing.v1.routergroups.UpdateRouterGroupRequest;
 import org.cloudfoundry.routing.v1.routergroups.UpdateRouterGroupResponse;
+import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 import reactor.core.publisher.Mono;
 import reactor.test.StepVerifier;
 
 import java.time.Duration;
 
-public final class RouterGroupsTest extends AbstractIntegrationTest {
+final class RouterGroupsTest extends AbstractIntegrationTest {
 
     private static final String DEFAULT_ROUTER_GROUP = "default-tcp";
 
@@ -37,7 +38,7 @@ public final class RouterGroupsTest extends AbstractIntegrationTest {
     private RoutingClient routingClient;
 
     @Test
-    public void list() {
+    void list() {
         this.routingClient.routerGroups()
             .list(ListRouterGroupsRequest.builder()
                 .build())
@@ -51,7 +52,7 @@ public void list() {
     }
 
     @Test
-    public void update() {
+    void update() {
         getRouterGroupId(this.routingClient, DEFAULT_ROUTER_GROUP)
             .flatMap(routerGroupId -> this.routingClient.routerGroups()
                 .update(UpdateRouterGroupRequest.builder()
diff --git a/integration-test/src/test/java/org/cloudfoundry/routing/v1/TcpRoutesTest.java b/integration-test/src/test/java/org/cloudfoundry/routing/v1/TcpRoutesTest.java
index 5438c70535..30f083abb9 100644
--- a/integration-test/src/test/java/org/cloudfoundry/routing/v1/TcpRoutesTest.java
+++ b/integration-test/src/test/java/org/cloudfoundry/routing/v1/TcpRoutesTest.java
@@ -31,6 +31,7 @@
 import org.cloudfoundry.routing.v1.tcproutes.TcpRoute;
 import org.cloudfoundry.routing.v1.tcproutes.TcpRouteConfiguration;
 import org.cloudfoundry.routing.v1.tcproutes.TcpRouteDeletion;
+import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 import reactor.core.publisher.Flux;
 import reactor.core.publisher.Mono;
@@ -38,7 +39,7 @@
 
 import java.time.Duration;
 
-public final class TcpRoutesTest extends AbstractIntegrationTest {
+final class TcpRoutesTest extends AbstractIntegrationTest {
 
     private static final String DEFAULT_ROUTER_GROUP = "default-tcp";
 
@@ -49,7 +50,7 @@ public final class TcpRoutesTest extends AbstractIntegrationTest {
     private RoutingClient routingClient;
 
     @Test
-    public void create() {
+    void create() {
         String backendIp = this.nameFactory.getIpAddress();
         Integer backendPort = this.nameFactory.getPort();
         Integer port = this.nameFactory.getPort();
@@ -77,7 +78,7 @@ public void create() {
     }
 
     @Test
-    public void delete() {
+    void delete() {
         String backendIp = this.nameFactory.getIpAddress();
         Integer backendPort = this.nameFactory.getPort();
         Integer port = this.nameFactory.getPort();
@@ -104,7 +105,7 @@ public void delete() {
     }
 
     @Test
-    public void events() {
+    void events() {
         String backendIp = this.nameFactory.getIpAddress();
         Integer backendPort = this.nameFactory.getPort();
         Integer port = this.nameFactory.getPort();
@@ -126,7 +127,7 @@ public void events() {
     }
 
     @Test
-    public void list() {
+    void list() {
         String backendIp = this.nameFactory.getIpAddress();
         Integer backendPort = this.nameFactory.getPort();
         Integer port = this.nameFactory.getPort();
diff --git a/integration-test/src/test/java/org/cloudfoundry/uaa/AuthorizationsTest.java b/integration-test/src/test/java/org/cloudfoundry/uaa/AuthorizationsTest.java
index 471391d133..ec4d50481c 100644
--- a/integration-test/src/test/java/org/cloudfoundry/uaa/AuthorizationsTest.java
+++ b/integration-test/src/test/java/org/cloudfoundry/uaa/AuthorizationsTest.java
@@ -26,6 +26,7 @@
 import org.cloudfoundry.uaa.authorizations.AuthorizeByOpenIdWithImplicitGrantRequest;
 import org.cloudfoundry.uaa.authorizations.GetOpenIdProviderConfigurationRequest;
 import org.cloudfoundry.uaa.authorizations.GetOpenIdProviderConfigurationResponse;
+import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 import reactor.test.StepVerifier;
 
@@ -34,7 +35,7 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-public final class AuthorizationsTest extends AbstractIntegrationTest {
+final class AuthorizationsTest extends AbstractIntegrationTest {
 
     @Autowired
     private String clientId;
@@ -43,7 +44,7 @@ public final class AuthorizationsTest extends AbstractIntegrationTest {
     private UaaClient uaaClient;
 
     @Test
-    public void authorizeByAuthorizationCodeGrantApi() {
+    void authorizeByAuthorizationCodeGrantApi() {
         this.uaaClient.authorizations()
             .authorizationCodeGrantApi(AuthorizeByAuthorizationCodeGrantApiRequest.builder()
                 .clientId(this.clientId)
@@ -55,7 +56,7 @@ public void authorizeByAuthorizationCodeGrantApi() {
     }
 
     @Test
-    public void authorizeByAuthorizationCodeGrantBrowser() {
+    void authorizeByAuthorizationCodeGrantBrowser() {
         this.uaaClient.authorizations()
             .authorizationCodeGrantBrowser(AuthorizeByAuthorizationCodeGrantBrowserRequest.builder()
                 .clientId(this.clientId)
@@ -68,7 +69,7 @@ public void authorizeByAuthorizationCodeGrantBrowser() {
     }
 
     @Test
-    public void authorizeByAuthorizationCodeGrantHybrid() {
+    void authorizeByAuthorizationCodeGrantHybrid() {
         this.uaaClient.authorizations()
             .authorizationCodeGrantHybrid(AuthorizeByAuthorizationCodeGrantHybridRequest.builder()
                 .clientId(this.clientId)
@@ -81,7 +82,7 @@ public void authorizeByAuthorizationCodeGrantHybrid() {
     }
 
     @Test
-    public void authorizeByImplicitGrantBrowser() {
+    void authorizeByImplicitGrantBrowser() {
         this.uaaClient.authorizations()
             .implicitGrantBrowser(AuthorizeByImplicitGrantBrowserRequest.builder()
                 .clientId(this.clientId)
@@ -94,7 +95,7 @@ public void authorizeByImplicitGrantBrowser() {
     }
 
     @Test
-    public void authorizeByOpenIdWithAuthorizationCodeGrant() {
+    void authorizeByOpenIdWithAuthorizationCodeGrant() {
         this.uaaClient.authorizations()
             .openIdWithAuthorizationCodeAndIdToken(AuthorizeByOpenIdWithAuthorizationCodeGrantRequest.builder()
                 .clientId("app")
@@ -108,7 +109,7 @@ public void authorizeByOpenIdWithAuthorizationCodeGrant() {
     }
 
     @Test
-    public void authorizeByOpenIdWithIdToken() {
+    void authorizeByOpenIdWithIdToken() {
         this.uaaClient.authorizations()
             .openIdWithIdToken(AuthorizeByOpenIdWithIdTokenRequest.builder()
                 .clientId("app")
@@ -122,7 +123,7 @@ public void authorizeByOpenIdWithIdToken() {
     }
 
     @Test
-    public void authorizeByOpenIdWithImplicitGrant() {
+    void authorizeByOpenIdWithImplicitGrant() {
         this.uaaClient.authorizations()
             .openIdWithTokenAndIdToken(AuthorizeByOpenIdWithImplicitGrantRequest.builder()
                 .clientId("app")
@@ -136,7 +137,7 @@ public void authorizeByOpenIdWithImplicitGrant() {
     }
 
     @Test
-    public void openIdProviderConfiguration() {
+    void openIdProviderConfiguration() {
         this.uaaClient.authorizations()
             .getOpenIdProviderConfiguration(GetOpenIdProviderConfigurationRequest.builder()
                 .build())
diff --git a/integration-test/src/test/java/org/cloudfoundry/uaa/ClientsTest.java b/integration-test/src/test/java/org/cloudfoundry/uaa/ClientsTest.java
index 80e2489115..092f70e276 100644
--- a/integration-test/src/test/java/org/cloudfoundry/uaa/ClientsTest.java
+++ b/integration-test/src/test/java/org/cloudfoundry/uaa/ClientsTest.java
@@ -51,6 +51,7 @@
 import org.cloudfoundry.uaa.clients.UpdateSecretAction;
 import org.cloudfoundry.uaa.clients.UpdateSecretClientAction;
 import org.cloudfoundry.util.PaginationUtils;
+import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 import reactor.core.publisher.Flux;
 import reactor.core.publisher.Mono;
@@ -65,7 +66,7 @@
 import static org.cloudfoundry.uaa.tokens.GrantType.PASSWORD;
 import static org.cloudfoundry.uaa.tokens.GrantType.REFRESH_TOKEN;
 
-public final class ClientsTest extends AbstractIntegrationTest {
+final class ClientsTest extends AbstractIntegrationTest {
 
     @Autowired
     private String clientId;
@@ -74,7 +75,7 @@ public final class ClientsTest extends AbstractIntegrationTest {
     private UaaClient uaaClient;
 
     @Test
-    public void batchChangeSecret() {
+    void batchChangeSecret() {
         String clientId1 = this.nameFactory.getClientId();
         String clientId2 = this.nameFactory.getClientId();
         String clientSecret = this.nameFactory.getClientSecret();
@@ -104,7 +105,7 @@ public void batchChangeSecret() {
     }
 
     @Test
-    public void batchCreate() {
+    void batchCreate() {
         String clientId1 = this.nameFactory.getClientId();
         String clientId2 = this.nameFactory.getClientId();
         String clientSecret = this.nameFactory.getClientSecret();
@@ -142,7 +143,7 @@ public void batchCreate() {
     }
 
     @Test
-    public void batchDelete() {
+    void batchDelete() {
         String clientId1 = this.nameFactory.getClientId();
         String clientId2 = this.nameFactory.getClientId();
         String clientSecret = this.nameFactory.getClientSecret();
@@ -163,7 +164,7 @@ public void batchDelete() {
     }
 
     @Test
-    public void batchUpdate() {
+    void batchUpdate() {
         String clientId1 = this.nameFactory.getClientId();
         String clientId2 = this.nameFactory.getClientId();
         String clientSecret = this.nameFactory.getClientSecret();
@@ -204,7 +205,7 @@ public void batchUpdate() {
 
     @IfCloudFoundryVersion(lessThan = CloudFoundryVersion.PCF_2_8)
     @Test
-    public void changeSecret27() {
+    void changeSecret27() {
         String clientId = this.nameFactory.getClientId();
         String newClientSecret = this.nameFactory.getClientSecret();
         String oldClientSecret = this.nameFactory.getClientSecret();
@@ -223,7 +224,7 @@ public void changeSecret27() {
 
     @IfCloudFoundryVersion(greaterThanOrEqualTo = CloudFoundryVersion.PCF_2_8)
     @Test
-    public void changeSecret28() {
+    void changeSecret28() {
         String clientId = this.nameFactory.getClientId();
         String newClientSecret = this.nameFactory.getClientSecret();
         String oldClientSecret = this.nameFactory.getClientSecret();
@@ -245,7 +246,7 @@ public void changeSecret28() {
     }
 
     @Test
-    public void create() {
+    void create() {
         String clientId = this.nameFactory.getClientId();
         String clientSecret = this.nameFactory.getClientSecret();
 
@@ -270,7 +271,7 @@ public void create() {
     }
 
     @Test
-    public void delete() {
+    void delete() {
         String clientId = this.nameFactory.getClientId();
         String clientSecret = this.nameFactory.getClientSecret();
 
@@ -287,7 +288,7 @@ public void delete() {
     }
 
     @Test
-    public void get() {
+    void get() {
         String clientId = this.nameFactory.getClientId();
         String clientSecret = this.nameFactory.getClientSecret();
 
@@ -306,7 +307,7 @@ public void get() {
     }
 
     @Test
-    public void getMetadata() {
+    void getMetadata() {
         requestUpdateMetadata(this.uaaClient, this.clientId, "http://test.get.url")
             .then(this.uaaClient.clients()
                 .getMetadata(GetMetadataRequest.builder()
@@ -322,7 +323,7 @@ public void getMetadata() {
     }
 
     @Test
-    public void list() {
+    void list() {
         String clientId = this.nameFactory.getClientId();
         String clientSecret = this.nameFactory.getClientSecret();
 
@@ -339,7 +340,7 @@ public void list() {
     }
 
     @Test
-    public void listMetadatas() {
+    void listMetadatas() {
         requestUpdateMetadata(this.uaaClient, this.clientId, "http://test.list.url")
             .then(this.uaaClient.clients()
                 .listMetadatas(ListMetadatasRequest.builder()
@@ -357,7 +358,7 @@ public void listMetadatas() {
     }
 
     @Test
-    public void mixedActions() {
+    void mixedActions() {
         String clientId1 = this.nameFactory.getClientId();
         String clientId2 = this.nameFactory.getClientId();
         String clientSecret = this.nameFactory.getClientSecret();
@@ -404,7 +405,7 @@ public void mixedActions() {
     }
 
     @Test
-    public void update() {
+    void update() {
         String clientId = this.nameFactory.getClientId();
         String clientSecret = this.nameFactory.getClientSecret();
 
@@ -428,7 +429,7 @@ public void update() {
     }
 
     @Test
-    public void updateMetadata() {
+    void updateMetadata() {
         String appIcon = Base64.getEncoder().encodeToString(new AsciiString("test-image").toByteArray());
 
         this.uaaClient.clients()
diff --git a/integration-test/src/test/java/org/cloudfoundry/uaa/GroupsTest.java b/integration-test/src/test/java/org/cloudfoundry/uaa/GroupsTest.java
index 6534aa199e..5ff81d387e 100644
--- a/integration-test/src/test/java/org/cloudfoundry/uaa/GroupsTest.java
+++ b/integration-test/src/test/java/org/cloudfoundry/uaa/GroupsTest.java
@@ -47,6 +47,7 @@
 import org.cloudfoundry.uaa.users.Email;
 import org.cloudfoundry.uaa.users.Name;
 import org.cloudfoundry.util.PaginationUtils;
+import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 import reactor.core.publisher.Flux;
 import reactor.core.publisher.Mono;
@@ -60,13 +61,13 @@
 import static org.cloudfoundry.util.tuple.TupleUtils.function;
 
 
-public final class GroupsTest extends AbstractIntegrationTest {
+final class GroupsTest extends AbstractIntegrationTest {
 
     @Autowired
     private UaaClient uaaClient;
 
     @Test
-    public void addMemberGroup() {
+    void addMemberGroup() {
         String baseDisplayName = this.nameFactory.getGroupName();
         String memberDisplayName = this.nameFactory.getGroupName();
 
@@ -96,7 +97,7 @@ public void addMemberGroup() {
     }
 
     @Test
-    public void addMemberUser() {
+    void addMemberUser() {
         String displayName = this.nameFactory.getGroupName();
         String userName = this.nameFactory.getUserName();
 
@@ -126,7 +127,7 @@ public void addMemberUser() {
     }
 
     @Test
-    public void checkMembership() {
+    void checkMembership() {
         String displayName = this.nameFactory.getGroupName();
         String userName = this.nameFactory.getUserName();
 
@@ -154,7 +155,7 @@ public void checkMembership() {
     }
 
     @Test
-    public void create() {
+    void create() {
         String displayName = this.nameFactory.getGroupName();
         String userName = this.nameFactory.getUserName();
 
@@ -176,7 +177,7 @@ public void create() {
     }
 
     @Test
-    public void delete() {
+    void delete() {
         String displayName = this.nameFactory.getGroupName();
 
         createGroupId(this.uaaClient, displayName)
@@ -192,7 +193,7 @@ public void delete() {
     }
 
     @Test
-    public void get() {
+    void get() {
         String displayName = this.nameFactory.getGroupName();
 
         createGroupId(this.uaaClient, displayName)
@@ -208,7 +209,7 @@ public void get() {
     }
 
     @Test
-    public void list() {
+    void list() {
         String displayName = this.nameFactory.getGroupName();
 
         createGroupId(this.uaaClient, displayName)
@@ -227,7 +228,7 @@ public void list() {
     }
 
     @Test
-    public void listExternalGroupMappings() {
+    void listExternalGroupMappings() {
         String displayName = this.nameFactory.getGroupName();
 
         createGroupId(this.uaaClient, displayName)
@@ -246,7 +247,7 @@ public void listExternalGroupMappings() {
     }
 
     @Test
-    public void listMembers() {
+    void listMembers() {
         String displayName = this.nameFactory.getGroupName();
         String userName = this.nameFactory.getUserName();
 
@@ -273,7 +274,7 @@ public void listMembers() {
     }
 
     @Test
-    public void listMembersWithEntity() {
+    void listMembersWithEntity() {
         String displayName = this.nameFactory.getGroupName();
         String userName = this.nameFactory.getUserName();
 
@@ -297,7 +298,7 @@ public void listMembersWithEntity() {
     }
 
     @Test
-    public void mapExternalGroupMappings() {
+    void mapExternalGroupMappings() {
         String displayName = this.nameFactory.getGroupName();
 
         createGroupId(this.uaaClient, displayName)
@@ -319,7 +320,7 @@ public void mapExternalGroupMappings() {
     }
 
     @Test
-    public void removeMember() {
+    void removeMember() {
         String displayName = this.nameFactory.getGroupName();
         String userName = this.nameFactory.getUserName();
 
@@ -344,7 +345,7 @@ public void removeMember() {
     }
 
     @Test
-    public void unmapExternalGroupMappingsByGroupDisplayName() {
+    void unmapExternalGroupMappingsByGroupDisplayName() {
         String displayName = this.nameFactory.getGroupName();
 
         createGroupId(this.uaaClient, displayName)
@@ -363,7 +364,7 @@ public void unmapExternalGroupMappingsByGroupDisplayName() {
     }
 
     @Test
-    public void unmapExternalGroupMappingsByGroupId() {
+    void unmapExternalGroupMappingsByGroupId() {
         String displayName = this.nameFactory.getGroupName();
 
         createGroupId(this.uaaClient, displayName)
@@ -382,7 +383,7 @@ public void unmapExternalGroupMappingsByGroupId() {
     }
 
     @Test
-    public void update() {
+    void update() {
         String baseDisplayName = this.nameFactory.getGroupName();
         String newDisplayName = this.nameFactory.getGroupName();
 
diff --git a/integration-test/src/test/java/org/cloudfoundry/uaa/IdentityProvidersTest.java b/integration-test/src/test/java/org/cloudfoundry/uaa/IdentityProvidersTest.java
index 2be3d6cac3..b11e332d0e 100644
--- a/integration-test/src/test/java/org/cloudfoundry/uaa/IdentityProvidersTest.java
+++ b/integration-test/src/test/java/org/cloudfoundry/uaa/IdentityProvidersTest.java
@@ -33,6 +33,7 @@
 import org.cloudfoundry.uaa.identityproviders.UpdateIdentityProviderRequest;
 import org.cloudfoundry.uaa.identityzones.CreateIdentityZoneRequest;
 import org.cloudfoundry.uaa.identityzones.CreateIdentityZoneResponse;
+import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 import reactor.core.publisher.Mono;
 import reactor.test.StepVerifier;
@@ -43,7 +44,7 @@
 import static org.cloudfoundry.uaa.identityproviders.Type.OAUTH2;
 import static org.cloudfoundry.uaa.identityproviders.Type.SAML;
 
-public final class IdentityProvidersTest extends AbstractIntegrationTest {
+final class IdentityProvidersTest extends AbstractIntegrationTest {
 
     @Autowired
     private UaaClient uaaClient;
@@ -52,7 +53,7 @@ public final class IdentityProvidersTest extends AbstractIntegrationTest {
     private Mono<String> userId;
 
     @Test
-    public void createLdapSimpleBind() {
+    void createLdapSimpleBind() {
         String identityZoneName = this.nameFactory.getIdentityZoneName();
         String name = this.nameFactory.getIdentityProviderName();
         String subdomainName = this.nameFactory.getDomainName();
@@ -92,7 +93,7 @@ public void createLdapSimpleBind() {
     }
 
     @Test
-    public void createOAuth() {
+    void createOAuth() {
         String identityZoneName = this.nameFactory.getIdentityZoneName();
         String name = this.nameFactory.getIdentityProviderName();
         String subdomainName = this.nameFactory.getDomainName();
@@ -127,7 +128,7 @@ public void createOAuth() {
     }
 
     @Test
-    public void createSaml() {
+    void createSaml() {
         String identityZoneName = this.nameFactory.getIdentityZoneName();
         String name = this.nameFactory.getIdentityProviderName();
         String subdomainName = this.nameFactory.getDomainName();
@@ -176,7 +177,7 @@ public void createSaml() {
     }
 
     @Test
-    public void delete() {
+    void delete() {
         String identityZoneName = this.nameFactory.getIdentityZoneName();
         String name = this.nameFactory.getIdentityProviderName();
         String subdomainName = this.nameFactory.getDomainName();
@@ -198,7 +199,7 @@ public void delete() {
     }
 
     @Test
-    public void get() {
+    void get() {
         String identityZoneName = this.nameFactory.getIdentityZoneName();
         String name = this.nameFactory.getIdentityProviderName();
         String subdomainName = this.nameFactory.getDomainName();
@@ -218,7 +219,7 @@ public void get() {
     }
 
     @Test
-    public void list() {
+    void list() {
         String identityZoneName = this.nameFactory.getIdentityZoneName();
         String name = this.nameFactory.getIdentityProviderName();
         String subdomainName = this.nameFactory.getDomainName();
@@ -239,7 +240,7 @@ public void list() {
     }
 
     @Test
-    public void update() {
+    void update() {
         String identityZoneName = this.nameFactory.getIdentityZoneName();
         String oldName = this.nameFactory.getIdentityProviderName();
         String newName = this.nameFactory.getIdentityProviderName();
diff --git a/integration-test/src/test/java/org/cloudfoundry/uaa/IdentityZonesTest.java b/integration-test/src/test/java/org/cloudfoundry/uaa/IdentityZonesTest.java
index 76a4f9d52f..f2824c7b95 100644
--- a/integration-test/src/test/java/org/cloudfoundry/uaa/IdentityZonesTest.java
+++ b/integration-test/src/test/java/org/cloudfoundry/uaa/IdentityZonesTest.java
@@ -25,19 +25,20 @@
 import org.cloudfoundry.uaa.identityzones.ListIdentityZonesRequest;
 import org.cloudfoundry.uaa.identityzones.ListIdentityZonesResponse;
 import org.cloudfoundry.uaa.identityzones.UpdateIdentityZoneRequest;
+import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 import reactor.core.publisher.Mono;
 import reactor.test.StepVerifier;
 
 import java.time.Duration;
 
-public final class IdentityZonesTest extends AbstractIntegrationTest {
+final class IdentityZonesTest extends AbstractIntegrationTest {
 
     @Autowired
     private UaaClient uaaClient;
 
     @Test
-    public void create() {
+    void create() {
         String identityZoneName = this.nameFactory.getIdentityZoneName();
         String subdomainName = this.nameFactory.getDomainName();
 
@@ -56,7 +57,7 @@ public void create() {
     }
 
     @Test
-    public void delete() {
+    void delete() {
         String identityZoneName = this.nameFactory.getIdentityZoneName();
         String subdomainName = this.nameFactory.getDomainName();
 
@@ -74,7 +75,7 @@ public void delete() {
     }
 
     @Test
-    public void get() {
+    void get() {
         String identityZoneName = this.nameFactory.getIdentityZoneName();
         String subdomainName = this.nameFactory.getDomainName();
 
@@ -91,7 +92,7 @@ public void get() {
     }
 
     @Test
-    public void list() {
+    void list() {
         String identityZoneName = this.nameFactory.getIdentityZoneName();
         String subdomainName = this.nameFactory.getDomainName();
 
@@ -108,7 +109,7 @@ public void list() {
     }
 
     @Test
-    public void update() {
+    void update() {
         String identityZoneName = this.nameFactory.getIdentityZoneName();
         String baseSubdomainName = this.nameFactory.getDomainName();
         String newSubdomainName = this.nameFactory.getDomainName();
diff --git a/integration-test/src/test/java/org/cloudfoundry/uaa/ServerInformationTest.java b/integration-test/src/test/java/org/cloudfoundry/uaa/ServerInformationTest.java
index b0f8b6e61d..6ab10a8642 100644
--- a/integration-test/src/test/java/org/cloudfoundry/uaa/ServerInformationTest.java
+++ b/integration-test/src/test/java/org/cloudfoundry/uaa/ServerInformationTest.java
@@ -21,6 +21,7 @@
 import org.cloudfoundry.uaa.serverinformation.GetAutoLoginAuthenticationCodeRequest;
 import org.cloudfoundry.uaa.serverinformation.GetAutoLoginAuthenticationCodeResponse;
 import org.cloudfoundry.uaa.serverinformation.GetInfoRequest;
+import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 import reactor.core.publisher.Mono;
 import reactor.test.StepVerifier;
@@ -30,7 +31,7 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-public final class ServerInformationTest extends AbstractIntegrationTest {
+final class ServerInformationTest extends AbstractIntegrationTest {
 
     @Autowired
     private String clientId;
@@ -48,7 +49,7 @@ public final class ServerInformationTest extends AbstractIntegrationTest {
     private String username;
 
     @Test
-    public void autoLogin() {
+    void autoLogin() {
         getAuthenticationCode(this.uaaClient, this.clientId, this.clientSecret, this.password, this.username)
             .flatMap(code -> this.uaaClient.serverInformation()
                 .autoLogin(AutoLoginRequest.builder()
@@ -61,7 +62,7 @@ public void autoLogin() {
     }
 
     @Test
-    public void getAutoLoginAuthenticationCode() {
+    void getAutoLoginAuthenticationCode() {
         this.uaaClient.serverInformation()
             .getAuthenticationCode(GetAutoLoginAuthenticationCodeRequest.builder()
                 .clientId(this.clientId)
@@ -77,7 +78,7 @@ public void getAutoLoginAuthenticationCode() {
     }
 
     @Test
-    public void getInfo() {
+    void getInfo() {
         this.uaaClient.serverInformation()
             .getInfo(GetInfoRequest.builder()
                 .build())
diff --git a/integration-test/src/test/java/org/cloudfoundry/uaa/TokensTest.java b/integration-test/src/test/java/org/cloudfoundry/uaa/TokensTest.java
index 76fd5e1afd..b6083da667 100644
--- a/integration-test/src/test/java/org/cloudfoundry/uaa/TokensTest.java
+++ b/integration-test/src/test/java/org/cloudfoundry/uaa/TokensTest.java
@@ -38,7 +38,8 @@
 import org.cloudfoundry.uaa.tokens.RefreshTokenResponse;
 import org.cloudfoundry.uaa.tokens.TokenFormat;
 import org.cloudfoundry.uaa.tokens.TokenKey;
-import org.junit.Ignore;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 import reactor.core.publisher.Flux;
 import reactor.core.publisher.Mono;
@@ -48,7 +49,7 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-public final class TokensTest extends AbstractIntegrationTest {
+final class TokensTest extends AbstractIntegrationTest {
 
     @Autowired
     private String clientId;
@@ -72,7 +73,7 @@ public final class TokensTest extends AbstractIntegrationTest {
     private String username;
 
     @Test
-    public void checkTokenNotAuthorized() {
+    void checkTokenNotAuthorized() {
         this.tokenProvider.getToken(this.connectionContext)
             .flatMap(token -> this.uaaClient.tokens()
                 .check(CheckTokenRequest.builder()
@@ -87,7 +88,7 @@ public void checkTokenNotAuthorized() {
     }
 
     @Test
-    public void getTokenByAuthorizationCode() {
+    void getTokenByAuthorizationCode() {
         requestGetAuthorizationCode(this.uaaClient, this.clientId)
             .flatMap(authorizationCode -> this.uaaClient.tokens()
                 .getByAuthorizationCode(GetTokenByAuthorizationCodeRequest.builder()
@@ -103,7 +104,7 @@ public void getTokenByAuthorizationCode() {
     }
 
     @Test
-    public void getTokenByClientCredentials() {
+    void getTokenByClientCredentials() {
         this.uaaClient.tokens()
             .getByClientCredentials(GetTokenByClientCredentialsRequest.builder()
                 .clientId(this.clientId)
@@ -118,9 +119,9 @@ public void getTokenByClientCredentials() {
     }
 
     //TODO: Ready to Implement - Await https://github.com/cloudfoundry/cf-java-client/issues/862 to get passcode
-    @Ignore("Ready to Implement - Await https://github.com/cloudfoundry/cf-java-client/issues/862 to get passcode")
+    @Disabled("Ready to Implement - Await https://github.com/cloudfoundry/cf-java-client/issues/862 to get passcode")
     @Test
-    public void getTokenByOneTimePasscode() {
+    void getTokenByOneTimePasscode() {
         this.uaaClient.tokens()
             .getByOneTimePasscode(GetTokenByOneTimePasscodeRequest.builder()
                 .passcode("some passcode")
@@ -136,7 +137,7 @@ public void getTokenByOneTimePasscode() {
     }
 
     @Test
-    public void getTokenByOpenId() {
+    void getTokenByOpenId() {
         requestGetAuthorizationCode(this.uaaClient, this.clientId)
             .flatMap(authorizationCode -> this.uaaClient.tokens()
                 .getByOpenId(GetTokenByOpenIdRequest.builder()
@@ -153,7 +154,7 @@ public void getTokenByOpenId() {
     }
 
     @Test
-    public void getTokenByPassword() {
+    void getTokenByPassword() {
         this.uaaClient.tokens()
             .getByPassword(GetTokenByPasswordRequest.builder()
                 .clientId(this.clientId)
@@ -170,7 +171,7 @@ public void getTokenByPassword() {
     }
 
     @Test
-    public void getTokenKey() {
+    void getTokenKey() {
         this.uaaClient.tokens()
             .getKey(GetTokenKeyRequest.builder()
                 .build())
@@ -181,7 +182,7 @@ public void getTokenKey() {
     }
 
     @Test
-    public void listTokenKeys() {
+    void listTokenKeys() {
         this.uaaClient.tokens()
             .getKey(GetTokenKeyRequest.builder()
                 .build())
@@ -203,7 +204,7 @@ public void listTokenKeys() {
     }
 
     @Test
-    public void refreshToken() {
+    void refreshToken() {
         getRequestToken(this.uaaClient, this.clientId, this.clientSecret, this.password, this.username)
             .flatMap(refreshToken -> this.uaaClient.tokens()
                 .refresh(RefreshTokenRequest.builder()
diff --git a/integration-test/src/test/java/org/cloudfoundry/uaa/UsersTest.java b/integration-test/src/test/java/org/cloudfoundry/uaa/UsersTest.java
index 1eac301ac8..0bd5c8fe80 100644
--- a/integration-test/src/test/java/org/cloudfoundry/uaa/UsersTest.java
+++ b/integration-test/src/test/java/org/cloudfoundry/uaa/UsersTest.java
@@ -43,6 +43,7 @@
 import org.cloudfoundry.uaa.users.UserInfoResponse;
 import org.cloudfoundry.uaa.users.VerifyUserRequest;
 import org.cloudfoundry.uaa.users.VerifyUserResponse;
+import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 import reactor.core.publisher.Flux;
 import reactor.core.publisher.Mono;
@@ -52,13 +53,13 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-public final class UsersTest extends AbstractIntegrationTest {
+final class UsersTest extends AbstractIntegrationTest {
 
     @Autowired
     private UaaClient uaaClient;
 
     @Test
-    public void changePassword() {
+    void changePassword() {
         String userName = this.nameFactory.getUserName();
 
         requestCreateUser(this.uaaClient, userName)
@@ -79,7 +80,7 @@ public void changePassword() {
     }
 
     @Test
-    public void create() {
+    void create() {
         String userName = this.nameFactory.getUserName();
 
         this.uaaClient.users()
@@ -106,7 +107,7 @@ public void create() {
     }
 
     @Test
-    public void delete() {
+    void delete() {
         String userName = this.nameFactory.getUserName();
 
         createUserId(this.uaaClient, userName)
@@ -125,7 +126,7 @@ public void delete() {
 
     @IfCloudFoundryVersion(greaterThanOrEqualTo = CloudFoundryVersion.PCF_1_10)
     @Test
-    public void expirePassword() {
+    void expirePassword() {
         String userName = this.nameFactory.getUserName();
 
         createUserId(this.uaaClient, userName)
@@ -144,7 +145,7 @@ public void expirePassword() {
 
     @IfCloudFoundryVersion(equalTo = CloudFoundryVersion.PCF_1_9)
     @Test
-    public void expirePassword19() {
+    void expirePassword19() {
         String userName = this.nameFactory.getUserName();
 
         createUserId(this.uaaClient, userName)
@@ -161,7 +162,7 @@ public void expirePassword19() {
     }
 
     @Test
-    public void getVerificationLink() {
+    void getVerificationLink() {
         String userName = this.nameFactory.getUserName();
 
         createUserId(this.uaaClient, userName)
@@ -177,7 +178,7 @@ public void getVerificationLink() {
     }
 
     @Test
-    public void invite() {
+    void invite() {
         this.uaaClient.users()
             .invite(InviteUsersRequest.builder()
                 .email("test@email.address")
@@ -196,7 +197,7 @@ public void invite() {
     }
 
     @Test
-    public void list() {
+    void list() {
         String userName = this.nameFactory.getUserName();
 
         createUserId(this.uaaClient, userName)
@@ -213,7 +214,7 @@ public void list() {
     }
 
     @Test
-    public void lookup() {
+    void lookup() {
         String userName = this.nameFactory.getUserName();
 
         createUserId(this.uaaClient, userName)
@@ -230,7 +231,7 @@ public void lookup() {
     }
 
     @Test
-    public void update() {
+    void update() {
         String userName = this.nameFactory.getUserName();
 
         createUserId(this.uaaClient, userName)
@@ -257,7 +258,7 @@ public void update() {
     }
 
     @Test
-    public void userInfo() {
+    void userInfo() {
         this.uaaClient.users()
             .userInfo(UserInfoRequest.builder()
                 .build())
@@ -269,7 +270,7 @@ public void userInfo() {
     }
 
     @Test
-    public void verifyUser() {
+    void verifyUser() {
         String userName = this.nameFactory.getUserName();
 
         createUserId(this.uaaClient, userName)