diff --git a/.github/workflows/ci-java-17-and-21.yml b/.github/workflows/ci-java-17-and-21.yml
new file mode 100644
index 00000000000..548858ce0b8
--- /dev/null
+++ b/.github/workflows/ci-java-17-and-21.yml
@@ -0,0 +1,34 @@
+name: Java CI
+
+on:
+  workflow_dispatch:
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        java: [ 17, 21 ]
+    name: Java ${{ matrix.java }} build
+    steps:
+      - uses: actions/checkout@v4
+      - name: Prepare multi-module build
+        run: |
+          git submodule update --init --recursive
+      - name: Set up Java
+        uses: actions/setup-java@v3
+        with:
+          distribution: liberica
+          java-version: ${{ matrix.java }}
+      - name: Cache Maven packages
+        uses: actions/cache@v3
+        with:
+          path: ~/.m2
+          key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }}
+          restore-keys: ${{ runner.os }}-m2
+      - name: Build with Maven
+        run: ./mvnw clean package -Dgpg.skip
+      - if: ${{ matrix.java != 8 }}
+        name: Check style with Spotless
+        run: ./mvnw spotless:check
+
diff --git a/.github/workflows/maven.yml b/.github/workflows/ci-java-8-and-11.yml
similarity index 100%
rename from .github/workflows/maven.yml
rename to .github/workflows/ci-java-8-and-11.yml
diff --git a/.gitignore b/.gitignore
index 176ae6fc30a..2450d49c513 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,5 @@
 .idea/
+.vscode/
 target/
 bin/
 .project
@@ -6,4 +7,4 @@ bin/
 .settings/
 .factorypath
 .gradle
-.history
\ No newline at end of file
+.history/
\ No newline at end of file
diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml
index 2cd4bcce9ce..f4ec93d14cd 100644
--- a/.idea/codeStyles/Project.xml
+++ b/.idea/codeStyles/Project.xml
@@ -7,9 +7,9 @@
       <option name="CLASS_COUNT_TO_USE_IMPORT_ON_DEMAND" value="999" />
       <option name="NAMES_COUNT_TO_USE_IMPORT_ON_DEMAND" value="999" />
     </JavaCodeStyleSettings>
-    <XML>
-      <option name="XML_LEGACY_SETTINGS_IMPORTED" value="true" />
-    </XML>
+    <ScalaCodeStyleSettings>
+      <option name="MULTILINE_STRING_CLOSING_QUOTES_ON_NEW_LINE" value="true" />
+    </ScalaCodeStyleSettings>
     <codeStyleSettings language="JAVA">
       <option name="BLANK_LINES_BEFORE_PACKAGE" value="1" />
       <option name="BLANK_LINES_AROUND_FIELD" value="1" />
diff --git a/.idea/compiler.xml b/.idea/compiler.xml
index 891206729d3..1d6ce3c640e 100644
--- a/.idea/compiler.xml
+++ b/.idea/compiler.xml
@@ -18,13 +18,14 @@
   </component>
   <component name="JavacSettings">
     <option name="ADDITIONAL_OPTIONS_OVERRIDE">
-      <module name="cloudfoundry-client" options="-Werror -Xlint:all -Xlint:-options -Xlint:-processing -Xlint:-serial" />
-      <module name="cloudfoundry-client-reactor" options="-Werror -Xlint:all -Xlint:-options -Xlint:-processing -Xlint:-serial" />
-      <module name="cloudfoundry-operations" options="-Werror -Xlint:all -Xlint:-options -Xlint:-processing -Xlint:-serial" />
-      <module name="cloudfoundry-util" options="-Werror -Xlint:all -Xlint:-options -Xlint:-processing -Xlint:-serial" />
-      <module name="integration-test" options="-Werror -Xlint:all -Xlint:-options -Xlint:-processing -Xlint:-serial" />
-      <module name="test-log-cache" options="-Werror -Xlint:all -Xlint:-options -Xlint:-processing -Xlint:-serial" />
-      <module name="test-service-broker" options="-Werror -Xlint:all -Xlint:-options -Xlint:-processing -Xlint:-serial" />
+      <module name="cloudfoundry-client" options="-Xlint:all -Xlint:-options -Xlint:-processing -Xlint:-serial -J--add-opens=jdk.compiler/com.sun.tools.javac.code=ALL-UNNAMED" />
+      <module name="cloudfoundry-client-reactor" options="-Xlint:all -Xlint:-options -Xlint:-processing -Xlint:-serial -J--add-opens=jdk.compiler/com.sun.tools.javac.code=ALL-UNNAMED" />
+      <module name="cloudfoundry-java-client" options="-Xlint:all -Xlint:-options -Xlint:-processing -Xlint:-serial -J--add-opens=jdk.compiler/com.sun.tools.javac.code=ALL-UNNAMED" />
+      <module name="cloudfoundry-operations" options="-Xlint:all -Xlint:-options -Xlint:-processing -Xlint:-serial -J--add-opens=jdk.compiler/com.sun.tools.javac.code=ALL-UNNAMED" />
+      <module name="cloudfoundry-util" options="-Xlint:all -Xlint:-options -Xlint:-processing -Xlint:-serial -J--add-opens=jdk.compiler/com.sun.tools.javac.code=ALL-UNNAMED" />
+      <module name="integration-test" options="-Xlint:all -Xlint:-options -Xlint:-processing -Xlint:-serial -J--add-opens=jdk.compiler/com.sun.tools.javac.code=ALL-UNNAMED" />
+      <module name="test-log-cache" options="-Xlint:all -Xlint:-options -Xlint:-processing -Xlint:-serial -J--add-opens=jdk.compiler/com.sun.tools.javac.code=ALL-UNNAMED" />
+      <module name="test-service-broker" options="-Xlint:all -Xlint:-options -Xlint:-processing -Xlint:-serial -J--add-opens=jdk.compiler/com.sun.tools.javac.code=ALL-UNNAMED" />
     </option>
   </component>
 </project>
\ No newline at end of file
diff --git a/.idea/misc.xml b/.idea/misc.xml
index fc9aaf441c7..a1043f84492 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -13,8 +13,12 @@
         <option value="$PROJECT_DIR$/test-service-broker/pom.xml" />
       </list>
     </option>
+    <option name="workspaceImportForciblyTurnedOn" value="true" />
   </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" project-jdk-name="1.8 (2)" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_21" project-jdk-name="graalvm-21" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/out" />
   </component>
+  <component name="ProjectType">
+    <option name="id" value="jpab" />
+  </component>
 </project>
\ No newline at end of file
diff --git a/cloudfoundry-client-reactor/pom.xml b/cloudfoundry-client-reactor/pom.xml
index 67a1d9753bd..0f59f8b342c 100644
--- a/cloudfoundry-client-reactor/pom.xml
+++ b/cloudfoundry-client-reactor/pom.xml
@@ -50,10 +50,11 @@
             <groupId>com.github.zafarkhaja</groupId>
             <artifactId>java-semver</artifactId>
         </dependency>
-        <dependency>
-            <groupId>com.squareup.okhttp3</groupId>
-            <artifactId>mockwebserver</artifactId>
-            <scope>test</scope>
+    <dependency>
+      <groupId>com.squareup.okhttp3</groupId>
+      <artifactId>mockwebserver3-junit5</artifactId>
+      <scope>test</scope>
+      <version>5.0.0-alpha.11</version>
         </dependency>
         <dependency>
             <groupId>io.jsonwebtoken</groupId>
@@ -88,11 +89,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>
         <dependency>
             <groupId>org.assertj</groupId>
             <artifactId>assertj-core</artifactId>
diff --git a/cloudfoundry-client-reactor/src/test/java/org/cloudfoundry/reactor/AbstractRestTest.java b/cloudfoundry-client-reactor/src/test/java/org/cloudfoundry/reactor/AbstractRestTest.java
index 25c22ca46b7..f3f3ad3e1af 100644
--- a/cloudfoundry-client-reactor/src/test/java/org/cloudfoundry/reactor/AbstractRestTest.java
+++ b/cloudfoundry-client-reactor/src/test/java/org/cloudfoundry/reactor/AbstractRestTest.java
@@ -24,16 +24,12 @@
 import com.fasterxml.jackson.databind.JsonDeserializer;
 import com.fasterxml.jackson.databind.deser.DeserializationProblemHandler;
 import java.io.IOException;
-import java.util.ArrayList;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Queue;
-import okhttp3.mockwebserver.Dispatcher;
-import okhttp3.mockwebserver.MockResponse;
-import okhttp3.mockwebserver.MockWebServer;
-import okhttp3.mockwebserver.RecordedRequest;
-import org.junit.After;
-import org.junit.ComparisonFailure;
+import java.util.*;
+import mockwebserver3.Dispatcher;
+import mockwebserver3.MockResponse;
+import mockwebserver3.MockWebServer;
+import mockwebserver3.RecordedRequest;
+import org.junit.jupiter.api.AfterEach;
 import org.slf4j.bridge.SLF4JBridgeHandler;
 import reactor.core.publisher.Mono;
 
@@ -68,12 +64,12 @@ protected AbstractRestTest() {
         this.root = Mono.just(this.mockWebServer.url("/").uri().toString());
     }
 
-    @After
+    @AfterEach
     public final void shutdown() throws IOException {
         this.mockWebServer.shutdown();
     }
 
-    @After
+    @AfterEach
     public final void verify() {
         this.multipleRequestDispatcher.verify();
     }
@@ -122,7 +118,7 @@ public MockResponse dispatch(RecordedRequest request) {
             try {
                 interactionContext.getRequest().assertEquals(request);
                 return interactionContext.getResponse().getMockResponse();
-            } catch (ComparisonFailure e) {
+            } catch (AssertionError e) {
                 e.printStackTrace();
                 return new MockResponse().setResponseCode(400);
             }
diff --git a/cloudfoundry-client-reactor/src/test/java/org/cloudfoundry/reactor/CustomRequestTagTest.java b/cloudfoundry-client-reactor/src/test/java/org/cloudfoundry/reactor/CustomRequestTagTest.java
index 774cb2e726c..91a8c16f679 100644
--- a/cloudfoundry-client-reactor/src/test/java/org/cloudfoundry/reactor/CustomRequestTagTest.java
+++ b/cloudfoundry-client-reactor/src/test/java/org/cloudfoundry/reactor/CustomRequestTagTest.java
@@ -23,11 +23,11 @@
 import java.util.Collections;
 import org.cloudfoundry.reactor.util.AbstractReactorOperations;
 import org.cloudfoundry.reactor.util.Operator;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import reactor.core.publisher.Mono;
 import reactor.test.StepVerifier;
 
-public final class CustomRequestTagTest extends AbstractRestTest {
+final class CustomRequestTagTest extends AbstractRestTest {
 
     private static final String CUSTOM_REQUEST_TAG_NAME = "test-header";
 
@@ -41,7 +41,7 @@ public final class CustomRequestTagTest extends AbstractRestTest {
                     .build();
 
     @Test
-    public void addCustomHttpHeader() {
+    void addCustomHttpHeader() {
         mockRequest(
                 InteractionContext.builder()
                         .request(
diff --git a/cloudfoundry-client-reactor/src/test/java/org/cloudfoundry/reactor/DefaultConnectionContextTest.java b/cloudfoundry-client-reactor/src/test/java/org/cloudfoundry/reactor/DefaultConnectionContextTest.java
index d632a6e8651..4aba4f36d31 100644
--- a/cloudfoundry-client-reactor/src/test/java/org/cloudfoundry/reactor/DefaultConnectionContextTest.java
+++ b/cloudfoundry-client-reactor/src/test/java/org/cloudfoundry/reactor/DefaultConnectionContextTest.java
@@ -25,13 +25,13 @@
 import java.net.InetSocketAddress;
 import java.time.Duration;
 import java.util.Optional;
-import org.junit.After;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.Test;
 import reactor.netty.http.client.HttpClient;
 import reactor.netty.transport.ProxyProvider;
 import reactor.test.StepVerifier;
 
-public final class DefaultConnectionContextTest extends AbstractRestTest {
+final class DefaultConnectionContextTest extends AbstractRestTest {
 
     private final DefaultConnectionContext connectionContext =
             DefaultConnectionContext.builder()
@@ -40,13 +40,13 @@ public final class DefaultConnectionContextTest extends AbstractRestTest {
                     .secure(false)
                     .build();
 
-    @After
-    public void dispose() {
+    @AfterEach
+    void dispose() {
         this.connectionContext.dispose();
     }
 
     @Test
-    public void getInfo() {
+    void getInfo() {
         mockRequest(
                 InteractionContext.builder()
                         .request(TestRequest.builder().method(GET).path("/").build())
@@ -77,7 +77,7 @@ public void getInfo() {
     }
 
     @Test
-    public void multipleInstances() {
+    void multipleInstances() {
         DefaultConnectionContext first =
                 DefaultConnectionContext.builder().apiHost("test-host").build();
 
@@ -92,7 +92,7 @@ public void multipleInstances() {
     }
 
     @Test
-    public void configurationAlwaysApplied() {
+    void configurationAlwaysApplied() {
         DefaultConnectionContext ctx =
                 DefaultConnectionContext.builder()
                         .connectionPoolSize(24)
diff --git a/cloudfoundry-client-reactor/src/test/java/org/cloudfoundry/reactor/DelegatingRootProviderTest.java b/cloudfoundry-client-reactor/src/test/java/org/cloudfoundry/reactor/DelegatingRootProviderTest.java
index 411421c2f3c..380b557b0b7 100644
--- a/cloudfoundry-client-reactor/src/test/java/org/cloudfoundry/reactor/DelegatingRootProviderTest.java
+++ b/cloudfoundry-client-reactor/src/test/java/org/cloudfoundry/reactor/DelegatingRootProviderTest.java
@@ -22,10 +22,10 @@
 
 import io.netty.handler.codec.http.HttpResponseStatus;
 import java.time.Duration;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import reactor.test.StepVerifier;
 
-public final class DelegatingRootProviderTest extends AbstractRestTest {
+final class DelegatingRootProviderTest extends AbstractRestTest {
 
     private final DelegatingRootProvider rootProvider =
             DelegatingRootProvider.builder()
@@ -36,7 +36,7 @@ public final class DelegatingRootProviderTest extends AbstractRestTest {
                     .build();
 
     @Test
-    public void getRoot() {
+    void getRoot() {
         this.rootProvider
                 .getRoot(CONNECTION_CONTEXT)
                 .as(StepVerifier::create)
@@ -46,7 +46,7 @@ public void getRoot() {
     }
 
     @Test
-    public void getRootCloudFoundryClientV2() {
+    void getRootCloudFoundryClientV2() {
         mockRequest(
                 InteractionContext.builder()
                         .request(TestRequest.builder().method(GET).path("/").build())
@@ -68,7 +68,7 @@ public void getRootCloudFoundryClientV2() {
     }
 
     @Test
-    public void getRootCloudFoundryClientV2Fallback() {
+    void getRootCloudFoundryClientV2Fallback() {
         mockRequest(
                 InteractionContext.builder()
                         .request(TestRequest.builder().method(GET).path("/").build())
@@ -88,7 +88,7 @@ public void getRootCloudFoundryClientV2Fallback() {
     }
 
     @Test
-    public void getRootCloudFoundryClientV3() {
+    void getRootCloudFoundryClientV3() {
         mockRequest(
                 InteractionContext.builder()
                         .request(TestRequest.builder().method(GET).path("/").build())
@@ -110,7 +110,7 @@ public void getRootCloudFoundryClientV3() {
     }
 
     @Test
-    public void getRootCloudFoundryClientV3Fallback() {
+    void getRootCloudFoundryClientV3Fallback() {
         mockRequest(
                 InteractionContext.builder()
                         .request(TestRequest.builder().method(GET).path("/").build())
@@ -130,7 +130,7 @@ public void getRootCloudFoundryClientV3Fallback() {
     }
 
     @Test
-    public void getRootDopplerClient() {
+    void getRootDopplerClient() {
         mockRequest(
                 InteractionContext.builder()
                         .request(TestRequest.builder().method(GET).path("/").build())
@@ -150,7 +150,7 @@ public void getRootDopplerClient() {
     }
 
     @Test
-    public void getRootDopplerClientFallback() {
+    void getRootDopplerClientFallback() {
         mockRequest(
                 InteractionContext.builder()
                         .request(TestRequest.builder().method(GET).path("/").build())
@@ -180,7 +180,7 @@ public void getRootDopplerClientFallback() {
     }
 
     @Test
-    public void getRootKeyNoKey() {
+    void getRootKeyNoKey() {
         mockRequest(
                 InteractionContext.builder()
                         .request(TestRequest.builder().method(GET).path("/").build())
@@ -209,7 +209,7 @@ public void getRootKeyNoKey() {
     }
 
     @Test
-    public void getRootKeyNoValue() {
+    void getRootKeyNoValue() {
         mockRequest(
                 InteractionContext.builder()
                         .request(TestRequest.builder().method(GET).path("/").build())
@@ -238,7 +238,7 @@ public void getRootKeyNoValue() {
     }
 
     @Test
-    public void getRootNetworkingClient() {
+    void getRootNetworkingClient() {
         mockRequest(
                 InteractionContext.builder()
                         .request(TestRequest.builder().method(GET).path("/").build())
@@ -261,7 +261,7 @@ public void getRootNetworkingClient() {
     }
 
     @Test
-    public void getRootRoutingClientFallback() {
+    void getRootRoutingClientFallback() {
         mockRequest(
                 InteractionContext.builder()
                         .request(TestRequest.builder().method(GET).path("/").build())
@@ -291,7 +291,7 @@ public void getRootRoutingClientFallback() {
     }
 
     @Test
-    public void getRootTokenProviderFallback() {
+    void getRootTokenProviderFallback() {
         mockRequest(
                 InteractionContext.builder()
                         .request(TestRequest.builder().method(GET).path("/").build())
@@ -321,7 +321,7 @@ public void getRootTokenProviderFallback() {
     }
 
     @Test
-    public void getRootUaaClient() {
+    void getRootUaaClient() {
         mockRequest(
                 InteractionContext.builder()
                         .request(TestRequest.builder().method(GET).path("/").build())
@@ -342,7 +342,7 @@ public void getRootUaaClient() {
     }
 
     @Test
-    public void getRootUaaClientFallback() {
+    void getRootUaaClientFallback() {
         mockRequest(
                 InteractionContext.builder()
                         .request(TestRequest.builder().method(GET).path("/").build())
@@ -372,7 +372,7 @@ public void getRootUaaClientFallback() {
     }
 
     @Test
-    public void getWithInvalidRoot() {
+    void getWithInvalidRoot() {
         mockRequest(
                 InteractionContext.builder()
                         .request(TestRequest.builder().method(GET).path("/").build())
diff --git a/cloudfoundry-client-reactor/src/test/java/org/cloudfoundry/reactor/InfoPayloadRootProviderTest.java b/cloudfoundry-client-reactor/src/test/java/org/cloudfoundry/reactor/InfoPayloadRootProviderTest.java
index 9e023b0e64d..8f5da92655d 100644
--- a/cloudfoundry-client-reactor/src/test/java/org/cloudfoundry/reactor/InfoPayloadRootProviderTest.java
+++ b/cloudfoundry-client-reactor/src/test/java/org/cloudfoundry/reactor/InfoPayloadRootProviderTest.java
@@ -20,10 +20,10 @@
 import static io.netty.handler.codec.http.HttpResponseStatus.OK;
 
 import java.time.Duration;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import reactor.test.StepVerifier;
 
-public final class InfoPayloadRootProviderTest extends AbstractRestTest {
+final class InfoPayloadRootProviderTest extends AbstractRestTest {
 
     private final InfoPayloadRootProvider rootProvider =
             InfoPayloadRootProvider.builder()
@@ -34,7 +34,7 @@ public final class InfoPayloadRootProviderTest extends AbstractRestTest {
                     .build();
 
     @Test
-    public void getRoot() {
+    void getRoot() {
         this.rootProvider
                 .getRoot(CONNECTION_CONTEXT)
                 .as(StepVerifier::create)
@@ -44,7 +44,7 @@ public void getRoot() {
     }
 
     @Test
-    public void getRootKey() {
+    void getRootKey() {
         mockRequest(
                 InteractionContext.builder()
                         .request(TestRequest.builder().method(GET).path("/v2/info").build())
@@ -64,7 +64,7 @@ public void getRootKey() {
     }
 
     @Test
-    public void getRootKeyNoKey() {
+    void getRootKeyNoKey() {
         mockRequest(
                 InteractionContext.builder()
                         .request(TestRequest.builder().method(GET).path("/v2/info").build())
diff --git a/cloudfoundry-client-reactor/src/test/java/org/cloudfoundry/reactor/RootPayloadRootProviderTest.java b/cloudfoundry-client-reactor/src/test/java/org/cloudfoundry/reactor/RootPayloadRootProviderTest.java
index 0826391f77b..d9fbc35887d 100644
--- a/cloudfoundry-client-reactor/src/test/java/org/cloudfoundry/reactor/RootPayloadRootProviderTest.java
+++ b/cloudfoundry-client-reactor/src/test/java/org/cloudfoundry/reactor/RootPayloadRootProviderTest.java
@@ -20,10 +20,10 @@
 import static io.netty.handler.codec.http.HttpResponseStatus.OK;
 
 import java.time.Duration;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import reactor.test.StepVerifier;
 
-public final class RootPayloadRootProviderTest extends AbstractRestTest {
+final class RootPayloadRootProviderTest extends AbstractRestTest {
 
     private final RootPayloadRootProvider rootProvider =
             RootPayloadRootProvider.builder()
@@ -34,7 +34,7 @@ public final class RootPayloadRootProviderTest extends AbstractRestTest {
                     .build();
 
     @Test
-    public void getRoot() {
+    void getRoot() {
         this.rootProvider
                 .getRoot(CONNECTION_CONTEXT)
                 .as(StepVerifier::create)
@@ -44,7 +44,7 @@ public void getRoot() {
     }
 
     @Test
-    public void getRootKey() {
+    void getRootKey() {
         mockRequest(
                 InteractionContext.builder()
                         .request(TestRequest.builder().method(GET).path("/").build())
@@ -66,7 +66,7 @@ public void getRootKey() {
     }
 
     @Test
-    public void getRootKeyNoKey() {
+    void getRootKeyNoKey() {
         mockRequest(
                 InteractionContext.builder()
                         .request(TestRequest.builder().method(GET).path("/").build())
diff --git a/cloudfoundry-client-reactor/src/test/java/org/cloudfoundry/reactor/SingleEndpointRootProviderTest.java b/cloudfoundry-client-reactor/src/test/java/org/cloudfoundry/reactor/SingleEndpointRootProviderTest.java
index 6340224e4d8..90c2f9a3064 100644
--- a/cloudfoundry-client-reactor/src/test/java/org/cloudfoundry/reactor/SingleEndpointRootProviderTest.java
+++ b/cloudfoundry-client-reactor/src/test/java/org/cloudfoundry/reactor/SingleEndpointRootProviderTest.java
@@ -17,16 +17,16 @@
 package org.cloudfoundry.reactor;
 
 import java.time.Duration;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import reactor.test.StepVerifier;
 
-public final class SingleEndpointRootProviderTest extends AbstractRestTest {
+final class SingleEndpointRootProviderTest extends AbstractRestTest {
 
     private final SingleEndpointRootProvider rootProvider =
             SingleEndpointRootProvider.builder().apiHost("localhost").build();
 
     @Test
-    public void getRoot() {
+    void getRoot() {
         this.rootProvider
                 .getRoot(CONNECTION_CONTEXT)
                 .as(StepVerifier::create)
@@ -36,7 +36,7 @@ public void getRoot() {
     }
 
     @Test
-    public void getRootKey() {
+    void getRootKey() {
         this.rootProvider
                 .getRoot(null, CONNECTION_CONTEXT)
                 .as(StepVerifier::create)
diff --git a/cloudfoundry-client-reactor/src/test/java/org/cloudfoundry/reactor/_TestRequest.java b/cloudfoundry-client-reactor/src/test/java/org/cloudfoundry/reactor/_TestRequest.java
index ee1ff4f07a1..9126aed7a23 100644
--- a/cloudfoundry-client-reactor/src/test/java/org/cloudfoundry/reactor/_TestRequest.java
+++ b/cloudfoundry-client-reactor/src/test/java/org/cloudfoundry/reactor/_TestRequest.java
@@ -21,7 +21,7 @@
 import io.netty.handler.codec.http.HttpHeaderNames;
 import io.netty.handler.codec.http.HttpMethod;
 import okhttp3.Headers;
-import okhttp3.mockwebserver.RecordedRequest;
+import mockwebserver3.RecordedRequest;
 import okio.Buffer;
 import org.cloudfoundry.AllowNulls;
 import org.immutables.value.Value;
diff --git a/cloudfoundry-client-reactor/src/test/java/org/cloudfoundry/reactor/_TestResponse.java b/cloudfoundry-client-reactor/src/test/java/org/cloudfoundry/reactor/_TestResponse.java
index 1800e745711..efe791dc6c8 100644
--- a/cloudfoundry-client-reactor/src/test/java/org/cloudfoundry/reactor/_TestResponse.java
+++ b/cloudfoundry-client-reactor/src/test/java/org/cloudfoundry/reactor/_TestResponse.java
@@ -17,7 +17,7 @@
 package org.cloudfoundry.reactor;
 
 import io.netty.handler.codec.http.HttpResponseStatus;
-import okhttp3.mockwebserver.MockResponse;
+import mockwebserver3.MockResponse;
 import okio.Buffer;
 import org.cloudfoundry.AllowNulls;
 import org.immutables.value.Value;
diff --git a/cloudfoundry-client-reactor/src/test/java/org/cloudfoundry/reactor/client/MethodNameComparatorTest.java b/cloudfoundry-client-reactor/src/test/java/org/cloudfoundry/reactor/client/MethodNameComparatorTest.java
index 43d220c4fd9..0d727af49dc 100644
--- a/cloudfoundry-client-reactor/src/test/java/org/cloudfoundry/reactor/client/MethodNameComparatorTest.java
+++ b/cloudfoundry-client-reactor/src/test/java/org/cloudfoundry/reactor/client/MethodNameComparatorTest.java
@@ -19,14 +19,14 @@
 import static org.assertj.core.api.Assertions.assertThat;
 
 import java.lang.reflect.Method;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
-public final class MethodNameComparatorTest {
+final class MethodNameComparatorTest {
 
     private final MethodNameComparator comparator = MethodNameComparator.INSTANCE;
 
     @Test
-    public void test() throws NoSuchMethodException {
+    void test() throws NoSuchMethodException {
         Method alpha = this.getClass().getDeclaredMethod("alpha");
         Method bravo = this.getClass().getDeclaredMethod("bravo");
 
diff --git a/cloudfoundry-client-reactor/src/test/java/org/cloudfoundry/reactor/client/QueryBuilderTest.java b/cloudfoundry-client-reactor/src/test/java/org/cloudfoundry/reactor/client/QueryBuilderTest.java
index 8d68fb8dfed..e3b65984562 100644
--- a/cloudfoundry-client-reactor/src/test/java/org/cloudfoundry/reactor/client/QueryBuilderTest.java
+++ b/cloudfoundry-client-reactor/src/test/java/org/cloudfoundry/reactor/client/QueryBuilderTest.java
@@ -25,14 +25,14 @@
 import org.cloudfoundry.QueryParameter;
 import org.cloudfoundry.reactor.util.UriQueryParameter;
 import org.cloudfoundry.reactor.util.UriQueryParameters;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.springframework.util.MultiValueMap;
 import org.springframework.web.util.UriComponentsBuilder;
 
-public final class QueryBuilderTest {
+final class QueryBuilderTest {
 
     @Test
-    public void test() {
+    void test() {
         UriComponentsBuilder builder = UriComponentsBuilder.newInstance();
 
         Stream<UriQueryParameter> parameters =
diff --git a/cloudfoundry-client-reactor/src/test/java/org/cloudfoundry/reactor/client/ReactorCloudFoundryClientTest.java b/cloudfoundry-client-reactor/src/test/java/org/cloudfoundry/reactor/client/ReactorCloudFoundryClientTest.java
index 6011bd5efc9..297cf56748f 100644
--- a/cloudfoundry-client-reactor/src/test/java/org/cloudfoundry/reactor/client/ReactorCloudFoundryClientTest.java
+++ b/cloudfoundry-client-reactor/src/test/java/org/cloudfoundry/reactor/client/ReactorCloudFoundryClientTest.java
@@ -19,9 +19,9 @@
 import static org.assertj.core.api.Assertions.assertThat;
 
 import org.cloudfoundry.reactor.AbstractRestTest;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
-public final class ReactorCloudFoundryClientTest extends AbstractRestTest {
+final class ReactorCloudFoundryClientTest extends AbstractRestTest {
 
     private final ReactorCloudFoundryClient client =
             ReactorCloudFoundryClient.builder()
@@ -32,217 +32,217 @@ public final class ReactorCloudFoundryClientTest extends AbstractRestTest {
                     .build();
 
     @Test
-    public void applicationUsageEvents() {
+    void applicationUsageEvents() {
         assertThat(this.client.applicationUsageEvents()).isNotNull();
     }
 
     @Test
-    public void applicationsV2() {
+    void applicationsV2() {
         assertThat(this.client.applicationsV2()).isNotNull();
     }
 
     @Test
-    public void applicationsV3() {
+    void applicationsV3() {
         assertThat(this.client.applicationsV3()).isNotNull();
     }
 
     @Test
-    public void buildpacks() {
+    void buildpacks() {
         assertThat(this.client.buildpacks()).isNotNull();
     }
 
     @Test
-    public void builds() {
+    void builds() {
         assertThat(this.client.builds()).isNotNull();
     }
 
     @Test
-    public void domains() {
+    void domains() {
         assertThat(this.client.domains()).isNotNull();
     }
 
     @Test
-    public void domainsV3() {
+    void domainsV3() {
         assertThat(this.client.domainsV3()).isNotNull();
     }
 
     @Test
-    public void droplets() {
+    void droplets() {
         assertThat(this.client.droplets()).isNotNull();
     }
 
     @Test
-    public void environmentVariableGroups() {
+    void environmentVariableGroups() {
         assertThat(this.client.environmentVariableGroups()).isNotNull();
     }
 
     @Test
-    public void events() {
+    void events() {
         assertThat(this.client.events()).isNotNull();
     }
 
     @Test
-    public void featureFlags() {
+    void featureFlags() {
         assertThat(this.client.featureFlags()).isNotNull();
     }
 
     @Test
-    public void info() {
+    void info() {
         assertThat(this.client.info()).isNotNull();
     }
 
     @Test
-    public void isolationSegments() {
+    void isolationSegments() {
         assertThat(this.client.isolationSegments()).isNotNull();
     }
 
     @Test
-    public void jobs() {
+    void jobs() {
         assertThat(this.client.jobs()).isNotNull();
     }
 
     @Test
-    public void jobsV3() {
+    void jobsV3() {
         assertThat(this.client.jobsV3()).isNotNull();
     }
 
     @Test
-    public void organizationQuotaDefinitions() {
+    void organizationQuotaDefinitions() {
         assertThat(this.client.organizationQuotaDefinitions()).isNotNull();
     }
 
     @Test
-    public void organizations() {
+    void organizations() {
         assertThat(this.client.organizations()).isNotNull();
     }
 
     @Test
-    public void organizationsV3() {
+    void organizationsV3() {
         assertThat(this.client.organizationsV3()).isNotNull();
     }
 
     @Test
-    public void packages() {
+    void packages() {
         assertThat(this.client.packages()).isNotNull();
     }
 
     @Test
-    public void privateDomains() {
+    void privateDomains() {
         assertThat(this.client.privateDomains()).isNotNull();
     }
 
     @Test
-    public void processes() {
+    void processes() {
         assertThat(this.client.processes()).isNotNull();
     }
 
     @Test
-    public void resourceMatch() {
+    void resourceMatch() {
         assertThat(this.client.resourceMatch()).isNotNull();
     }
 
     @Test
-    public void rolesV3() {
+    void rolesV3() {
         assertThat(this.client.rolesV3()).isNotNull();
     }
 
     @Test
-    public void routeMappings() {
+    void routeMappings() {
         assertThat(this.client.routeMappings()).isNotNull();
     }
 
     @Test
-    public void routes() {
+    void routes() {
         assertThat(this.client.routes()).isNotNull();
     }
 
     @Test
-    public void runningSecurityGroups() {
+    void runningSecurityGroups() {
         assertThat(this.client.securityGroups()).isNotNull();
     }
 
     @Test
-    public void serviceBindingsV2() {
+    void serviceBindingsV2() {
         assertThat(this.client.serviceBindingsV2()).isNotNull();
     }
 
     @Test
-    public void serviceBindingsV3() {
+    void serviceBindingsV3() {
         assertThat(this.client.serviceBindingsV3()).isNotNull();
     }
 
     @Test
-    public void serviceBrokers() {
+    void serviceBrokers() {
         assertThat(this.client.serviceBrokers()).isNotNull();
     }
 
     @Test
-    public void serviceInstances() {
+    void serviceInstances() {
         assertThat(this.client.serviceInstances()).isNotNull();
     }
 
     @Test
-    public void serviceKeys() {
+    void serviceKeys() {
         assertThat(this.client.serviceKeys()).isNotNull();
     }
 
     @Test
-    public void servicePlanVisibilities() {
+    void servicePlanVisibilities() {
         assertThat(this.client.servicePlanVisibilities()).isNotNull();
     }
 
     @Test
-    public void servicePlans() {
+    void servicePlans() {
         assertThat(this.client.servicePlans()).isNotNull();
     }
 
     @Test
-    public void serviceUsageEvents() {
+    void serviceUsageEvents() {
         assertThat(this.client.serviceUsageEvents()).isNotNull();
     }
 
     @Test
-    public void services() {
+    void services() {
         assertThat(this.client.services()).isNotNull();
     }
 
     @Test
-    public void sharedDomains() {
+    void sharedDomains() {
         assertThat(this.client.sharedDomains()).isNotNull();
     }
 
     @Test
-    public void spaceQuotaDefinitions() {
+    void spaceQuotaDefinitions() {
         assertThat(this.client.spaceQuotaDefinitions()).isNotNull();
     }
 
     @Test
-    public void spaces() {
+    void spaces() {
         assertThat(this.client.spaces()).isNotNull();
     }
 
     @Test
-    public void spacesV3() {
+    void spacesV3() {
         assertThat(this.client.spacesV3()).isNotNull();
     }
 
     @Test
-    public void stacks() {
+    void stacks() {
         assertThat(this.client.stacks()).isNotNull();
     }
 
     @Test
-    public void tasks() {
+    void tasks() {
         assertThat(this.client.tasks()).isNotNull();
     }
 
     @Test
-    public void userProvidedServiceInstances() {
+    void userProvidedServiceInstances() {
         assertThat(this.client.userProvidedServiceInstances()).isNotNull();
     }
 
     @Test
-    public void users() {
+    void users() {
         assertThat(this.client.users()).isNotNull();
     }
 }
diff --git a/cloudfoundry-client-reactor/src/test/java/org/cloudfoundry/reactor/client/v2/FilterBuilderTest.java b/cloudfoundry-client-reactor/src/test/java/org/cloudfoundry/reactor/client/v2/FilterBuilderTest.java
index 02a186d87b7..1f2f293e5d2 100644
--- a/cloudfoundry-client-reactor/src/test/java/org/cloudfoundry/reactor/client/v2/FilterBuilderTest.java
+++ b/cloudfoundry-client-reactor/src/test/java/org/cloudfoundry/reactor/client/v2/FilterBuilderTest.java
@@ -29,14 +29,14 @@
 import org.cloudfoundry.client.v2.FilterParameter;
 import org.cloudfoundry.reactor.util.UriQueryParameter;
 import org.cloudfoundry.reactor.util.UriQueryParameters;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.springframework.util.MultiValueMap;
 import org.springframework.web.util.UriComponentsBuilder;
 
-public final class FilterBuilderTest {
+final class FilterBuilderTest {
 
     @Test
-    public void test() {
+    void test() {
         UriComponentsBuilder builder = UriComponentsBuilder.newInstance();
 
         Stream<UriQueryParameter> parameters =
diff --git a/cloudfoundry-client-reactor/src/test/java/org/cloudfoundry/reactor/client/v2/applications/ReactorApplicationsV2Test.java b/cloudfoundry-client-reactor/src/test/java/org/cloudfoundry/reactor/client/v2/applications/ReactorApplicationsV2Test.java
index e7c2961e5f3..c7730693f24 100644
--- a/cloudfoundry-client-reactor/src/test/java/org/cloudfoundry/reactor/client/v2/applications/ReactorApplicationsV2Test.java
+++ b/cloudfoundry-client-reactor/src/test/java/org/cloudfoundry/reactor/client/v2/applications/ReactorApplicationsV2Test.java
@@ -93,11 +93,11 @@
 import org.cloudfoundry.reactor.client.AbstractClientApiTest;
 import org.cloudfoundry.util.FluentMap;
 import org.cloudfoundry.util.OperationUtils;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.springframework.core.io.ClassPathResource;
 import reactor.test.StepVerifier;
 
-public final class ReactorApplicationsV2Test extends AbstractClientApiTest {
+final class ReactorApplicationsV2Test extends AbstractClientApiTest {
 
     private final ReactorApplicationsV2 applications =
             new ReactorApplicationsV2(
@@ -105,7 +105,7 @@ public final class ReactorApplicationsV2Test extends AbstractClientApiTest {
 
     @SuppressWarnings("deprecation")
     @Test
-    public void associateRoute() {
+    void associateRoute() {
         mockRequest(
                 InteractionContext.builder()
                         .request(
@@ -179,7 +179,7 @@ public void associateRoute() {
     }
 
     @Test
-    public void copy() {
+    void copy() {
         mockRequest(
                 InteractionContext.builder()
                         .request(
@@ -225,7 +225,7 @@ public void copy() {
 
     @SuppressWarnings("deprecation")
     @Test
-    public void create() {
+    void create() {
         mockRequest(
                 InteractionContext.builder()
                         .request(
@@ -301,7 +301,7 @@ public void create() {
     }
 
     @Test
-    public void delete() {
+    void delete() {
         mockRequest(
                 InteractionContext.builder()
                         .request(
@@ -323,7 +323,7 @@ public void delete() {
     }
 
     @Test
-    public void download() {
+    void download() {
         mockRequest(
                 InteractionContext.builder()
                         .request(
@@ -357,7 +357,7 @@ public void download() {
     }
 
     @Test
-    public void downloadDroplet() {
+    void downloadDroplet() {
         mockRequest(
                 InteractionContext.builder()
                         .request(
@@ -391,7 +391,7 @@ public void downloadDroplet() {
     }
 
     @Test
-    public void environment() {
+    void environment() {
         mockRequest(
                 InteractionContext.builder()
                         .request(
@@ -455,7 +455,7 @@ public void environment() {
 
     @SuppressWarnings("deprecation")
     @Test
-    public void get() {
+    void get() {
         mockRequest(
                 InteractionContext.builder()
                         .request(
@@ -522,7 +522,7 @@ public void get() {
     }
 
     @Test
-    public void getPermissions() {
+    void getPermissions() {
         mockRequest(
                 InteractionContext.builder()
                         .request(
@@ -555,7 +555,7 @@ public void getPermissions() {
     }
 
     @Test
-    public void instances() {
+    void instances() {
         mockRequest(
                 InteractionContext.builder()
                         .request(
@@ -592,7 +592,7 @@ public void instances() {
 
     @SuppressWarnings("deprecation")
     @Test
-    public void list() {
+    void list() {
         mockRequest(
                 InteractionContext.builder()
                         .request(
@@ -770,7 +770,7 @@ public void list() {
     }
 
     @Test
-    public void listRoutes() {
+    void listRoutes() {
         mockRequest(
                 InteractionContext.builder()
                         .request(
@@ -832,7 +832,7 @@ public void listRoutes() {
     }
 
     @Test
-    public void listServiceBindings() {
+    void listServiceBindings() {
         mockRequest(
                 InteractionContext.builder()
                         .request(
@@ -895,7 +895,7 @@ public void listServiceBindings() {
     }
 
     @Test
-    public void removeRoute() {
+    void removeRoute() {
         mockRequest(
                 InteractionContext.builder()
                         .request(
@@ -918,7 +918,7 @@ public void removeRoute() {
     }
 
     @Test
-    public void removeServiceBinding() {
+    void removeServiceBinding() {
         mockRequest(
                 InteractionContext.builder()
                         .request(
@@ -943,7 +943,7 @@ public void removeServiceBinding() {
 
     @SuppressWarnings("deprecation")
     @Test
-    public void restage() {
+    void restage() {
         mockRequest(
                 InteractionContext.builder()
                         .request(
@@ -1004,7 +1004,7 @@ public void restage() {
     }
 
     @Test
-    public void statistics() {
+    void statistics() {
         mockRequest(
                 InteractionContext.builder()
                         .request(
@@ -1064,7 +1064,7 @@ public void statistics() {
 
     @SuppressWarnings("deprecation")
     @Test
-    public void summary() {
+    void summary() {
         mockRequest(
                 InteractionContext.builder()
                         .request(
@@ -1161,7 +1161,7 @@ public void summary() {
     }
 
     @Test
-    public void terminateInstance() {
+    void terminateInstance() {
         mockRequest(
                 InteractionContext.builder()
                         .request(
@@ -1185,7 +1185,7 @@ public void terminateInstance() {
 
     @SuppressWarnings("deprecation")
     @Test
-    public void update() {
+    void update() {
         mockRequest(
                 InteractionContext.builder()
                         .request(
@@ -1260,7 +1260,7 @@ public void update() {
     }
 
     @Test
-    public void upload() throws IOException {
+    void upload() throws IOException {
         mockRequest(
                 InteractionContext.builder()
                         .request(
@@ -1363,7 +1363,7 @@ public void upload() throws IOException {
     }
 
     @Test
-    public void uploadDroplet() throws IOException {
+    void uploadDroplet() throws IOException {
         mockRequest(
                 InteractionContext.builder()
                         .request(
diff --git a/cloudfoundry-client-reactor/src/test/java/org/cloudfoundry/reactor/client/v2/applicationusageevents/ReactorApplicationUsageEventsTest.java b/cloudfoundry-client-reactor/src/test/java/org/cloudfoundry/reactor/client/v2/applicationusageevents/ReactorApplicationUsageEventsTest.java
index 058947a6354..43079f76237 100644
--- a/cloudfoundry-client-reactor/src/test/java/org/cloudfoundry/reactor/client/v2/applicationusageevents/ReactorApplicationUsageEventsTest.java
+++ b/cloudfoundry-client-reactor/src/test/java/org/cloudfoundry/reactor/client/v2/applicationusageevents/ReactorApplicationUsageEventsTest.java
@@ -35,17 +35,17 @@
 import org.cloudfoundry.reactor.TestRequest;
 import org.cloudfoundry.reactor.TestResponse;
 import org.cloudfoundry.reactor.client.AbstractClientApiTest;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import reactor.test.StepVerifier;
 
-public final class ReactorApplicationUsageEventsTest extends AbstractClientApiTest {
+final class ReactorApplicationUsageEventsTest extends AbstractClientApiTest {
 
     private final ReactorApplicationUsageEvents applicationUsageEvents =
             new ReactorApplicationUsageEvents(
                     CONNECTION_CONTEXT, this.root, TOKEN_PROVIDER, Collections.emptyMap());
 
     @Test
-    public void get() {
+    void get() {
         mockRequest(
                 InteractionContext.builder()
                         .request(
@@ -102,7 +102,7 @@ public void get() {
     }
 
     @Test
-    public void list() {
+    void list() {
         mockRequest(
                 InteractionContext.builder()
                         .request(
@@ -169,7 +169,7 @@ public void list() {
     }
 
     @Test
-    public void purgeAndReseed() {
+    void purgeAndReseed() {
         mockRequest(
                 InteractionContext.builder()
                         .request(
diff --git a/cloudfoundry-client-reactor/src/test/java/org/cloudfoundry/reactor/client/v2/blobstores/ReactorBlobstoresTest.java b/cloudfoundry-client-reactor/src/test/java/org/cloudfoundry/reactor/client/v2/blobstores/ReactorBlobstoresTest.java
index 180a60c1d3a..9c54293a4e4 100644
--- a/cloudfoundry-client-reactor/src/test/java/org/cloudfoundry/reactor/client/v2/blobstores/ReactorBlobstoresTest.java
+++ b/cloudfoundry-client-reactor/src/test/java/org/cloudfoundry/reactor/client/v2/blobstores/ReactorBlobstoresTest.java
@@ -29,17 +29,17 @@
 import org.cloudfoundry.reactor.TestRequest;
 import org.cloudfoundry.reactor.TestResponse;
 import org.cloudfoundry.reactor.client.AbstractClientApiTest;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import reactor.test.StepVerifier;
 
-public final class ReactorBlobstoresTest extends AbstractClientApiTest {
+final class ReactorBlobstoresTest extends AbstractClientApiTest {
 
     private ReactorBlobstores blobstores =
             new ReactorBlobstores(
                     CONNECTION_CONTEXT, this.root, TOKEN_PROVIDER, Collections.emptyMap());
 
     @Test
-    public void delete() {
+    void delete() {
         mockRequest(
                 InteractionContext.builder()
                         .request(
diff --git a/cloudfoundry-client-reactor/src/test/java/org/cloudfoundry/reactor/client/v2/buildpacks/ReactorBuildpacksTest.java b/cloudfoundry-client-reactor/src/test/java/org/cloudfoundry/reactor/client/v2/buildpacks/ReactorBuildpacksTest.java
index 2f13b65305c..41e576c0a0d 100644
--- a/cloudfoundry-client-reactor/src/test/java/org/cloudfoundry/reactor/client/v2/buildpacks/ReactorBuildpacksTest.java
+++ b/cloudfoundry-client-reactor/src/test/java/org/cloudfoundry/reactor/client/v2/buildpacks/ReactorBuildpacksTest.java
@@ -49,18 +49,18 @@
 import org.cloudfoundry.reactor.TestRequest;
 import org.cloudfoundry.reactor.TestResponse;
 import org.cloudfoundry.reactor.client.AbstractClientApiTest;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.springframework.core.io.ClassPathResource;
 import reactor.test.StepVerifier;
 
-public final class ReactorBuildpacksTest extends AbstractClientApiTest {
+final class ReactorBuildpacksTest extends AbstractClientApiTest {
 
     private final ReactorBuildpacks buildpacks =
             new ReactorBuildpacks(
                     CONNECTION_CONTEXT, this.root, TOKEN_PROVIDER, Collections.emptyMap());
 
     @Test
-    public void create() {
+    void create() {
         mockRequest(
                 InteractionContext.builder()
                         .request(
@@ -103,7 +103,7 @@ public void create() {
     }
 
     @Test
-    public void delete() {
+    void delete() {
         mockRequest(
                 InteractionContext.builder()
                         .request(
@@ -146,7 +146,7 @@ public void delete() {
     }
 
     @Test
-    public void get() {
+    void get() {
         mockRequest(
                 InteractionContext.builder()
                         .request(
@@ -188,7 +188,7 @@ public void get() {
     }
 
     @Test
-    public void list() {
+    void list() {
         mockRequest(
                 InteractionContext.builder()
                         .request(
@@ -273,7 +273,7 @@ public void list() {
     }
 
     @Test
-    public void update() {
+    void update() {
         mockRequest(
                 InteractionContext.builder()
                         .request(
@@ -322,7 +322,7 @@ public void update() {
     }
 
     @Test
-    public void upload() throws IOException {
+    void upload() throws IOException {
         mockRequest(
                 InteractionContext.builder()
                         .request(
diff --git a/cloudfoundry-client-reactor/src/test/java/org/cloudfoundry/reactor/client/v2/domains/ReactorDomainsTest.java b/cloudfoundry-client-reactor/src/test/java/org/cloudfoundry/reactor/client/v2/domains/ReactorDomainsTest.java
index 300dd57fa5d..9948c3c9fc2 100644
--- a/cloudfoundry-client-reactor/src/test/java/org/cloudfoundry/reactor/client/v2/domains/ReactorDomainsTest.java
+++ b/cloudfoundry-client-reactor/src/test/java/org/cloudfoundry/reactor/client/v2/domains/ReactorDomainsTest.java
@@ -45,17 +45,17 @@
 import org.cloudfoundry.reactor.TestRequest;
 import org.cloudfoundry.reactor.TestResponse;
 import org.cloudfoundry.reactor.client.AbstractClientApiTest;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import reactor.test.StepVerifier;
 
-public final class ReactorDomainsTest extends AbstractClientApiTest {
+final class ReactorDomainsTest extends AbstractClientApiTest {
 
     private final ReactorDomains domains =
             new ReactorDomains(
                     CONNECTION_CONTEXT, this.root, TOKEN_PROVIDER, Collections.emptyMap());
 
     @Test
-    public void create() {
+    void create() {
         mockRequest(
                 InteractionContext.builder()
                         .request(
@@ -105,7 +105,7 @@ public void create() {
     }
 
     @Test
-    public void delete() {
+    void delete() {
         mockRequest(
                 InteractionContext.builder()
                         .request(
@@ -124,7 +124,7 @@ public void delete() {
     }
 
     @Test
-    public void deleteAsync() {
+    void deleteAsync() {
         mockRequest(
                 InteractionContext.builder()
                         .request(
@@ -167,7 +167,7 @@ public void deleteAsync() {
     }
 
     @Test
-    public void get() {
+    void get() {
         mockRequest(
                 InteractionContext.builder()
                         .request(
@@ -205,7 +205,7 @@ public void get() {
     }
 
     @Test
-    public void listDomains() {
+    void listDomains() {
         mockRequest(
                 InteractionContext.builder()
                         .request(TestRequest.builder().method(GET).path("/domains?page=-1").build())
@@ -295,7 +295,7 @@ public void listDomains() {
     }
 
     @Test
-    public void listSpaces() {
+    void listSpaces() {
         mockRequest(
                 InteractionContext.builder()
                         .request(
diff --git a/cloudfoundry-client-reactor/src/test/java/org/cloudfoundry/reactor/client/v2/environmentvariablegroups/ReactorEnvironmentVariableGroupsTest.java b/cloudfoundry-client-reactor/src/test/java/org/cloudfoundry/reactor/client/v2/environmentvariablegroups/ReactorEnvironmentVariableGroupsTest.java
index b01dbeaa2ac..884af0f5b97 100644
--- a/cloudfoundry-client-reactor/src/test/java/org/cloudfoundry/reactor/client/v2/environmentvariablegroups/ReactorEnvironmentVariableGroupsTest.java
+++ b/cloudfoundry-client-reactor/src/test/java/org/cloudfoundry/reactor/client/v2/environmentvariablegroups/ReactorEnvironmentVariableGroupsTest.java
@@ -34,17 +34,17 @@
 import org.cloudfoundry.reactor.TestRequest;
 import org.cloudfoundry.reactor.TestResponse;
 import org.cloudfoundry.reactor.client.AbstractClientApiTest;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import reactor.test.StepVerifier;
 
-public class ReactorEnvironmentVariableGroupsTest extends AbstractClientApiTest {
+class ReactorEnvironmentVariableGroupsTest extends AbstractClientApiTest {
 
     private ReactorEnvironmentVariableGroups environmentVariableGroups =
             new ReactorEnvironmentVariableGroups(
                     CONNECTION_CONTEXT, this.root, TOKEN_PROVIDER, Collections.emptyMap());
 
     @Test
-    public void getRunningEnvironmentVariables() {
+    void getRunningEnvironmentVariables() {
         mockRequest(
                 InteractionContext.builder()
                         .request(
@@ -74,7 +74,7 @@ public void getRunningEnvironmentVariables() {
     }
 
     @Test
-    public void getStagingEnvironmentVariables() {
+    void getStagingEnvironmentVariables() {
         mockRequest(
                 InteractionContext.builder()
                         .request(
@@ -104,7 +104,7 @@ public void getStagingEnvironmentVariables() {
     }
 
     @Test
-    public void updateRunningEnvironmentVariables() {
+    void updateRunningEnvironmentVariables() {
         mockRequest(
                 InteractionContext.builder()
                         .request(
@@ -139,7 +139,7 @@ public void updateRunningEnvironmentVariables() {
     }
 
     @Test
-    public void updateRunningEnvironmentVariablesEmpty() {
+    void updateRunningEnvironmentVariablesEmpty() {
         mockRequest(
                 InteractionContext.builder()
                         .request(
@@ -172,7 +172,7 @@ public void updateRunningEnvironmentVariablesEmpty() {
     }
 
     @Test
-    public void updateStagingEnvironmentVariables() {
+    void updateStagingEnvironmentVariables() {
         mockRequest(
                 InteractionContext.builder()
                         .request(
@@ -207,7 +207,7 @@ public void updateStagingEnvironmentVariables() {
     }
 
     @Test
-    public void updateStagingEnvironmentVariablesEmpty() {
+    void updateStagingEnvironmentVariablesEmpty() {
         mockRequest(
                 InteractionContext.builder()
                         .request(
diff --git a/cloudfoundry-client-reactor/src/test/java/org/cloudfoundry/reactor/client/v2/events/ReactorEventsTest.java b/cloudfoundry-client-reactor/src/test/java/org/cloudfoundry/reactor/client/v2/events/ReactorEventsTest.java
index 17ad996190a..6d8fc5cb270 100644
--- a/cloudfoundry-client-reactor/src/test/java/org/cloudfoundry/reactor/client/v2/events/ReactorEventsTest.java
+++ b/cloudfoundry-client-reactor/src/test/java/org/cloudfoundry/reactor/client/v2/events/ReactorEventsTest.java
@@ -32,17 +32,17 @@
 import org.cloudfoundry.reactor.TestRequest;
 import org.cloudfoundry.reactor.TestResponse;
 import org.cloudfoundry.reactor.client.AbstractClientApiTest;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import reactor.test.StepVerifier;
 
-public final class ReactorEventsTest extends AbstractClientApiTest {
+final class ReactorEventsTest extends AbstractClientApiTest {
 
     private final ReactorEvents events =
             new ReactorEvents(
                     CONNECTION_CONTEXT, this.root, TOKEN_PROVIDER, Collections.emptyMap());
 
     @Test
-    public void get() {
+    void get() {
         mockRequest(
                 InteractionContext.builder()
                         .request(
@@ -90,7 +90,7 @@ public void get() {
     }
 
     @Test
-    public void list() {
+    void list() {
         mockRequest(
                 InteractionContext.builder()
                         .request(
diff --git a/cloudfoundry-client-reactor/src/test/java/org/cloudfoundry/reactor/client/v2/featureflags/ReactorFeatureFlagsTest.java b/cloudfoundry-client-reactor/src/test/java/org/cloudfoundry/reactor/client/v2/featureflags/ReactorFeatureFlagsTest.java
index 7efad2ab996..3c5631e6b74 100644
--- a/cloudfoundry-client-reactor/src/test/java/org/cloudfoundry/reactor/client/v2/featureflags/ReactorFeatureFlagsTest.java
+++ b/cloudfoundry-client-reactor/src/test/java/org/cloudfoundry/reactor/client/v2/featureflags/ReactorFeatureFlagsTest.java
@@ -33,17 +33,17 @@
 import org.cloudfoundry.reactor.TestRequest;
 import org.cloudfoundry.reactor.TestResponse;
 import org.cloudfoundry.reactor.client.AbstractClientApiTest;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import reactor.test.StepVerifier;
 
-public final class ReactorFeatureFlagsTest extends AbstractClientApiTest {
+final class ReactorFeatureFlagsTest extends AbstractClientApiTest {
 
     private final ReactorFeatureFlags featureFlags =
             new ReactorFeatureFlags(
                     CONNECTION_CONTEXT, this.root, TOKEN_PROVIDER, Collections.emptyMap());
 
     @Test
-    public void getAppScaling() {
+    void getAppScaling() {
         mockRequest(
                 InteractionContext.builder()
                         .request(
@@ -73,7 +73,7 @@ public void getAppScaling() {
     }
 
     @Test
-    public void getUserRoles() {
+    void getUserRoles() {
         mockRequest(
                 InteractionContext.builder()
                         .request(
@@ -103,7 +103,7 @@ public void getUserRoles() {
     }
 
     @Test
-    public void list() {
+    void list() {
         mockRequest(
                 InteractionContext.builder()
                         .request(
@@ -209,7 +209,7 @@ public void list() {
     }
 
     @Test
-    public void set() {
+    void set() {
         mockRequest(
                 InteractionContext.builder()
                         .request(
diff --git a/cloudfoundry-client-reactor/src/test/java/org/cloudfoundry/reactor/client/v2/info/ReactorInfoTest.java b/cloudfoundry-client-reactor/src/test/java/org/cloudfoundry/reactor/client/v2/info/ReactorInfoTest.java
index cd4db2d196b..d2efab96204 100644
--- a/cloudfoundry-client-reactor/src/test/java/org/cloudfoundry/reactor/client/v2/info/ReactorInfoTest.java
+++ b/cloudfoundry-client-reactor/src/test/java/org/cloudfoundry/reactor/client/v2/info/ReactorInfoTest.java
@@ -27,16 +27,16 @@
 import org.cloudfoundry.reactor.TestRequest;
 import org.cloudfoundry.reactor.TestResponse;
 import org.cloudfoundry.reactor.client.AbstractClientApiTest;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import reactor.test.StepVerifier;
 
-public final class ReactorInfoTest extends AbstractClientApiTest {
+final class ReactorInfoTest extends AbstractClientApiTest {
 
     private final ReactorInfo info =
             new ReactorInfo(CONNECTION_CONTEXT, this.root, TOKEN_PROVIDER, Collections.emptyMap());
 
     @Test
-    public void get() {
+    void get() {
         mockRequest(
                 InteractionContext.builder()
                         .request(TestRequest.builder().method(GET).path("/info").build())
diff --git a/cloudfoundry-client-reactor/src/test/java/org/cloudfoundry/reactor/client/v2/jobs/ReactorJobsTest.java b/cloudfoundry-client-reactor/src/test/java/org/cloudfoundry/reactor/client/v2/jobs/ReactorJobsTest.java
index b26257b66ff..864332304d4 100644
--- a/cloudfoundry-client-reactor/src/test/java/org/cloudfoundry/reactor/client/v2/jobs/ReactorJobsTest.java
+++ b/cloudfoundry-client-reactor/src/test/java/org/cloudfoundry/reactor/client/v2/jobs/ReactorJobsTest.java
@@ -30,16 +30,16 @@
 import org.cloudfoundry.reactor.TestRequest;
 import org.cloudfoundry.reactor.TestResponse;
 import org.cloudfoundry.reactor.client.AbstractClientApiTest;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import reactor.test.StepVerifier;
 
-public final class ReactorJobsTest extends AbstractClientApiTest {
+final class ReactorJobsTest extends AbstractClientApiTest {
 
     private final ReactorJobs jobs =
             new ReactorJobs(CONNECTION_CONTEXT, this.root, TOKEN_PROVIDER, Collections.emptyMap());
 
     @Test
-    public void get() {
+    void get() {
         mockRequest(
                 InteractionContext.builder()
                         .request(
diff --git a/cloudfoundry-client-reactor/src/test/java/org/cloudfoundry/reactor/client/v2/organizationquotadefinitions/ReactorOrganizationQuotaDefinitionsTest.java b/cloudfoundry-client-reactor/src/test/java/org/cloudfoundry/reactor/client/v2/organizationquotadefinitions/ReactorOrganizationQuotaDefinitionsTest.java
index 68e671e293f..de8dfe9a830 100644
--- a/cloudfoundry-client-reactor/src/test/java/org/cloudfoundry/reactor/client/v2/organizationquotadefinitions/ReactorOrganizationQuotaDefinitionsTest.java
+++ b/cloudfoundry-client-reactor/src/test/java/org/cloudfoundry/reactor/client/v2/organizationquotadefinitions/ReactorOrganizationQuotaDefinitionsTest.java
@@ -42,10 +42,10 @@
 import org.cloudfoundry.reactor.TestRequest;
 import org.cloudfoundry.reactor.TestResponse;
 import org.cloudfoundry.reactor.client.AbstractClientApiTest;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import reactor.test.StepVerifier;
 
-public final class ReactorOrganizationQuotaDefinitionsTest extends AbstractClientApiTest {
+final class ReactorOrganizationQuotaDefinitionsTest extends AbstractClientApiTest {
 
     private final ReactorOrganizationQuotaDefinitions quotaDefinitions =
             new ReactorOrganizationQuotaDefinitions(
@@ -53,7 +53,7 @@ public final class ReactorOrganizationQuotaDefinitionsTest extends AbstractClien
 
     @SuppressWarnings("deprecation")
     @Test
-    public void create() {
+    void create() {
         mockRequest(
                 InteractionContext.builder()
                         .request(
@@ -116,7 +116,7 @@ public void create() {
     }
 
     @Test
-    public void delete() {
+    void delete() {
         mockRequest(
                 InteractionContext.builder()
                         .request(
@@ -139,7 +139,7 @@ public void delete() {
 
     @SuppressWarnings("deprecation")
     @Test
-    public void get() {
+    void get() {
         mockRequest(
                 InteractionContext.builder()
                         .request(
@@ -191,7 +191,7 @@ public void get() {
 
     @SuppressWarnings("deprecation")
     @Test
-    public void list() {
+    void list() {
         mockRequest(
                 InteractionContext.builder()
                         .request(
@@ -246,7 +246,7 @@ public void list() {
 
     @SuppressWarnings("deprecation")
     @Test
-    public void update() {
+    void update() {
         mockRequest(
                 InteractionContext.builder()
                         .request(
diff --git a/cloudfoundry-client-reactor/src/test/java/org/cloudfoundry/reactor/client/v2/organizations/ReactorOrganizationsTest.java b/cloudfoundry-client-reactor/src/test/java/org/cloudfoundry/reactor/client/v2/organizations/ReactorOrganizationsTest.java
index 94ed6d425cf..6e7cf62af82 100644
--- a/cloudfoundry-client-reactor/src/test/java/org/cloudfoundry/reactor/client/v2/organizations/ReactorOrganizationsTest.java
+++ b/cloudfoundry-client-reactor/src/test/java/org/cloudfoundry/reactor/client/v2/organizations/ReactorOrganizationsTest.java
@@ -113,17 +113,17 @@
 import org.cloudfoundry.reactor.TestRequest;
 import org.cloudfoundry.reactor.TestResponse;
 import org.cloudfoundry.reactor.client.AbstractClientApiTest;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import reactor.test.StepVerifier;
 
-public final class ReactorOrganizationsTest extends AbstractClientApiTest {
+final class ReactorOrganizationsTest extends AbstractClientApiTest {
 
     private final ReactorOrganizations organizations =
             new ReactorOrganizations(
                     CONNECTION_CONTEXT, this.root, TOKEN_PROVIDER, Collections.emptyMap());
 
     @Test
-    public void associateOrganizationAuditor() {
+    void associateOrganizationAuditor() {
         mockRequest(
                 InteractionContext.builder()
                         .request(
@@ -190,7 +190,7 @@ public void associateOrganizationAuditor() {
     }
 
     @Test
-    public void associateOrganizationAuditorByUsername() {
+    void associateOrganizationAuditorByUsername() {
         mockRequest(
                 InteractionContext.builder()
                         .request(
@@ -258,7 +258,7 @@ public void associateOrganizationAuditorByUsername() {
     }
 
     @Test
-    public void associateOrganizationBillingManager() {
+    void associateOrganizationBillingManager() {
         mockRequest(
                 InteractionContext.builder()
                         .request(
@@ -325,7 +325,7 @@ public void associateOrganizationBillingManager() {
     }
 
     @Test
-    public void associateOrganizationBillingManagerByUsername() {
+    void associateOrganizationBillingManagerByUsername() {
         mockRequest(
                 InteractionContext.builder()
                         .request(
@@ -394,7 +394,7 @@ public void associateOrganizationBillingManagerByUsername() {
     }
 
     @Test
-    public void associateOrganizationManager() {
+    void associateOrganizationManager() {
         mockRequest(
                 InteractionContext.builder()
                         .request(
@@ -461,7 +461,7 @@ public void associateOrganizationManager() {
     }
 
     @Test
-    public void associateOrganizationManagerByUsername() {
+    void associateOrganizationManagerByUsername() {
         mockRequest(
                 InteractionContext.builder()
                         .request(
@@ -529,7 +529,7 @@ public void associateOrganizationManagerByUsername() {
     }
 
     @Test
-    public void associateOrganizationUser() {
+    void associateOrganizationUser() {
         mockRequest(
                 InteractionContext.builder()
                         .request(
@@ -596,7 +596,7 @@ public void associateOrganizationUser() {
     }
 
     @Test
-    public void associateOrganizationUserByUsername() {
+    void associateOrganizationUserByUsername() {
         mockRequest(
                 InteractionContext.builder()
                         .request(
@@ -664,7 +664,7 @@ public void associateOrganizationUserByUsername() {
     }
 
     @Test
-    public void associatePrivateDomain() {
+    void associatePrivateDomain() {
         mockRequest(
                 InteractionContext.builder()
                         .request(
@@ -731,7 +731,7 @@ public void associatePrivateDomain() {
     }
 
     @Test
-    public void create() {
+    void create() {
         mockRequest(
                 InteractionContext.builder()
                         .request(
@@ -799,7 +799,7 @@ public void create() {
     }
 
     @Test
-    public void delete() {
+    void delete() {
         mockRequest(
                 InteractionContext.builder()
                         .request(
@@ -821,7 +821,7 @@ public void delete() {
     }
 
     @Test
-    public void deleteAsync() {
+    void deleteAsync() {
         mockRequest(
                 InteractionContext.builder()
                         .request(
@@ -864,7 +864,7 @@ public void deleteAsync() {
     }
 
     @Test
-    public void get() {
+    void get() {
         mockRequest(
                 InteractionContext.builder()
                         .request(
@@ -929,7 +929,7 @@ public void get() {
     }
 
     @Test
-    public void getInstanceUsage() {
+    void getInstanceUsage() {
         mockRequest(
                 InteractionContext.builder()
                         .request(
@@ -957,7 +957,7 @@ public void getInstanceUsage() {
     }
 
     @Test
-    public void getMemoryUsage() {
+    void getMemoryUsage() {
         mockRequest(
                 InteractionContext.builder()
                         .request(
@@ -985,7 +985,7 @@ public void getMemoryUsage() {
     }
 
     @Test
-    public void getUserRoles() {
+    void getUserRoles() {
         mockRequest(
                 InteractionContext.builder()
                         .request(
@@ -1055,7 +1055,7 @@ public void getUserRoles() {
     }
 
     @Test
-    public void list() {
+    void list() {
         mockRequest(
                 InteractionContext.builder()
                         .request(
@@ -1123,7 +1123,7 @@ public void list() {
     }
 
     @Test
-    public void listAuditors() {
+    void listAuditors() {
         mockRequest(
                 InteractionContext.builder()
                         .request(
@@ -1187,7 +1187,7 @@ public void listAuditors() {
     }
 
     @Test
-    public void listBillingManagers() {
+    void listBillingManagers() {
         mockRequest(
                 InteractionContext.builder()
                         .request(
@@ -1252,7 +1252,7 @@ public void listBillingManagers() {
     }
 
     @Test
-    public void listDomains() {
+    void listDomains() {
         mockRequest(
                 InteractionContext.builder()
                         .request(
@@ -1315,7 +1315,7 @@ public void listDomains() {
     }
 
     @Test
-    public void listManagers() {
+    void listManagers() {
         mockRequest(
                 InteractionContext.builder()
                         .request(
@@ -1408,7 +1408,7 @@ public void listManagers() {
     }
 
     @Test
-    public void listPrivateDomains() {
+    void listPrivateDomains() {
         mockRequest(
                 InteractionContext.builder()
                         .request(
@@ -1463,7 +1463,7 @@ public void listPrivateDomains() {
     }
 
     @Test
-    public void listServices() {
+    void listServices() {
         mockRequest(
                 InteractionContext.builder()
                         .request(
@@ -1524,7 +1524,7 @@ public void listServices() {
     }
 
     @Test
-    public void listSpaceQuotaDefinitions() {
+    void listSpaceQuotaDefinitions() {
         mockRequest(
                 InteractionContext.builder()
                         .request(
@@ -1584,7 +1584,7 @@ public void listSpaceQuotaDefinitions() {
     }
 
     @Test
-    public void listSpaces() {
+    void listSpaces() {
         mockRequest(
                 InteractionContext.builder()
                         .request(
@@ -1658,7 +1658,7 @@ public void listSpaces() {
     }
 
     @Test
-    public void listUsers() {
+    void listUsers() {
         mockRequest(
                 InteractionContext.builder()
                         .request(
@@ -1721,7 +1721,7 @@ public void listUsers() {
     }
 
     @Test
-    public void removeAuditor() {
+    void removeAuditor() {
         mockRequest(
                 InteractionContext.builder()
                         .request(
@@ -1745,7 +1745,7 @@ public void removeAuditor() {
     }
 
     @Test
-    public void removeAuditorByUsername() {
+    void removeAuditorByUsername() {
         mockRequest(
                 InteractionContext.builder()
                         .request(
@@ -1770,7 +1770,7 @@ public void removeAuditorByUsername() {
     }
 
     @Test
-    public void removeBillingManager() {
+    void removeBillingManager() {
         mockRequest(
                 InteractionContext.builder()
                         .request(
@@ -1794,7 +1794,7 @@ public void removeBillingManager() {
     }
 
     @Test
-    public void removeManager() {
+    void removeManager() {
         mockRequest(
                 InteractionContext.builder()
                         .request(
@@ -1818,7 +1818,7 @@ public void removeManager() {
     }
 
     @Test
-    public void removeOrganizationBillingManagerByUsername() {
+    void removeOrganizationBillingManagerByUsername() {
         mockRequest(
                 InteractionContext.builder()
                         .request(
@@ -1844,7 +1844,7 @@ public void removeOrganizationBillingManagerByUsername() {
     }
 
     @Test
-    public void removeOrganizationManagerByUsername() {
+    void removeOrganizationManagerByUsername() {
         mockRequest(
                 InteractionContext.builder()
                         .request(
@@ -1869,7 +1869,7 @@ public void removeOrganizationManagerByUsername() {
     }
 
     @Test
-    public void removePrivateDomain() {
+    void removePrivateDomain() {
         mockRequest(
                 InteractionContext.builder()
                         .request(
@@ -1893,7 +1893,7 @@ public void removePrivateDomain() {
     }
 
     @Test
-    public void removeUser() {
+    void removeUser() {
         mockRequest(
                 InteractionContext.builder()
                         .request(
@@ -1917,7 +1917,7 @@ public void removeUser() {
     }
 
     @Test
-    public void removeUserByUsername() {
+    void removeUserByUsername() {
         mockRequest(
                 InteractionContext.builder()
                         .request(
@@ -1942,7 +1942,7 @@ public void removeUserByUsername() {
     }
 
     @Test
-    public void summary() {
+    void summary() {
         mockRequest(
                 InteractionContext.builder()
                         .request(
@@ -1984,7 +1984,7 @@ public void summary() {
     }
 
     @Test
-    public void update() {
+    void update() {
         mockRequest(
                 InteractionContext.builder()
                         .request(
diff --git a/cloudfoundry-client-reactor/src/test/java/org/cloudfoundry/reactor/client/v2/privatedomains/ReactorPrivateDomainsTest.java b/cloudfoundry-client-reactor/src/test/java/org/cloudfoundry/reactor/client/v2/privatedomains/ReactorPrivateDomainsTest.java
index 66596b84e5f..4e8cfafd2b6 100644
--- a/cloudfoundry-client-reactor/src/test/java/org/cloudfoundry/reactor/client/v2/privatedomains/ReactorPrivateDomainsTest.java
+++ b/cloudfoundry-client-reactor/src/test/java/org/cloudfoundry/reactor/client/v2/privatedomains/ReactorPrivateDomainsTest.java
@@ -45,17 +45,17 @@
 import org.cloudfoundry.reactor.TestRequest;
 import org.cloudfoundry.reactor.TestResponse;
 import org.cloudfoundry.reactor.client.AbstractClientApiTest;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import reactor.test.StepVerifier;
 
-public final class ReactorPrivateDomainsTest extends AbstractClientApiTest {
+final class ReactorPrivateDomainsTest extends AbstractClientApiTest {
 
     private final ReactorPrivateDomains privateDomains =
             new ReactorPrivateDomains(
                     CONNECTION_CONTEXT, this.root, TOKEN_PROVIDER, Collections.emptyMap());
 
     @Test
-    public void create() {
+    void create() {
         mockRequest(
                 InteractionContext.builder()
                         .request(
@@ -105,7 +105,7 @@ public void create() {
     }
 
     @Test
-    public void delete() {
+    void delete() {
         mockRequest(
                 InteractionContext.builder()
                         .request(
@@ -127,7 +127,7 @@ public void delete() {
     }
 
     @Test
-    public void deleteAsync() {
+    void deleteAsync() {
         mockRequest(
                 InteractionContext.builder()
                         .request(
@@ -170,7 +170,7 @@ public void deleteAsync() {
     }
 
     @Test
-    public void get() {
+    void get() {
         mockRequest(
                 InteractionContext.builder()
                         .request(
@@ -217,7 +217,7 @@ public void get() {
     }
 
     @Test
-    public void list() {
+    void list() {
         mockRequest(
                 InteractionContext.builder()
                         .request(
@@ -267,7 +267,7 @@ public void list() {
     }
 
     @Test
-    public void listSharedOrganizations() {
+    void listSharedOrganizations() {
         mockRequest(
                 InteractionContext.builder()
                         .request(
diff --git a/cloudfoundry-client-reactor/src/test/java/org/cloudfoundry/reactor/client/v2/resourcematch/ReactorResourceMatchTest.java b/cloudfoundry-client-reactor/src/test/java/org/cloudfoundry/reactor/client/v2/resourcematch/ReactorResourceMatchTest.java
index c0917f56cfb..27bed893271 100644
--- a/cloudfoundry-client-reactor/src/test/java/org/cloudfoundry/reactor/client/v2/resourcematch/ReactorResourceMatchTest.java
+++ b/cloudfoundry-client-reactor/src/test/java/org/cloudfoundry/reactor/client/v2/resourcematch/ReactorResourceMatchTest.java
@@ -28,17 +28,17 @@
 import org.cloudfoundry.reactor.TestRequest;
 import org.cloudfoundry.reactor.TestResponse;
 import org.cloudfoundry.reactor.client.AbstractClientApiTest;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import reactor.test.StepVerifier;
 
-public final class ReactorResourceMatchTest extends AbstractClientApiTest {
+final class ReactorResourceMatchTest extends AbstractClientApiTest {
 
     private final ReactorResourceMatch resourceMatch =
             new ReactorResourceMatch(
                     CONNECTION_CONTEXT, this.root, TOKEN_PROVIDER, Collections.emptyMap());
 
     @Test
-    public void list() {
+    void list() {
         mockRequest(
                 InteractionContext.builder()
                         .request(
diff --git a/cloudfoundry-client-reactor/src/test/java/org/cloudfoundry/reactor/client/v2/routemappings/ReactorRouteMappingsTest.java b/cloudfoundry-client-reactor/src/test/java/org/cloudfoundry/reactor/client/v2/routemappings/ReactorRouteMappingsTest.java
index 9827a006535..f67fd00a344 100644
--- a/cloudfoundry-client-reactor/src/test/java/org/cloudfoundry/reactor/client/v2/routemappings/ReactorRouteMappingsTest.java
+++ b/cloudfoundry-client-reactor/src/test/java/org/cloudfoundry/reactor/client/v2/routemappings/ReactorRouteMappingsTest.java
@@ -42,17 +42,17 @@
 import org.cloudfoundry.reactor.TestRequest;
 import org.cloudfoundry.reactor.TestResponse;
 import org.cloudfoundry.reactor.client.AbstractClientApiTest;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import reactor.test.StepVerifier;
 
-public final class ReactorRouteMappingsTest extends AbstractClientApiTest {
+final class ReactorRouteMappingsTest extends AbstractClientApiTest {
 
     private final ReactorRouteMappings routeMappings =
             new ReactorRouteMappings(
                     CONNECTION_CONTEXT, this.root, TOKEN_PROVIDER, Collections.emptyMap());
 
     @Test
-    public void create() {
+    void create() {
         mockRequest(
                 InteractionContext.builder()
                         .request(
@@ -104,7 +104,7 @@ public void create() {
     }
 
     @Test
-    public void delete() {
+    void delete() {
         mockRequest(
                 InteractionContext.builder()
                         .request(
@@ -126,7 +126,7 @@ public void delete() {
     }
 
     @Test
-    public void deleteAsync() {
+    void deleteAsync() {
         mockRequest(
                 InteractionContext.builder()
                         .request(
@@ -169,7 +169,7 @@ public void deleteAsync() {
     }
 
     @Test
-    public void get() {
+    void get() {
         mockRequest(
                 InteractionContext.builder()
                         .request(
@@ -214,7 +214,7 @@ public void get() {
     }
 
     @Test
-    public void list() {
+    void list() {
         mockRequest(
                 InteractionContext.builder()
                         .request(
diff --git a/cloudfoundry-client-reactor/src/test/java/org/cloudfoundry/reactor/client/v2/routes/ReactorRoutesTest.java b/cloudfoundry-client-reactor/src/test/java/org/cloudfoundry/reactor/client/v2/routes/ReactorRoutesTest.java
index b4082b19ff0..13a9388e27b 100644
--- a/cloudfoundry-client-reactor/src/test/java/org/cloudfoundry/reactor/client/v2/routes/ReactorRoutesTest.java
+++ b/cloudfoundry-client-reactor/src/test/java/org/cloudfoundry/reactor/client/v2/routes/ReactorRoutesTest.java
@@ -58,17 +58,17 @@
 import org.cloudfoundry.reactor.TestRequest;
 import org.cloudfoundry.reactor.TestResponse;
 import org.cloudfoundry.reactor.client.AbstractClientApiTest;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import reactor.test.StepVerifier;
 
-public final class ReactorRoutesTest extends AbstractClientApiTest {
+final class ReactorRoutesTest extends AbstractClientApiTest {
 
     private final ReactorRoutes routes =
             new ReactorRoutes(
                     CONNECTION_CONTEXT, this.root, TOKEN_PROVIDER, Collections.emptyMap());
 
     @Test
-    public void associateApplication() {
+    void associateApplication() {
         mockRequest(
                 InteractionContext.builder()
                         .request(
@@ -122,7 +122,7 @@ public void associateApplication() {
     }
 
     @Test
-    public void create() {
+    void create() {
         mockRequest(
                 InteractionContext.builder()
                         .request(
@@ -177,7 +177,7 @@ public void create() {
     }
 
     @Test
-    public void delete() {
+    void delete() {
         mockRequest(
                 InteractionContext.builder()
                         .request(
@@ -196,7 +196,7 @@ public void delete() {
     }
 
     @Test
-    public void deleteAsync() {
+    void deleteAsync() {
         mockRequest(
                 InteractionContext.builder()
                         .request(
@@ -235,7 +235,7 @@ public void deleteAsync() {
     }
 
     @Test
-    public void exists() {
+    void exists() {
         mockRequest(
                 InteractionContext.builder()
                         .request(
@@ -261,7 +261,7 @@ public void exists() {
     }
 
     @Test
-    public void get() {
+    void get() {
         mockRequest(
                 InteractionContext.builder()
                         .request(
@@ -314,7 +314,7 @@ public void get() {
     }
 
     @Test
-    public void list() {
+    void list() {
         mockRequest(
                 InteractionContext.builder()
                         .request(TestRequest.builder().method(GET).path("/routes?page=-1").build())
@@ -372,7 +372,7 @@ public void list() {
 
     @SuppressWarnings("deprecation")
     @Test
-    public void listApplications() {
+    void listApplications() {
         mockRequest(
                 InteractionContext.builder()
                         .request(
@@ -456,7 +456,7 @@ public void listApplications() {
     }
 
     @Test
-    public void listMappings() {
+    void listMappings() {
         mockRequest(
                 InteractionContext.builder()
                         .request(
@@ -512,7 +512,7 @@ public void listMappings() {
     }
 
     @Test
-    public void removeApplication() {
+    void removeApplication() {
         mockRequest(
                 InteractionContext.builder()
                         .request(
@@ -535,7 +535,7 @@ public void removeApplication() {
     }
 
     @Test
-    public void update() {
+    void update() {
         mockRequest(
                 InteractionContext.builder()
                         .request(
diff --git a/cloudfoundry-client-reactor/src/test/java/org/cloudfoundry/reactor/client/v2/securitygroups/ReactorSecurityGroupsTest.java b/cloudfoundry-client-reactor/src/test/java/org/cloudfoundry/reactor/client/v2/securitygroups/ReactorSecurityGroupsTest.java
index e35ba36322a..b456be7158c 100644
--- a/cloudfoundry-client-reactor/src/test/java/org/cloudfoundry/reactor/client/v2/securitygroups/ReactorSecurityGroupsTest.java
+++ b/cloudfoundry-client-reactor/src/test/java/org/cloudfoundry/reactor/client/v2/securitygroups/ReactorSecurityGroupsTest.java
@@ -66,17 +66,17 @@
 import org.cloudfoundry.reactor.TestRequest;
 import org.cloudfoundry.reactor.TestResponse;
 import org.cloudfoundry.reactor.client.AbstractClientApiTest;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import reactor.test.StepVerifier;
 
-public final class ReactorSecurityGroupsTest extends AbstractClientApiTest {
+final class ReactorSecurityGroupsTest extends AbstractClientApiTest {
 
     private final ReactorSecurityGroups securityGroups =
             new ReactorSecurityGroups(
                     CONNECTION_CONTEXT, this.root, TOKEN_PROVIDER, Collections.emptyMap());
 
     @Test
-    public void associateSpace() {
+    void associateSpace() {
         mockRequest(
                 InteractionContext.builder()
                         .request(
@@ -125,7 +125,7 @@ public void associateSpace() {
     }
 
     @Test
-    public void create() {
+    void create() {
         mockRequest(
                 InteractionContext.builder()
                         .request(
@@ -222,7 +222,7 @@ public void create() {
     }
 
     @Test
-    public void delete() {
+    void delete() {
         mockRequest(
                 InteractionContext.builder()
                         .request(
@@ -241,7 +241,7 @@ public void delete() {
     }
 
     @Test
-    public void deleteAsync() {
+    void deleteAsync() {
         mockRequest(
                 InteractionContext.builder()
                         .request(
@@ -284,7 +284,7 @@ public void deleteAsync() {
     }
 
     @Test
-    public void deleteRunning() {
+    void deleteRunning() {
         mockRequest(
                 InteractionContext.builder()
                         .request(
@@ -306,7 +306,7 @@ public void deleteRunning() {
     }
 
     @Test
-    public void deleteStaging() {
+    void deleteStaging() {
         mockRequest(
                 InteractionContext.builder()
                         .request(
@@ -328,7 +328,7 @@ public void deleteStaging() {
     }
 
     @Test
-    public void get() {
+    void get() {
         mockRequest(
                 InteractionContext.builder()
                         .request(
@@ -378,7 +378,7 @@ public void get() {
     }
 
     @Test
-    public void list() {
+    void list() {
         mockRequest(
                 InteractionContext.builder()
                         .request(TestRequest.builder().method(GET).path("/security_groups").build())
@@ -521,7 +521,7 @@ public void list() {
     }
 
     @Test
-    public void listRunning() {
+    void listRunning() {
         mockRequest(
                 InteractionContext.builder()
                         .request(
@@ -574,7 +574,7 @@ public void listRunning() {
     }
 
     @Test
-    public void listSpaces() {
+    void listSpaces() {
         mockRequest(
                 InteractionContext.builder()
                         .request(
@@ -650,7 +650,7 @@ public void listSpaces() {
     }
 
     @Test
-    public void listStaging() {
+    void listStaging() {
         mockRequest(
                 InteractionContext.builder()
                         .request(
@@ -703,7 +703,7 @@ public void listStaging() {
     }
 
     @Test
-    public void removeSpace() {
+    void removeSpace() {
         mockRequest(
                 InteractionContext.builder()
                         .request(
@@ -727,7 +727,7 @@ public void removeSpace() {
     }
 
     @Test
-    public void setRunning() {
+    void setRunning() {
         mockRequest(
                 InteractionContext.builder()
                         .request(
@@ -778,7 +778,7 @@ public void setRunning() {
     }
 
     @Test
-    public void setStaging() {
+    void setStaging() {
         mockRequest(
                 InteractionContext.builder()
                         .request(
@@ -829,7 +829,7 @@ public void setStaging() {
     }
 
     @Test
-    public void update() {
+    void update() {
         mockRequest(
                 InteractionContext.builder()
                         .request(
diff --git a/cloudfoundry-client-reactor/src/test/java/org/cloudfoundry/reactor/client/v2/servicebindings/ReactorServiceBindingsV2Test.java b/cloudfoundry-client-reactor/src/test/java/org/cloudfoundry/reactor/client/v2/servicebindings/ReactorServiceBindingsV2Test.java
index 385b1a4a408..dbf9fffa579 100644
--- a/cloudfoundry-client-reactor/src/test/java/org/cloudfoundry/reactor/client/v2/servicebindings/ReactorServiceBindingsV2Test.java
+++ b/cloudfoundry-client-reactor/src/test/java/org/cloudfoundry/reactor/client/v2/servicebindings/ReactorServiceBindingsV2Test.java
@@ -45,17 +45,17 @@
 import org.cloudfoundry.reactor.TestRequest;
 import org.cloudfoundry.reactor.TestResponse;
 import org.cloudfoundry.reactor.client.AbstractClientApiTest;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import reactor.test.StepVerifier;
 
-public final class ReactorServiceBindingsV2Test extends AbstractClientApiTest {
+final class ReactorServiceBindingsV2Test extends AbstractClientApiTest {
 
     private final ReactorServiceBindingsV2 serviceBindings =
             new ReactorServiceBindingsV2(
                     CONNECTION_CONTEXT, this.root, TOKEN_PROVIDER, Collections.emptyMap());
 
     @Test
-    public void create() {
+    void create() {
         mockRequest(
                 InteractionContext.builder()
                         .request(
@@ -112,7 +112,7 @@ public void create() {
     }
 
     @Test
-    public void delete() {
+    void delete() {
         mockRequest(
                 InteractionContext.builder()
                         .request(
@@ -134,7 +134,7 @@ public void delete() {
     }
 
     @Test
-    public void deleteAsync() {
+    void deleteAsync() {
         mockRequest(
                 InteractionContext.builder()
                         .request(
@@ -178,7 +178,7 @@ public void deleteAsync() {
     }
 
     @Test
-    public void get() {
+    void get() {
         mockRequest(
                 InteractionContext.builder()
                         .request(
@@ -241,7 +241,7 @@ public void get() {
     }
 
     @Test
-    public void getParameters() {
+    void getParameters() {
         mockRequest(
                 InteractionContext.builder()
                         .request(
@@ -277,7 +277,7 @@ public void getParameters() {
     }
 
     @Test
-    public void list() {
+    void list() {
         mockRequest(
                 InteractionContext.builder()
                         .request(
diff --git a/cloudfoundry-client-reactor/src/test/java/org/cloudfoundry/reactor/client/v2/servicebrokers/ReactorServiceBrokersTest.java b/cloudfoundry-client-reactor/src/test/java/org/cloudfoundry/reactor/client/v2/servicebrokers/ReactorServiceBrokersTest.java
index da40b3107d9..cb52d7be015 100644
--- a/cloudfoundry-client-reactor/src/test/java/org/cloudfoundry/reactor/client/v2/servicebrokers/ReactorServiceBrokersTest.java
+++ b/cloudfoundry-client-reactor/src/test/java/org/cloudfoundry/reactor/client/v2/servicebrokers/ReactorServiceBrokersTest.java
@@ -42,17 +42,17 @@
 import org.cloudfoundry.reactor.TestRequest;
 import org.cloudfoundry.reactor.TestResponse;
 import org.cloudfoundry.reactor.client.AbstractClientApiTest;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import reactor.test.StepVerifier;
 
-public final class ReactorServiceBrokersTest extends AbstractClientApiTest {
+final class ReactorServiceBrokersTest extends AbstractClientApiTest {
 
     private final ReactorServiceBrokers serviceBrokers =
             new ReactorServiceBrokers(
                     CONNECTION_CONTEXT, this.root, TOKEN_PROVIDER, Collections.emptyMap());
 
     @Test
-    public void create() {
+    void create() {
         mockRequest(
                 InteractionContext.builder()
                         .request(
@@ -100,7 +100,7 @@ public void create() {
     }
 
     @Test
-    public void delete() {
+    void delete() {
         mockRequest(
                 InteractionContext.builder()
                         .request(
@@ -122,7 +122,7 @@ public void delete() {
     }
 
     @Test
-    public void get() {
+    void get() {
         mockRequest(
                 InteractionContext.builder()
                         .request(
@@ -167,7 +167,7 @@ public void get() {
     }
 
     @Test
-    public void list() {
+    void list() {
         mockRequest(
                 InteractionContext.builder()
                         .request(
@@ -253,7 +253,7 @@ public void list() {
     }
 
     @Test
-    public void update() {
+    void update() {
         mockRequest(
                 InteractionContext.builder()
                         .request(
diff --git a/cloudfoundry-client-reactor/src/test/java/org/cloudfoundry/reactor/client/v2/serviceinstances/ReactorServiceInstancesTest.java b/cloudfoundry-client-reactor/src/test/java/org/cloudfoundry/reactor/client/v2/serviceinstances/ReactorServiceInstancesTest.java
index 18c9b8d10e8..8ca8726d96a 100644
--- a/cloudfoundry-client-reactor/src/test/java/org/cloudfoundry/reactor/client/v2/serviceinstances/ReactorServiceInstancesTest.java
+++ b/cloudfoundry-client-reactor/src/test/java/org/cloudfoundry/reactor/client/v2/serviceinstances/ReactorServiceInstancesTest.java
@@ -66,17 +66,17 @@
 import org.cloudfoundry.reactor.TestRequest;
 import org.cloudfoundry.reactor.TestResponse;
 import org.cloudfoundry.reactor.client.AbstractClientApiTest;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import reactor.test.StepVerifier;
 
-public final class ReactorServiceInstancesTest extends AbstractClientApiTest {
+final class ReactorServiceInstancesTest extends AbstractClientApiTest {
 
     private final ReactorServiceInstances serviceInstances =
             new ReactorServiceInstances(
                     CONNECTION_CONTEXT, this.root, TOKEN_PROVIDER, Collections.emptyMap());
 
     @Test
-    public void bindRoute() {
+    void bindRoute() {
         mockRequest(
                 InteractionContext.builder()
                         .request(
@@ -138,7 +138,7 @@ public void bindRoute() {
     }
 
     @Test
-    public void create() {
+    void create() {
         mockRequest(
                 InteractionContext.builder()
                         .request(
@@ -210,7 +210,7 @@ public void create() {
     }
 
     @Test
-    public void delete() {
+    void delete() {
         mockRequest(
                 InteractionContext.builder()
                         .request(
@@ -235,7 +235,7 @@ public void delete() {
     }
 
     @Test
-    public void deleteAcceptsIncomplete() {
+    void deleteAcceptsIncomplete() {
         mockRequest(
                 InteractionContext.builder()
                         .request(
@@ -303,7 +303,7 @@ public void deleteAcceptsIncomplete() {
     }
 
     @Test
-    public void deleteAsync() {
+    void deleteAsync() {
         mockRequest(
                 InteractionContext.builder()
                         .request(
@@ -348,7 +348,7 @@ public void deleteAsync() {
     }
 
     @Test
-    public void get() {
+    void get() {
         mockRequest(
                 InteractionContext.builder()
                         .request(
@@ -426,7 +426,7 @@ public void get() {
     }
 
     @Test
-    public void getParameters() {
+    void getParameters() {
         mockRequest(
                 InteractionContext.builder()
                         .request(
@@ -462,7 +462,7 @@ public void getParameters() {
     }
 
     @Test
-    public void getPermissions() {
+    void getPermissions() {
         mockRequest(
                 InteractionContext.builder()
                         .request(
@@ -495,7 +495,7 @@ public void getPermissions() {
     }
 
     @Test
-    public void list() {
+    void list() {
         mockRequest(
                 InteractionContext.builder()
                         .request(
@@ -570,7 +570,7 @@ public void list() {
     }
 
     @Test
-    public void listRoutes() {
+    void listRoutes() {
         mockRequest(
                 InteractionContext.builder()
                         .request(
@@ -636,7 +636,7 @@ public void listRoutes() {
     }
 
     @Test
-    public void listServiceBindings() {
+    void listServiceBindings() {
         mockRequest(
                 InteractionContext.builder()
                         .request(
@@ -699,7 +699,7 @@ public void listServiceBindings() {
     }
 
     @Test
-    public void listServiceKeys() {
+    void listServiceKeys() {
         mockRequest(
                 InteractionContext.builder()
                         .request(
@@ -755,7 +755,7 @@ public void listServiceKeys() {
     }
 
     @Test
-    public void unbindRoute() {
+    void unbindRoute() {
         mockRequest(
                 InteractionContext.builder()
                         .request(
@@ -779,7 +779,7 @@ public void unbindRoute() {
     }
 
     @Test
-    public void update() {
+    void update() {
         mockRequest(
                 InteractionContext.builder()
                         .request(
diff --git a/cloudfoundry-client-reactor/src/test/java/org/cloudfoundry/reactor/client/v2/servicekeys/ReactorServiceKeysTest.java b/cloudfoundry-client-reactor/src/test/java/org/cloudfoundry/reactor/client/v2/servicekeys/ReactorServiceKeysTest.java
index fbf2570d5de..a0e3d0f1297 100644
--- a/cloudfoundry-client-reactor/src/test/java/org/cloudfoundry/reactor/client/v2/servicekeys/ReactorServiceKeysTest.java
+++ b/cloudfoundry-client-reactor/src/test/java/org/cloudfoundry/reactor/client/v2/servicekeys/ReactorServiceKeysTest.java
@@ -39,17 +39,17 @@
 import org.cloudfoundry.reactor.TestRequest;
 import org.cloudfoundry.reactor.TestResponse;
 import org.cloudfoundry.reactor.client.AbstractClientApiTest;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import reactor.test.StepVerifier;
 
-public final class ReactorServiceKeysTest extends AbstractClientApiTest {
+final class ReactorServiceKeysTest extends AbstractClientApiTest {
 
     private final ReactorServiceKeys serviceKeys =
             new ReactorServiceKeys(
                     CONNECTION_CONTEXT, this.root, TOKEN_PROVIDER, Collections.emptyMap());
 
     @Test
-    public void create() {
+    void create() {
         mockRequest(
                 InteractionContext.builder()
                         .request(
@@ -98,7 +98,7 @@ public void create() {
     }
 
     @Test
-    public void delete() {
+    void delete() {
         mockRequest(
                 InteractionContext.builder()
                         .request(
@@ -120,7 +120,7 @@ public void delete() {
     }
 
     @Test
-    public void get() {
+    void get() {
         mockRequest(
                 InteractionContext.builder()
                         .request(
@@ -166,7 +166,7 @@ public void get() {
     }
 
     @Test
-    public void list() {
+    void list() {
         mockRequest(
                 InteractionContext.builder()
                         .request(
diff --git a/cloudfoundry-client-reactor/src/test/java/org/cloudfoundry/reactor/client/v2/serviceplans/ReactorServicePlansTest.java b/cloudfoundry-client-reactor/src/test/java/org/cloudfoundry/reactor/client/v2/serviceplans/ReactorServicePlansTest.java
index 7fa7ceb3d0f..6be9486d1b8 100644
--- a/cloudfoundry-client-reactor/src/test/java/org/cloudfoundry/reactor/client/v2/serviceplans/ReactorServicePlansTest.java
+++ b/cloudfoundry-client-reactor/src/test/java/org/cloudfoundry/reactor/client/v2/serviceplans/ReactorServicePlansTest.java
@@ -53,17 +53,17 @@
 import org.cloudfoundry.reactor.TestRequest;
 import org.cloudfoundry.reactor.TestResponse;
 import org.cloudfoundry.reactor.client.AbstractClientApiTest;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import reactor.test.StepVerifier;
 
-public final class ReactorServicePlansTest extends AbstractClientApiTest {
+final class ReactorServicePlansTest extends AbstractClientApiTest {
 
     private final ReactorServicePlans servicePlans =
             new ReactorServicePlans(
                     CONNECTION_CONTEXT, this.root, TOKEN_PROVIDER, Collections.emptyMap());
 
     @Test
-    public void delete() {
+    void delete() {
         mockRequest(
                 InteractionContext.builder()
                         .request(
@@ -85,7 +85,7 @@ public void delete() {
     }
 
     @Test
-    public void deleteAsync() {
+    void deleteAsync() {
         mockRequest(
                 InteractionContext.builder()
                         .request(
@@ -128,7 +128,7 @@ public void deleteAsync() {
     }
 
     @Test
-    public void get() {
+    void get() {
         Map<String, String> details = new HashMap<>();
         details.put(
                 "description", "Billing account number used to charge use of shared fake server.");
@@ -207,7 +207,7 @@ public void get() {
     }
 
     @Test
-    public void list() {
+    void list() {
         mockRequest(
                 InteractionContext.builder()
                         .request(
@@ -268,7 +268,7 @@ public void list() {
     }
 
     @Test
-    public void listServiceInstances() {
+    void listServiceInstances() {
         mockRequest(
                 InteractionContext.builder()
                         .request(
@@ -335,7 +335,7 @@ public void listServiceInstances() {
     }
 
     @Test
-    public void update() {
+    void update() {
         mockRequest(
                 InteractionContext.builder()
                         .request(
diff --git a/cloudfoundry-client-reactor/src/test/java/org/cloudfoundry/reactor/client/v2/serviceplanvisibilities/ReactorServicePlanVisibilitiesTest.java b/cloudfoundry-client-reactor/src/test/java/org/cloudfoundry/reactor/client/v2/serviceplanvisibilities/ReactorServicePlanVisibilitiesTest.java
index df064ee4a33..0c17705b272 100644
--- a/cloudfoundry-client-reactor/src/test/java/org/cloudfoundry/reactor/client/v2/serviceplanvisibilities/ReactorServicePlanVisibilitiesTest.java
+++ b/cloudfoundry-client-reactor/src/test/java/org/cloudfoundry/reactor/client/v2/serviceplanvisibilities/ReactorServicePlanVisibilitiesTest.java
@@ -46,17 +46,17 @@
 import org.cloudfoundry.reactor.TestRequest;
 import org.cloudfoundry.reactor.TestResponse;
 import org.cloudfoundry.reactor.client.AbstractClientApiTest;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import reactor.test.StepVerifier;
 
-public final class ReactorServicePlanVisibilitiesTest extends AbstractClientApiTest {
+final class ReactorServicePlanVisibilitiesTest extends AbstractClientApiTest {
 
     private final ServicePlanVisibilities servicePlanVisibilities =
             new ReactorServicePlanVisibilities(
                     CONNECTION_CONTEXT, this.root, TOKEN_PROVIDER, Collections.emptyMap());
 
     @Test
-    public void create() {
+    void create() {
         mockRequest(
                 InteractionContext.builder()
                         .request(
@@ -107,7 +107,7 @@ public void create() {
     }
 
     @Test
-    public void delete() {
+    void delete() {
         mockRequest(
                 InteractionContext.builder()
                         .request(
@@ -130,7 +130,7 @@ public void delete() {
     }
 
     @Test
-    public void deleteAsync() {
+    void deleteAsync() {
         mockRequest(
                 InteractionContext.builder()
                         .request(
@@ -174,7 +174,7 @@ public void deleteAsync() {
     }
 
     @Test
-    public void get() {
+    void get() {
         mockRequest(
                 InteractionContext.builder()
                         .request(
@@ -223,7 +223,7 @@ public void get() {
     }
 
     @Test
-    public void list() {
+    void list() {
         mockRequest(
                 InteractionContext.builder()
                         .request(
@@ -279,7 +279,7 @@ public void list() {
     }
 
     @Test
-    public void update() {
+    void update() {
         mockRequest(
                 InteractionContext.builder()
                         .request(
diff --git a/cloudfoundry-client-reactor/src/test/java/org/cloudfoundry/reactor/client/v2/services/ReactorServicesTest.java b/cloudfoundry-client-reactor/src/test/java/org/cloudfoundry/reactor/client/v2/services/ReactorServicesTest.java
index 031ddd8da66..8250ab197bf 100644
--- a/cloudfoundry-client-reactor/src/test/java/org/cloudfoundry/reactor/client/v2/services/ReactorServicesTest.java
+++ b/cloudfoundry-client-reactor/src/test/java/org/cloudfoundry/reactor/client/v2/services/ReactorServicesTest.java
@@ -42,17 +42,17 @@
 import org.cloudfoundry.reactor.TestRequest;
 import org.cloudfoundry.reactor.TestResponse;
 import org.cloudfoundry.reactor.client.AbstractClientApiTest;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import reactor.test.StepVerifier;
 
-public final class ReactorServicesTest extends AbstractClientApiTest {
+final class ReactorServicesTest extends AbstractClientApiTest {
 
     private final ReactorServices services =
             new ReactorServices(
                     CONNECTION_CONTEXT, this.root, TOKEN_PROVIDER, Collections.emptyMap());
 
     @Test
-    public void delete() {
+    void delete() {
         mockRequest(
                 InteractionContext.builder()
                         .request(
@@ -75,7 +75,7 @@ public void delete() {
     }
 
     @Test
-    public void deleteAsync() {
+    void deleteAsync() {
         mockRequest(
                 InteractionContext.builder()
                         .request(
@@ -118,7 +118,7 @@ public void deleteAsync() {
     }
 
     @Test
-    public void get() {
+    void get() {
         mockRequest(
                 InteractionContext.builder()
                         .request(
@@ -168,7 +168,7 @@ public void get() {
     }
 
     @Test
-    public void list() {
+    void list() {
         mockRequest(
                 InteractionContext.builder()
                         .request(
@@ -223,7 +223,7 @@ public void list() {
     }
 
     @Test
-    public void listServicePlans() {
+    void listServicePlans() {
         mockRequest(
                 InteractionContext.builder()
                         .request(
diff --git a/cloudfoundry-client-reactor/src/test/java/org/cloudfoundry/reactor/client/v2/serviceusageevents/ReactorServiceUsageEventsTest.java b/cloudfoundry-client-reactor/src/test/java/org/cloudfoundry/reactor/client/v2/serviceusageevents/ReactorServiceUsageEventsTest.java
index fcb0afd0155..f4b8855dc93 100644
--- a/cloudfoundry-client-reactor/src/test/java/org/cloudfoundry/reactor/client/v2/serviceusageevents/ReactorServiceUsageEventsTest.java
+++ b/cloudfoundry-client-reactor/src/test/java/org/cloudfoundry/reactor/client/v2/serviceusageevents/ReactorServiceUsageEventsTest.java
@@ -35,17 +35,17 @@
 import org.cloudfoundry.reactor.TestRequest;
 import org.cloudfoundry.reactor.TestResponse;
 import org.cloudfoundry.reactor.client.AbstractClientApiTest;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import reactor.test.StepVerifier;
 
-public final class ReactorServiceUsageEventsTest extends AbstractClientApiTest {
+final class ReactorServiceUsageEventsTest extends AbstractClientApiTest {
 
     private final ReactorServiceUsageEvents serviceUsageEvents =
             new ReactorServiceUsageEvents(
                     CONNECTION_CONTEXT, this.root, TOKEN_PROVIDER, Collections.emptyMap());
 
     @Test
-    public void get() {
+    void get() {
         mockRequest(
                 InteractionContext.builder()
                         .request(
@@ -102,7 +102,7 @@ public void get() {
     }
 
     @Test
-    public void list() {
+    void list() {
         mockRequest(
                 InteractionContext.builder()
                         .request(
@@ -166,7 +166,7 @@ public void list() {
     }
 
     @Test
-    public void purgeAndReseed() {
+    void purgeAndReseed() {
         mockRequest(
                 InteractionContext.builder()
                         .request(
diff --git a/cloudfoundry-client-reactor/src/test/java/org/cloudfoundry/reactor/client/v2/shareddomains/ReactorSharedDomainsTest.java b/cloudfoundry-client-reactor/src/test/java/org/cloudfoundry/reactor/client/v2/shareddomains/ReactorSharedDomainsTest.java
index c90d6248ba0..de1cf17a452 100644
--- a/cloudfoundry-client-reactor/src/test/java/org/cloudfoundry/reactor/client/v2/shareddomains/ReactorSharedDomainsTest.java
+++ b/cloudfoundry-client-reactor/src/test/java/org/cloudfoundry/reactor/client/v2/shareddomains/ReactorSharedDomainsTest.java
@@ -41,17 +41,18 @@
 import org.cloudfoundry.reactor.TestRequest;
 import org.cloudfoundry.reactor.TestResponse;
 import org.cloudfoundry.reactor.client.AbstractClientApiTest;
-import org.junit.Test;
+import org.junit.jupiter.api.Nested;
+import org.junit.jupiter.api.Test;
 import reactor.test.StepVerifier;
 
-public final class ReactorSharedDomainsTest extends AbstractClientApiTest {
+final class ReactorSharedDomainsTest extends AbstractClientApiTest {
 
     private final ReactorSharedDomains sharedDomains =
             new ReactorSharedDomains(
                     CONNECTION_CONTEXT, this.root, TOKEN_PROVIDER, Collections.emptyMap());
 
     @Test
-    public void create() {
+    void create() {
         mockRequest(
                 InteractionContext.builder()
                         .request(
@@ -97,7 +98,7 @@ public void create() {
     }
 
     @Test
-    public void delete() {
+    void delete() {
         mockRequest(
                 InteractionContext.builder()
                         .request(
@@ -120,7 +121,7 @@ public void delete() {
     }
 
     @Test
-    public void deleteAsync() {
+    void deleteAsync() {
         mockRequest(
                 InteractionContext.builder()
                         .request(
@@ -164,7 +165,7 @@ public void deleteAsync() {
     }
 
     @Test
-    public void listSharedDomains() {
+    void listSharedDomains() {
         mockRequest(
                 InteractionContext.builder()
                         .request(
@@ -267,14 +268,15 @@ public void listSharedDomains() {
                 .verify(Duration.ofSeconds(5));
     }
 
-    public static final class Get extends AbstractClientApiTest {
+    @Nested
+    public final class Get extends AbstractClientApiTest {
 
         private final ReactorSharedDomains sharedDomains =
                 new ReactorSharedDomains(
                         CONNECTION_CONTEXT, this.root, TOKEN_PROVIDER, Collections.emptyMap());
 
         @Test
-        public void get() {
+        void get() {
             mockRequest(interactionContext());
 
             this.sharedDomains
diff --git a/cloudfoundry-client-reactor/src/test/java/org/cloudfoundry/reactor/client/v2/spacequotadefinitions/ReactorSpaceQuotaDefinitionsTest.java b/cloudfoundry-client-reactor/src/test/java/org/cloudfoundry/reactor/client/v2/spacequotadefinitions/ReactorSpaceQuotaDefinitionsTest.java
index 1ccebd1fb73..b2cc4554b0f 100644
--- a/cloudfoundry-client-reactor/src/test/java/org/cloudfoundry/reactor/client/v2/spacequotadefinitions/ReactorSpaceQuotaDefinitionsTest.java
+++ b/cloudfoundry-client-reactor/src/test/java/org/cloudfoundry/reactor/client/v2/spacequotadefinitions/ReactorSpaceQuotaDefinitionsTest.java
@@ -52,17 +52,17 @@
 import org.cloudfoundry.reactor.TestRequest;
 import org.cloudfoundry.reactor.TestResponse;
 import org.cloudfoundry.reactor.client.AbstractClientApiTest;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import reactor.test.StepVerifier;
 
-public final class ReactorSpaceQuotaDefinitionsTest extends AbstractClientApiTest {
+final class ReactorSpaceQuotaDefinitionsTest extends AbstractClientApiTest {
 
     private final ReactorSpaceQuotaDefinitions spaceQuotaDefinitions =
             new ReactorSpaceQuotaDefinitions(
                     CONNECTION_CONTEXT, this.root, TOKEN_PROVIDER, Collections.emptyMap());
 
     @Test
-    public void associateSpace() {
+    void associateSpace() {
         mockRequest(
                 InteractionContext.builder()
                         .request(
@@ -117,7 +117,7 @@ public void associateSpace() {
     }
 
     @Test
-    public void create() {
+    void create() {
         mockRequest(
                 InteractionContext.builder()
                         .request(
@@ -181,7 +181,7 @@ public void create() {
     }
 
     @Test
-    public void delete() {
+    void delete() {
         mockRequest(
                 InteractionContext.builder()
                         .request(
@@ -204,7 +204,7 @@ public void delete() {
     }
 
     @Test
-    public void deleteAsync() {
+    void deleteAsync() {
         mockRequest(
                 InteractionContext.builder()
                         .request(
@@ -248,7 +248,7 @@ public void deleteAsync() {
     }
 
     @Test
-    public void getSpaceQuotaDefinition() {
+    void getSpaceQuotaDefinition() {
         mockRequest(
                 InteractionContext.builder()
                         .request(
@@ -302,7 +302,7 @@ public void getSpaceQuotaDefinition() {
     }
 
     @Test
-    public void list() {
+    void list() {
         mockRequest(
                 InteractionContext.builder()
                         .request(
@@ -357,7 +357,7 @@ public void list() {
     }
 
     @Test
-    public void listSpaces() {
+    void listSpaces() {
         mockRequest(
                 InteractionContext.builder()
                         .request(
@@ -437,7 +437,7 @@ public void listSpaces() {
     }
 
     @Test
-    public void removeSpace() {
+    void removeSpace() {
         mockRequest(
                 InteractionContext.builder()
                         .request(
@@ -461,7 +461,7 @@ public void removeSpace() {
     }
 
     @Test
-    public void update() {
+    void update() {
         mockRequest(
                 InteractionContext.builder()
                         .request(
diff --git a/cloudfoundry-client-reactor/src/test/java/org/cloudfoundry/reactor/client/v2/spaces/ReactorSpacesTest.java b/cloudfoundry-client-reactor/src/test/java/org/cloudfoundry/reactor/client/v2/spaces/ReactorSpacesTest.java
index 670f6c06f3b..9064651bdd2 100644
--- a/cloudfoundry-client-reactor/src/test/java/org/cloudfoundry/reactor/client/v2/spaces/ReactorSpacesTest.java
+++ b/cloudfoundry-client-reactor/src/test/java/org/cloudfoundry/reactor/client/v2/spaces/ReactorSpacesTest.java
@@ -122,17 +122,17 @@
 import org.cloudfoundry.reactor.TestResponse;
 import org.cloudfoundry.reactor.client.AbstractClientApiTest;
 import org.cloudfoundry.util.FluentMap;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import reactor.test.StepVerifier;
 
-public final class ReactorSpacesTest extends AbstractClientApiTest {
+final class ReactorSpacesTest extends AbstractClientApiTest {
 
     private final ReactorSpaces spaces =
             new ReactorSpaces(
                     CONNECTION_CONTEXT, this.root, TOKEN_PROVIDER, Collections.emptyMap());
 
     @Test
-    public void associateAuditor() {
+    void associateAuditor() {
         mockRequest(
                 InteractionContext.builder()
                         .request(
@@ -199,7 +199,7 @@ public void associateAuditor() {
     }
 
     @Test
-    public void associateAuditorByUsername() {
+    void associateAuditorByUsername() {
         mockRequest(
                 InteractionContext.builder()
                         .request(
@@ -268,7 +268,7 @@ public void associateAuditorByUsername() {
     }
 
     @Test
-    public void associateDeveloper() {
+    void associateDeveloper() {
         mockRequest(
                 InteractionContext.builder()
                         .request(
@@ -335,7 +335,7 @@ public void associateDeveloper() {
     }
 
     @Test
-    public void associateManager() {
+    void associateManager() {
         mockRequest(
                 InteractionContext.builder()
                         .request(
@@ -402,7 +402,7 @@ public void associateManager() {
     }
 
     @Test
-    public void associateSecurityGroup() {
+    void associateSecurityGroup() {
         mockRequest(
                 InteractionContext.builder()
                         .request(
@@ -470,7 +470,7 @@ public void associateSecurityGroup() {
     }
 
     @Test
-    public void associateSpaceDeveloperByUsername() {
+    void associateSpaceDeveloperByUsername() {
         mockRequest(
                 InteractionContext.builder()
                         .request(
@@ -539,7 +539,7 @@ public void associateSpaceDeveloperByUsername() {
     }
 
     @Test
-    public void associateSpaceManagerByUsername() {
+    void associateSpaceManagerByUsername() {
         mockRequest(
                 InteractionContext.builder()
                         .request(
@@ -608,7 +608,7 @@ public void associateSpaceManagerByUsername() {
     }
 
     @Test
-    public void create() {
+    void create() {
         mockRequest(
                 InteractionContext.builder()
                         .request(
@@ -675,7 +675,7 @@ public void create() {
     }
 
     @Test
-    public void delete() {
+    void delete() {
         mockRequest(
                 InteractionContext.builder()
                         .request(
@@ -694,7 +694,7 @@ public void delete() {
     }
 
     @Test
-    public void deleteAsync() {
+    void deleteAsync() {
         mockRequest(
                 InteractionContext.builder()
                         .request(
@@ -733,7 +733,7 @@ public void deleteAsync() {
     }
 
     @Test
-    public void deleteRecursive() {
+    void deleteRecursive() {
         mockRequest(
                 InteractionContext.builder()
                         .request(
@@ -756,7 +756,7 @@ public void deleteRecursive() {
     }
 
     @Test
-    public void get() {
+    void get() {
         mockRequest(
                 InteractionContext.builder()
                         .request(
@@ -819,7 +819,7 @@ public void get() {
 
     @SuppressWarnings("deprecation")
     @Test
-    public void getSummary() {
+    void getSummary() {
         mockRequest(
                 InteractionContext.builder()
                         .request(
@@ -917,7 +917,7 @@ public void getSummary() {
     }
 
     @Test
-    public void list() {
+    void list() {
         mockRequest(
                 InteractionContext.builder()
                         .request(
@@ -986,7 +986,7 @@ public void list() {
 
     @SuppressWarnings("deprecation")
     @Test
-    public void listApplications() {
+    void listApplications() {
         mockRequest(
                 InteractionContext.builder()
                         .request(
@@ -1071,7 +1071,7 @@ public void listApplications() {
     }
 
     @Test
-    public void listAuditors() {
+    void listAuditors() {
         mockRequest(
                 InteractionContext.builder()
                         .request(
@@ -1134,7 +1134,7 @@ public void listAuditors() {
     }
 
     @Test
-    public void listDevelopers() {
+    void listDevelopers() {
         mockRequest(
                 InteractionContext.builder()
                         .request(
@@ -1197,7 +1197,7 @@ public void listDevelopers() {
     }
 
     @Test
-    public void listDomains() {
+    void listDomains() {
         mockRequest(
                 InteractionContext.builder()
                         .request(
@@ -1257,7 +1257,7 @@ public void listDomains() {
     }
 
     @Test
-    public void listEvents() {
+    void listEvents() {
         mockRequest(
                 InteractionContext.builder()
                         .request(
@@ -1322,7 +1322,7 @@ public void listEvents() {
     }
 
     @Test
-    public void listManagers() {
+    void listManagers() {
         mockRequest(
                 InteractionContext.builder()
                         .request(
@@ -1385,7 +1385,7 @@ public void listManagers() {
     }
 
     @Test
-    public void listRoutes() {
+    void listRoutes() {
         mockRequest(
                 InteractionContext.builder()
                         .request(
@@ -1444,7 +1444,7 @@ public void listRoutes() {
     }
 
     @Test
-    public void listSecurityGroups() {
+    void listSecurityGroups() {
         mockRequest(
                 InteractionContext.builder()
                         .request(
@@ -1503,7 +1503,7 @@ public void listSecurityGroups() {
     }
 
     @Test
-    public void listServiceInstances() {
+    void listServiceInstances() {
         mockRequest(
                 InteractionContext.builder()
                         .request(
@@ -1570,7 +1570,7 @@ public void listServiceInstances() {
     }
 
     @Test
-    public void listServices() {
+    void listServices() {
         mockRequest(
                 InteractionContext.builder()
                         .request(
@@ -1630,7 +1630,7 @@ public void listServices() {
     }
 
     @Test
-    public void listUserRoles() {
+    void listUserRoles() {
         mockRequest(
                 InteractionContext.builder()
                         .request(
@@ -1696,7 +1696,7 @@ public void listUserRoles() {
     }
 
     @Test
-    public void removeAuditor() {
+    void removeAuditor() {
         mockRequest(
                 InteractionContext.builder()
                         .request(
@@ -1719,7 +1719,7 @@ public void removeAuditor() {
     }
 
     @Test
-    public void removeAuditorByUsername() {
+    void removeAuditorByUsername() {
         mockRequest(
                 InteractionContext.builder()
                         .request(
@@ -1788,7 +1788,7 @@ public void removeAuditorByUsername() {
     }
 
     @Test
-    public void removeDeveloper() {
+    void removeDeveloper() {
         mockRequest(
                 InteractionContext.builder()
                         .request(
@@ -1811,7 +1811,7 @@ public void removeDeveloper() {
     }
 
     @Test
-    public void removeDeveloperByUsername() {
+    void removeDeveloperByUsername() {
         mockRequest(
                 InteractionContext.builder()
                         .request(
@@ -1880,7 +1880,7 @@ public void removeDeveloperByUsername() {
     }
 
     @Test
-    public void removeManager() {
+    void removeManager() {
         mockRequest(
                 InteractionContext.builder()
                         .request(
@@ -1903,7 +1903,7 @@ public void removeManager() {
     }
 
     @Test
-    public void removeManagerByUsername() {
+    void removeManagerByUsername() {
         mockRequest(
                 InteractionContext.builder()
                         .request(
@@ -1972,7 +1972,7 @@ public void removeManagerByUsername() {
     }
 
     @Test
-    public void removeSecurityGroup() {
+    void removeSecurityGroup() {
         mockRequest(
                 InteractionContext.builder()
                         .request(
@@ -1996,7 +1996,7 @@ public void removeSecurityGroup() {
     }
 
     @Test
-    public void update() {
+    void update() {
         mockRequest(
                 InteractionContext.builder()
                         .request(
diff --git a/cloudfoundry-client-reactor/src/test/java/org/cloudfoundry/reactor/client/v2/stacks/ReactorStacksTest.java b/cloudfoundry-client-reactor/src/test/java/org/cloudfoundry/reactor/client/v2/stacks/ReactorStacksTest.java
index f5fad758c6b..0888b7aee0f 100644
--- a/cloudfoundry-client-reactor/src/test/java/org/cloudfoundry/reactor/client/v2/stacks/ReactorStacksTest.java
+++ b/cloudfoundry-client-reactor/src/test/java/org/cloudfoundry/reactor/client/v2/stacks/ReactorStacksTest.java
@@ -40,17 +40,17 @@
 import org.cloudfoundry.reactor.TestRequest;
 import org.cloudfoundry.reactor.TestResponse;
 import org.cloudfoundry.reactor.client.AbstractClientApiTest;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import reactor.test.StepVerifier;
 
-public final class ReactorStacksTest extends AbstractClientApiTest {
+final class ReactorStacksTest extends AbstractClientApiTest {
 
     private final ReactorStacks stacks =
             new ReactorStacks(
                     CONNECTION_CONTEXT, this.root, TOKEN_PROVIDER, Collections.emptyMap());
 
     @Test
-    public void create() {
+    void create() {
         mockRequest(
                 InteractionContext.builder()
                         .request(
@@ -94,7 +94,7 @@ public void create() {
     }
 
     @Test
-    public void delete() {
+    void delete() {
         mockRequest(
                 InteractionContext.builder()
                         .request(
@@ -113,7 +113,7 @@ public void delete() {
     }
 
     @Test
-    public void deleteAsync() {
+    void deleteAsync() {
         mockRequest(
                 InteractionContext.builder()
                         .request(
@@ -152,7 +152,7 @@ public void deleteAsync() {
     }
 
     @Test
-    public void get() {
+    void get() {
         mockRequest(
                 InteractionContext.builder()
                         .request(
@@ -190,7 +190,7 @@ public void get() {
     }
 
     @Test
-    public void list() {
+    void list() {
         mockRequest(
                 InteractionContext.builder()
                         .request(
diff --git a/cloudfoundry-client-reactor/src/test/java/org/cloudfoundry/reactor/client/v2/userprovidedserviceinstances/ReactorUserProvidedServiceInstancesTest.java b/cloudfoundry-client-reactor/src/test/java/org/cloudfoundry/reactor/client/v2/userprovidedserviceinstances/ReactorUserProvidedServiceInstancesTest.java
index adedafe4304..aafc8a246d2 100644
--- a/cloudfoundry-client-reactor/src/test/java/org/cloudfoundry/reactor/client/v2/userprovidedserviceinstances/ReactorUserProvidedServiceInstancesTest.java
+++ b/cloudfoundry-client-reactor/src/test/java/org/cloudfoundry/reactor/client/v2/userprovidedserviceinstances/ReactorUserProvidedServiceInstancesTest.java
@@ -54,17 +54,17 @@
 import org.cloudfoundry.reactor.TestRequest;
 import org.cloudfoundry.reactor.TestResponse;
 import org.cloudfoundry.reactor.client.AbstractClientApiTest;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import reactor.test.StepVerifier;
 
-public final class ReactorUserProvidedServiceInstancesTest extends AbstractClientApiTest {
+final class ReactorUserProvidedServiceInstancesTest extends AbstractClientApiTest {
 
     private final ReactorUserProvidedServiceInstances userProvidedServiceInstances =
             new ReactorUserProvidedServiceInstances(
                     CONNECTION_CONTEXT, this.root, TOKEN_PROVIDER, Collections.emptyMap());
 
     @Test
-    public void associateRoute() {
+    void associateRoute() {
         mockRequest(
                 InteractionContext.builder()
                         .request(
@@ -121,7 +121,7 @@ public void associateRoute() {
     }
 
     @Test
-    public void create() {
+    void create() {
         mockRequest(
                 InteractionContext.builder()
                         .request(
@@ -181,7 +181,7 @@ public void create() {
     }
 
     @Test
-    public void delete() {
+    void delete() {
         mockRequest(
                 InteractionContext.builder()
                         .request(
@@ -205,7 +205,7 @@ public void delete() {
     }
 
     @Test
-    public void get() {
+    void get() {
         mockRequest(
                 InteractionContext.builder()
                         .request(
@@ -260,7 +260,7 @@ public void get() {
     }
 
     @Test
-    public void list() {
+    void list() {
         mockRequest(
                 InteractionContext.builder()
                         .request(
@@ -319,7 +319,7 @@ public void list() {
     }
 
     @Test
-    public void listRoutes() {
+    void listRoutes() {
         mockRequest(
                 InteractionContext.builder()
                         .request(
@@ -386,7 +386,7 @@ public void listRoutes() {
     }
 
     @Test
-    public void listServiceBindings() {
+    void listServiceBindings() {
         mockRequest(
                 InteractionContext.builder()
                         .request(
@@ -449,7 +449,7 @@ public void listServiceBindings() {
     }
 
     @Test
-    public void removeRoute() {
+    void removeRoute() {
         mockRequest(
                 InteractionContext.builder()
                         .request(
@@ -474,7 +474,7 @@ public void removeRoute() {
     }
 
     @Test
-    public void update() {
+    void update() {
         mockRequest(
                 InteractionContext.builder()
                         .request(
@@ -533,7 +533,7 @@ public void update() {
     }
 
     @Test
-    public void updateWithEmptyCredentials() {
+    void updateWithEmptyCredentials() {
         mockRequest(
                 InteractionContext.builder()
                         .request(
diff --git a/cloudfoundry-client-reactor/src/test/java/org/cloudfoundry/reactor/client/v2/users/ReactorUsersTest.java b/cloudfoundry-client-reactor/src/test/java/org/cloudfoundry/reactor/client/v2/users/ReactorUsersTest.java
index d5ff9f0ebb1..365368e872e 100644
--- a/cloudfoundry-client-reactor/src/test/java/org/cloudfoundry/reactor/client/v2/users/ReactorUsersTest.java
+++ b/cloudfoundry-client-reactor/src/test/java/org/cloudfoundry/reactor/client/v2/users/ReactorUsersTest.java
@@ -90,16 +90,16 @@
 import org.cloudfoundry.reactor.TestRequest;
 import org.cloudfoundry.reactor.TestResponse;
 import org.cloudfoundry.reactor.client.AbstractClientApiTest;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import reactor.test.StepVerifier;
 
-public final class ReactorUsersTest extends AbstractClientApiTest {
+final class ReactorUsersTest extends AbstractClientApiTest {
 
     private final ReactorUsers users =
             new ReactorUsers(CONNECTION_CONTEXT, this.root, TOKEN_PROVIDER, Collections.emptyMap());
 
     @Test
-    public void associateAuditedOrganization() {
+    void associateAuditedOrganization() {
         mockRequest(
                 InteractionContext.builder()
                         .request(
@@ -160,7 +160,7 @@ public void associateAuditedOrganization() {
     }
 
     @Test
-    public void associateAuditedSpace() {
+    void associateAuditedSpace() {
         mockRequest(
                 InteractionContext.builder()
                         .request(
@@ -221,7 +221,7 @@ public void associateAuditedSpace() {
     }
 
     @Test
-    public void associateBillingManagedOrganization() {
+    void associateBillingManagedOrganization() {
         mockRequest(
                 InteractionContext.builder()
                         .request(
@@ -283,7 +283,7 @@ public void associateBillingManagedOrganization() {
     }
 
     @Test
-    public void associateManagedOrganization() {
+    void associateManagedOrganization() {
         mockRequest(
                 InteractionContext.builder()
                         .request(
@@ -344,7 +344,7 @@ public void associateManagedOrganization() {
     }
 
     @Test
-    public void associateManagedSpace() {
+    void associateManagedSpace() {
         mockRequest(
                 InteractionContext.builder()
                         .request(
@@ -405,7 +405,7 @@ public void associateManagedSpace() {
     }
 
     @Test
-    public void associateOrganization() {
+    void associateOrganization() {
         mockRequest(
                 InteractionContext.builder()
                         .request(
@@ -466,7 +466,7 @@ public void associateOrganization() {
     }
 
     @Test
-    public void associateSpace() {
+    void associateSpace() {
         mockRequest(
                 InteractionContext.builder()
                         .request(
@@ -527,7 +527,7 @@ public void associateSpace() {
     }
 
     @Test
-    public void create() {
+    void create() {
         mockRequest(
                 InteractionContext.builder()
                         .request(
@@ -584,7 +584,7 @@ public void create() {
     }
 
     @Test
-    public void delete() {
+    void delete() {
         mockRequest(
                 InteractionContext.builder()
                         .request(
@@ -603,7 +603,7 @@ public void delete() {
     }
 
     @Test
-    public void get() {
+    void get() {
         mockRequest(
                 InteractionContext.builder()
                         .request(
@@ -655,7 +655,7 @@ public void get() {
     }
 
     @Test
-    public void list() {
+    void list() {
         mockRequest(
                 InteractionContext.builder()
                         .request(TestRequest.builder().method(GET).path("/users?page=-1").build())
@@ -740,7 +740,7 @@ public void list() {
     }
 
     @Test
-    public void listAuditedOrganizations() {
+    void listAuditedOrganizations() {
         mockRequest(
                 InteractionContext.builder()
                         .request(
@@ -810,7 +810,7 @@ public void listAuditedOrganizations() {
     }
 
     @Test
-    public void listAuditedSpaces() {
+    void listAuditedSpaces() {
         mockRequest(
                 InteractionContext.builder()
                         .request(
@@ -883,7 +883,7 @@ public void listAuditedSpaces() {
     }
 
     @Test
-    public void listBillingManagedOrganizations() {
+    void listBillingManagedOrganizations() {
         mockRequest(
                 InteractionContext.builder()
                         .request(
@@ -955,7 +955,7 @@ public void listBillingManagedOrganizations() {
     }
 
     @Test
-    public void listManagedOrganizations() {
+    void listManagedOrganizations() {
         mockRequest(
                 InteractionContext.builder()
                         .request(
@@ -1025,7 +1025,7 @@ public void listManagedOrganizations() {
     }
 
     @Test
-    public void listManagedSpaces() {
+    void listManagedSpaces() {
         mockRequest(
                 InteractionContext.builder()
                         .request(
@@ -1098,7 +1098,7 @@ public void listManagedSpaces() {
     }
 
     @Test
-    public void listOrganizations() {
+    void listOrganizations() {
         mockRequest(
                 InteractionContext.builder()
                         .request(
@@ -1168,7 +1168,7 @@ public void listOrganizations() {
     }
 
     @Test
-    public void listSpaces() {
+    void listSpaces() {
         mockRequest(
                 InteractionContext.builder()
                         .request(
@@ -1240,7 +1240,7 @@ public void listSpaces() {
     }
 
     @Test
-    public void removeAuditedOrganization() {
+    void removeAuditedOrganization() {
         mockRequest(
                 InteractionContext.builder()
                         .request(
@@ -1264,7 +1264,7 @@ public void removeAuditedOrganization() {
     }
 
     @Test
-    public void removeAuditedSpace() {
+    void removeAuditedSpace() {
         mockRequest(
                 InteractionContext.builder()
                         .request(
@@ -1288,7 +1288,7 @@ public void removeAuditedSpace() {
     }
 
     @Test
-    public void removeBillingManagedOrganization() {
+    void removeBillingManagedOrganization() {
         mockRequest(
                 InteractionContext.builder()
                         .request(
@@ -1313,7 +1313,7 @@ public void removeBillingManagedOrganization() {
     }
 
     @Test
-    public void removeManagedOrganization() {
+    void removeManagedOrganization() {
         mockRequest(
                 InteractionContext.builder()
                         .request(
@@ -1337,7 +1337,7 @@ public void removeManagedOrganization() {
     }
 
     @Test
-    public void removeManagedSpace() {
+    void removeManagedSpace() {
         mockRequest(
                 InteractionContext.builder()
                         .request(
@@ -1361,7 +1361,7 @@ public void removeManagedSpace() {
     }
 
     @Test
-    public void removeOrganization() {
+    void removeOrganization() {
         mockRequest(
                 InteractionContext.builder()
                         .request(
@@ -1385,7 +1385,7 @@ public void removeOrganization() {
     }
 
     @Test
-    public void removeSpace() {
+    void removeSpace() {
         mockRequest(
                 InteractionContext.builder()
                         .request(
@@ -1410,7 +1410,7 @@ public void removeSpace() {
 
     @SuppressWarnings("deprecation")
     @Test
-    public void summary() {
+    void summary() {
         mockRequest(
                 InteractionContext.builder()
                         .request(
@@ -1902,7 +1902,7 @@ public void summary() {
     }
 
     @Test
-    public void update() {
+    void update() {
         mockRequest(
                 InteractionContext.builder()
                         .request(
diff --git a/cloudfoundry-client-reactor/src/test/java/org/cloudfoundry/reactor/client/v3/FilterBuilderTest.java b/cloudfoundry-client-reactor/src/test/java/org/cloudfoundry/reactor/client/v3/FilterBuilderTest.java
index 48d9f0b6d8e..efc2d007557 100644
--- a/cloudfoundry-client-reactor/src/test/java/org/cloudfoundry/reactor/client/v3/FilterBuilderTest.java
+++ b/cloudfoundry-client-reactor/src/test/java/org/cloudfoundry/reactor/client/v3/FilterBuilderTest.java
@@ -25,14 +25,14 @@
 import org.cloudfoundry.client.v3.FilterParameter;
 import org.cloudfoundry.reactor.util.UriQueryParameter;
 import org.cloudfoundry.reactor.util.UriQueryParameters;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.springframework.util.MultiValueMap;
 import org.springframework.web.util.UriComponentsBuilder;
 
-public final class FilterBuilderTest {
+final class FilterBuilderTest {
 
     @Test
-    public void test() {
+    void test() {
         UriComponentsBuilder builder = UriComponentsBuilder.newInstance();
 
         Stream<UriQueryParameter> parameters =
diff --git a/cloudfoundry-client-reactor/src/test/java/org/cloudfoundry/reactor/client/v3/admin/ReactorAdminV3Test.java b/cloudfoundry-client-reactor/src/test/java/org/cloudfoundry/reactor/client/v3/admin/ReactorAdminV3Test.java
index ff7b2787a9d..5d5e2594723 100644
--- a/cloudfoundry-client-reactor/src/test/java/org/cloudfoundry/reactor/client/v3/admin/ReactorAdminV3Test.java
+++ b/cloudfoundry-client-reactor/src/test/java/org/cloudfoundry/reactor/client/v3/admin/ReactorAdminV3Test.java
@@ -26,17 +26,17 @@
 import org.cloudfoundry.reactor.TestRequest;
 import org.cloudfoundry.reactor.TestResponse;
 import org.cloudfoundry.reactor.client.AbstractClientApiTest;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import reactor.test.StepVerifier;
 
-public final class ReactorAdminV3Test extends AbstractClientApiTest {
+final class ReactorAdminV3Test extends AbstractClientApiTest {
 
     private final ReactorAdminV3 admin =
             new ReactorAdminV3(
                     CONNECTION_CONTEXT, this.root, TOKEN_PROVIDER, Collections.emptyMap());
 
     @Test
-    public void clearBuildpackCache() {
+    void clearBuildpackCache() {
         mockRequest(
                 InteractionContext.builder()
                         .request(
diff --git a/cloudfoundry-client-reactor/src/test/java/org/cloudfoundry/reactor/client/v3/applications/ReactorApplicationsV3Test.java b/cloudfoundry-client-reactor/src/test/java/org/cloudfoundry/reactor/client/v3/applications/ReactorApplicationsV3Test.java
index 2cdf3bad4c3..4dc2ec79c0a 100644
--- a/cloudfoundry-client-reactor/src/test/java/org/cloudfoundry/reactor/client/v3/applications/ReactorApplicationsV3Test.java
+++ b/cloudfoundry-client-reactor/src/test/java/org/cloudfoundry/reactor/client/v3/applications/ReactorApplicationsV3Test.java
@@ -130,17 +130,17 @@
 import org.cloudfoundry.reactor.TestResponse;
 import org.cloudfoundry.reactor.client.AbstractClientApiTest;
 import org.cloudfoundry.util.FluentMap;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import reactor.test.StepVerifier;
 
-public final class ReactorApplicationsV3Test extends AbstractClientApiTest {
+final class ReactorApplicationsV3Test extends AbstractClientApiTest {
 
     private final ReactorApplicationsV3 applications =
             new ReactorApplicationsV3(
                     CONNECTION_CONTEXT, this.root, TOKEN_PROVIDER, Collections.emptyMap());
 
     @Test
-    public void create() {
+    void create() {
         mockRequest(
                 InteractionContext.builder()
                         .request(
@@ -284,7 +284,7 @@ public void create() {
     }
 
     @Test
-    public void delete() {
+    void delete() {
         mockRequest(
                 InteractionContext.builder()
                         .request(
@@ -313,7 +313,7 @@ public void delete() {
     }
 
     @Test
-    public void get() {
+    void get() {
         mockRequest(
                 InteractionContext.builder()
                         .request(
@@ -438,7 +438,7 @@ public void get() {
     }
 
     @Test
-    public void getCurrentDroplet() {
+    void getCurrentDroplet() {
         mockRequest(
                 InteractionContext.builder()
                         .request(
@@ -519,7 +519,7 @@ public void getCurrentDroplet() {
     }
 
     @Test
-    public void getCurrentDropletRelationship() {
+    void getCurrentDropletRelationship() {
         mockRequest(
                 InteractionContext.builder()
                         .request(
@@ -566,7 +566,7 @@ public void getCurrentDropletRelationship() {
     }
 
     @Test
-    public void getEnvironment() {
+    void getEnvironment() {
         mockRequest(
                 InteractionContext.builder()
                         .request(
@@ -658,7 +658,7 @@ public void getEnvironment() {
     }
 
     @Test
-    public void getEnvironmentVariables() {
+    void getEnvironmentVariables() {
         mockRequest(
                 InteractionContext.builder()
                         .request(
@@ -700,7 +700,7 @@ public void getEnvironmentVariables() {
     }
 
     @Test
-    public void getFeature() {
+    void getFeature() {
         mockRequest(
                 InteractionContext.builder()
                         .request(
@@ -735,7 +735,7 @@ public void getFeature() {
     }
 
     @Test
-    public void getPermissions() {
+    void getPermissions() {
         mockRequest(
                 InteractionContext.builder()
                         .request(
@@ -767,7 +767,7 @@ public void getPermissions() {
     }
 
     @Test
-    public void getProcess() {
+    void getProcess() {
         mockRequest(
                 InteractionContext.builder()
                         .request(
@@ -852,7 +852,7 @@ public void getProcess() {
     }
 
     @Test
-    public void getProcessStatistics() {
+    void getProcessStatistics() {
         mockRequest(
                 InteractionContext.builder()
                         .request(
@@ -909,7 +909,7 @@ public void getProcessStatistics() {
     }
 
     @Test
-    public void getSshEnabled() {
+    void getSshEnabled() {
         mockRequest(
                 InteractionContext.builder()
                         .request(
@@ -941,7 +941,7 @@ public void getSshEnabled() {
     }
 
     @Test
-    public void list() {
+    void list() {
         mockRequest(
                 InteractionContext.builder()
                         .request(TestRequest.builder().method(GET).path("/apps").build())
@@ -1184,7 +1184,7 @@ public void list() {
     }
 
     @Test
-    public void listBuilds() {
+    void listBuilds() {
         mockRequest(
                 InteractionContext.builder()
                         .request(
@@ -1271,7 +1271,7 @@ public void listBuilds() {
     }
 
     @Test
-    public void listDroplets() {
+    void listDroplets() {
         mockRequest(
                 InteractionContext.builder()
                         .request(
@@ -1419,7 +1419,7 @@ public void listDroplets() {
     }
 
     @Test
-    public void listFeatures() {
+    void listFeatures() {
         mockRequest(
                 InteractionContext.builder()
                         .request(
@@ -1476,7 +1476,7 @@ public void listFeatures() {
     }
 
     @Test
-    public void listPackages() {
+    void listPackages() {
         mockRequest(
                 InteractionContext.builder()
                         .request(
@@ -1566,7 +1566,7 @@ public void listPackages() {
     }
 
     @Test
-    public void listProcesses() {
+    void listProcesses() {
         mockRequest(
                 InteractionContext.builder()
                         .request(
@@ -1732,7 +1732,7 @@ public void listProcesses() {
     }
 
     @Test
-    public void listRoutes() {
+    void listRoutes() {
         mockRequest(
                 InteractionContext.builder()
                         .request(
@@ -1876,7 +1876,7 @@ public void listRoutes() {
     }
 
     @Test
-    public void listTasks() {
+    void listTasks() {
         mockRequest(
                 InteractionContext.builder()
                         .request(
@@ -2006,7 +2006,7 @@ public void listTasks() {
     }
 
     @Test
-    public void scale() {
+    void scale() {
         mockRequest(
                 InteractionContext.builder()
                         .request(
@@ -2097,7 +2097,7 @@ public void scale() {
     }
 
     @Test
-    public void setCurrentDroplet() {
+    void setCurrentDroplet() {
         mockRequest(
                 InteractionContext.builder()
                         .request(
@@ -2147,7 +2147,7 @@ public void setCurrentDroplet() {
     }
 
     @Test
-    public void start() {
+    void start() {
         mockRequest(
                 InteractionContext.builder()
                         .request(
@@ -2270,7 +2270,7 @@ public void start() {
     }
 
     @Test
-    public void stop() {
+    void stop() {
         mockRequest(
                 InteractionContext.builder()
                         .request(
@@ -2390,7 +2390,7 @@ public void stop() {
     }
 
     @Test
-    public void terminateInstance() {
+    void terminateInstance() {
         mockRequest(
                 InteractionContext.builder()
                         .request(
@@ -2415,7 +2415,7 @@ public void terminateInstance() {
     }
 
     @Test
-    public void update() {
+    void update() {
         mockRequest(
                 InteractionContext.builder()
                         .request(
@@ -2559,7 +2559,7 @@ public void update() {
     }
 
     @Test
-    public void updateEnvironmentVariables() {
+    void updateEnvironmentVariables() {
         mockRequest(
                 InteractionContext.builder()
                         .request(
@@ -2605,7 +2605,7 @@ public void updateEnvironmentVariables() {
     }
 
     @Test
-    public void updateFeature() {
+    void updateFeature() {
         mockRequest(
                 InteractionContext.builder()
                         .request(
diff --git a/cloudfoundry-client-reactor/src/test/java/org/cloudfoundry/reactor/client/v3/auditevents/ReactorAuditEventsV3Test.java b/cloudfoundry-client-reactor/src/test/java/org/cloudfoundry/reactor/client/v3/auditevents/ReactorAuditEventsV3Test.java
index e19fc943e78..a1f8c8e9682 100644
--- a/cloudfoundry-client-reactor/src/test/java/org/cloudfoundry/reactor/client/v3/auditevents/ReactorAuditEventsV3Test.java
+++ b/cloudfoundry-client-reactor/src/test/java/org/cloudfoundry/reactor/client/v3/auditevents/ReactorAuditEventsV3Test.java
@@ -35,17 +35,17 @@
 import org.cloudfoundry.reactor.TestRequest;
 import org.cloudfoundry.reactor.TestResponse;
 import org.cloudfoundry.reactor.client.AbstractClientApiTest;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import reactor.test.StepVerifier;
 
-public class ReactorAuditEventsV3Test extends AbstractClientApiTest {
+class ReactorAuditEventsV3Test extends AbstractClientApiTest {
 
     private final ReactorAuditEventsV3 events =
             new ReactorAuditEventsV3(
                     CONNECTION_CONTEXT, this.root, TOKEN_PROVIDER, Collections.emptyMap());
 
     @Test
-    public void get() {
+    void get() {
         mockRequest(
                 InteractionContext.builder()
                         .request(
@@ -106,7 +106,7 @@ public void get() {
     }
 
     @Test
-    public void list() {
+    void list() {
         mockRequest(
                 InteractionContext.builder()
                         .request(TestRequest.builder().method(GET).path("/audit_events").build())
diff --git a/cloudfoundry-client-reactor/src/test/java/org/cloudfoundry/reactor/client/v3/buildpacks/ReactorBuildpacksTest.java b/cloudfoundry-client-reactor/src/test/java/org/cloudfoundry/reactor/client/v3/buildpacks/ReactorBuildpacksTest.java
index e4b8120c81b..7913028573d 100644
--- a/cloudfoundry-client-reactor/src/test/java/org/cloudfoundry/reactor/client/v3/buildpacks/ReactorBuildpacksTest.java
+++ b/cloudfoundry-client-reactor/src/test/java/org/cloudfoundry/reactor/client/v3/buildpacks/ReactorBuildpacksTest.java
@@ -51,18 +51,18 @@
 import org.cloudfoundry.reactor.TestResponse;
 import org.cloudfoundry.reactor.client.AbstractClientApiTest;
 import org.cloudfoundry.reactor.client.v3.builpacks.ReactorBuildpacksV3;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.springframework.core.io.ClassPathResource;
 import reactor.test.StepVerifier;
 
-public final class ReactorBuildpacksTest extends AbstractClientApiTest {
+final class ReactorBuildpacksTest extends AbstractClientApiTest {
 
     private final ReactorBuildpacksV3 buildpacks =
             new ReactorBuildpacksV3(
                     CONNECTION_CONTEXT, this.root, TOKEN_PROVIDER, Collections.emptyMap());
 
     @Test
-    public void create() {
+    void create() {
         mockRequest(
                 InteractionContext.builder()
                         .request(
@@ -123,7 +123,7 @@ public void create() {
     }
 
     @Test
-    public void delete() {
+    void delete() {
         mockRequest(
                 InteractionContext.builder()
                         .request(
@@ -149,7 +149,7 @@ public void delete() {
     }
 
     @Test
-    public void get() {
+    void get() {
         mockRequest(
                 InteractionContext.builder()
                         .request(
@@ -203,7 +203,7 @@ public void get() {
     }
 
     @Test
-    public void list() {
+    void list() {
         mockRequest(
                 InteractionContext.builder()
                         .request(TestRequest.builder().method(GET).path("/buildpacks").build())
@@ -275,7 +275,7 @@ public void list() {
     }
 
     @Test
-    public void update() {
+    void update() {
         mockRequest(
                 InteractionContext.builder()
                         .request(
@@ -339,7 +339,7 @@ public void update() {
     }
 
     @Test
-    public void upload() throws IOException {
+    void upload() throws IOException {
         mockRequest(
                 InteractionContext.builder()
                         .request(
diff --git a/cloudfoundry-client-reactor/src/test/java/org/cloudfoundry/reactor/client/v3/builds/ReactorBuildsTest.java b/cloudfoundry-client-reactor/src/test/java/org/cloudfoundry/reactor/client/v3/builds/ReactorBuildsTest.java
index e3917394cf8..c250c0b6a63 100644
--- a/cloudfoundry-client-reactor/src/test/java/org/cloudfoundry/reactor/client/v3/builds/ReactorBuildsTest.java
+++ b/cloudfoundry-client-reactor/src/test/java/org/cloudfoundry/reactor/client/v3/builds/ReactorBuildsTest.java
@@ -43,17 +43,17 @@
 import org.cloudfoundry.reactor.TestRequest;
 import org.cloudfoundry.reactor.TestResponse;
 import org.cloudfoundry.reactor.client.AbstractClientApiTest;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import reactor.test.StepVerifier;
 
-public final class ReactorBuildsTest extends AbstractClientApiTest {
+final class ReactorBuildsTest extends AbstractClientApiTest {
 
     private final ReactorBuilds builds =
             new ReactorBuilds(
                     CONNECTION_CONTEXT, this.root, TOKEN_PROVIDER, Collections.emptyMap());
 
     @Test
-    public void create() {
+    void create() {
         mockRequest(
                 InteractionContext.builder()
                         .request(
@@ -120,7 +120,7 @@ public void create() {
     }
 
     @Test
-    public void get() {
+    void get() {
         mockRequest(
                 InteractionContext.builder()
                         .request(
@@ -186,7 +186,7 @@ public void get() {
     }
 
     @Test
-    public void list() {
+    void list() {
         mockRequest(
                 InteractionContext.builder()
                         .request(TestRequest.builder().method(GET).path("/builds").build())
diff --git a/cloudfoundry-client-reactor/src/test/java/org/cloudfoundry/reactor/client/v3/deployments/ReactorDeploymentsV3Test.java b/cloudfoundry-client-reactor/src/test/java/org/cloudfoundry/reactor/client/v3/deployments/ReactorDeploymentsV3Test.java
index 303c81646ea..97f66771414 100644
--- a/cloudfoundry-client-reactor/src/test/java/org/cloudfoundry/reactor/client/v3/deployments/ReactorDeploymentsV3Test.java
+++ b/cloudfoundry-client-reactor/src/test/java/org/cloudfoundry/reactor/client/v3/deployments/ReactorDeploymentsV3Test.java
@@ -43,17 +43,17 @@
 import org.cloudfoundry.reactor.TestRequest;
 import org.cloudfoundry.reactor.TestResponse;
 import org.cloudfoundry.reactor.client.AbstractClientApiTest;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import reactor.test.StepVerifier;
 
-public class ReactorDeploymentsV3Test extends AbstractClientApiTest {
+class ReactorDeploymentsV3Test extends AbstractClientApiTest {
 
     private final ReactorDeploymentsV3 deployments =
             new ReactorDeploymentsV3(
                     CONNECTION_CONTEXT, this.root, TOKEN_PROVIDER, Collections.emptyMap());
 
     @Test
-    public void cancel() {
+    void cancel() {
         mockRequest(
                 InteractionContext.builder()
                         .request(
@@ -78,7 +78,7 @@ public void cancel() {
 
     @SuppressWarnings("deprecation")
     @Test
-    public void create() {
+    void create() {
         mockRequest(
                 InteractionContext.builder()
                         .request(
@@ -171,7 +171,7 @@ public void create() {
 
     @SuppressWarnings("deprecation")
     @Test
-    public void get() {
+    void get() {
         mockRequest(
                 InteractionContext.builder()
                         .request(
@@ -246,7 +246,7 @@ public void get() {
 
     @SuppressWarnings("deprecation")
     @Test
-    public void list() {
+    void list() {
         mockRequest(
                 InteractionContext.builder()
                         .request(TestRequest.builder().method(GET).path("/deployments").build())
diff --git a/cloudfoundry-client-reactor/src/test/java/org/cloudfoundry/reactor/client/v3/domains/ReactorDomainsV3Test.java b/cloudfoundry-client-reactor/src/test/java/org/cloudfoundry/reactor/client/v3/domains/ReactorDomainsV3Test.java
index 974377bfe18..225145322a3 100644
--- a/cloudfoundry-client-reactor/src/test/java/org/cloudfoundry/reactor/client/v3/domains/ReactorDomainsV3Test.java
+++ b/cloudfoundry-client-reactor/src/test/java/org/cloudfoundry/reactor/client/v3/domains/ReactorDomainsV3Test.java
@@ -51,17 +51,17 @@
 import org.cloudfoundry.reactor.TestRequest;
 import org.cloudfoundry.reactor.TestResponse;
 import org.cloudfoundry.reactor.client.AbstractClientApiTest;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import reactor.test.StepVerifier;
 
-public final class ReactorDomainsV3Test extends AbstractClientApiTest {
+final class ReactorDomainsV3Test extends AbstractClientApiTest {
 
     private final ReactorDomainsV3 domains =
             new ReactorDomainsV3(
                     CONNECTION_CONTEXT, this.root, TOKEN_PROVIDER, Collections.emptyMap());
 
     @Test
-    public void create() {
+    void create() {
         mockRequest(
                 InteractionContext.builder()
                         .request(
@@ -120,7 +120,7 @@ public void create() {
     }
 
     @Test
-    public void delete() {
+    void delete() {
         mockRequest(
                 InteractionContext.builder()
                         .request(
@@ -146,7 +146,7 @@ public void delete() {
     }
 
     @Test
-    public void get() {
+    void get() {
         mockRequest(
                 InteractionContext.builder()
                         .request(
@@ -231,7 +231,7 @@ public void get() {
     }
 
     @Test
-    public void list() {
+    void list() {
         mockRequest(
                 InteractionContext.builder()
                         .request(TestRequest.builder().method(GET).path("/domains").build())
@@ -308,7 +308,7 @@ public void list() {
     }
 
     @Test
-    public void share() {
+    void share() {
         mockRequest(
                 InteractionContext.builder()
                         .request(
@@ -357,7 +357,7 @@ public void share() {
     }
 
     @Test
-    public void unshare() {
+    void unshare() {
         mockRequest(
                 InteractionContext.builder()
                         .request(
@@ -382,7 +382,7 @@ public void unshare() {
     }
 
     @Test
-    public void update() {
+    void update() {
         mockRequest(
                 InteractionContext.builder()
                         .request(
diff --git a/cloudfoundry-client-reactor/src/test/java/org/cloudfoundry/reactor/client/v3/droplets/ReactorDropletsTest.java b/cloudfoundry-client-reactor/src/test/java/org/cloudfoundry/reactor/client/v3/droplets/ReactorDropletsTest.java
index 7d2f5abc7ac..75629857761 100644
--- a/cloudfoundry-client-reactor/src/test/java/org/cloudfoundry/reactor/client/v3/droplets/ReactorDropletsTest.java
+++ b/cloudfoundry-client-reactor/src/test/java/org/cloudfoundry/reactor/client/v3/droplets/ReactorDropletsTest.java
@@ -50,17 +50,17 @@
 import org.cloudfoundry.reactor.TestRequest;
 import org.cloudfoundry.reactor.TestResponse;
 import org.cloudfoundry.reactor.client.AbstractClientApiTest;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import reactor.test.StepVerifier;
 
-public final class ReactorDropletsTest extends AbstractClientApiTest {
+final class ReactorDropletsTest extends AbstractClientApiTest {
 
     private final ReactorDroplets droplets =
             new ReactorDroplets(
                     CONNECTION_CONTEXT, this.root, TOKEN_PROVIDER, Collections.emptyMap());
 
     @Test
-    public void copy() {
+    void copy() {
         mockRequest(
                 InteractionContext.builder()
                         .request(
@@ -142,7 +142,7 @@ public void copy() {
     }
 
     @Test
-    public void delete() {
+    void delete() {
         mockRequest(
                 InteractionContext.builder()
                         .request(
@@ -168,7 +168,7 @@ public void delete() {
     }
 
     @Test
-    public void get() {
+    void get() {
         mockRequest(
                 InteractionContext.builder()
                         .request(
@@ -248,7 +248,7 @@ public void get() {
     }
 
     @Test
-    public void list() {
+    void list() {
         mockRequest(
                 InteractionContext.builder()
                         .request(TestRequest.builder().method(GET).path("/droplets").build())
diff --git a/cloudfoundry-client-reactor/src/test/java/org/cloudfoundry/reactor/client/v3/isolationsegments/ReactorIsolationSegmentsTest.java b/cloudfoundry-client-reactor/src/test/java/org/cloudfoundry/reactor/client/v3/isolationsegments/ReactorIsolationSegmentsTest.java
index 7a0ddc4315e..232443a87a5 100644
--- a/cloudfoundry-client-reactor/src/test/java/org/cloudfoundry/reactor/client/v3/isolationsegments/ReactorIsolationSegmentsTest.java
+++ b/cloudfoundry-client-reactor/src/test/java/org/cloudfoundry/reactor/client/v3/isolationsegments/ReactorIsolationSegmentsTest.java
@@ -54,17 +54,17 @@
 import org.cloudfoundry.reactor.TestRequest;
 import org.cloudfoundry.reactor.TestResponse;
 import org.cloudfoundry.reactor.client.AbstractClientApiTest;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import reactor.test.StepVerifier;
 
-public class ReactorIsolationSegmentsTest extends AbstractClientApiTest {
+class ReactorIsolationSegmentsTest extends AbstractClientApiTest {
 
     private final ReactorIsolationSegments isolationSegments =
             new ReactorIsolationSegments(
                     CONNECTION_CONTEXT, this.root, TOKEN_PROVIDER, Collections.emptyMap());
 
     @Test
-    public void addOrganizationEntitlement() {
+    void addOrganizationEntitlement() {
         mockRequest(
                 InteractionContext.builder()
                         .request(
@@ -119,7 +119,7 @@ public void addOrganizationEntitlement() {
     }
 
     @Test
-    public void create() {
+    void create() {
         mockRequest(
                 InteractionContext.builder()
                         .request(
@@ -164,7 +164,7 @@ public void create() {
     }
 
     @Test
-    public void delete() {
+    void delete() {
         mockRequest(
                 InteractionContext.builder()
                         .request(
@@ -186,7 +186,7 @@ public void delete() {
     }
 
     @Test
-    public void get() {
+    void get() {
         mockRequest(
                 InteractionContext.builder()
                         .request(
@@ -232,7 +232,7 @@ public void get() {
     }
 
     @Test
-    public void list() {
+    void list() {
         mockRequest(
                 InteractionContext.builder()
                         .request(
@@ -374,7 +374,7 @@ public void list() {
     }
 
     @Test
-    public void listEntitledOrganizations() {
+    void listEntitledOrganizations() {
         mockRequest(
                 InteractionContext.builder()
                         .request(
@@ -444,7 +444,7 @@ public void listEntitledOrganizations() {
     }
 
     @Test
-    public void listOrganizationsRelationship() {
+    void listOrganizationsRelationship() {
         mockRequest(
                 InteractionContext.builder()
                         .request(
@@ -495,7 +495,7 @@ public void listOrganizationsRelationship() {
     }
 
     @Test
-    public void listSpacesRelationship() {
+    void listSpacesRelationship() {
         mockRequest(
                 InteractionContext.builder()
                         .request(
@@ -540,7 +540,7 @@ public void listSpacesRelationship() {
     }
 
     @Test
-    public void removeOrganizationEntitlement() {
+    void removeOrganizationEntitlement() {
         mockRequest(
                 InteractionContext.builder()
                         .request(
@@ -564,7 +564,7 @@ public void removeOrganizationEntitlement() {
     }
 
     @Test
-    public void update() {
+    void update() {
         mockRequest(
                 InteractionContext.builder()
                         .request(
diff --git a/cloudfoundry-client-reactor/src/test/java/org/cloudfoundry/reactor/client/v3/jobs/ReactorJobsV3Test.java b/cloudfoundry-client-reactor/src/test/java/org/cloudfoundry/reactor/client/v3/jobs/ReactorJobsV3Test.java
index 07ea16c5708..d60e6b824d9 100644
--- a/cloudfoundry-client-reactor/src/test/java/org/cloudfoundry/reactor/client/v3/jobs/ReactorJobsV3Test.java
+++ b/cloudfoundry-client-reactor/src/test/java/org/cloudfoundry/reactor/client/v3/jobs/ReactorJobsV3Test.java
@@ -30,17 +30,17 @@
 import org.cloudfoundry.reactor.TestRequest;
 import org.cloudfoundry.reactor.TestResponse;
 import org.cloudfoundry.reactor.client.AbstractClientApiTest;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import reactor.test.StepVerifier;
 
-public final class ReactorJobsV3Test extends AbstractClientApiTest {
+final class ReactorJobsV3Test extends AbstractClientApiTest {
 
     private final ReactorJobsV3 jobs =
             new ReactorJobsV3(
                     CONNECTION_CONTEXT, this.root, TOKEN_PROVIDER, Collections.emptyMap());
 
     @Test
-    public void get() {
+    void get() {
         mockRequest(
                 InteractionContext.builder()
                         .request(
diff --git a/cloudfoundry-client-reactor/src/test/java/org/cloudfoundry/reactor/client/v3/organizations/ReactorOrganizationsV3Test.java b/cloudfoundry-client-reactor/src/test/java/org/cloudfoundry/reactor/client/v3/organizations/ReactorOrganizationsV3Test.java
index a518f2b65d3..bd6b893f086 100644
--- a/cloudfoundry-client-reactor/src/test/java/org/cloudfoundry/reactor/client/v3/organizations/ReactorOrganizationsV3Test.java
+++ b/cloudfoundry-client-reactor/src/test/java/org/cloudfoundry/reactor/client/v3/organizations/ReactorOrganizationsV3Test.java
@@ -59,17 +59,17 @@
 import org.cloudfoundry.reactor.TestRequest;
 import org.cloudfoundry.reactor.TestResponse;
 import org.cloudfoundry.reactor.client.AbstractClientApiTest;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import reactor.test.StepVerifier;
 
-public class ReactorOrganizationsV3Test extends AbstractClientApiTest {
+class ReactorOrganizationsV3Test extends AbstractClientApiTest {
 
     private final ReactorOrganizationsV3 organizations =
             new ReactorOrganizationsV3(
                     CONNECTION_CONTEXT, this.root, TOKEN_PROVIDER, Collections.emptyMap());
 
     @Test
-    public void assignDefaultIsolationSegment() {
+    void assignDefaultIsolationSegment() {
         mockRequest(
                 InteractionContext.builder()
                         .request(
@@ -119,7 +119,7 @@ public void assignDefaultIsolationSegment() {
     }
 
     @Test
-    public void create() {
+    void create() {
         mockRequest(
                 InteractionContext.builder()
                         .request(
@@ -163,7 +163,7 @@ public void create() {
     }
 
     @Test
-    public void delete() {
+    void delete() {
         mockRequest(
                 InteractionContext.builder()
                         .request(
@@ -192,7 +192,7 @@ public void delete() {
     }
 
     @Test
-    public void get() {
+    void get() {
         mockRequest(
                 InteractionContext.builder()
                         .request(
@@ -237,7 +237,7 @@ public void get() {
     }
 
     @Test
-    public void getDefaultDomain() {
+    void getDefaultDomain() {
         mockRequest(
                 InteractionContext.builder()
                         .request(
@@ -326,7 +326,7 @@ public void getDefaultDomain() {
     }
 
     @Test
-    public void getDefaultIsolationSegment() {
+    void getDefaultIsolationSegment() {
         mockRequest(
                 InteractionContext.builder()
                         .request(
@@ -373,7 +373,7 @@ public void getDefaultIsolationSegment() {
     }
 
     @Test
-    public void getUsageSummary() {
+    void getUsageSummary() {
         mockRequest(
                 InteractionContext.builder()
                         .request(
@@ -420,7 +420,7 @@ public void getUsageSummary() {
     }
 
     @Test
-    public void list() {
+    void list() {
         mockRequest(
                 InteractionContext.builder()
                         .request(TestRequest.builder().method(GET).path("/organizations").build())
@@ -482,7 +482,7 @@ public void list() {
     }
 
     @Test
-    public void listDomains() {
+    void listDomains() {
         mockRequest(
                 InteractionContext.builder()
                         .request(
@@ -578,7 +578,7 @@ public void listDomains() {
     }
 
     @Test
-    public void update() {
+    void update() {
         mockRequest(
                 InteractionContext.builder()
                         .request(
diff --git a/cloudfoundry-client-reactor/src/test/java/org/cloudfoundry/reactor/client/v3/packages/ReactorPackagesTest.java b/cloudfoundry-client-reactor/src/test/java/org/cloudfoundry/reactor/client/v3/packages/ReactorPackagesTest.java
index e8fc9160383..6c7a65b1412 100644
--- a/cloudfoundry-client-reactor/src/test/java/org/cloudfoundry/reactor/client/v3/packages/ReactorPackagesTest.java
+++ b/cloudfoundry-client-reactor/src/test/java/org/cloudfoundry/reactor/client/v3/packages/ReactorPackagesTest.java
@@ -67,18 +67,18 @@
 import org.cloudfoundry.reactor.TestResponse;
 import org.cloudfoundry.reactor.client.AbstractClientApiTest;
 import org.cloudfoundry.util.OperationUtils;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.springframework.core.io.ClassPathResource;
 import reactor.test.StepVerifier;
 
-public final class ReactorPackagesTest extends AbstractClientApiTest {
+final class ReactorPackagesTest extends AbstractClientApiTest {
 
     private final ReactorPackages packages =
             new ReactorPackages(
                     CONNECTION_CONTEXT, this.root, TOKEN_PROVIDER, Collections.emptyMap());
 
     @Test
-    public void copy() {
+    void copy() {
         mockRequest(
                 InteractionContext.builder()
                         .request(
@@ -161,7 +161,7 @@ public void copy() {
     }
 
     @Test
-    public void create() {
+    void create() {
         mockRequest(
                 InteractionContext.builder()
                         .request(
@@ -241,7 +241,7 @@ public void create() {
     }
 
     @Test
-    public void delete() {
+    void delete() {
         mockRequest(
                 InteractionContext.builder()
                         .request(
@@ -267,7 +267,7 @@ public void delete() {
     }
 
     @Test
-    public void download() {
+    void download() {
         mockRequest(
                 InteractionContext.builder()
                         .request(
@@ -298,7 +298,7 @@ public void download() {
     }
 
     @Test
-    public void get() {
+    void get() {
         mockRequest(
                 InteractionContext.builder()
                         .request(
@@ -365,7 +365,7 @@ public void get() {
     }
 
     @Test
-    public void list() {
+    void list() {
         mockRequest(
                 InteractionContext.builder()
                         .request(TestRequest.builder().method(GET).path("/packages").build())
@@ -473,7 +473,7 @@ public void list() {
     }
 
     @Test
-    public void listDroplets() {
+    void listDroplets() {
         mockRequest(
                 InteractionContext.builder()
                         .request(
@@ -683,7 +683,7 @@ public void listDroplets() {
     }
 
     @Test
-    public void upload() throws IOException {
+    void upload() throws IOException {
         mockRequest(
                 InteractionContext.builder()
                         .request(
diff --git a/cloudfoundry-client-reactor/src/test/java/org/cloudfoundry/reactor/client/v3/processes/ReactorProcessesTest.java b/cloudfoundry-client-reactor/src/test/java/org/cloudfoundry/reactor/client/v3/processes/ReactorProcessesTest.java
index cd3795562a4..8efd6f66b45 100644
--- a/cloudfoundry-client-reactor/src/test/java/org/cloudfoundry/reactor/client/v3/processes/ReactorProcessesTest.java
+++ b/cloudfoundry-client-reactor/src/test/java/org/cloudfoundry/reactor/client/v3/processes/ReactorProcessesTest.java
@@ -52,17 +52,17 @@
 import org.cloudfoundry.reactor.TestRequest;
 import org.cloudfoundry.reactor.TestResponse;
 import org.cloudfoundry.reactor.client.AbstractClientApiTest;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import reactor.test.StepVerifier;
 
-public final class ReactorProcessesTest extends AbstractClientApiTest {
+final class ReactorProcessesTest extends AbstractClientApiTest {
 
     private final ReactorProcesses processes =
             new ReactorProcesses(
                     CONNECTION_CONTEXT, this.root, TOKEN_PROVIDER, Collections.emptyMap());
 
     @Test
-    public void deleteInstance() {
+    void deleteInstance() {
         mockRequest(
                 InteractionContext.builder()
                         .request(
@@ -85,7 +85,7 @@ public void deleteInstance() {
     }
 
     @Test
-    public void get() {
+    void get() {
         mockRequest(
                 InteractionContext.builder()
                         .request(
@@ -166,7 +166,7 @@ public void get() {
     }
 
     @Test
-    public void getProcessStatistics() {
+    void getProcessStatistics() {
         mockRequest(
                 InteractionContext.builder()
                         .request(
@@ -219,7 +219,7 @@ public void getProcessStatistics() {
     }
 
     @Test
-    public void getProcessStatisticsWithNullFields() {
+    void getProcessStatisticsWithNullFields() {
         mockRequest(
                 InteractionContext.builder()
                         .request(
@@ -256,7 +256,7 @@ public void getProcessStatisticsWithNullFields() {
     }
 
     @Test
-    public void list() {
+    void list() {
         mockRequest(
                 InteractionContext.builder()
                         .request(TestRequest.builder().method(GET).path("/processes").build())
@@ -414,7 +414,7 @@ public void list() {
     }
 
     @Test
-    public void scale() {
+    void scale() {
         mockRequest(
                 InteractionContext.builder()
                         .request(
@@ -503,7 +503,7 @@ public void scale() {
     }
 
     @Test
-    public void update() {
+    void update() {
         mockRequest(
                 InteractionContext.builder()
                         .request(
diff --git a/cloudfoundry-client-reactor/src/test/java/org/cloudfoundry/reactor/client/v3/roles/ReactorRolesV3Test.java b/cloudfoundry-client-reactor/src/test/java/org/cloudfoundry/reactor/client/v3/roles/ReactorRolesV3Test.java
index 4168d2a28d3..1084b44a309 100644
--- a/cloudfoundry-client-reactor/src/test/java/org/cloudfoundry/reactor/client/v3/roles/ReactorRolesV3Test.java
+++ b/cloudfoundry-client-reactor/src/test/java/org/cloudfoundry/reactor/client/v3/roles/ReactorRolesV3Test.java
@@ -43,17 +43,17 @@
 import org.cloudfoundry.reactor.TestRequest;
 import org.cloudfoundry.reactor.TestResponse;
 import org.cloudfoundry.reactor.client.AbstractClientApiTest;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import reactor.test.StepVerifier;
 
-public class ReactorRolesV3Test extends AbstractClientApiTest {
+class ReactorRolesV3Test extends AbstractClientApiTest {
 
     private final ReactorRolesV3 roles =
             new ReactorRolesV3(
                     CONNECTION_CONTEXT, this.root, TOKEN_PROVIDER, Collections.emptyMap());
 
     @Test
-    public void create() {
+    void create() {
         mockRequest(
                 InteractionContext.builder()
                         .request(
@@ -142,7 +142,7 @@ public void create() {
     }
 
     @Test
-    public void delete() {
+    void delete() {
         mockRequest(
                 InteractionContext.builder()
                         .request(
@@ -168,7 +168,7 @@ public void delete() {
     }
 
     @Test
-    public void get() {
+    void get() {
         mockRequest(
                 InteractionContext.builder()
                         .request(
@@ -238,7 +238,7 @@ public void get() {
     }
 
     @Test
-    public void list() {
+    void list() {
         mockRequest(
                 InteractionContext.builder()
                         .request(TestRequest.builder().method(GET).path("/roles").build())
diff --git a/cloudfoundry-client-reactor/src/test/java/org/cloudfoundry/reactor/client/v3/routes/ReactorRoutesV3Test.java b/cloudfoundry-client-reactor/src/test/java/org/cloudfoundry/reactor/client/v3/routes/ReactorRoutesV3Test.java
index e35e89834b6..96731f354bc 100644
--- a/cloudfoundry-client-reactor/src/test/java/org/cloudfoundry/reactor/client/v3/routes/ReactorRoutesV3Test.java
+++ b/cloudfoundry-client-reactor/src/test/java/org/cloudfoundry/reactor/client/v3/routes/ReactorRoutesV3Test.java
@@ -57,17 +57,17 @@
 import org.cloudfoundry.reactor.TestRequest;
 import org.cloudfoundry.reactor.TestResponse;
 import org.cloudfoundry.reactor.client.AbstractClientApiTest;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import reactor.test.StepVerifier;
 
-public class ReactorRoutesV3Test extends AbstractClientApiTest {
+class ReactorRoutesV3Test extends AbstractClientApiTest {
 
     private final ReactorRoutesV3 routes =
             new ReactorRoutesV3(
                     CONNECTION_CONTEXT, this.root, TOKEN_PROVIDER, Collections.emptyMap());
 
     @Test
-    public void create() {
+    void create() {
         mockRequest(
                 InteractionContext.builder()
                         .request(
@@ -172,7 +172,7 @@ public void create() {
     }
 
     @Test
-    public void delete() {
+    void delete() {
         mockRequest(
                 InteractionContext.builder()
                         .request(
@@ -198,7 +198,7 @@ public void delete() {
     }
 
     @Test
-    public void get() {
+    void get() {
         mockRequest(
                 InteractionContext.builder()
                         .request(
@@ -280,7 +280,7 @@ public void get() {
     }
 
     @Test
-    public void insertDestinations() {
+    void insertDestinations() {
         mockRequest(
                 InteractionContext.builder()
                         .request(
@@ -373,7 +373,7 @@ public void insertDestinations() {
     }
 
     @Test
-    public void list() {
+    void list() {
         mockRequest(
                 InteractionContext.builder()
                         .request(TestRequest.builder().method(GET).path("/routes").build())
@@ -478,7 +478,7 @@ public void list() {
     }
 
     @Test
-    public void listDestinations() {
+    void listDestinations() {
         mockRequest(
                 InteractionContext.builder()
                         .request(
@@ -547,7 +547,7 @@ public void listDestinations() {
     }
 
     @Test
-    public void removeDestinations() {
+    void removeDestinations() {
         mockRequest(
                 InteractionContext.builder()
                         .request(
@@ -571,7 +571,7 @@ public void removeDestinations() {
     }
 
     @Test
-    public void replaceDestinations() {
+    void replaceDestinations() {
         mockRequest(
                 InteractionContext.builder()
                         .request(
@@ -668,7 +668,7 @@ public void replaceDestinations() {
     }
 
     @Test
-    public void update() {
+    void update() {
         mockRequest(
                 InteractionContext.builder()
                         .request(
diff --git a/cloudfoundry-client-reactor/src/test/java/org/cloudfoundry/reactor/client/v3/serviceInstances/ReactorServiceInstancesV3Test.java b/cloudfoundry-client-reactor/src/test/java/org/cloudfoundry/reactor/client/v3/serviceInstances/ReactorServiceInstancesV3Test.java
index aa028c4e2dc..1e6df1f2585 100644
--- a/cloudfoundry-client-reactor/src/test/java/org/cloudfoundry/reactor/client/v3/serviceInstances/ReactorServiceInstancesV3Test.java
+++ b/cloudfoundry-client-reactor/src/test/java/org/cloudfoundry/reactor/client/v3/serviceInstances/ReactorServiceInstancesV3Test.java
@@ -62,17 +62,17 @@
 import org.cloudfoundry.reactor.TestRequest;
 import org.cloudfoundry.reactor.TestResponse;
 import org.cloudfoundry.reactor.client.AbstractClientApiTest;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import reactor.test.StepVerifier;
 
-public final class ReactorServiceInstancesV3Test extends AbstractClientApiTest {
+final class ReactorServiceInstancesV3Test extends AbstractClientApiTest {
 
     private final ReactorServiceInstancesV3 serviceInstances =
             new ReactorServiceInstancesV3(
                     CONNECTION_CONTEXT, this.root, TOKEN_PROVIDER, Collections.emptyMap());
 
     @Test
-    public void getManagedServiceParameters() {
+    void getManagedServiceParameters() {
         Map<String, Object> parameters = new HashMap<>();
         parameters.put("key_1", "value_1");
         parameters.put("key_2", "value_2");
@@ -108,7 +108,7 @@ public void getManagedServiceParameters() {
     }
 
     @Test
-    public void getUserProvidedCredentials() {
+    void getUserProvidedCredentials() {
         Map<String, Object> credentials = new HashMap<>();
         credentials.put("username", "my-username");
         credentials.put("password", "super-secret");
@@ -145,7 +145,7 @@ public void getUserProvidedCredentials() {
     }
 
     @Test
-    public void get() {
+    void get() {
         mockRequest(
                 InteractionContext.builder()
                         .request(
@@ -254,7 +254,7 @@ public void get() {
     }
 
     @Test
-    public void list() {
+    void list() {
         mockRequest(
                 InteractionContext.builder()
                         .request(
@@ -378,7 +378,7 @@ public void list() {
     }
 
     @Test
-    public void listSharedSpaces() {
+    void listSharedSpaces() {
         mockRequest(
                 InteractionContext.builder()
                         .request(
@@ -423,7 +423,7 @@ public void listSharedSpaces() {
     }
 
     @Test
-    public void share() {
+    void share() {
         mockRequest(
                 InteractionContext.builder()
                         .request(
@@ -472,7 +472,7 @@ public void share() {
     }
 
     @Test
-    public void unshare() {
+    void unshare() {
         mockRequest(
                 InteractionContext.builder()
                         .request(
@@ -496,7 +496,7 @@ public void unshare() {
     }
 
     @Test
-    public void createManagedServiceInstance() {
+    void createManagedServiceInstance() {
         mockRequest(
                 InteractionContext.builder()
                         .request(
@@ -556,7 +556,7 @@ public void createManagedServiceInstance() {
     }
 
     @Test
-    public void testCreateUserProvidedService() {
+    void createUserProvidedService() {
         mockRequest(
                 InteractionContext.builder()
                         .request(
@@ -676,7 +676,7 @@ public void testCreateUserProvidedService() {
     }
 
     @Test
-    public void updateManagedServiceInstance() {
+    void updateManagedServiceInstance() {
         mockRequest(
                 InteractionContext.builder()
                         .request(
@@ -824,7 +824,7 @@ public void updateManagedServiceInstance() {
     }
 
     @Test
-    public void updateManagedServiceInstanceAsync() {
+    void updateManagedServiceInstanceAsync() {
         mockRequest(
                 InteractionContext.builder()
                         .request(
@@ -878,7 +878,7 @@ public void updateManagedServiceInstanceAsync() {
     }
 
     @Test
-    public void updateUserProvidedServiceInstance() {
+    void updateUserProvidedServiceInstance() {
         mockRequest(
                 InteractionContext.builder()
                         .request(
@@ -988,7 +988,7 @@ public void updateUserProvidedServiceInstance() {
     }
 
     @Test
-    public void deleteManagedServiceInstance() {
+    void deleteManagedServiceInstance() {
         mockRequest(
                 InteractionContext.builder()
                         .request(
@@ -1016,7 +1016,7 @@ public void deleteManagedServiceInstance() {
     }
 
     @Test
-    public void deleteUserProvidedServiceInstance() {
+    void deleteUserProvidedServiceInstance() {
         mockRequest(
                 InteractionContext.builder()
                         .request(
diff --git a/cloudfoundry-client-reactor/src/test/java/org/cloudfoundry/reactor/client/v3/servicebindings/ReactorServiceBindingsV3Test.java b/cloudfoundry-client-reactor/src/test/java/org/cloudfoundry/reactor/client/v3/servicebindings/ReactorServiceBindingsV3Test.java
index 76907cdde32..5fb5fba7256 100644
--- a/cloudfoundry-client-reactor/src/test/java/org/cloudfoundry/reactor/client/v3/servicebindings/ReactorServiceBindingsV3Test.java
+++ b/cloudfoundry-client-reactor/src/test/java/org/cloudfoundry/reactor/client/v3/servicebindings/ReactorServiceBindingsV3Test.java
@@ -43,17 +43,17 @@
 import org.cloudfoundry.reactor.TestRequest;
 import org.cloudfoundry.reactor.TestResponse;
 import org.cloudfoundry.reactor.client.AbstractClientApiTest;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import reactor.test.StepVerifier;
 
-public final class ReactorServiceBindingsV3Test extends AbstractClientApiTest {
+final class ReactorServiceBindingsV3Test extends AbstractClientApiTest {
 
     private final ReactorServiceBindingsV3 serviceBindings =
             new ReactorServiceBindingsV3(
                     CONNECTION_CONTEXT, this.root, TOKEN_PROVIDER, Collections.emptyMap());
 
     @Test
-    public void create() {
+    void create() {
         mockRequest(
                 InteractionContext.builder()
                         .request(
@@ -106,7 +106,7 @@ public void create() {
     }
 
     @Test
-    public void delete() {
+    void delete() {
         mockRequest(
                 InteractionContext.builder()
                         .request(
@@ -129,7 +129,7 @@ public void delete() {
     }
 
     @Test
-    public void get() {
+    void get() {
         mockRequest(
                 InteractionContext.builder()
                         .request(
@@ -200,7 +200,7 @@ public void get() {
     }
 
     @Test
-    public void list() {
+    void list() {
         mockRequest(
                 InteractionContext.builder()
                         .request(
diff --git a/cloudfoundry-client-reactor/src/test/java/org/cloudfoundry/reactor/client/v3/servicebrokers/ReactorServiceBrokersV3Test.java b/cloudfoundry-client-reactor/src/test/java/org/cloudfoundry/reactor/client/v3/servicebrokers/ReactorServiceBrokersV3Test.java
index 192bfe614ad..cf4e1260c6e 100644
--- a/cloudfoundry-client-reactor/src/test/java/org/cloudfoundry/reactor/client/v3/servicebrokers/ReactorServiceBrokersV3Test.java
+++ b/cloudfoundry-client-reactor/src/test/java/org/cloudfoundry/reactor/client/v3/servicebrokers/ReactorServiceBrokersV3Test.java
@@ -24,17 +24,17 @@
 import org.cloudfoundry.reactor.TestRequest;
 import org.cloudfoundry.reactor.TestResponse;
 import org.cloudfoundry.reactor.client.AbstractClientApiTest;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import reactor.test.StepVerifier;
 
-public final class ReactorServiceBrokersV3Test extends AbstractClientApiTest {
+final class ReactorServiceBrokersV3Test extends AbstractClientApiTest {
 
     private final ReactorServiceBrokersV3 serviceBrokersV3 =
             new ReactorServiceBrokersV3(
                     CONNECTION_CONTEXT, this.root, TOKEN_PROVIDER, Collections.emptyMap());
 
     @Test
-    public void create() {
+    void create() {
         mockRequest(
                 InteractionContext.builder()
                         .request(
@@ -82,7 +82,7 @@ public void create() {
     }
 
     @Test
-    public void delete() {
+    void delete() {
         mockRequest(
                 InteractionContext.builder()
                         .request(
@@ -111,7 +111,7 @@ public void delete() {
     }
 
     @Test
-    public void get() {
+    void get() {
         mockRequest(
                 InteractionContext.builder()
                         .request(
@@ -180,7 +180,7 @@ public void get() {
     }
 
     @Test
-    public void list() {
+    void list() {
         mockRequest(
                 InteractionContext.builder()
                         .request(
@@ -298,7 +298,7 @@ public void list() {
     }
 
     @Test
-    public void update() {
+    void update() {
         mockRequest(
                 InteractionContext.builder()
                         .request(
@@ -345,7 +345,7 @@ public void update() {
     }
 
     @Test
-    public void updateMetadata() {
+    void updateMetadata() {
         mockRequest(
                 InteractionContext.builder()
                         .request(
diff --git a/cloudfoundry-client-reactor/src/test/java/org/cloudfoundry/reactor/client/v3/serviceofferings/ReactorServiceOfferingsTest.java b/cloudfoundry-client-reactor/src/test/java/org/cloudfoundry/reactor/client/v3/serviceofferings/ReactorServiceOfferingsTest.java
index 34bf27d03e0..c71082bda36 100644
--- a/cloudfoundry-client-reactor/src/test/java/org/cloudfoundry/reactor/client/v3/serviceofferings/ReactorServiceOfferingsTest.java
+++ b/cloudfoundry-client-reactor/src/test/java/org/cloudfoundry/reactor/client/v3/serviceofferings/ReactorServiceOfferingsTest.java
@@ -45,17 +45,17 @@
 import org.cloudfoundry.reactor.TestRequest;
 import org.cloudfoundry.reactor.TestResponse;
 import org.cloudfoundry.reactor.client.AbstractClientApiTest;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import reactor.test.StepVerifier;
 
-public final class ReactorServiceOfferingsTest extends AbstractClientApiTest {
+final class ReactorServiceOfferingsTest extends AbstractClientApiTest {
 
     private final ReactorServiceOfferingsV3 serviceOfferings =
             new ReactorServiceOfferingsV3(
                     CONNECTION_CONTEXT, this.root, TOKEN_PROVIDER, Collections.emptyMap());
 
     @Test
-    public void delete() {
+    void delete() {
         mockRequest(
                 InteractionContext.builder()
                         .request(
@@ -77,7 +77,7 @@ public void delete() {
     }
 
     @Test
-    public void get() {
+    void get() {
         mockRequest(
                 InteractionContext.builder()
                         .request(
@@ -166,7 +166,7 @@ public void get() {
     }
 
     @Test
-    public void list() {
+    void list() {
         mockRequest(
                 InteractionContext.builder()
                         .request(
@@ -351,7 +351,7 @@ public void list() {
     }
 
     @Test
-    public void update() {
+    void update() {
         mockRequest(
                 InteractionContext.builder()
                         .request(
diff --git a/cloudfoundry-client-reactor/src/test/java/org/cloudfoundry/reactor/client/v3/serviceplans/ReactorServicePlansTest.java b/cloudfoundry-client-reactor/src/test/java/org/cloudfoundry/reactor/client/v3/serviceplans/ReactorServicePlansTest.java
index 626e617a9df..050d592936c 100644
--- a/cloudfoundry-client-reactor/src/test/java/org/cloudfoundry/reactor/client/v3/serviceplans/ReactorServicePlansTest.java
+++ b/cloudfoundry-client-reactor/src/test/java/org/cloudfoundry/reactor/client/v3/serviceplans/ReactorServicePlansTest.java
@@ -61,17 +61,17 @@
 import org.cloudfoundry.reactor.TestRequest;
 import org.cloudfoundry.reactor.TestResponse;
 import org.cloudfoundry.reactor.client.AbstractClientApiTest;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import reactor.test.StepVerifier;
 
-public final class ReactorServicePlansTest extends AbstractClientApiTest {
+final class ReactorServicePlansTest extends AbstractClientApiTest {
 
     private final ReactorServicePlansV3 servicePlans =
             new ReactorServicePlansV3(
                     CONNECTION_CONTEXT, this.root, TOKEN_PROVIDER, Collections.emptyMap());
 
     @Test
-    public void delete() {
+    void delete() {
         mockRequest(
                 InteractionContext.builder()
                         .request(
@@ -93,7 +93,7 @@ public void delete() {
     }
 
     @Test
-    public void get() {
+    void get() {
         Map<String, String> details = new HashMap<>();
         details.put(
                 "description", "Billing account number used to charge use of shared fake server.");
@@ -221,7 +221,7 @@ public void get() {
     }
 
     @Test
-    public void list() {
+    void list() {
         Map<String, String> details = new HashMap<>();
         details.put(
                 "description", "Billing account number used to charge use of shared fake server.");
@@ -471,7 +471,7 @@ public void list() {
     }
 
     @Test
-    public void update() {
+    void update() {
         Map<String, String> details = new HashMap<>();
         details.put(
                 "description", "Billing account number used to charge use of shared fake server.");
@@ -607,7 +607,7 @@ public void update() {
     }
 
     @Test
-    public void updatePlanVisibility() {
+    void updatePlanVisibility() {
         mockRequest(
                 InteractionContext.builder()
                         .request(
diff --git a/cloudfoundry-client-reactor/src/test/java/org/cloudfoundry/reactor/client/v3/spaces/ReactorSpacesV3Test.java b/cloudfoundry-client-reactor/src/test/java/org/cloudfoundry/reactor/client/v3/spaces/ReactorSpacesV3Test.java
index 221672f652c..ad9fd9f61a0 100644
--- a/cloudfoundry-client-reactor/src/test/java/org/cloudfoundry/reactor/client/v3/spaces/ReactorSpacesV3Test.java
+++ b/cloudfoundry-client-reactor/src/test/java/org/cloudfoundry/reactor/client/v3/spaces/ReactorSpacesV3Test.java
@@ -50,17 +50,17 @@
 import org.cloudfoundry.reactor.TestRequest;
 import org.cloudfoundry.reactor.TestResponse;
 import org.cloudfoundry.reactor.client.AbstractClientApiTest;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import reactor.test.StepVerifier;
 
-public class ReactorSpacesV3Test extends AbstractClientApiTest {
+class ReactorSpacesV3Test extends AbstractClientApiTest {
 
     private final ReactorSpacesV3 spaces =
             new ReactorSpacesV3(
                     CONNECTION_CONTEXT, this.root, TOKEN_PROVIDER, Collections.emptyMap());
 
     @Test
-    public void assignIsolationSegment() {
+    void assignIsolationSegment() {
         mockRequest(
                 InteractionContext.builder()
                         .request(
@@ -110,7 +110,7 @@ public void assignIsolationSegment() {
     }
 
     @Test
-    public void create() {
+    void create() {
         mockRequest(
                 InteractionContext.builder()
                         .request(
@@ -178,7 +178,7 @@ public void create() {
     }
 
     @Test
-    public void delete() {
+    void delete() {
         mockRequest(
                 InteractionContext.builder()
                         .request(
@@ -204,7 +204,7 @@ public void delete() {
     }
 
     @Test
-    public void deleteUnmappedRoutes() {
+    void deleteUnmappedRoutes() {
         mockRequest(
                 InteractionContext.builder()
                         .request(
@@ -231,7 +231,7 @@ public void deleteUnmappedRoutes() {
     }
 
     @Test
-    public void get() {
+    void get() {
         mockRequest(
                 InteractionContext.builder()
                         .request(
@@ -272,7 +272,7 @@ public void get() {
     }
 
     @Test
-    public void getIsolationSegment() {
+    void getIsolationSegment() {
         mockRequest(
                 InteractionContext.builder()
                         .request(
@@ -317,7 +317,7 @@ public void getIsolationSegment() {
     }
 
     @Test
-    public void list() {
+    void list() {
         mockRequest(
                 InteractionContext.builder()
                         .request(TestRequest.builder().method(GET).path("/spaces").build())
@@ -380,7 +380,7 @@ public void list() {
     }
 
     @Test
-    public void update() {
+    void update() {
         mockRequest(
                 InteractionContext.builder()
                         .request(
diff --git a/cloudfoundry-client-reactor/src/test/java/org/cloudfoundry/reactor/client/v3/stacks/ReactorStacksV3Test.java b/cloudfoundry-client-reactor/src/test/java/org/cloudfoundry/reactor/client/v3/stacks/ReactorStacksV3Test.java
index 0b93698af5b..eac89dfbe5b 100644
--- a/cloudfoundry-client-reactor/src/test/java/org/cloudfoundry/reactor/client/v3/stacks/ReactorStacksV3Test.java
+++ b/cloudfoundry-client-reactor/src/test/java/org/cloudfoundry/reactor/client/v3/stacks/ReactorStacksV3Test.java
@@ -43,17 +43,17 @@
 import org.cloudfoundry.reactor.TestRequest;
 import org.cloudfoundry.reactor.TestResponse;
 import org.cloudfoundry.reactor.client.AbstractClientApiTest;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import reactor.test.StepVerifier;
 
-public class ReactorStacksV3Test extends AbstractClientApiTest {
+class ReactorStacksV3Test extends AbstractClientApiTest {
 
     private final ReactorStacksV3 stacks =
             new ReactorStacksV3(
                     CONNECTION_CONTEXT, this.root, TOKEN_PROVIDER, Collections.emptyMap());
 
     @Test
-    public void create() {
+    void create() {
         mockRequest(
                 InteractionContext.builder()
                         .request(
@@ -100,7 +100,7 @@ public void create() {
     }
 
     @Test
-    public void delete() {
+    void delete() {
         mockRequest(
                 InteractionContext.builder()
                         .request(
@@ -119,7 +119,7 @@ public void delete() {
     }
 
     @Test
-    public void get() {
+    void get() {
         mockRequest(
                 InteractionContext.builder()
                         .request(
@@ -164,7 +164,7 @@ public void get() {
     }
 
     @Test
-    public void list() {
+    void list() {
         mockRequest(
                 InteractionContext.builder()
                         .request(TestRequest.builder().method(GET).path("/stacks").build())
@@ -248,7 +248,7 @@ public void list() {
     }
 
     @Test
-    public void update() {
+    void update() {
         mockRequest(
                 InteractionContext.builder()
                         .request(
diff --git a/cloudfoundry-client-reactor/src/test/java/org/cloudfoundry/reactor/client/v3/tasks/ReactorTasksTest.java b/cloudfoundry-client-reactor/src/test/java/org/cloudfoundry/reactor/client/v3/tasks/ReactorTasksTest.java
index 142453f33fd..0556a2fef1b 100644
--- a/cloudfoundry-client-reactor/src/test/java/org/cloudfoundry/reactor/client/v3/tasks/ReactorTasksTest.java
+++ b/cloudfoundry-client-reactor/src/test/java/org/cloudfoundry/reactor/client/v3/tasks/ReactorTasksTest.java
@@ -41,16 +41,16 @@
 import org.cloudfoundry.reactor.TestRequest;
 import org.cloudfoundry.reactor.TestResponse;
 import org.cloudfoundry.reactor.client.AbstractClientApiTest;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import reactor.test.StepVerifier;
 
-public final class ReactorTasksTest extends AbstractClientApiTest {
+final class ReactorTasksTest extends AbstractClientApiTest {
 
     private final ReactorTasks tasks =
             new ReactorTasks(CONNECTION_CONTEXT, this.root, TOKEN_PROVIDER, Collections.emptyMap());
 
     @Test
-    public void cancel() {
+    void cancel() {
         mockRequest(
                 InteractionContext.builder()
                         .request(
@@ -113,7 +113,7 @@ public void cancel() {
     }
 
     @Test
-    public void create() {
+    void create() {
         mockRequest(
                 InteractionContext.builder()
                         .request(
@@ -182,7 +182,7 @@ public void create() {
     }
 
     @Test
-    public void get() {
+    void get() {
         mockRequest(
                 InteractionContext.builder()
                         .request(TestRequest.builder().method(GET).path("/tasks/test-id").build())
@@ -240,7 +240,7 @@ public void get() {
     }
 
     @Test
-    public void list() {
+    void list() {
         mockRequest(
                 InteractionContext.builder()
                         .request(TestRequest.builder().method(GET).path("/tasks").build())
diff --git a/cloudfoundry-client-reactor/src/test/java/org/cloudfoundry/reactor/doppler/ReactorDopplerClientTest.java b/cloudfoundry-client-reactor/src/test/java/org/cloudfoundry/reactor/doppler/ReactorDopplerClientTest.java
index 8424d1bb24d..21b436e34ff 100644
--- a/cloudfoundry-client-reactor/src/test/java/org/cloudfoundry/reactor/doppler/ReactorDopplerClientTest.java
+++ b/cloudfoundry-client-reactor/src/test/java/org/cloudfoundry/reactor/doppler/ReactorDopplerClientTest.java
@@ -31,17 +31,17 @@
 import org.cloudfoundry.reactor.InteractionContext;
 import org.cloudfoundry.reactor.TestRequest;
 import org.cloudfoundry.reactor.TestResponse;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import reactor.test.StepVerifier;
 
-public final class ReactorDopplerClientTest extends AbstractDopplerApiTest {
+final class ReactorDopplerClientTest extends AbstractDopplerApiTest {
 
     private final ReactorDopplerEndpoints dopplerEndpoints =
             new ReactorDopplerEndpoints(
                     CONNECTION_CONTEXT, this.root, TOKEN_PROVIDER, Collections.emptyMap());
 
     @Test
-    public void containerMetrics() {
+    void containerMetrics() {
         mockRequest(
                 InteractionContext.builder()
                         .request(
@@ -108,7 +108,7 @@ public void containerMetrics() {
     }
 
     @Test
-    public void containerMetricsLarge() {
+    void containerMetricsLarge() {
         mockRequest(
                 InteractionContext.builder()
                         .request(
@@ -139,7 +139,7 @@ public void containerMetricsLarge() {
     }
 
     @Test
-    public void recentLogs() {
+    void recentLogs() {
         mockRequest(
                 InteractionContext.builder()
                         .request(
@@ -214,7 +214,7 @@ public void recentLogs() {
     }
 
     @Test
-    public void recentLogsLarge() {
+    void recentLogsLarge() {
         mockRequest(
                 InteractionContext.builder()
                         .request(
diff --git a/cloudfoundry-client-reactor/src/test/java/org/cloudfoundry/reactor/logcache/v1/ReactorLogCacheClientTest.java b/cloudfoundry-client-reactor/src/test/java/org/cloudfoundry/reactor/logcache/v1/ReactorLogCacheClientTest.java
index 92af9e83d4d..e0015204d67 100644
--- a/cloudfoundry-client-reactor/src/test/java/org/cloudfoundry/reactor/logcache/v1/ReactorLogCacheClientTest.java
+++ b/cloudfoundry-client-reactor/src/test/java/org/cloudfoundry/reactor/logcache/v1/ReactorLogCacheClientTest.java
@@ -37,17 +37,17 @@
 import org.cloudfoundry.reactor.InteractionContext;
 import org.cloudfoundry.reactor.TestRequest;
 import org.cloudfoundry.reactor.TestResponse;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import reactor.test.StepVerifier;
 
-public class ReactorLogCacheClientTest extends AbstractLogCacheApiTest {
+class ReactorLogCacheClientTest extends AbstractLogCacheApiTest {
 
     private final ReactorLogCacheEndpoints logCacheEndpoints =
             new ReactorLogCacheEndpoints(
                     CONNECTION_CONTEXT, this.root, TOKEN_PROVIDER, Collections.emptyMap());
 
     @Test
-    public void info() {
+    void info() {
         mockRequest(
                 InteractionContext.builder()
                         .request(TestRequest.builder().method(GET).path("/api/v1/info").build())
@@ -68,7 +68,7 @@ public void info() {
     }
 
     @Test
-    public void meta() {
+    void meta() {
         mockRequest(
                 InteractionContext.builder()
                         .request(TestRequest.builder().method(GET).path("/api/v1/meta").build())
@@ -107,7 +107,7 @@ public void meta() {
     }
 
     @Test
-    public void read() {
+    void read() {
         mockRequest(
                 InteractionContext.builder()
                         .request(
diff --git a/cloudfoundry-client-reactor/src/test/java/org/cloudfoundry/reactor/networking/v1/policies/ReactorPoliciesClientTest.java b/cloudfoundry-client-reactor/src/test/java/org/cloudfoundry/reactor/networking/v1/policies/ReactorPoliciesClientTest.java
index 09ffbf0b0fb..f278332fb2e 100644
--- a/cloudfoundry-client-reactor/src/test/java/org/cloudfoundry/reactor/networking/v1/policies/ReactorPoliciesClientTest.java
+++ b/cloudfoundry-client-reactor/src/test/java/org/cloudfoundry/reactor/networking/v1/policies/ReactorPoliciesClientTest.java
@@ -34,17 +34,17 @@
 import org.cloudfoundry.reactor.TestRequest;
 import org.cloudfoundry.reactor.TestResponse;
 import org.cloudfoundry.reactor.networking.AbstractNetworkingApiTest;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import reactor.test.StepVerifier;
 
-public final class ReactorPoliciesClientTest extends AbstractNetworkingApiTest {
+final class ReactorPoliciesClientTest extends AbstractNetworkingApiTest {
 
     private final ReactorPolicies policies =
             new ReactorPolicies(
                     CONNECTION_CONTEXT, this.root, TOKEN_PROVIDER, Collections.emptyMap());
 
     @Test
-    public void create() {
+    void create() {
         mockRequest(
                 InteractionContext.builder()
                         .request(
@@ -108,7 +108,7 @@ public void create() {
     }
 
     @Test
-    public void delete() {
+    void delete() {
         mockRequest(
                 InteractionContext.builder()
                         .request(
@@ -174,7 +174,7 @@ public void delete() {
     }
 
     @Test
-    public void list() {
+    void list() {
         mockRequest(
                 InteractionContext.builder()
                         .request(TestRequest.builder().method(GET).path("/policies").build())
diff --git a/cloudfoundry-client-reactor/src/test/java/org/cloudfoundry/reactor/networking/v1/tags/ReactorTagsClientTest.java b/cloudfoundry-client-reactor/src/test/java/org/cloudfoundry/reactor/networking/v1/tags/ReactorTagsClientTest.java
index 31b6bf8b4af..8cf537c3a50 100644
--- a/cloudfoundry-client-reactor/src/test/java/org/cloudfoundry/reactor/networking/v1/tags/ReactorTagsClientTest.java
+++ b/cloudfoundry-client-reactor/src/test/java/org/cloudfoundry/reactor/networking/v1/tags/ReactorTagsClientTest.java
@@ -28,16 +28,16 @@
 import org.cloudfoundry.reactor.TestRequest;
 import org.cloudfoundry.reactor.TestResponse;
 import org.cloudfoundry.reactor.networking.AbstractNetworkingApiTest;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import reactor.test.StepVerifier;
 
-public final class ReactorTagsClientTest extends AbstractNetworkingApiTest {
+final class ReactorTagsClientTest extends AbstractNetworkingApiTest {
 
     private final ReactorTags tags =
             new ReactorTags(CONNECTION_CONTEXT, this.root, TOKEN_PROVIDER, Collections.emptyMap());
 
     @Test
-    public void list() {
+    void list() {
         mockRequest(
                 InteractionContext.builder()
                         .request(TestRequest.builder().method(GET).path("/tags").build())
diff --git a/cloudfoundry-client-reactor/src/test/java/org/cloudfoundry/reactor/routing/v1/routergroups/ReactorRouterGroupsTest.java b/cloudfoundry-client-reactor/src/test/java/org/cloudfoundry/reactor/routing/v1/routergroups/ReactorRouterGroupsTest.java
index f154dbe3e81..cb3edf35b8d 100644
--- a/cloudfoundry-client-reactor/src/test/java/org/cloudfoundry/reactor/routing/v1/routergroups/ReactorRouterGroupsTest.java
+++ b/cloudfoundry-client-reactor/src/test/java/org/cloudfoundry/reactor/routing/v1/routergroups/ReactorRouterGroupsTest.java
@@ -31,17 +31,17 @@
 import org.cloudfoundry.routing.v1.routergroups.RouterGroup;
 import org.cloudfoundry.routing.v1.routergroups.UpdateRouterGroupRequest;
 import org.cloudfoundry.routing.v1.routergroups.UpdateRouterGroupResponse;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import reactor.test.StepVerifier;
 
-public final class ReactorRouterGroupsTest extends AbstractRoutingApiTest {
+final class ReactorRouterGroupsTest extends AbstractRoutingApiTest {
 
     private final ReactorRouterGroups routerGroups =
             new ReactorRouterGroups(
                     CONNECTION_CONTEXT, this.root, TOKEN_PROVIDER, Collections.emptyMap());
 
     @Test
-    public void list() {
+    void list() {
         mockRequest(
                 InteractionContext.builder()
                         .request(
@@ -72,7 +72,7 @@ public void list() {
     }
 
     @Test
-    public void update() {
+    void update() {
         mockRequest(
                 InteractionContext.builder()
                         .request(
diff --git a/cloudfoundry-client-reactor/src/test/java/org/cloudfoundry/reactor/routing/v1/tcproutes/EventStreamCodecTest.java b/cloudfoundry-client-reactor/src/test/java/org/cloudfoundry/reactor/routing/v1/tcproutes/EventStreamCodecTest.java
index ef6a61f4770..1c3693a90a8 100644
--- a/cloudfoundry-client-reactor/src/test/java/org/cloudfoundry/reactor/routing/v1/tcproutes/EventStreamCodecTest.java
+++ b/cloudfoundry-client-reactor/src/test/java/org/cloudfoundry/reactor/routing/v1/tcproutes/EventStreamCodecTest.java
@@ -24,17 +24,17 @@
 import org.cloudfoundry.reactor.InteractionContext;
 import org.cloudfoundry.reactor.TestRequest;
 import org.cloudfoundry.reactor.TestResponse;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import reactor.core.publisher.Flux;
 import reactor.netty.ByteBufFlux;
 import reactor.netty.Connection;
 import reactor.netty.http.client.HttpClientResponse;
 import reactor.test.StepVerifier;
 
-public final class EventStreamCodecTest extends AbstractRestTest {
+final class EventStreamCodecTest extends AbstractRestTest {
 
     @Test
-    public void allData() {
+    void allData() {
         mockRequest(
                 InteractionContext.builder()
                         .request(TestRequest.builder().method(GET).path("/").build())
@@ -64,7 +64,7 @@ public void allData() {
     }
 
     @Test
-    public void colonSpacing() {
+    void colonSpacing() {
         mockRequest(
                 InteractionContext.builder()
                         .request(TestRequest.builder().method(GET).path("/").build())
@@ -89,7 +89,7 @@ public void colonSpacing() {
     }
 
     @Test
-    public void randomColons() {
+    void randomColons() {
         mockRequest(
                 InteractionContext.builder()
                         .request(TestRequest.builder().method(GET).path("/").build())
@@ -114,7 +114,7 @@ public void randomColons() {
     }
 
     @Test
-    public void threeLines() {
+    void threeLines() {
         mockRequest(
                 InteractionContext.builder()
                         .request(TestRequest.builder().method(GET).path("/").build())
@@ -138,7 +138,7 @@ public void threeLines() {
     }
 
     @Test
-    public void withComment() {
+    void withComment() {
         mockRequest(
                 InteractionContext.builder()
                         .request(TestRequest.builder().method(GET).path("/").build())
@@ -164,7 +164,7 @@ public void withComment() {
     }
 
     @Test
-    public void withEventTypes() {
+    void withEventTypes() {
         mockRequest(
                 InteractionContext.builder()
                         .request(TestRequest.builder().method(GET).path("/").build())
diff --git a/cloudfoundry-client-reactor/src/test/java/org/cloudfoundry/reactor/routing/v1/tcproutes/ReactorTcpRoutesTest.java b/cloudfoundry-client-reactor/src/test/java/org/cloudfoundry/reactor/routing/v1/tcproutes/ReactorTcpRoutesTest.java
index b1c9be5eaca..eb79fe9eac3 100644
--- a/cloudfoundry-client-reactor/src/test/java/org/cloudfoundry/reactor/routing/v1/tcproutes/ReactorTcpRoutesTest.java
+++ b/cloudfoundry-client-reactor/src/test/java/org/cloudfoundry/reactor/routing/v1/tcproutes/ReactorTcpRoutesTest.java
@@ -34,17 +34,17 @@
 import org.cloudfoundry.routing.v1.tcproutes.TcpRoute;
 import org.cloudfoundry.routing.v1.tcproutes.TcpRouteConfiguration;
 import org.cloudfoundry.routing.v1.tcproutes.TcpRouteDeletion;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import reactor.test.StepVerifier;
 
-public final class ReactorTcpRoutesTest extends AbstractRoutingApiTest {
+final class ReactorTcpRoutesTest extends AbstractRoutingApiTest {
 
     private final ReactorTcpRoutes tcpRoutes =
             new ReactorTcpRoutes(
                     CONNECTION_CONTEXT, this.root, TOKEN_PROVIDER, Collections.emptyMap());
 
     @Test
-    public void create() {
+    void create() {
         mockRequest(
                 InteractionContext.builder()
                         .request(
@@ -75,7 +75,7 @@ public void create() {
     }
 
     @Test
-    public void delete() {
+    void delete() {
         mockRequest(
                 InteractionContext.builder()
                         .request(
@@ -105,7 +105,7 @@ public void delete() {
     }
 
     @Test
-    public void list() {
+    void list() {
         mockRequest(
                 InteractionContext.builder()
                         .request(TestRequest.builder().method(GET).path("/v1/tcp_routes").build())
diff --git a/cloudfoundry-client-reactor/src/test/java/org/cloudfoundry/reactor/uaa/IdentityZoneBuilderTest.java b/cloudfoundry-client-reactor/src/test/java/org/cloudfoundry/reactor/uaa/IdentityZoneBuilderTest.java
index 59006745db1..43e5ed73a81 100644
--- a/cloudfoundry-client-reactor/src/test/java/org/cloudfoundry/reactor/uaa/IdentityZoneBuilderTest.java
+++ b/cloudfoundry-client-reactor/src/test/java/org/cloudfoundry/reactor/uaa/IdentityZoneBuilderTest.java
@@ -22,14 +22,14 @@
 
 import io.netty.handler.codec.http.HttpHeaders;
 import org.cloudfoundry.uaa.IdentityZoned;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
-public final class IdentityZoneBuilderTest {
+final class IdentityZoneBuilderTest {
 
     private final HttpHeaders outbound = mock(HttpHeaders.class);
 
     @Test
-    public void augment() {
+    void augment() {
         IdentityZoneBuilder.augment(this.outbound, new StubIdentityZoned());
 
         verify(this.outbound).set("X-Identity-Zone-Id", "test-identity-zone-id");
@@ -37,7 +37,7 @@ public void augment() {
     }
 
     @Test
-    public void augmentNotIdentityZoned() {
+    void augmentNotIdentityZoned() {
         IdentityZoneBuilder.augment(this.outbound, new Object());
 
         verifyNoInteractions(this.outbound);
diff --git a/cloudfoundry-client-reactor/src/test/java/org/cloudfoundry/reactor/uaa/ReactorUaaClientTest.java b/cloudfoundry-client-reactor/src/test/java/org/cloudfoundry/reactor/uaa/ReactorUaaClientTest.java
index 7156aa94a25..85620c7464a 100644
--- a/cloudfoundry-client-reactor/src/test/java/org/cloudfoundry/reactor/uaa/ReactorUaaClientTest.java
+++ b/cloudfoundry-client-reactor/src/test/java/org/cloudfoundry/reactor/uaa/ReactorUaaClientTest.java
@@ -19,9 +19,9 @@
 import static org.assertj.core.api.Assertions.assertThat;
 
 import org.cloudfoundry.reactor.AbstractRestTest;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
-public final class ReactorUaaClientTest extends AbstractRestTest {
+final class ReactorUaaClientTest extends AbstractRestTest {
 
     private final ReactorUaaClient client =
             ReactorUaaClient.builder()
@@ -31,37 +31,37 @@ public final class ReactorUaaClientTest extends AbstractRestTest {
                     .build();
 
     @Test
-    public void authorizations() {
+    void authorizations() {
         assertThat(this.client.authorizations()).isNotNull();
     }
 
     @Test
-    public void clients() {
+    void clients() {
         assertThat(this.client.clients()).isNotNull();
     }
 
     @Test
-    public void groups() {
+    void groups() {
         assertThat(this.client.groups()).isNotNull();
     }
 
     @Test
-    public void identityProviders() {
+    void identityProviders() {
         assertThat(this.client.identityProviders()).isNotNull();
     }
 
     @Test
-    public void identityZones() {
+    void identityZones() {
         assertThat(this.client.identityZones()).isNotNull();
     }
 
     @Test
-    public void tokens() {
+    void tokens() {
         assertThat(this.client.tokens()).isNotNull();
     }
 
     @Test
-    public void users() {
+    void users() {
         assertThat(this.client.users()).isNotNull();
     }
 }
diff --git a/cloudfoundry-client-reactor/src/test/java/org/cloudfoundry/reactor/uaa/UaaSigningKeyResolverTest.java b/cloudfoundry-client-reactor/src/test/java/org/cloudfoundry/reactor/uaa/UaaSigningKeyResolverTest.java
index 45b1eb0da94..ab34bb207ac 100644
--- a/cloudfoundry-client-reactor/src/test/java/org/cloudfoundry/reactor/uaa/UaaSigningKeyResolverTest.java
+++ b/cloudfoundry-client-reactor/src/test/java/org/cloudfoundry/reactor/uaa/UaaSigningKeyResolverTest.java
@@ -17,6 +17,7 @@
 package org.cloudfoundry.reactor.uaa;
 
 import static org.assertj.core.api.Assertions.assertThat;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 
@@ -34,17 +35,17 @@
 import org.cloudfoundry.uaa.tokens.ListTokenKeysResponse;
 import org.cloudfoundry.uaa.tokens.TokenKey;
 import org.cloudfoundry.uaa.tokens.Tokens;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import reactor.core.publisher.Mono;
 
-public final class UaaSigningKeyResolverTest {
+final class UaaSigningKeyResolverTest {
 
     private final Tokens tokens = mock(Tokens.class);
 
     private final UaaSigningKeyResolver signingKeyResolver = new UaaSigningKeyResolver(this.tokens);
 
     @Test
-    public void resolveExistingKey() throws NoSuchAlgorithmException {
+    void resolveExistingKey() throws NoSuchAlgorithmException {
         PublicKey publicKey = getKeyPair().getPublic();
 
         when(this.tokens.listKeys(ListTokenKeysRequest.builder().build()))
@@ -71,7 +72,7 @@ public void resolveExistingKey() throws NoSuchAlgorithmException {
     }
 
     @Test
-    public void resolveRefreshedKey() throws NoSuchAlgorithmException {
+    void resolveRefreshedKey() throws NoSuchAlgorithmException {
         PublicKey publicKey = getKeyPair().getPublic();
 
         when(this.tokens.listKeys(ListTokenKeysRequest.builder().build()))
@@ -96,15 +97,19 @@ public void resolveRefreshedKey() throws NoSuchAlgorithmException {
         assertThat(this.signingKeyResolver.resolveSigningKey(header, claims)).isNotNull();
     }
 
-    @Test(expected = IllegalStateException.class)
-    public void resolveUnknownKey() {
-        when(this.tokens.listKeys(ListTokenKeysRequest.builder().build()))
-                .thenReturn(Mono.just(ListTokenKeysResponse.builder().build()));
-
-        JwsHeader<?> header = new DefaultJwsHeader().setKeyId("test-key-id");
-        Claims claims = new DefaultClaims();
-
-        this.signingKeyResolver.resolveSigningKey(header, claims);
+    @Test
+    void resolveUnknownKey() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    when(this.tokens.listKeys(ListTokenKeysRequest.builder().build()))
+                            .thenReturn(Mono.just(ListTokenKeysResponse.builder().build()));
+
+                    JwsHeader<?> header = new DefaultJwsHeader().setKeyId("test-key-id");
+                    Claims claims = new DefaultClaims();
+
+                    this.signingKeyResolver.resolveSigningKey(header, claims);
+                });
     }
 
     private static String getEncoded(PublicKey publicKey) {
diff --git a/cloudfoundry-client-reactor/src/test/java/org/cloudfoundry/reactor/uaa/UsernameProviderTest.java b/cloudfoundry-client-reactor/src/test/java/org/cloudfoundry/reactor/uaa/UsernameProviderTest.java
index 38a3e0b3992..5cc2e47b9f8 100644
--- a/cloudfoundry-client-reactor/src/test/java/org/cloudfoundry/reactor/uaa/UsernameProviderTest.java
+++ b/cloudfoundry-client-reactor/src/test/java/org/cloudfoundry/reactor/uaa/UsernameProviderTest.java
@@ -37,11 +37,11 @@
 import java.util.Map;
 import org.cloudfoundry.reactor.ConnectionContext;
 import org.cloudfoundry.reactor.TokenProvider;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import reactor.core.publisher.Mono;
 import reactor.test.StepVerifier;
 
-public final class UsernameProviderTest {
+final class UsernameProviderTest {
 
     private final ConnectionContext connectionContext = mock(ConnectionContext.class);
 
@@ -55,7 +55,7 @@ public final class UsernameProviderTest {
 
     @SuppressWarnings("unchecked")
     @Test
-    public void getInvalidToken() throws NoSuchAlgorithmException {
+    void getInvalidToken() throws NoSuchAlgorithmException {
         KeyPair keyPair = getKeyPair();
         when(this.signingKeyResolver.resolveSigningKey(any(JwsHeader.class), any(Claims.class)))
                 .thenReturn(keyPair.getPublic());
@@ -82,7 +82,7 @@ public void getInvalidToken() throws NoSuchAlgorithmException {
     }
 
     @Test
-    public void getValidToken() throws NoSuchAlgorithmException {
+    void getValidToken() throws NoSuchAlgorithmException {
         KeyPair keyPair = getKeyPair();
         when(this.signingKeyResolver.resolveSigningKey(any(JwsHeader.class), any(Claims.class)))
                 .thenReturn(keyPair.getPublic());
diff --git a/cloudfoundry-client-reactor/src/test/java/org/cloudfoundry/reactor/uaa/VersionBuilderTest.java b/cloudfoundry-client-reactor/src/test/java/org/cloudfoundry/reactor/uaa/VersionBuilderTest.java
index c9d56e4f3db..f73cc6734a6 100644
--- a/cloudfoundry-client-reactor/src/test/java/org/cloudfoundry/reactor/uaa/VersionBuilderTest.java
+++ b/cloudfoundry-client-reactor/src/test/java/org/cloudfoundry/reactor/uaa/VersionBuilderTest.java
@@ -22,26 +22,26 @@
 
 import io.netty.handler.codec.http.HttpHeaders;
 import org.cloudfoundry.uaa.Versioned;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
-public final class VersionBuilderTest {
+final class VersionBuilderTest {
 
     private final HttpHeaders outbound = mock(HttpHeaders.class);
 
     @Test
-    public void augment() {
+    void augment() {
         VersionBuilder.augment(this.outbound, new StubVersioned("test-version"));
         verify(this.outbound).set("If-Match", "test-version");
     }
 
     @Test
-    public void augmentNotVersioned() {
+    void augmentNotVersioned() {
         VersionBuilder.augment(this.outbound, new Object());
         verifyNoInteractions(this.outbound);
     }
 
     @Test
-    public void augmentNullVersion() {
+    void augmentNullVersion() {
         VersionBuilder.augment(this.outbound, new StubVersioned(null));
         verifyNoInteractions(this.outbound);
     }
diff --git a/cloudfoundry-client-reactor/src/test/java/org/cloudfoundry/reactor/uaa/authorizations/ReactorAuthorizationsTest.java b/cloudfoundry-client-reactor/src/test/java/org/cloudfoundry/reactor/uaa/authorizations/ReactorAuthorizationsTest.java
index 11c3e33be3d..946f72d8a1c 100644
--- a/cloudfoundry-client-reactor/src/test/java/org/cloudfoundry/reactor/uaa/authorizations/ReactorAuthorizationsTest.java
+++ b/cloudfoundry-client-reactor/src/test/java/org/cloudfoundry/reactor/uaa/authorizations/ReactorAuthorizationsTest.java
@@ -36,17 +36,17 @@
 import org.cloudfoundry.uaa.authorizations.AuthorizeByOpenIdWithImplicitGrantRequest;
 import org.cloudfoundry.uaa.authorizations.GetOpenIdProviderConfigurationRequest;
 import org.cloudfoundry.uaa.authorizations.GetOpenIdProviderConfigurationResponse;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import reactor.test.StepVerifier;
 
-public final class ReactorAuthorizationsTest extends AbstractUaaApiTest {
+final class ReactorAuthorizationsTest extends AbstractUaaApiTest {
 
     private final ReactorAuthorizations authorizations =
             new ReactorAuthorizations(
                     CONNECTION_CONTEXT, this.root, TOKEN_PROVIDER, Collections.emptyMap());
 
     @Test
-    public void authorizeByAuthorizationCodeGrantApi() {
+    void authorizeByAuthorizationCodeGrantApi() {
         mockRequest(
                 InteractionContext.builder()
                         .request(
@@ -78,7 +78,7 @@ public void authorizeByAuthorizationCodeGrantApi() {
     }
 
     @Test
-    public void authorizeByAuthorizationCodeGrantBrowser() {
+    void authorizeByAuthorizationCodeGrantBrowser() {
         mockRequest(
                 InteractionContext.builder()
                         .request(
@@ -109,7 +109,7 @@ public void authorizeByAuthorizationCodeGrantBrowser() {
     }
 
     @Test
-    public void authorizeByAuthorizationCodeGrantHybrid() {
+    void authorizeByAuthorizationCodeGrantHybrid() {
         mockRequest(
                 InteractionContext.builder()
                         .request(
@@ -154,7 +154,7 @@ public void authorizeByAuthorizationCodeGrantHybrid() {
     }
 
     @Test
-    public void authorizeByImplicitGrantBrowser() {
+    void authorizeByImplicitGrantBrowser() {
         mockRequest(
                 InteractionContext.builder()
                         .request(
@@ -192,7 +192,7 @@ public void authorizeByImplicitGrantBrowser() {
     }
 
     @Test
-    public void authorizeByOpenIdWithAuthorizationCodeGrant() {
+    void authorizeByOpenIdWithAuthorizationCodeGrant() {
         mockRequest(
                 InteractionContext.builder()
                         .request(
@@ -222,7 +222,7 @@ public void authorizeByOpenIdWithAuthorizationCodeGrant() {
     }
 
     @Test
-    public void authorizeByOpenIdWithToken() {
+    void authorizeByOpenIdWithToken() {
         mockRequest(
                 InteractionContext.builder()
                         .request(
@@ -267,7 +267,7 @@ public void authorizeByOpenIdWithToken() {
     }
 
     @Test
-    public void authorizeByOpenIdWithimplicitGrant() {
+    void authorizeByOpenIdWithimplicitGrant() {
         mockRequest(
                 InteractionContext.builder()
                         .request(
@@ -297,7 +297,7 @@ public void authorizeByOpenIdWithimplicitGrant() {
     }
 
     @Test
-    public void getOpenIdProviderConfigurationRequest() {
+    void getOpenIdProviderConfigurationRequest() {
         mockRequest(
                 InteractionContext.builder()
                         .request(
diff --git a/cloudfoundry-client-reactor/src/test/java/org/cloudfoundry/reactor/uaa/clients/ReactorClientsTest.java b/cloudfoundry-client-reactor/src/test/java/org/cloudfoundry/reactor/uaa/clients/ReactorClientsTest.java
index 2101b430312..c36ac4f4434 100644
--- a/cloudfoundry-client-reactor/src/test/java/org/cloudfoundry/reactor/uaa/clients/ReactorClientsTest.java
+++ b/cloudfoundry-client-reactor/src/test/java/org/cloudfoundry/reactor/uaa/clients/ReactorClientsTest.java
@@ -70,17 +70,17 @@
 import org.cloudfoundry.uaa.clients.UpdateMetadataRequest;
 import org.cloudfoundry.uaa.clients.UpdateMetadataResponse;
 import org.cloudfoundry.uaa.clients.UpdateSecretAction;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import reactor.test.StepVerifier;
 
-public final class ReactorClientsTest extends AbstractUaaApiTest {
+final class ReactorClientsTest extends AbstractUaaApiTest {
 
     private final ReactorClients clients =
             new ReactorClients(
                     CONNECTION_CONTEXT, this.root, TOKEN_PROVIDER, Collections.emptyMap());
 
     @Test
-    public void batchChangeSecret() {
+    void batchChangeSecret() {
         mockRequest(
                 InteractionContext.builder()
                         .request(
@@ -161,7 +161,7 @@ public void batchChangeSecret() {
     }
 
     @Test
-    public void batchCreate() {
+    void batchCreate() {
         mockRequest(
                 InteractionContext.builder()
                         .request(
@@ -252,7 +252,7 @@ public void batchCreate() {
     }
 
     @Test
-    public void batchDelete() {
+    void batchDelete() {
         mockRequest(
                 InteractionContext.builder()
                         .request(
@@ -315,7 +315,7 @@ public void batchDelete() {
     }
 
     @Test
-    public void batchUpdate() {
+    void batchUpdate() {
         mockRequest(
                 InteractionContext.builder()
                         .request(
@@ -410,7 +410,7 @@ public void batchUpdate() {
     }
 
     @Test
-    public void changeSecrets() {
+    void changeSecrets() {
         mockRequest(
                 InteractionContext.builder()
                         .request(
@@ -445,7 +445,7 @@ public void changeSecrets() {
     }
 
     @Test
-    public void create() {
+    void create() {
         mockRequest(
                 InteractionContext.builder()
                         .request(
@@ -499,7 +499,7 @@ public void create() {
     }
 
     @Test
-    public void delete() {
+    void delete() {
         mockRequest(
                 InteractionContext.builder()
                         .request(
@@ -538,7 +538,7 @@ public void delete() {
     }
 
     @Test
-    public void deserialize() {
+    void deserialize() {
         mockRequest(
                 InteractionContext.builder()
                         .request(TestRequest.builder().method(GET).path("/oauth/clients").build())
@@ -597,7 +597,7 @@ public void deserialize() {
     }
 
     @Test
-    public void get() {
+    void get() {
         mockRequest(
                 InteractionContext.builder()
                         .request(
@@ -636,7 +636,7 @@ public void get() {
     }
 
     @Test
-    public void getMetadata() {
+    void getMetadata() {
         mockRequest(
                 InteractionContext.builder()
                         .request(
@@ -666,7 +666,7 @@ public void getMetadata() {
     }
 
     @Test
-    public void list() {
+    void list() {
         mockRequest(
                 InteractionContext.builder()
                         .request(
@@ -720,7 +720,7 @@ public void list() {
     }
 
     @Test
-    public void listMetadatas() {
+    void listMetadatas() {
         mockRequest(
                 InteractionContext.builder()
                         .request(
@@ -774,7 +774,7 @@ public void listMetadatas() {
     }
 
     @Test
-    public void mixedActions() {
+    void mixedActions() {
         mockRequest(
                 InteractionContext.builder()
                         .request(
@@ -876,7 +876,7 @@ public void mixedActions() {
     }
 
     @Test
-    public void update() {
+    void update() {
         mockRequest(
                 InteractionContext.builder()
                         .request(
@@ -922,7 +922,7 @@ public void update() {
     }
 
     @Test
-    public void updateMetadata() {
+    void updateMetadata() {
         mockRequest(
                 InteractionContext.builder()
                         .request(
diff --git a/cloudfoundry-client-reactor/src/test/java/org/cloudfoundry/reactor/uaa/groups/ReactorGroupsTest.java b/cloudfoundry-client-reactor/src/test/java/org/cloudfoundry/reactor/uaa/groups/ReactorGroupsTest.java
index cd0939b907e..2275afcccde 100644
--- a/cloudfoundry-client-reactor/src/test/java/org/cloudfoundry/reactor/uaa/groups/ReactorGroupsTest.java
+++ b/cloudfoundry-client-reactor/src/test/java/org/cloudfoundry/reactor/uaa/groups/ReactorGroupsTest.java
@@ -66,17 +66,17 @@
 import org.cloudfoundry.uaa.users.Email;
 import org.cloudfoundry.uaa.users.Meta;
 import org.cloudfoundry.uaa.users.Name;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import reactor.test.StepVerifier;
 
-public final class ReactorGroupsTest extends AbstractUaaApiTest {
+final class ReactorGroupsTest extends AbstractUaaApiTest {
 
     private final ReactorGroups groups =
             new ReactorGroups(
                     CONNECTION_CONTEXT, this.root, TOKEN_PROVIDER, Collections.emptyMap());
 
     @Test
-    public void addMember() {
+    void addMember() {
         mockRequest(
                 InteractionContext.builder()
                         .request(
@@ -114,7 +114,7 @@ public void addMember() {
     }
 
     @Test
-    public void checkMember() {
+    void checkMember() {
         mockRequest(
                 InteractionContext.builder()
                         .request(
@@ -148,7 +148,7 @@ public void checkMember() {
     }
 
     @Test
-    public void create() {
+    void create() {
         mockRequest(
                 InteractionContext.builder()
                         .request(
@@ -204,7 +204,7 @@ public void create() {
     }
 
     @Test
-    public void delete() {
+    void delete() {
         mockRequest(
                 InteractionContext.builder()
                         .request(
@@ -248,7 +248,7 @@ public void delete() {
     }
 
     @Test
-    public void get() {
+    void get() {
         mockRequest(
                 InteractionContext.builder()
                         .request(
@@ -291,7 +291,7 @@ public void get() {
     }
 
     @Test
-    public void list() {
+    void list() {
         mockRequest(
                 InteractionContext.builder()
                         .request(
@@ -354,7 +354,7 @@ public void list() {
     }
 
     @Test
-    public void listExternalGroupMappings() {
+    void listExternalGroupMappings() {
         mockRequest(
                 InteractionContext.builder()
                         .request(
@@ -399,7 +399,7 @@ public void listExternalGroupMappings() {
     }
 
     @Test
-    public void listMembers() {
+    void listMembers() {
         mockRequest(
                 InteractionContext.builder()
                         .request(
@@ -471,7 +471,7 @@ public void listMembers() {
     }
 
     @Test
-    public void listMembersNoEntity() {
+    void listMembersNoEntity() {
         mockRequest(
                 InteractionContext.builder()
                         .request(
@@ -509,7 +509,7 @@ public void listMembersNoEntity() {
     }
 
     @Test
-    public void mapExternalGroup() {
+    void mapExternalGroup() {
         mockRequest(
                 InteractionContext.builder()
                         .request(
@@ -551,7 +551,7 @@ public void mapExternalGroup() {
     }
 
     @Test
-    public void removeMember() {
+    void removeMember() {
         mockRequest(
                 InteractionContext.builder()
                         .request(
@@ -586,7 +586,7 @@ public void removeMember() {
     }
 
     @Test
-    public void success() {
+    void success() {
         mockRequest(
                 InteractionContext.builder()
                         .request(
@@ -645,7 +645,7 @@ public void success() {
     }
 
     @Test
-    public void unmapExternalGroupByGroupDisplayName() {
+    void unmapExternalGroupByGroupDisplayName() {
         mockRequest(
                 InteractionContext.builder()
                         .request(
@@ -691,7 +691,7 @@ public void unmapExternalGroupByGroupDisplayName() {
     }
 
     @Test
-    public void unmapExternalGroupByGroupId() {
+    void unmapExternalGroupByGroupId() {
         mockRequest(
                 InteractionContext.builder()
                         .request(
diff --git a/cloudfoundry-client-reactor/src/test/java/org/cloudfoundry/reactor/uaa/identityproviders/ReactorIdentityProvidersTest.java b/cloudfoundry-client-reactor/src/test/java/org/cloudfoundry/reactor/uaa/identityproviders/ReactorIdentityProvidersTest.java
index 83c106f0030..94b78f7d545 100644
--- a/cloudfoundry-client-reactor/src/test/java/org/cloudfoundry/reactor/uaa/identityproviders/ReactorIdentityProvidersTest.java
+++ b/cloudfoundry-client-reactor/src/test/java/org/cloudfoundry/reactor/uaa/identityproviders/ReactorIdentityProvidersTest.java
@@ -50,17 +50,17 @@
 import org.cloudfoundry.uaa.identityproviders.Type;
 import org.cloudfoundry.uaa.identityproviders.UpdateIdentityProviderRequest;
 import org.cloudfoundry.uaa.identityproviders.UpdateIdentityProviderResponse;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import reactor.test.StepVerifier;
 
-public final class ReactorIdentityProvidersTest extends AbstractUaaApiTest {
+final class ReactorIdentityProvidersTest extends AbstractUaaApiTest {
 
     private final ReactorIdentityProviders identityProviders =
             new ReactorIdentityProviders(
                     CONNECTION_CONTEXT, this.root, TOKEN_PROVIDER, Collections.emptyMap());
 
     @Test
-    public void createLdap() {
+    void createLdap() {
         mockRequest(
                 InteractionContext.builder()
                         .request(
@@ -135,7 +135,7 @@ public void createLdap() {
     }
 
     @Test
-    public void createOauth() {
+    void createOauth() {
         mockRequest(
                 InteractionContext.builder()
                         .request(
@@ -208,7 +208,7 @@ public void createOauth() {
     }
 
     @Test
-    public void createSaml() {
+    void createSaml() {
         mockRequest(
                 InteractionContext.builder()
                         .request(
@@ -341,7 +341,7 @@ public void createSaml() {
     }
 
     @Test
-    public void delete() {
+    void delete() {
         mockRequest(
                 InteractionContext.builder()
                         .request(
@@ -429,7 +429,7 @@ public void delete() {
     }
 
     @Test
-    public void get() {
+    void get() {
         mockRequest(
                 InteractionContext.builder()
                         .request(
@@ -517,7 +517,7 @@ public void get() {
     }
 
     @Test
-    public void list() {
+    void list() {
         mockRequest(
                 InteractionContext.builder()
                         .request(
@@ -673,7 +673,7 @@ public void list() {
     }
 
     @Test
-    public void update() {
+    void update() {
         mockRequest(
                 InteractionContext.builder()
                         .request(
diff --git a/cloudfoundry-client-reactor/src/test/java/org/cloudfoundry/reactor/uaa/identityzones/ReactorIdentityZonesTest.java b/cloudfoundry-client-reactor/src/test/java/org/cloudfoundry/reactor/uaa/identityzones/ReactorIdentityZonesTest.java
index 9808a42c76e..62674816d25 100644
--- a/cloudfoundry-client-reactor/src/test/java/org/cloudfoundry/reactor/uaa/identityzones/ReactorIdentityZonesTest.java
+++ b/cloudfoundry-client-reactor/src/test/java/org/cloudfoundry/reactor/uaa/identityzones/ReactorIdentityZonesTest.java
@@ -60,17 +60,17 @@
 import org.cloudfoundry.uaa.identityzones.UpdateIdentityZoneRequest;
 import org.cloudfoundry.uaa.identityzones.UpdateIdentityZoneResponse;
 import org.cloudfoundry.uaa.identityzones.UserConfig;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import reactor.test.StepVerifier;
 
-public final class ReactorIdentityZonesTest extends AbstractUaaApiTest {
+final class ReactorIdentityZonesTest extends AbstractUaaApiTest {
 
     private final ReactorIdentityZones identityZones =
             new ReactorIdentityZones(
                     CONNECTION_CONTEXT, this.root, TOKEN_PROVIDER, Collections.emptyMap());
 
     @Test
-    public void create() {
+    void create() {
         IdentityZoneConfiguration testConfiguration =
                 IdentityZoneConfiguration.builder()
                         .clientSecretPolicy(
@@ -298,7 +298,7 @@ public void create() {
     }
 
     @Test
-    public void delete() {
+    void delete() {
         mockRequest(
                 InteractionContext.builder()
                         .request(
@@ -450,7 +450,7 @@ public void delete() {
     }
 
     @Test
-    public void get() {
+    void get() {
         mockRequest(
                 InteractionContext.builder()
                         .request(
@@ -682,7 +682,7 @@ public void get() {
     }
 
     @Test
-    public void list() {
+    void list() {
         mockRequest(
                 InteractionContext.builder()
                         .request(TestRequest.builder().method(GET).path("/identity-zones").build())
@@ -846,7 +846,7 @@ public void list() {
     }
 
     @Test
-    public void update() {
+    void update() {
         mockRequest(
                 InteractionContext.builder()
                         .request(
diff --git a/cloudfoundry-client-reactor/src/test/java/org/cloudfoundry/reactor/uaa/serverinformation/ReactorServerInformationTest.java b/cloudfoundry-client-reactor/src/test/java/org/cloudfoundry/reactor/uaa/serverinformation/ReactorServerInformationTest.java
index f08cc1caa3d..a0e921ef75a 100644
--- a/cloudfoundry-client-reactor/src/test/java/org/cloudfoundry/reactor/uaa/serverinformation/ReactorServerInformationTest.java
+++ b/cloudfoundry-client-reactor/src/test/java/org/cloudfoundry/reactor/uaa/serverinformation/ReactorServerInformationTest.java
@@ -38,17 +38,17 @@
 import org.cloudfoundry.uaa.serverinformation.GetInfoResponse;
 import org.cloudfoundry.uaa.serverinformation.Links;
 import org.cloudfoundry.uaa.serverinformation.Prompts;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import reactor.test.StepVerifier;
 
-public final class ReactorServerInformationTest extends AbstractUaaApiTest {
+final class ReactorServerInformationTest extends AbstractUaaApiTest {
 
     private final ReactorServerInformation info =
             new ReactorServerInformation(
                     CONNECTION_CONTEXT, this.root, TOKEN_PROVIDER, Collections.emptyMap());
 
     @Test
-    public void autoLogin() {
+    void autoLogin() {
         mockRequest(
                 InteractionContext.builder()
                         .request(
@@ -67,7 +67,7 @@ public void autoLogin() {
     }
 
     @Test
-    public void getAutoLoginAuthenticationCode() {
+    void getAutoLoginAuthenticationCode() {
         mockRequest(
                 InteractionContext.builder()
                         .request(
@@ -102,7 +102,7 @@ public void getAutoLoginAuthenticationCode() {
     }
 
     @Test
-    public void getInfo() {
+    void getInfo() {
         Map<String, String> ipDefinitions = new HashMap<>();
         ipDefinitions.put(
                 "SAMLMetadataUrl",
diff --git a/cloudfoundry-client-reactor/src/test/java/org/cloudfoundry/reactor/uaa/tokens/ReactorTokensTest.java b/cloudfoundry-client-reactor/src/test/java/org/cloudfoundry/reactor/uaa/tokens/ReactorTokensTest.java
index 7d68def87bc..db0299aa645 100644
--- a/cloudfoundry-client-reactor/src/test/java/org/cloudfoundry/reactor/uaa/tokens/ReactorTokensTest.java
+++ b/cloudfoundry-client-reactor/src/test/java/org/cloudfoundry/reactor/uaa/tokens/ReactorTokensTest.java
@@ -48,17 +48,17 @@
 import org.cloudfoundry.uaa.tokens.RefreshTokenResponse;
 import org.cloudfoundry.uaa.tokens.TokenFormat;
 import org.cloudfoundry.uaa.tokens.TokenKey;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import reactor.test.StepVerifier;
 
-public final class ReactorTokensTest extends AbstractUaaApiTest {
+final class ReactorTokensTest extends AbstractUaaApiTest {
 
     private final ReactorTokens tokens =
             new ReactorTokens(
                     CONNECTION_CONTEXT, this.root, TOKEN_PROVIDER, Collections.emptyMap());
 
     @Test
-    public void check() {
+    void check() {
         mockRequest(
                 InteractionContext.builder()
                         .request(
@@ -126,7 +126,7 @@ public void check() {
     }
 
     @Test
-    public void getKey() {
+    void getKey() {
         mockRequest(
                 InteractionContext.builder()
                         .request(TestRequest.builder().method(GET).path("/token_key").build())
@@ -167,7 +167,7 @@ public void getKey() {
     }
 
     @Test
-    public void getTokenByAuthorizationCode() {
+    void getTokenByAuthorizationCode() {
         mockRequest(
                 InteractionContext.builder()
                         .request(
@@ -210,7 +210,7 @@ public void getTokenByAuthorizationCode() {
     }
 
     @Test
-    public void getTokenByClientCredentials() {
+    void getTokenByClientCredentials() {
         mockRequest(
                 InteractionContext.builder()
                         .request(
@@ -252,7 +252,7 @@ public void getTokenByClientCredentials() {
     }
 
     @Test
-    public void getTokenByOneTimePasscode() {
+    void getTokenByOneTimePasscode() {
         mockRequest(
                 InteractionContext.builder()
                         .request(
@@ -295,7 +295,7 @@ public void getTokenByOneTimePasscode() {
     }
 
     @Test
-    public void getTokenByOpenId() {
+    void getTokenByOpenId() {
         mockRequest(
                 InteractionContext.builder()
                         .request(
@@ -340,7 +340,7 @@ public void getTokenByOpenId() {
     }
 
     @Test
-    public void getTokenByPassword() {
+    void getTokenByPassword() {
         mockRequest(
                 InteractionContext.builder()
                         .request(
@@ -385,7 +385,7 @@ public void getTokenByPassword() {
     }
 
     @Test
-    public void listKeys() {
+    void listKeys() {
         mockRequest(
                 InteractionContext.builder()
                         .request(TestRequest.builder().method(GET).path("/token_keys").build())
@@ -429,7 +429,7 @@ public void listKeys() {
     }
 
     @Test
-    public void refreshToken() {
+    void refreshToken() {
         mockRequest(
                 InteractionContext.builder()
                         .request(
diff --git a/cloudfoundry-client-reactor/src/test/java/org/cloudfoundry/reactor/uaa/users/ReactorUsersTest.java b/cloudfoundry-client-reactor/src/test/java/org/cloudfoundry/reactor/uaa/users/ReactorUsersTest.java
index 1828b33faae..7ace0b0f463 100644
--- a/cloudfoundry-client-reactor/src/test/java/org/cloudfoundry/reactor/uaa/users/ReactorUsersTest.java
+++ b/cloudfoundry-client-reactor/src/test/java/org/cloudfoundry/reactor/uaa/users/ReactorUsersTest.java
@@ -65,16 +65,16 @@
 import org.cloudfoundry.uaa.users.UserInfoResponse;
 import org.cloudfoundry.uaa.users.VerifyUserRequest;
 import org.cloudfoundry.uaa.users.VerifyUserResponse;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import reactor.test.StepVerifier;
 
-public final class ReactorUsersTest extends AbstractUaaApiTest {
+final class ReactorUsersTest extends AbstractUaaApiTest {
 
     private final ReactorUsers users =
             new ReactorUsers(CONNECTION_CONTEXT, this.root, TOKEN_PROVIDER, Collections.emptyMap());
 
     @Test
-    public void changePassword() {
+    void changePassword() {
         mockRequest(
                 InteractionContext.builder()
                         .request(
@@ -109,7 +109,7 @@ public void changePassword() {
     }
 
     @Test
-    public void create() {
+    void create() {
         mockRequest(
                 InteractionContext.builder()
                         .request(
@@ -260,7 +260,7 @@ public void create() {
     }
 
     @Test
-    public void delete() {
+    void delete() {
         mockRequest(
                 InteractionContext.builder()
                         .request(
@@ -413,7 +413,7 @@ public void delete() {
     }
 
     @Test
-    public void expirePassword() {
+    void expirePassword() {
         mockRequest(
                 InteractionContext.builder()
                         .request(
@@ -444,7 +444,7 @@ public void expirePassword() {
     }
 
     @Test
-    public void getVerificationLink() {
+    void getVerificationLink() {
         mockRequest(
                 InteractionContext.builder()
                         .request(
@@ -477,7 +477,7 @@ public void getVerificationLink() {
     }
 
     @Test
-    public void inviteUsers() {
+    void inviteUsers() {
         mockRequest(
                 InteractionContext.builder()
                         .request(
@@ -530,7 +530,7 @@ public void inviteUsers() {
     }
 
     @Test
-    public void list() {
+    void list() {
         mockRequest(
                 InteractionContext.builder()
                         .request(
@@ -702,7 +702,7 @@ public void list() {
     }
 
     @Test
-    public void lookup() {
+    void lookup() {
         mockRequest(
                 InteractionContext.builder()
                         .request(
@@ -754,7 +754,7 @@ public void lookup() {
     }
 
     @Test
-    public void update() {
+    void update() {
         mockRequest(
                 InteractionContext.builder()
                         .request(
@@ -864,7 +864,7 @@ public void update() {
     }
 
     @Test
-    public void userInfo() {
+    void userInfo() {
         mockRequest(
                 InteractionContext.builder()
                         .request(TestRequest.builder().method(GET).path("/userinfo").build())
@@ -896,7 +896,7 @@ public void userInfo() {
     }
 
     @Test
-    public void verifyUser() {
+    void verifyUser() {
         mockRequest(
                 InteractionContext.builder()
                         .request(
diff --git a/cloudfoundry-client-reactor/src/test/java/org/cloudfoundry/reactor/util/CertificateCollectingTrustManagerTest.java b/cloudfoundry-client-reactor/src/test/java/org/cloudfoundry/reactor/util/CertificateCollectingTrustManagerTest.java
index 5d38218e1e7..a4ad9fe78ab 100644
--- a/cloudfoundry-client-reactor/src/test/java/org/cloudfoundry/reactor/util/CertificateCollectingTrustManagerTest.java
+++ b/cloudfoundry-client-reactor/src/test/java/org/cloudfoundry/reactor/util/CertificateCollectingTrustManagerTest.java
@@ -17,6 +17,7 @@
 package org.cloudfoundry.reactor.util;
 
 import static org.assertj.core.api.Assertions.assertThat;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 import static org.mockito.Mockito.RETURNS_SMART_NULLS;
 import static org.mockito.Mockito.doThrow;
 import static org.mockito.Mockito.mock;
@@ -25,9 +26,9 @@
 import java.security.cert.CertificateException;
 import java.security.cert.X509Certificate;
 import javax.net.ssl.X509TrustManager;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
-public final class CertificateCollectingTrustManagerTest {
+final class CertificateCollectingTrustManagerTest {
 
     private final X509Certificate[] chain = new X509Certificate[0];
 
@@ -36,14 +37,18 @@ public final class CertificateCollectingTrustManagerTest {
     private final CertificateCollectingTrustManager trustManager =
             new CertificateCollectingTrustManager(this.delegate);
 
-    @Test(expected = IllegalStateException.class)
-    public void checkClientTrustedAlreadyCollected() {
-        this.trustManager.checkClientTrusted(this.chain, null);
-        this.trustManager.checkClientTrusted(this.chain, null);
+    @Test
+    void checkClientTrustedAlreadyCollected() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    this.trustManager.checkClientTrusted(this.chain, null);
+                    this.trustManager.checkClientTrusted(this.chain, null);
+                });
     }
 
     @Test
-    public void checkClientTrustedNotTrusted() throws CertificateException {
+    void checkClientTrustedNotTrusted() throws CertificateException {
         doThrow(new CertificateException())
                 .when(this.delegate)
                 .checkClientTrusted(this.chain, null);
@@ -54,20 +59,24 @@ public void checkClientTrustedNotTrusted() throws CertificateException {
     }
 
     @Test
-    public void checkClientTrustedTrusted() {
+    void checkClientTrustedTrusted() {
         this.trustManager.checkClientTrusted(this.chain, null);
 
         assertThat(this.trustManager.isTrusted()).isTrue();
     }
 
-    @Test(expected = IllegalStateException.class)
-    public void checkServerTrustedAlreadyCollected() {
-        this.trustManager.checkServerTrusted(this.chain, null);
-        this.trustManager.checkServerTrusted(this.chain, null);
+    @Test
+    void checkServerTrustedAlreadyCollected() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    this.trustManager.checkServerTrusted(this.chain, null);
+                    this.trustManager.checkServerTrusted(this.chain, null);
+                });
     }
 
     @Test
-    public void checkServerTrustedNotTrusted() throws CertificateException {
+    void checkServerTrustedNotTrusted() throws CertificateException {
         doThrow(new CertificateException())
                 .when(this.delegate)
                 .checkServerTrusted(this.chain, null);
@@ -78,21 +87,21 @@ public void checkServerTrustedNotTrusted() throws CertificateException {
     }
 
     @Test
-    public void checkServerTrustedTrusted() {
+    void checkServerTrustedTrusted() {
         this.trustManager.checkServerTrusted(this.chain, null);
 
         assertThat(this.trustManager.isTrusted()).isTrue();
     }
 
     @Test
-    public void getAcceptedIssuers() {
+    void getAcceptedIssuers() {
         this.trustManager.getAcceptedIssuers();
 
         verify(this.delegate).getAcceptedIssuers();
     }
 
     @Test
-    public void getCollectedCertificateChain() {
+    void getCollectedCertificateChain() {
         this.trustManager.checkServerTrusted(this.chain, null);
 
         X509Certificate[] collectedCertificateChain =
@@ -103,12 +112,12 @@ public void getCollectedCertificateChain() {
     }
 
     @Test
-    public void getCollectedCertificateChainNotCollected() {
+    void getCollectedCertificateChainNotCollected() {
         assertThat(this.trustManager.getCollectedCertificateChain()).isNull();
     }
 
     @Test
-    public void isTrusted() {
+    void isTrusted() {
         assertThat(this.trustManager.isTrusted()).isFalse();
     }
 }
diff --git a/cloudfoundry-client-reactor/src/test/java/org/cloudfoundry/reactor/util/ErrorPayloadMappersTest.java b/cloudfoundry-client-reactor/src/test/java/org/cloudfoundry/reactor/util/ErrorPayloadMappersTest.java
index bcd9a138e4c..d3f0580cced 100644
--- a/cloudfoundry-client-reactor/src/test/java/org/cloudfoundry/reactor/util/ErrorPayloadMappersTest.java
+++ b/cloudfoundry-client-reactor/src/test/java/org/cloudfoundry/reactor/util/ErrorPayloadMappersTest.java
@@ -32,7 +32,7 @@
 import org.cloudfoundry.client.v3.ClientV3Exception;
 import org.cloudfoundry.reactor.HttpClientResponseWithConnection;
 import org.cloudfoundry.uaa.UaaException;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.springframework.core.io.ClassPathResource;
 import reactor.core.publisher.Flux;
 import reactor.netty.ByteBufFlux;
@@ -41,7 +41,7 @@
 import reactor.netty.http.client.HttpClientResponse;
 import reactor.test.StepVerifier;
 
-public final class ErrorPayloadMappersTest {
+final class ErrorPayloadMappersTest {
 
     private final Connection connection = mock(Connection.class, RETURNS_SMART_NULLS);
 
@@ -52,7 +52,7 @@ public final class ErrorPayloadMappersTest {
     private final HttpClientResponse response = mock(HttpClientResponse.class, RETURNS_SMART_NULLS);
 
     @Test
-    public void clientV2BadPayload() throws IOException {
+    void clientV2BadPayload() throws IOException {
         when(this.connection.inbound()).thenReturn(this.inbound);
         when(this.inbound.receive())
                 .thenReturn(
@@ -79,7 +79,7 @@ public void clientV2BadPayload() throws IOException {
     }
 
     @Test
-    public void clientV2ClientError() throws IOException {
+    void clientV2ClientError() throws IOException {
         when(this.connection.inbound()).thenReturn(this.inbound);
         when(this.inbound.receive())
                 .thenReturn(
@@ -114,7 +114,7 @@ public void clientV2ClientError() throws IOException {
     }
 
     @Test
-    public void clientV2NoError() {
+    void clientV2NoError() {
         when(this.response.status()).thenReturn(OK);
         HttpClientResponseWithConnection responseWithConnection =
                 buildResponseWithConnection(this.connection);
@@ -128,7 +128,7 @@ public void clientV2NoError() {
     }
 
     @Test
-    public void clientV2ServerError() throws IOException {
+    void clientV2ServerError() throws IOException {
         when(this.connection.inbound()).thenReturn(this.inbound);
         when(this.inbound.receive())
                 .thenReturn(
@@ -163,7 +163,7 @@ public void clientV2ServerError() throws IOException {
     }
 
     @Test
-    public void clientV3BadPayload() throws IOException {
+    void clientV3BadPayload() throws IOException {
         when(this.connection.inbound()).thenReturn(this.inbound);
         when(this.inbound.receive())
                 .thenReturn(
@@ -190,7 +190,7 @@ public void clientV3BadPayload() throws IOException {
     }
 
     @Test
-    public void clientV3ClientError() throws IOException {
+    void clientV3ClientError() throws IOException {
         when(this.connection.inbound()).thenReturn(this.inbound);
         when(this.inbound.receive())
                 .thenReturn(
@@ -228,7 +228,7 @@ public void clientV3ClientError() throws IOException {
     }
 
     @Test
-    public void clientV3NoError() {
+    void clientV3NoError() {
         when(this.response.status()).thenReturn(OK);
         HttpClientResponseWithConnection responseWithConnection =
                 buildResponseWithConnection(this.connection);
@@ -242,7 +242,7 @@ public void clientV3NoError() {
     }
 
     @Test
-    public void clientV3ServerError() throws IOException {
+    void clientV3ServerError() throws IOException {
         when(this.connection.inbound()).thenReturn(this.inbound);
         when(this.inbound.receive())
                 .thenReturn(
@@ -280,7 +280,7 @@ public void clientV3ServerError() throws IOException {
     }
 
     @Test
-    public void uaaBadPayload() throws IOException {
+    void uaaBadPayload() throws IOException {
         when(this.connection.inbound()).thenReturn(this.inbound);
         when(this.inbound.receive())
                 .thenReturn(
@@ -307,7 +307,7 @@ public void uaaBadPayload() throws IOException {
     }
 
     @Test
-    public void uaaClientError() throws IOException {
+    void uaaClientError() throws IOException {
         when(this.connection.inbound()).thenReturn(this.inbound);
         when(this.inbound.receive())
                 .thenReturn(
@@ -336,7 +336,7 @@ public void uaaClientError() throws IOException {
     }
 
     @Test
-    public void uaaNoError() {
+    void uaaNoError() {
         when(this.response.status()).thenReturn(OK);
         HttpClientResponseWithConnection responseWithConnection =
                 buildResponseWithConnection(this.connection);
@@ -350,7 +350,7 @@ public void uaaNoError() {
     }
 
     @Test
-    public void uaaServerError() throws IOException {
+    void uaaServerError() throws IOException {
         when(this.connection.inbound()).thenReturn(this.inbound);
         when(this.inbound.receive())
                 .thenReturn(
diff --git a/cloudfoundry-client/pom.xml b/cloudfoundry-client/pom.xml
index cdf66dc957b..6dfdb0aec4b 100644
--- a/cloudfoundry-client/pom.xml
+++ b/cloudfoundry-client/pom.xml
@@ -52,11 +52,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>
         <dependency>
             <groupId>io.projectreactor</groupId>
             <artifactId>reactor-core</artifactId>
diff --git a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/ClientV2ExceptionTest.java b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/ClientV2ExceptionTest.java
index 0b808c21d82..3cc96d0504c 100644
--- a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/ClientV2ExceptionTest.java
+++ b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/ClientV2ExceptionTest.java
@@ -18,12 +18,12 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
-public final class ClientV2ExceptionTest {
+final class ClientV2ExceptionTest {
 
     @Test
-    public void test() {
+    void test() {
         assertThat(new ClientV2Exception(-1, -2, "test-description", "test-error-code"))
                 .hasNoCause()
                 .hasMessage("test-error-code(-2): test-description")
diff --git a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/PaginatedRequestTest.java b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/PaginatedRequestTest.java
index e4cedbcc66c..7c1cbdeefdc 100644
--- a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/PaginatedRequestTest.java
+++ b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/PaginatedRequestTest.java
@@ -20,12 +20,12 @@
 import static org.cloudfoundry.client.v2.OrderDirection.ASCENDING;
 import static org.cloudfoundry.client.v2.OrderDirection.DESCENDING;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
-public final class PaginatedRequestTest {
+final class PaginatedRequestTest {
 
     @Test
-    public void orderedBy() {
+    void orderedBy() {
         assertThat(ASCENDING.getValue()).isEqualTo("asc");
         assertThat(DESCENDING.getValue()).isEqualTo("desc");
     }
diff --git a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/applications/ApplicationEnvironmentRequestTest.java b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/applications/ApplicationEnvironmentRequestTest.java
index 0fc61cfb021..adacb024343 100644
--- a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/applications/ApplicationEnvironmentRequestTest.java
+++ b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/applications/ApplicationEnvironmentRequestTest.java
@@ -16,17 +16,23 @@
 
 package org.cloudfoundry.client.v2.applications;
 
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
-public final class ApplicationEnvironmentRequestTest {
+import org.junit.jupiter.api.Test;
 
-    @Test(expected = IllegalStateException.class)
-    public void noApplicationId() {
-        ApplicationEnvironmentRequest.builder().build();
+final class ApplicationEnvironmentRequestTest {
+
+    @Test
+    void noApplicationId() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    ApplicationEnvironmentRequest.builder().build();
+                });
     }
 
     @Test
-    public void valid() {
+    void valid() {
         ApplicationEnvironmentRequest.builder().applicationId("test-application-id").build();
     }
 }
diff --git a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/applications/ApplicationInstancesRequestTest.java b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/applications/ApplicationInstancesRequestTest.java
index d01636be288..1540f45d5c8 100644
--- a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/applications/ApplicationInstancesRequestTest.java
+++ b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/applications/ApplicationInstancesRequestTest.java
@@ -16,17 +16,23 @@
 
 package org.cloudfoundry.client.v2.applications;
 
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
-public final class ApplicationInstancesRequestTest {
+import org.junit.jupiter.api.Test;
 
-    @Test(expected = IllegalStateException.class)
-    public void noApplicationId() {
-        ApplicationInstancesRequest.builder().build();
+final class ApplicationInstancesRequestTest {
+
+    @Test
+    void noApplicationId() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    ApplicationInstancesRequest.builder().build();
+                });
     }
 
     @Test
-    public void valid() {
+    void valid() {
         ApplicationInstancesRequest.builder().applicationId("test-application-id").build();
     }
 }
diff --git a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/applications/ApplicationStatisticsRequestTest.java b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/applications/ApplicationStatisticsRequestTest.java
index c469257ec6e..98e611e32f0 100644
--- a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/applications/ApplicationStatisticsRequestTest.java
+++ b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/applications/ApplicationStatisticsRequestTest.java
@@ -16,17 +16,23 @@
 
 package org.cloudfoundry.client.v2.applications;
 
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
-public final class ApplicationStatisticsRequestTest {
+import org.junit.jupiter.api.Test;
 
-    @Test(expected = IllegalStateException.class)
-    public void noApplicationId() {
-        ApplicationStatisticsRequest.builder().build();
+final class ApplicationStatisticsRequestTest {
+
+    @Test
+    void noApplicationId() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    ApplicationStatisticsRequest.builder().build();
+                });
     }
 
     @Test
-    public void valid() {
+    void valid() {
         ApplicationStatisticsRequest.builder().applicationId("test-application-id").build();
     }
 }
diff --git a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/applications/AssociateApplicationRouteRequestTest.java b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/applications/AssociateApplicationRouteRequestTest.java
index f499314687b..26793e71ed7 100644
--- a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/applications/AssociateApplicationRouteRequestTest.java
+++ b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/applications/AssociateApplicationRouteRequestTest.java
@@ -16,22 +16,34 @@
 
 package org.cloudfoundry.client.v2.applications;
 
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
-public final class AssociateApplicationRouteRequestTest {
+import org.junit.jupiter.api.Test;
 
-    @Test(expected = IllegalStateException.class)
-    public void noApplicationId() {
-        AssociateApplicationRouteRequest.builder().routeId("test-route-id").build();
+final class AssociateApplicationRouteRequestTest {
+
+    @Test
+    void noApplicationId() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    AssociateApplicationRouteRequest.builder().routeId("test-route-id").build();
+                });
     }
 
-    @Test(expected = IllegalStateException.class)
-    public void noRouteId() {
-        AssociateApplicationRouteRequest.builder().applicationId("test-application-id").build();
+    @Test
+    void noRouteId() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    AssociateApplicationRouteRequest.builder()
+                            .applicationId("test-application-id")
+                            .build();
+                });
     }
 
     @Test
-    public void valid() {
+    void valid() {
         AssociateApplicationRouteRequest.builder()
                 .applicationId("test-application-id")
                 .routeId("test-route-id")
diff --git a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/applications/CopyApplicationRequestTest.java b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/applications/CopyApplicationRequestTest.java
index 313586686b4..2bb87399e57 100644
--- a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/applications/CopyApplicationRequestTest.java
+++ b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/applications/CopyApplicationRequestTest.java
@@ -16,22 +16,34 @@
 
 package org.cloudfoundry.client.v2.applications;
 
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
-public final class CopyApplicationRequestTest {
+import org.junit.jupiter.api.Test;
 
-    @Test(expected = IllegalStateException.class)
-    public void noApplicationId() {
-        CopyApplicationRequest.builder().sourceApplicationId("test-source-application-id").build();
+final class CopyApplicationRequestTest {
+
+    @Test
+    void noApplicationId() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    CopyApplicationRequest.builder()
+                            .sourceApplicationId("test-source-application-id")
+                            .build();
+                });
     }
 
-    @Test(expected = IllegalStateException.class)
-    public void noSourceApplicationId() {
-        CopyApplicationRequest.builder().applicationId("test-application id").build();
+    @Test
+    void noSourceApplicationId() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    CopyApplicationRequest.builder().applicationId("test-application id").build();
+                });
     }
 
     @Test
-    public void valid() {
+    void valid() {
         CopyApplicationRequest.builder()
                 .applicationId("test-application-id")
                 .sourceApplicationId("test-source-application-id")
diff --git a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/applications/CreateApplicationRequestTest.java b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/applications/CreateApplicationRequestTest.java
index 597eeb6ad41..587eb1fe46e 100644
--- a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/applications/CreateApplicationRequestTest.java
+++ b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/applications/CreateApplicationRequestTest.java
@@ -16,22 +16,32 @@
 
 package org.cloudfoundry.client.v2.applications;
 
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
-public final class CreateApplicationRequestTest {
+import org.junit.jupiter.api.Test;
 
-    @Test(expected = IllegalStateException.class)
-    public void noName() {
-        CreateApplicationRequest.builder().spaceId("test-space-id").build();
+final class CreateApplicationRequestTest {
+
+    @Test
+    void noName() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    CreateApplicationRequest.builder().spaceId("test-space-id").build();
+                });
     }
 
-    @Test(expected = IllegalStateException.class)
-    public void noSpaceId() {
-        CreateApplicationRequest.builder().name("test-name").build();
+    @Test
+    void noSpaceId() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    CreateApplicationRequest.builder().name("test-name").build();
+                });
     }
 
     @Test
-    public void valid() {
+    void valid() {
         CreateApplicationRequest.builder().name("test-name").spaceId("test-space-id").build();
     }
 }
diff --git a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/applications/DeleteApplicationRequestTest.java b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/applications/DeleteApplicationRequestTest.java
index 387fcb995eb..10835a705a8 100644
--- a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/applications/DeleteApplicationRequestTest.java
+++ b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/applications/DeleteApplicationRequestTest.java
@@ -16,17 +16,23 @@
 
 package org.cloudfoundry.client.v2.applications;
 
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
-public final class DeleteApplicationRequestTest {
+import org.junit.jupiter.api.Test;
 
-    @Test(expected = IllegalStateException.class)
-    public void noApplicationId() {
-        DeleteApplicationRequest.builder().build();
+final class DeleteApplicationRequestTest {
+
+    @Test
+    void noApplicationId() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    DeleteApplicationRequest.builder().build();
+                });
     }
 
     @Test
-    public void valid() {
+    void valid() {
         DeleteApplicationRequest.builder().applicationId("test-application-id").build();
     }
 }
diff --git a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/applications/DownloadApplicationDropletRequestTest.java b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/applications/DownloadApplicationDropletRequestTest.java
index 8ce9ee13b6f..bfed0672e5d 100644
--- a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/applications/DownloadApplicationDropletRequestTest.java
+++ b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/applications/DownloadApplicationDropletRequestTest.java
@@ -16,17 +16,23 @@
 
 package org.cloudfoundry.client.v2.applications;
 
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
-public final class DownloadApplicationDropletRequestTest {
+import org.junit.jupiter.api.Test;
 
-    @Test(expected = IllegalStateException.class)
-    public void noApplicationId() {
-        DownloadApplicationDropletRequest.builder().build();
+final class DownloadApplicationDropletRequestTest {
+
+    @Test
+    void noApplicationId() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    DownloadApplicationDropletRequest.builder().build();
+                });
     }
 
     @Test
-    public void valid() {
+    void valid() {
         DownloadApplicationDropletRequest.builder().applicationId("test-application-id").build();
     }
 }
diff --git a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/applications/DownloadApplicationRequestTest.java b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/applications/DownloadApplicationRequestTest.java
index 6caf7d09c71..50f5d3ae66e 100644
--- a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/applications/DownloadApplicationRequestTest.java
+++ b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/applications/DownloadApplicationRequestTest.java
@@ -16,17 +16,23 @@
 
 package org.cloudfoundry.client.v2.applications;
 
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
-public final class DownloadApplicationRequestTest {
+import org.junit.jupiter.api.Test;
 
-    @Test(expected = IllegalStateException.class)
-    public void noApplicationId() {
-        DownloadApplicationRequest.builder().build();
+final class DownloadApplicationRequestTest {
+
+    @Test
+    void noApplicationId() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    DownloadApplicationRequest.builder().build();
+                });
     }
 
     @Test
-    public void valid() {
+    void valid() {
         DownloadApplicationRequest.builder().applicationId("test-application-id").build();
     }
 }
diff --git a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/applications/GetApplicationPermissionsRequestTest.java b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/applications/GetApplicationPermissionsRequestTest.java
index 3364d47e733..c457960124c 100644
--- a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/applications/GetApplicationPermissionsRequestTest.java
+++ b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/applications/GetApplicationPermissionsRequestTest.java
@@ -16,17 +16,23 @@
 
 package org.cloudfoundry.client.v2.applications;
 
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
-public final class GetApplicationPermissionsRequestTest {
+import org.junit.jupiter.api.Test;
 
-    @Test(expected = IllegalStateException.class)
-    public void noApplicationId() {
-        GetApplicationPermissionsRequest.builder().build();
+final class GetApplicationPermissionsRequestTest {
+
+    @Test
+    void noApplicationId() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    GetApplicationPermissionsRequest.builder().build();
+                });
     }
 
     @Test
-    public void valid() {
+    void valid() {
         GetApplicationPermissionsRequest.builder().applicationId("test-application-id").build();
     }
 }
diff --git a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/applications/GetApplicationRequestTest.java b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/applications/GetApplicationRequestTest.java
index afd821928c9..46c46d7a7ef 100644
--- a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/applications/GetApplicationRequestTest.java
+++ b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/applications/GetApplicationRequestTest.java
@@ -16,17 +16,23 @@
 
 package org.cloudfoundry.client.v2.applications;
 
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
-public final class GetApplicationRequestTest {
+import org.junit.jupiter.api.Test;
 
-    @Test(expected = IllegalStateException.class)
-    public void noApplicationId() {
-        GetApplicationRequest.builder().build();
+final class GetApplicationRequestTest {
+
+    @Test
+    void noApplicationId() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    GetApplicationRequest.builder().build();
+                });
     }
 
     @Test
-    public void valid() {
+    void valid() {
         GetApplicationRequest.builder().applicationId("test-application-id").build();
     }
 }
diff --git a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/applications/ListApplicationRoutesRequestTest.java b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/applications/ListApplicationRoutesRequestTest.java
index 14ba0dc0a6d..df360651a81 100644
--- a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/applications/ListApplicationRoutesRequestTest.java
+++ b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/applications/ListApplicationRoutesRequestTest.java
@@ -16,17 +16,23 @@
 
 package org.cloudfoundry.client.v2.applications;
 
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
-public final class ListApplicationRoutesRequestTest {
+import org.junit.jupiter.api.Test;
 
-    @Test(expected = IllegalStateException.class)
-    public void noApplicationId() {
-        ListApplicationRoutesRequest.builder().build();
+final class ListApplicationRoutesRequestTest {
+
+    @Test
+    void noApplicationId() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    ListApplicationRoutesRequest.builder().build();
+                });
     }
 
     @Test
-    public void valid() {
+    void valid() {
         ListApplicationRoutesRequest.builder().applicationId("test-application-id").build();
     }
 }
diff --git a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/applications/ListApplicationServiceBindingsRequestTest.java b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/applications/ListApplicationServiceBindingsRequestTest.java
index d09422fe479..d01a1e00736 100644
--- a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/applications/ListApplicationServiceBindingsRequestTest.java
+++ b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/applications/ListApplicationServiceBindingsRequestTest.java
@@ -16,17 +16,23 @@
 
 package org.cloudfoundry.client.v2.applications;
 
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
-public final class ListApplicationServiceBindingsRequestTest {
+import org.junit.jupiter.api.Test;
 
-    @Test(expected = IllegalStateException.class)
-    public void noApplicationId() {
-        ListApplicationServiceBindingsRequest.builder().build();
+final class ListApplicationServiceBindingsRequestTest {
+
+    @Test
+    void noApplicationId() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    ListApplicationServiceBindingsRequest.builder().build();
+                });
     }
 
     @Test
-    public void valid() {
+    void valid() {
         ListApplicationServiceBindingsRequest.builder()
                 .applicationId("test-application-id")
                 .build();
diff --git a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/applications/ListApplicationsRequestTest.java b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/applications/ListApplicationsRequestTest.java
index c03adbd55ee..6f15d821a2f 100644
--- a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/applications/ListApplicationsRequestTest.java
+++ b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/applications/ListApplicationsRequestTest.java
@@ -16,12 +16,12 @@
 
 package org.cloudfoundry.client.v2.applications;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
-public final class ListApplicationsRequestTest {
+final class ListApplicationsRequestTest {
 
     @Test
-    public void valid() {
+    void valid() {
         ListApplicationsRequest.builder().build();
     }
 }
diff --git a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/applications/RemoveApplicationRouteRequestTest.java b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/applications/RemoveApplicationRouteRequestTest.java
index f03ca16b9ab..ebe19291e4f 100644
--- a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/applications/RemoveApplicationRouteRequestTest.java
+++ b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/applications/RemoveApplicationRouteRequestTest.java
@@ -16,22 +16,34 @@
 
 package org.cloudfoundry.client.v2.applications;
 
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
-public final class RemoveApplicationRouteRequestTest {
+import org.junit.jupiter.api.Test;
 
-    @Test(expected = IllegalStateException.class)
-    public void noApplicationId() {
-        RemoveApplicationRouteRequest.builder().routeId("test-route-id").build();
+final class RemoveApplicationRouteRequestTest {
+
+    @Test
+    void noApplicationId() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    RemoveApplicationRouteRequest.builder().routeId("test-route-id").build();
+                });
     }
 
-    @Test(expected = IllegalStateException.class)
-    public void noRouteId() {
-        RemoveApplicationRouteRequest.builder().applicationId("test-application-id").build();
+    @Test
+    void noRouteId() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    RemoveApplicationRouteRequest.builder()
+                            .applicationId("test-application-id")
+                            .build();
+                });
     }
 
     @Test
-    public void valid() {
+    void valid() {
         RemoveApplicationRouteRequest.builder()
                 .applicationId("test-application-id")
                 .routeId("test-route-id")
diff --git a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/applications/RemoveApplicationServiceBindingRequestTest.java b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/applications/RemoveApplicationServiceBindingRequestTest.java
index 381a88920b8..c7bb872a09d 100644
--- a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/applications/RemoveApplicationServiceBindingRequestTest.java
+++ b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/applications/RemoveApplicationServiceBindingRequestTest.java
@@ -16,26 +16,36 @@
 
 package org.cloudfoundry.client.v2.applications;
 
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
-public final class RemoveApplicationServiceBindingRequestTest {
+import org.junit.jupiter.api.Test;
 
-    @Test(expected = IllegalStateException.class)
-    public void noApplicationId() {
-        RemoveApplicationServiceBindingRequest.builder()
-                .serviceBindingId("test-service-binding-id")
-                .build();
+final class RemoveApplicationServiceBindingRequestTest {
+
+    @Test
+    void noApplicationId() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    RemoveApplicationServiceBindingRequest.builder()
+                            .serviceBindingId("test-service-binding-id")
+                            .build();
+                });
     }
 
-    @Test(expected = IllegalStateException.class)
-    public void noServiceBindingId() {
-        RemoveApplicationServiceBindingRequest.builder()
-                .applicationId("test-application-id")
-                .build();
+    @Test
+    void noServiceBindingId() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    RemoveApplicationServiceBindingRequest.builder()
+                            .applicationId("test-application-id")
+                            .build();
+                });
     }
 
     @Test
-    public void valid() {
+    void valid() {
         RemoveApplicationServiceBindingRequest.builder()
                 .applicationId("test-application-id")
                 .serviceBindingId("test-service-binding-id")
diff --git a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/applications/RestageApplicationRequestTest.java b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/applications/RestageApplicationRequestTest.java
index acd3189167a..61ed46a508e 100644
--- a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/applications/RestageApplicationRequestTest.java
+++ b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/applications/RestageApplicationRequestTest.java
@@ -16,17 +16,23 @@
 
 package org.cloudfoundry.client.v2.applications;
 
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
-public final class RestageApplicationRequestTest {
+import org.junit.jupiter.api.Test;
 
-    @Test(expected = IllegalStateException.class)
-    public void noApplicationId() {
-        RestageApplicationRequest.builder().build();
+final class RestageApplicationRequestTest {
+
+    @Test
+    void noApplicationId() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    RestageApplicationRequest.builder().build();
+                });
     }
 
     @Test
-    public void valid() {
+    void valid() {
         RestageApplicationRequest.builder().applicationId("test-application-id").build();
     }
 }
diff --git a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/applications/SummaryApplicationRequestTest.java b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/applications/SummaryApplicationRequestTest.java
index e52a15bfadc..adefc299d10 100644
--- a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/applications/SummaryApplicationRequestTest.java
+++ b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/applications/SummaryApplicationRequestTest.java
@@ -16,17 +16,23 @@
 
 package org.cloudfoundry.client.v2.applications;
 
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
-public final class SummaryApplicationRequestTest {
+import org.junit.jupiter.api.Test;
 
-    @Test(expected = IllegalStateException.class)
-    public void noApplicationId() {
-        SummaryApplicationRequest.builder().build();
+final class SummaryApplicationRequestTest {
+
+    @Test
+    void noApplicationId() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    SummaryApplicationRequest.builder().build();
+                });
     }
 
     @Test
-    public void valid() {
+    void valid() {
         SummaryApplicationRequest.builder().applicationId("test-application-id").build();
     }
 }
diff --git a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/applications/TerminateApplicationInstanceRequestTest.java b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/applications/TerminateApplicationInstanceRequestTest.java
index 2596df41d9e..d7d697f3cc8 100644
--- a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/applications/TerminateApplicationInstanceRequestTest.java
+++ b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/applications/TerminateApplicationInstanceRequestTest.java
@@ -16,22 +16,34 @@
 
 package org.cloudfoundry.client.v2.applications;
 
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
-public final class TerminateApplicationInstanceRequestTest {
+import org.junit.jupiter.api.Test;
 
-    @Test(expected = IllegalStateException.class)
-    public void noApplicationId() {
-        TerminateApplicationInstanceRequest.builder().index("0").build();
+final class TerminateApplicationInstanceRequestTest {
+
+    @Test
+    void noApplicationId() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    TerminateApplicationInstanceRequest.builder().index("0").build();
+                });
     }
 
-    @Test(expected = IllegalStateException.class)
-    public void noIndex() {
-        TerminateApplicationInstanceRequest.builder().applicationId("test-application-id").build();
+    @Test
+    void noIndex() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    TerminateApplicationInstanceRequest.builder()
+                            .applicationId("test-application-id")
+                            .build();
+                });
     }
 
     @Test
-    public void valid() {
+    void valid() {
         TerminateApplicationInstanceRequest.builder()
                 .applicationId("test-application-id")
                 .index("0")
diff --git a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/applications/UpdateApplicationRequestTest.java b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/applications/UpdateApplicationRequestTest.java
index 1e9d930da91..e35a0a85474 100644
--- a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/applications/UpdateApplicationRequestTest.java
+++ b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/applications/UpdateApplicationRequestTest.java
@@ -16,17 +16,23 @@
 
 package org.cloudfoundry.client.v2.applications;
 
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
-public final class UpdateApplicationRequestTest {
+import org.junit.jupiter.api.Test;
 
-    @Test(expected = IllegalStateException.class)
-    public void noApplicationId() {
-        UpdateApplicationRequest.builder().build();
+final class UpdateApplicationRequestTest {
+
+    @Test
+    void noApplicationId() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    UpdateApplicationRequest.builder().build();
+                });
     }
 
     @Test
-    public void valid() {
+    void valid() {
         UpdateApplicationRequest.builder().applicationId("test-application-id").build();
     }
 }
diff --git a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/applications/UploadApplicationDropletRequestTest.java b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/applications/UploadApplicationDropletRequestTest.java
index 7df0ca4e5d7..a1e7d91c425 100644
--- a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/applications/UploadApplicationDropletRequestTest.java
+++ b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/applications/UploadApplicationDropletRequestTest.java
@@ -16,26 +16,38 @@
 
 package org.cloudfoundry.client.v2.applications;
 
+import static org.junit.jupiter.api.Assertions.assertThrows;
+
 import java.nio.file.Path;
 import java.nio.file.Paths;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
-public final class UploadApplicationDropletRequestTest {
+final class UploadApplicationDropletRequestTest {
 
     private static final Path TEST_DROPLET = Paths.get("/");
 
-    @Test(expected = IllegalStateException.class)
-    public void noApplication() {
-        UploadApplicationDropletRequest.builder().applicationId("test-application-id").build();
+    @Test
+    void noApplication() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    UploadApplicationDropletRequest.builder()
+                            .applicationId("test-application-id")
+                            .build();
+                });
     }
 
-    @Test(expected = IllegalStateException.class)
-    public void noApplicationId() {
-        UploadApplicationDropletRequest.builder().droplet(TEST_DROPLET).build();
+    @Test
+    void noApplicationId() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    UploadApplicationDropletRequest.builder().droplet(TEST_DROPLET).build();
+                });
     }
 
     @Test
-    public void valid() {
+    void valid() {
         UploadApplicationDropletRequest.builder()
                 .droplet(TEST_DROPLET)
                 .applicationId("test-application-id")
diff --git a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/applications/UploadApplicationRequestTest.java b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/applications/UploadApplicationRequestTest.java
index 64471ac6e00..abf7c1ddbc5 100644
--- a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/applications/UploadApplicationRequestTest.java
+++ b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/applications/UploadApplicationRequestTest.java
@@ -16,26 +16,36 @@
 
 package org.cloudfoundry.client.v2.applications;
 
+import static org.junit.jupiter.api.Assertions.assertThrows;
+
 import java.nio.file.Path;
 import java.nio.file.Paths;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
-public final class UploadApplicationRequestTest {
+final class UploadApplicationRequestTest {
 
     private static final Path TEST_APPLICATION = Paths.get("/");
 
-    @Test(expected = IllegalStateException.class)
-    public void noApplication() {
-        UploadApplicationRequest.builder().applicationId("test-application-id").build();
+    @Test
+    void noApplication() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    UploadApplicationRequest.builder().applicationId("test-application-id").build();
+                });
     }
 
-    @Test(expected = IllegalStateException.class)
-    public void noApplicationId() {
-        UploadApplicationRequest.builder().application(TEST_APPLICATION).build();
+    @Test
+    void noApplicationId() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    UploadApplicationRequest.builder().application(TEST_APPLICATION).build();
+                });
     }
 
     @Test
-    public void valid() {
+    void valid() {
         UploadApplicationRequest.builder()
                 .application(TEST_APPLICATION)
                 .applicationId("test-application-id")
diff --git a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/applicationusageevents/GetApplicationUsageEventRequestTest.java b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/applicationusageevents/GetApplicationUsageEventRequestTest.java
index e185669baab..7712919ed0d 100644
--- a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/applicationusageevents/GetApplicationUsageEventRequestTest.java
+++ b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/applicationusageevents/GetApplicationUsageEventRequestTest.java
@@ -16,17 +16,23 @@
 
 package org.cloudfoundry.client.v2.applicationusageevents;
 
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
-public final class GetApplicationUsageEventRequestTest {
+import org.junit.jupiter.api.Test;
 
-    @Test(expected = IllegalStateException.class)
-    public void noApplicationUsageEventId() {
-        GetApplicationUsageEventRequest.builder().build();
+final class GetApplicationUsageEventRequestTest {
+
+    @Test
+    void noApplicationUsageEventId() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    GetApplicationUsageEventRequest.builder().build();
+                });
     }
 
     @Test
-    public void valid() {
+    void valid() {
         GetApplicationUsageEventRequest.builder()
                 .applicationUsageEventId("test-application-usage-event-id")
                 .build();
diff --git a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/applicationusageevents/ListApplicationUsageEventsRequestTest.java b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/applicationusageevents/ListApplicationUsageEventsRequestTest.java
index f6605affa8e..9d9bce342f5 100644
--- a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/applicationusageevents/ListApplicationUsageEventsRequestTest.java
+++ b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/applicationusageevents/ListApplicationUsageEventsRequestTest.java
@@ -16,12 +16,12 @@
 
 package org.cloudfoundry.client.v2.applicationusageevents;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
-public final class ListApplicationUsageEventsRequestTest {
+final class ListApplicationUsageEventsRequestTest {
 
     @Test
-    public void valid() {
+    void valid() {
         ListApplicationUsageEventsRequest.builder().build();
     }
 }
diff --git a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/applicationusageevents/PurgeAndReseedApplicationUsageEventsRequestTest.java b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/applicationusageevents/PurgeAndReseedApplicationUsageEventsRequestTest.java
index 0491b5e8e52..3478fbac5b0 100644
--- a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/applicationusageevents/PurgeAndReseedApplicationUsageEventsRequestTest.java
+++ b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/applicationusageevents/PurgeAndReseedApplicationUsageEventsRequestTest.java
@@ -16,12 +16,12 @@
 
 package org.cloudfoundry.client.v2.applicationusageevents;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
-public final class PurgeAndReseedApplicationUsageEventsRequestTest {
+final class PurgeAndReseedApplicationUsageEventsRequestTest {
 
     @Test
-    public void valid() {
+    void valid() {
         PurgeAndReseedApplicationUsageEventsRequest.builder().build();
     }
 }
diff --git a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/blobstores/DeleteBlobstoreBuildpackCachesRequestTest.java b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/blobstores/DeleteBlobstoreBuildpackCachesRequestTest.java
index 5f243e66d1e..a139f54e117 100644
--- a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/blobstores/DeleteBlobstoreBuildpackCachesRequestTest.java
+++ b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/blobstores/DeleteBlobstoreBuildpackCachesRequestTest.java
@@ -16,12 +16,12 @@
 
 package org.cloudfoundry.client.v2.blobstores;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
-public final class DeleteBlobstoreBuildpackCachesRequestTest {
+final class DeleteBlobstoreBuildpackCachesRequestTest {
 
     @Test
-    public void valid() {
+    void valid() {
         DeleteBlobstoreBuildpackCachesRequest.builder().build();
     }
 }
diff --git a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/buildpacks/CreateBuildpackRequestTest.java b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/buildpacks/CreateBuildpackRequestTest.java
index ac716171b6c..649a3b076fc 100644
--- a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/buildpacks/CreateBuildpackRequestTest.java
+++ b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/buildpacks/CreateBuildpackRequestTest.java
@@ -16,17 +16,23 @@
 
 package org.cloudfoundry.client.v2.buildpacks;
 
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
-public final class CreateBuildpackRequestTest {
+import org.junit.jupiter.api.Test;
 
-    @Test(expected = IllegalStateException.class)
-    public void noName() {
-        CreateBuildpackRequest.builder().build();
+final class CreateBuildpackRequestTest {
+
+    @Test
+    void noName() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    CreateBuildpackRequest.builder().build();
+                });
     }
 
     @Test
-    public void valid() {
+    void valid() {
         CreateBuildpackRequest.builder().name("test-buildpack-name").build();
     }
 }
diff --git a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/buildpacks/DeleteBuildpackRequestTest.java b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/buildpacks/DeleteBuildpackRequestTest.java
index c9594d9c19f..9511cdab594 100644
--- a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/buildpacks/DeleteBuildpackRequestTest.java
+++ b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/buildpacks/DeleteBuildpackRequestTest.java
@@ -16,17 +16,23 @@
 
 package org.cloudfoundry.client.v2.buildpacks;
 
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
-public class DeleteBuildpackRequestTest {
+import org.junit.jupiter.api.Test;
 
-    @Test(expected = IllegalStateException.class)
-    public void noBuildpackId() {
-        DeleteBuildpackRequest.builder().build();
+class DeleteBuildpackRequestTest {
+
+    @Test
+    void noBuildpackId() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    DeleteBuildpackRequest.builder().build();
+                });
     }
 
     @Test
-    public void valid() {
+    void valid() {
         DeleteBuildpackRequest.builder().buildpackId("test-buildpack-id").build();
     }
 }
diff --git a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/buildpacks/GetBuildpackRequestTest.java b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/buildpacks/GetBuildpackRequestTest.java
index ff6b8f30410..ac4b792848c 100644
--- a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/buildpacks/GetBuildpackRequestTest.java
+++ b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/buildpacks/GetBuildpackRequestTest.java
@@ -16,17 +16,23 @@
 
 package org.cloudfoundry.client.v2.buildpacks;
 
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
-public final class GetBuildpackRequestTest {
+import org.junit.jupiter.api.Test;
 
-    @Test(expected = IllegalStateException.class)
-    public void noBuildpackId() {
-        GetBuildpackRequest.builder().build();
+final class GetBuildpackRequestTest {
+
+    @Test
+    void noBuildpackId() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    GetBuildpackRequest.builder().build();
+                });
     }
 
     @Test
-    public void valid() {
+    void valid() {
         GetBuildpackRequest.builder().buildpackId("test-buildpack-id").build();
     }
 }
diff --git a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/buildpacks/ListBuildpacksRequestTest.java b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/buildpacks/ListBuildpacksRequestTest.java
index 7a84484e967..27758c0abf5 100644
--- a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/buildpacks/ListBuildpacksRequestTest.java
+++ b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/buildpacks/ListBuildpacksRequestTest.java
@@ -16,12 +16,12 @@
 
 package org.cloudfoundry.client.v2.buildpacks;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
-public final class ListBuildpacksRequestTest {
+final class ListBuildpacksRequestTest {
 
     @Test
-    public void valid() {
+    void valid() {
         ListBuildpacksRequest.builder().build();
     }
 }
diff --git a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/buildpacks/UpdateBuildpackRequestTest.java b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/buildpacks/UpdateBuildpackRequestTest.java
index 0ed7100b640..c12780cff97 100644
--- a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/buildpacks/UpdateBuildpackRequestTest.java
+++ b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/buildpacks/UpdateBuildpackRequestTest.java
@@ -16,17 +16,23 @@
 
 package org.cloudfoundry.client.v2.buildpacks;
 
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
-public final class UpdateBuildpackRequestTest {
+import org.junit.jupiter.api.Test;
 
-    @Test(expected = IllegalStateException.class)
-    public void noBuildpackId() {
-        UpdateBuildpackRequest.builder().build();
+final class UpdateBuildpackRequestTest {
+
+    @Test
+    void noBuildpackId() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    UpdateBuildpackRequest.builder().build();
+                });
     }
 
     @Test
-    public void valid() {
+    void valid() {
         UpdateBuildpackRequest.builder().buildpackId("test-buildpack-id").build();
     }
 }
diff --git a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/buildpacks/UploadBuildpackRequestTest.java b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/buildpacks/UploadBuildpackRequestTest.java
index 806a582a020..39793fa7b9b 100644
--- a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/buildpacks/UploadBuildpackRequestTest.java
+++ b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/buildpacks/UploadBuildpackRequestTest.java
@@ -16,40 +16,54 @@
 
 package org.cloudfoundry.client.v2.buildpacks;
 
+import static org.junit.jupiter.api.Assertions.assertThrows;
+
 import java.nio.file.Path;
 import java.nio.file.Paths;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
-public final class UploadBuildpackRequestTest {
+final class UploadBuildpackRequestTest {
 
     private static final Path TEST_BUILDPACK = Paths.get("/");
 
-    @Test(expected = IllegalStateException.class)
-    public void noBuildpack() {
-        UploadBuildpackRequest.builder()
-                .buildpackId("test-buildpack-id")
-                .filename("test-filename")
-                .build();
+    @Test
+    void noBuildpack() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    UploadBuildpackRequest.builder()
+                            .buildpackId("test-buildpack-id")
+                            .filename("test-filename")
+                            .build();
+                });
     }
 
-    @Test(expected = IllegalStateException.class)
-    public void noBuildpackId() {
-        UploadBuildpackRequest.builder()
-                .buildpack(TEST_BUILDPACK)
-                .filename("test-filename")
-                .build();
+    @Test
+    void noBuildpackId() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    UploadBuildpackRequest.builder()
+                            .buildpack(TEST_BUILDPACK)
+                            .filename("test-filename")
+                            .build();
+                });
     }
 
-    @Test(expected = IllegalStateException.class)
-    public void noFilename() {
-        UploadBuildpackRequest.builder()
-                .buildpack(TEST_BUILDPACK)
-                .buildpackId("test-buildpack-id")
-                .build();
+    @Test
+    void noFilename() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    UploadBuildpackRequest.builder()
+                            .buildpack(TEST_BUILDPACK)
+                            .buildpackId("test-buildpack-id")
+                            .build();
+                });
     }
 
     @Test
-    public void valid() {
+    void valid() {
         UploadBuildpackRequest.builder()
                 .buildpack(TEST_BUILDPACK)
                 .buildpackId("test-buildpack-id")
diff --git a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/domains/CreateDomainRequestTest.java b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/domains/CreateDomainRequestTest.java
index d5099cbf647..f2a9fd3979c 100644
--- a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/domains/CreateDomainRequestTest.java
+++ b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/domains/CreateDomainRequestTest.java
@@ -16,25 +16,35 @@
 
 package org.cloudfoundry.client.v2.domains;
 
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
-public final class CreateDomainRequestTest {
+import org.junit.jupiter.api.Test;
 
-    @Test(expected = IllegalStateException.class)
-    public void noName() {
-        CreateDomainRequest.builder().wildcard(true).build();
+final class CreateDomainRequestTest {
+
+    @Test
+    void noName() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    CreateDomainRequest.builder().wildcard(true).build();
+                });
     }
 
-    @Test(expected = IllegalStateException.class)
-    public void noWildcard() {
-        CreateDomainRequest.builder()
-                .name("test-name")
-                .owningOrganizationId("test-owning-organization-id")
-                .build();
+    @Test
+    void noWildcard() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    CreateDomainRequest.builder()
+                            .name("test-name")
+                            .owningOrganizationId("test-owning-organization-id")
+                            .build();
+                });
     }
 
     @Test
-    public void valid() {
+    void valid() {
         CreateDomainRequest.builder().name("test-name").wildcard(true).build();
     }
 }
diff --git a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/domains/DeleteDomainRequestTest.java b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/domains/DeleteDomainRequestTest.java
index 21011965c50..062eab07921 100644
--- a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/domains/DeleteDomainRequestTest.java
+++ b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/domains/DeleteDomainRequestTest.java
@@ -16,17 +16,23 @@
 
 package org.cloudfoundry.client.v2.domains;
 
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
-public final class DeleteDomainRequestTest {
+import org.junit.jupiter.api.Test;
 
-    @Test(expected = IllegalStateException.class)
-    public void noDomainId() {
-        DeleteDomainRequest.builder().build();
+final class DeleteDomainRequestTest {
+
+    @Test
+    void noDomainId() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    DeleteDomainRequest.builder().build();
+                });
     }
 
     @Test
-    public void valid() {
+    void valid() {
         DeleteDomainRequest.builder().domainId("test-id").build();
     }
 }
diff --git a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/domains/GetDomainRequestTest.java b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/domains/GetDomainRequestTest.java
index 35bbc835867..d41f183c055 100644
--- a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/domains/GetDomainRequestTest.java
+++ b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/domains/GetDomainRequestTest.java
@@ -16,17 +16,23 @@
 
 package org.cloudfoundry.client.v2.domains;
 
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
-public final class GetDomainRequestTest {
+import org.junit.jupiter.api.Test;
 
-    @Test(expected = IllegalStateException.class)
-    public void noDomainId() {
-        GetDomainRequest.builder().build();
+final class GetDomainRequestTest {
+
+    @Test
+    void noDomainId() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    GetDomainRequest.builder().build();
+                });
     }
 
     @Test
-    public void valid() {
+    void valid() {
         GetDomainRequest.builder().domainId("test-id").build();
     }
 }
diff --git a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/domains/ListDomainSpacesRequestTest.java b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/domains/ListDomainSpacesRequestTest.java
index 41610c9fb1a..95b6be35757 100644
--- a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/domains/ListDomainSpacesRequestTest.java
+++ b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/domains/ListDomainSpacesRequestTest.java
@@ -16,17 +16,23 @@
 
 package org.cloudfoundry.client.v2.domains;
 
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
-public final class ListDomainSpacesRequestTest {
+import org.junit.jupiter.api.Test;
 
-    @Test(expected = IllegalStateException.class)
-    public void noApplicationId() {
-        ListDomainSpacesRequest.builder().build();
+final class ListDomainSpacesRequestTest {
+
+    @Test
+    void noApplicationId() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    ListDomainSpacesRequest.builder().build();
+                });
     }
 
     @Test
-    public void valid() {
+    void valid() {
         ListDomainSpacesRequest.builder().domainId("test-id").build();
     }
 }
diff --git a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/domains/ListDomainsRequestTest.java b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/domains/ListDomainsRequestTest.java
index ef2ab0cd332..4d8483a1a00 100644
--- a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/domains/ListDomainsRequestTest.java
+++ b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/domains/ListDomainsRequestTest.java
@@ -16,12 +16,12 @@
 
 package org.cloudfoundry.client.v2.domains;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
-public final class ListDomainsRequestTest {
+final class ListDomainsRequestTest {
 
     @Test
-    public void valid() {
+    void valid() {
         ListDomainsRequest.builder().build();
     }
 }
diff --git a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/environmentvariablegroups/GetRunningEnvironmentVariablesRequestTest.java b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/environmentvariablegroups/GetRunningEnvironmentVariablesRequestTest.java
index eddb19b19a5..97ff62d979b 100644
--- a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/environmentvariablegroups/GetRunningEnvironmentVariablesRequestTest.java
+++ b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/environmentvariablegroups/GetRunningEnvironmentVariablesRequestTest.java
@@ -16,12 +16,12 @@
 
 package org.cloudfoundry.client.v2.environmentvariablegroups;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
-public final class GetRunningEnvironmentVariablesRequestTest {
+final class GetRunningEnvironmentVariablesRequestTest {
 
     @Test
-    public void valid() {
+    void valid() {
         GetRunningEnvironmentVariablesRequest.builder().build();
     }
 }
diff --git a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/environmentvariablegroups/GetStagingEnvironmentVariablesRequestTest.java b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/environmentvariablegroups/GetStagingEnvironmentVariablesRequestTest.java
index 6660e9e2dc7..8b631675dbc 100644
--- a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/environmentvariablegroups/GetStagingEnvironmentVariablesRequestTest.java
+++ b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/environmentvariablegroups/GetStagingEnvironmentVariablesRequestTest.java
@@ -16,12 +16,12 @@
 
 package org.cloudfoundry.client.v2.environmentvariablegroups;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
-public final class GetStagingEnvironmentVariablesRequestTest {
+final class GetStagingEnvironmentVariablesRequestTest {
 
     @Test
-    public void valid() {
+    void valid() {
         GetStagingEnvironmentVariablesRequest.builder().build();
     }
 }
diff --git a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/environmentvariablegroups/UpdateRunningEnvironmentVariablesRequestTest.java b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/environmentvariablegroups/UpdateRunningEnvironmentVariablesRequestTest.java
index 8b43adb9316..21aa5c58eb6 100644
--- a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/environmentvariablegroups/UpdateRunningEnvironmentVariablesRequestTest.java
+++ b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/environmentvariablegroups/UpdateRunningEnvironmentVariablesRequestTest.java
@@ -16,12 +16,12 @@
 
 package org.cloudfoundry.client.v2.environmentvariablegroups;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
-public final class UpdateRunningEnvironmentVariablesRequestTest {
+final class UpdateRunningEnvironmentVariablesRequestTest {
 
     @Test
-    public void valid() {
+    void valid() {
         UpdateRunningEnvironmentVariablesRequest.builder().build();
     }
 }
diff --git a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/environmentvariablegroups/UpdateStagingEnvironmentVariablesRequestTest.java b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/environmentvariablegroups/UpdateStagingEnvironmentVariablesRequestTest.java
index 58def500abf..212fd6e292c 100644
--- a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/environmentvariablegroups/UpdateStagingEnvironmentVariablesRequestTest.java
+++ b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/environmentvariablegroups/UpdateStagingEnvironmentVariablesRequestTest.java
@@ -16,12 +16,12 @@
 
 package org.cloudfoundry.client.v2.environmentvariablegroups;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
-public final class UpdateStagingEnvironmentVariablesRequestTest {
+final class UpdateStagingEnvironmentVariablesRequestTest {
 
     @Test
-    public void valid() {
+    void valid() {
         UpdateStagingEnvironmentVariablesRequest.builder().build();
     }
 }
diff --git a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/events/GetEventRequestTest.java b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/events/GetEventRequestTest.java
index 9c605e1b287..c2b41af64b6 100644
--- a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/events/GetEventRequestTest.java
+++ b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/events/GetEventRequestTest.java
@@ -16,17 +16,23 @@
 
 package org.cloudfoundry.client.v2.events;
 
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
-public final class GetEventRequestTest {
+import org.junit.jupiter.api.Test;
 
-    @Test(expected = IllegalStateException.class)
-    public void noEventId() {
-        GetEventRequest.builder().build();
+final class GetEventRequestTest {
+
+    @Test
+    void noEventId() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    GetEventRequest.builder().build();
+                });
     }
 
     @Test
-    public void valid() {
+    void valid() {
         GetEventRequest.builder().eventId("test-event-id").build();
     }
 }
diff --git a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/events/ListEventsRequestTest.java b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/events/ListEventsRequestTest.java
index 9a6106999f4..9c21f28e5c2 100644
--- a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/events/ListEventsRequestTest.java
+++ b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/events/ListEventsRequestTest.java
@@ -16,12 +16,12 @@
 
 package org.cloudfoundry.client.v2.events;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
-public final class ListEventsRequestTest {
+final class ListEventsRequestTest {
 
     @Test
-    public void valid() {
+    void valid() {
         ListEventsRequest.builder().build();
     }
 }
diff --git a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/featureflags/GetFeatureFlagRequestTest.java b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/featureflags/GetFeatureFlagRequestTest.java
index df264d3b51a..8070a15f5d6 100644
--- a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/featureflags/GetFeatureFlagRequestTest.java
+++ b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/featureflags/GetFeatureFlagRequestTest.java
@@ -16,34 +16,54 @@
 
 package org.cloudfoundry.client.v2.featureflags;
 
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
-public final class GetFeatureFlagRequestTest {
+import org.junit.jupiter.api.Test;
 
-    @Test(expected = IllegalStateException.class)
-    public void badName1() {
-        GetFeatureFlagRequest.builder()
-                .name("mustn't have spaces or / chars (or quotes, or parentheses, or commas)")
-                .build();
+final class GetFeatureFlagRequestTest {
+
+    @Test
+    void badName1() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    GetFeatureFlagRequest.builder()
+                            .name(
+                                    "mustn't have spaces or / chars (or quotes, or parentheses, or"
+                                            + " commas)")
+                            .build();
+                });
     }
 
-    @Test(expected = IllegalStateException.class)
-    public void badName2() {
-        GetFeatureFlagRequest.builder().name("good_name_with_bad_at_end ").build();
+    @Test
+    void badName2() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    GetFeatureFlagRequest.builder().name("good_name_with_bad_at_end ").build();
+                });
     }
 
-    @Test(expected = IllegalStateException.class)
-    public void badName3() {
-        GetFeatureFlagRequest.builder().name("good_name_with_bad_at_end.").build();
+    @Test
+    void badName3() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    GetFeatureFlagRequest.builder().name("good_name_with_bad_at_end.").build();
+                });
     }
 
-    @Test(expected = IllegalStateException.class)
-    public void noName() {
-        GetFeatureFlagRequest.builder().build();
+    @Test
+    void noName() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    GetFeatureFlagRequest.builder().build();
+                });
     }
 
     @Test
-    public void valid() {
+    void valid() {
         GetFeatureFlagRequest.builder().name("test_feature_flag_name").build();
     }
 }
diff --git a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/featureflags/ListFeatureFlagsRequestTest.java b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/featureflags/ListFeatureFlagsRequestTest.java
index c0adf525a4a..948ce5b5cf9 100644
--- a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/featureflags/ListFeatureFlagsRequestTest.java
+++ b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/featureflags/ListFeatureFlagsRequestTest.java
@@ -16,12 +16,12 @@
 
 package org.cloudfoundry.client.v2.featureflags;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
-public final class ListFeatureFlagsRequestTest {
+final class ListFeatureFlagsRequestTest {
 
     @Test
-    public void valid() {
+    void valid() {
         ListFeatureFlagsRequest.builder().build();
     }
 }
diff --git a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/featureflags/SetFeatureFlagRequestTest.java b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/featureflags/SetFeatureFlagRequestTest.java
index 662cbe1d59e..c5120a388af 100644
--- a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/featureflags/SetFeatureFlagRequestTest.java
+++ b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/featureflags/SetFeatureFlagRequestTest.java
@@ -16,22 +16,32 @@
 
 package org.cloudfoundry.client.v2.featureflags;
 
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
-public final class SetFeatureFlagRequestTest {
+import org.junit.jupiter.api.Test;
 
-    @Test(expected = IllegalStateException.class)
-    public void noEnabled() {
-        SetFeatureFlagRequest.builder().name("test-name").build();
+final class SetFeatureFlagRequestTest {
+
+    @Test
+    void noEnabled() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    SetFeatureFlagRequest.builder().name("test-name").build();
+                });
     }
 
-    @Test(expected = IllegalStateException.class)
-    public void noName() {
-        SetFeatureFlagRequest.builder().enabled(false).build();
+    @Test
+    void noName() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    SetFeatureFlagRequest.builder().enabled(false).build();
+                });
     }
 
     @Test
-    public void valid() {
+    void valid() {
         SetFeatureFlagRequest.builder().enabled(false).name("test-name").build();
     }
 }
diff --git a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/info/GetInfoRequestTest.java b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/info/GetInfoRequestTest.java
index a2789a81133..7c632c1a8bc 100644
--- a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/info/GetInfoRequestTest.java
+++ b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/info/GetInfoRequestTest.java
@@ -16,12 +16,12 @@
 
 package org.cloudfoundry.client.v2.info;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
-public final class GetInfoRequestTest {
+final class GetInfoRequestTest {
 
     @Test
-    public void valid() {
+    void valid() {
         GetInfoRequest.builder().build();
     }
 }
diff --git a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/jobs/GetJobRequestTest.java b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/jobs/GetJobRequestTest.java
index e60918216b8..d14bb1108c8 100644
--- a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/jobs/GetJobRequestTest.java
+++ b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/jobs/GetJobRequestTest.java
@@ -16,17 +16,23 @@
 
 package org.cloudfoundry.client.v2.jobs;
 
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
-public final class GetJobRequestTest {
+import org.junit.jupiter.api.Test;
 
-    @Test(expected = IllegalStateException.class)
-    public void noJobId() {
-        GetJobRequest.builder().build();
+final class GetJobRequestTest {
+
+    @Test
+    void noJobId() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    GetJobRequest.builder().build();
+                });
     }
 
     @Test
-    public void valid() {
+    void valid() {
         GetJobRequest.builder().jobId("test-job-id").build();
     }
 }
diff --git a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/organizationquotadefinitions/CreateOrganizationQuotaDefinitionRequestTest.java b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/organizationquotadefinitions/CreateOrganizationQuotaDefinitionRequestTest.java
index b23408c5dc2..bd12bb48ebc 100644
--- a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/organizationquotadefinitions/CreateOrganizationQuotaDefinitionRequestTest.java
+++ b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/organizationquotadefinitions/CreateOrganizationQuotaDefinitionRequestTest.java
@@ -16,77 +16,103 @@
 
 package org.cloudfoundry.client.v2.organizationquotadefinitions;
 
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
-public final class CreateOrganizationQuotaDefinitionRequestTest {
+import org.junit.jupiter.api.Test;
 
-    @Test(expected = IllegalStateException.class)
-    public void noInstanceMemoryLimit() {
-        CreateOrganizationQuotaDefinitionRequest.builder()
-                .memoryLimit(1024)
-                .name("test-quota-definition-name")
-                .nonBasicServicesAllowed(false)
-                .totalRoutes(-1)
-                .totalServices(-1)
-                .build();
+final class CreateOrganizationQuotaDefinitionRequestTest {
+
+    @Test
+    void noInstanceMemoryLimit() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    CreateOrganizationQuotaDefinitionRequest.builder()
+                            .memoryLimit(1024)
+                            .name("test-quota-definition-name")
+                            .nonBasicServicesAllowed(false)
+                            .totalRoutes(-1)
+                            .totalServices(-1)
+                            .build();
+                });
     }
 
-    @Test(expected = IllegalStateException.class)
-    public void noMemoryLimit() {
-        CreateOrganizationQuotaDefinitionRequest.builder()
-                .instanceMemoryLimit(1024)
-                .name("test-quota-definition-name")
-                .nonBasicServicesAllowed(false)
-                .totalRoutes(-1)
-                .totalServices(-1)
-                .build();
+    @Test
+    void noMemoryLimit() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    CreateOrganizationQuotaDefinitionRequest.builder()
+                            .instanceMemoryLimit(1024)
+                            .name("test-quota-definition-name")
+                            .nonBasicServicesAllowed(false)
+                            .totalRoutes(-1)
+                            .totalServices(-1)
+                            .build();
+                });
     }
 
-    @Test(expected = IllegalStateException.class)
-    public void noName() {
-        CreateOrganizationQuotaDefinitionRequest.builder()
-                .instanceMemoryLimit(1024)
-                .memoryLimit(1024)
-                .nonBasicServicesAllowed(false)
-                .totalRoutes(-1)
-                .totalServices(-1)
-                .build();
+    @Test
+    void noName() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    CreateOrganizationQuotaDefinitionRequest.builder()
+                            .instanceMemoryLimit(1024)
+                            .memoryLimit(1024)
+                            .nonBasicServicesAllowed(false)
+                            .totalRoutes(-1)
+                            .totalServices(-1)
+                            .build();
+                });
     }
 
-    @Test(expected = IllegalStateException.class)
-    public void noNonBasicServicesAllowed() {
-        CreateOrganizationQuotaDefinitionRequest.builder()
-                .instanceMemoryLimit(1024)
-                .memoryLimit(1024)
-                .name("test-quota-definition-name")
-                .totalRoutes(-1)
-                .totalServices(-1)
-                .build();
+    @Test
+    void noNonBasicServicesAllowed() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    CreateOrganizationQuotaDefinitionRequest.builder()
+                            .instanceMemoryLimit(1024)
+                            .memoryLimit(1024)
+                            .name("test-quota-definition-name")
+                            .totalRoutes(-1)
+                            .totalServices(-1)
+                            .build();
+                });
     }
 
-    @Test(expected = IllegalStateException.class)
-    public void noTotalRoutes() {
-        CreateOrganizationQuotaDefinitionRequest.builder()
-                .instanceMemoryLimit(1024)
-                .memoryLimit(1024)
-                .name("test-quota-definition-name")
-                .totalServices(-1)
-                .build();
+    @Test
+    void noTotalRoutes() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    CreateOrganizationQuotaDefinitionRequest.builder()
+                            .instanceMemoryLimit(1024)
+                            .memoryLimit(1024)
+                            .name("test-quota-definition-name")
+                            .totalServices(-1)
+                            .build();
+                });
     }
 
-    @Test(expected = IllegalStateException.class)
-    public void noTotalServices() {
-        CreateOrganizationQuotaDefinitionRequest.builder()
-                .instanceMemoryLimit(1024)
-                .memoryLimit(1024)
-                .name("test-quota-definition-name")
-                .nonBasicServicesAllowed(false)
-                .totalRoutes(-1)
-                .build();
+    @Test
+    void noTotalServices() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    CreateOrganizationQuotaDefinitionRequest.builder()
+                            .instanceMemoryLimit(1024)
+                            .memoryLimit(1024)
+                            .name("test-quota-definition-name")
+                            .nonBasicServicesAllowed(false)
+                            .totalRoutes(-1)
+                            .build();
+                });
     }
 
     @Test
-    public void valid() {
+    void valid() {
         CreateOrganizationQuotaDefinitionRequest.builder()
                 .instanceMemoryLimit(1024)
                 .memoryLimit(1024)
diff --git a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/organizationquotadefinitions/DeleteOrganizationQuotaDefinitionRequestTest.java b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/organizationquotadefinitions/DeleteOrganizationQuotaDefinitionRequestTest.java
index 51d69fd7208..5609b11de21 100644
--- a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/organizationquotadefinitions/DeleteOrganizationQuotaDefinitionRequestTest.java
+++ b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/organizationquotadefinitions/DeleteOrganizationQuotaDefinitionRequestTest.java
@@ -16,17 +16,23 @@
 
 package org.cloudfoundry.client.v2.organizationquotadefinitions;
 
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
-public class DeleteOrganizationQuotaDefinitionRequestTest {
+import org.junit.jupiter.api.Test;
 
-    @Test(expected = IllegalStateException.class)
-    public void noOrganizationQuotaDefinitionId() {
-        DeleteOrganizationQuotaDefinitionRequest.builder().build();
+class DeleteOrganizationQuotaDefinitionRequestTest {
+
+    @Test
+    void noOrganizationQuotaDefinitionId() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    DeleteOrganizationQuotaDefinitionRequest.builder().build();
+                });
     }
 
     @Test
-    public void valid() {
+    void valid() {
         DeleteOrganizationQuotaDefinitionRequest.builder()
                 .organizationQuotaDefinitionId("test-organization-quota-definition-id")
                 .build();
diff --git a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/organizationquotadefinitions/GetOrganizationQuotaDefinitionRequestTest.java b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/organizationquotadefinitions/GetOrganizationQuotaDefinitionRequestTest.java
index 403394be83d..38c45da95af 100644
--- a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/organizationquotadefinitions/GetOrganizationQuotaDefinitionRequestTest.java
+++ b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/organizationquotadefinitions/GetOrganizationQuotaDefinitionRequestTest.java
@@ -16,17 +16,23 @@
 
 package org.cloudfoundry.client.v2.organizationquotadefinitions;
 
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
-public final class GetOrganizationQuotaDefinitionRequestTest {
+import org.junit.jupiter.api.Test;
 
-    @Test(expected = IllegalStateException.class)
-    public void noOrganizationQuotaDefinitionId() {
-        GetOrganizationQuotaDefinitionRequest.builder().build();
+final class GetOrganizationQuotaDefinitionRequestTest {
+
+    @Test
+    void noOrganizationQuotaDefinitionId() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    GetOrganizationQuotaDefinitionRequest.builder().build();
+                });
     }
 
     @Test
-    public void valid() {
+    void valid() {
         GetOrganizationQuotaDefinitionRequest.builder()
                 .organizationQuotaDefinitionId("test-organization-quota-definition-id")
                 .build();
diff --git a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/organizationquotadefinitions/ListOrganizationQuotaDefinitionsRequestTest.java b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/organizationquotadefinitions/ListOrganizationQuotaDefinitionsRequestTest.java
index 4354441dcef..a2dab33af9b 100644
--- a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/organizationquotadefinitions/ListOrganizationQuotaDefinitionsRequestTest.java
+++ b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/organizationquotadefinitions/ListOrganizationQuotaDefinitionsRequestTest.java
@@ -16,12 +16,12 @@
 
 package org.cloudfoundry.client.v2.organizationquotadefinitions;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
-public final class ListOrganizationQuotaDefinitionsRequestTest {
+final class ListOrganizationQuotaDefinitionsRequestTest {
 
     @Test
-    public void valid() {
+    void valid() {
         ListOrganizationQuotaDefinitionsRequest.builder().build();
     }
 }
diff --git a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/organizationquotadefinitions/UpdateOrganizationQuotaDefinitionRequestTest.java b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/organizationquotadefinitions/UpdateOrganizationQuotaDefinitionRequestTest.java
index dadb09d7061..e0ebf64096f 100644
--- a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/organizationquotadefinitions/UpdateOrganizationQuotaDefinitionRequestTest.java
+++ b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/organizationquotadefinitions/UpdateOrganizationQuotaDefinitionRequestTest.java
@@ -16,17 +16,23 @@
 
 package org.cloudfoundry.client.v2.organizationquotadefinitions;
 
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
-public class UpdateOrganizationQuotaDefinitionRequestTest {
+import org.junit.jupiter.api.Test;
 
-    @Test(expected = IllegalStateException.class)
-    public void noOrganizationQuotaDefinitionId() {
-        UpdateOrganizationQuotaDefinitionRequest.builder().build();
+class UpdateOrganizationQuotaDefinitionRequestTest {
+
+    @Test
+    void noOrganizationQuotaDefinitionId() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    UpdateOrganizationQuotaDefinitionRequest.builder().build();
+                });
     }
 
     @Test
-    public void valid() {
+    void valid() {
         UpdateOrganizationQuotaDefinitionRequest.builder()
                 .organizationQuotaDefinitionId("test-organization-quota-definition-id")
                 .build();
diff --git a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/organizations/AssociateOrganizationAuditorByUsernameRequestTest.java b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/organizations/AssociateOrganizationAuditorByUsernameRequestTest.java
index 6eba39ce433..be9a68e67fb 100644
--- a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/organizations/AssociateOrganizationAuditorByUsernameRequestTest.java
+++ b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/organizations/AssociateOrganizationAuditorByUsernameRequestTest.java
@@ -16,24 +16,36 @@
 
 package org.cloudfoundry.client.v2.organizations;
 
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
-public final class AssociateOrganizationAuditorByUsernameRequestTest {
+import org.junit.jupiter.api.Test;
 
-    @Test(expected = IllegalStateException.class)
-    public void noOrganizationId() {
-        AssociateOrganizationAuditorByUsernameRequest.builder().username("test-username").build();
+final class AssociateOrganizationAuditorByUsernameRequestTest {
+
+    @Test
+    void noOrganizationId() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    AssociateOrganizationAuditorByUsernameRequest.builder()
+                            .username("test-username")
+                            .build();
+                });
     }
 
-    @Test(expected = IllegalStateException.class)
-    public void noUsername() {
-        AssociateOrganizationAuditorByUsernameRequest.builder()
-                .organizationId("test-organization-id")
-                .build();
+    @Test
+    void noUsername() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    AssociateOrganizationAuditorByUsernameRequest.builder()
+                            .organizationId("test-organization-id")
+                            .build();
+                });
     }
 
     @Test
-    public void valid() {
+    void valid() {
         AssociateOrganizationAuditorByUsernameRequest.builder()
                 .organizationId("test-organization-id")
                 .username("test-username")
diff --git a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/organizations/AssociateOrganizationAuditorRequestTest.java b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/organizations/AssociateOrganizationAuditorRequestTest.java
index d5264d94f0c..806930e9d6a 100644
--- a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/organizations/AssociateOrganizationAuditorRequestTest.java
+++ b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/organizations/AssociateOrganizationAuditorRequestTest.java
@@ -16,24 +16,36 @@
 
 package org.cloudfoundry.client.v2.organizations;
 
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
-public final class AssociateOrganizationAuditorRequestTest {
+import org.junit.jupiter.api.Test;
 
-    @Test(expected = IllegalStateException.class)
-    public void noAuditorId() {
-        AssociateOrganizationAuditorRequest.builder()
-                .organizationId("test-organization-id")
-                .build();
+final class AssociateOrganizationAuditorRequestTest {
+
+    @Test
+    void noAuditorId() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    AssociateOrganizationAuditorRequest.builder()
+                            .organizationId("test-organization-id")
+                            .build();
+                });
     }
 
-    @Test(expected = IllegalStateException.class)
-    public void noOrganizationId() {
-        AssociateOrganizationAuditorRequest.builder().auditorId("test-auditor-id").build();
+    @Test
+    void noOrganizationId() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    AssociateOrganizationAuditorRequest.builder()
+                            .auditorId("test-auditor-id")
+                            .build();
+                });
     }
 
     @Test
-    public void valid() {
+    void valid() {
         AssociateOrganizationAuditorRequest.builder()
                 .auditorId("test-auditor-id")
                 .organizationId("test-organization-id")
diff --git a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/organizations/AssociateOrganizationBillingManagerByUsernameRequestTest.java b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/organizations/AssociateOrganizationBillingManagerByUsernameRequestTest.java
index 015e3304818..ee68672ce74 100644
--- a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/organizations/AssociateOrganizationBillingManagerByUsernameRequestTest.java
+++ b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/organizations/AssociateOrganizationBillingManagerByUsernameRequestTest.java
@@ -16,26 +16,36 @@
 
 package org.cloudfoundry.client.v2.organizations;
 
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
-public final class AssociateOrganizationBillingManagerByUsernameRequestTest {
+import org.junit.jupiter.api.Test;
 
-    @Test(expected = IllegalStateException.class)
-    public void noOrganizationId() {
-        AssociateOrganizationBillingManagerByUsernameRequest.builder()
-                .username("test-username")
-                .build();
+final class AssociateOrganizationBillingManagerByUsernameRequestTest {
+
+    @Test
+    void noOrganizationId() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    AssociateOrganizationBillingManagerByUsernameRequest.builder()
+                            .username("test-username")
+                            .build();
+                });
     }
 
-    @Test(expected = IllegalStateException.class)
-    public void noUsername() {
-        AssociateOrganizationBillingManagerByUsernameRequest.builder()
-                .organizationId("test-organization-id")
-                .build();
+    @Test
+    void noUsername() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    AssociateOrganizationBillingManagerByUsernameRequest.builder()
+                            .organizationId("test-organization-id")
+                            .build();
+                });
     }
 
     @Test
-    public void valid() {
+    void valid() {
         AssociateOrganizationBillingManagerByUsernameRequest.builder()
                 .organizationId("test-organization-id")
                 .username("test-username")
diff --git a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/organizations/AssociateOrganizationBillingManagerRequestTest.java b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/organizations/AssociateOrganizationBillingManagerRequestTest.java
index c888a40f802..8dd44ef8bc6 100644
--- a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/organizations/AssociateOrganizationBillingManagerRequestTest.java
+++ b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/organizations/AssociateOrganizationBillingManagerRequestTest.java
@@ -16,26 +16,36 @@
 
 package org.cloudfoundry.client.v2.organizations;
 
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
-public final class AssociateOrganizationBillingManagerRequestTest {
+import org.junit.jupiter.api.Test;
 
-    @Test(expected = IllegalStateException.class)
-    public void noBillingManagerId() {
-        AssociateOrganizationBillingManagerRequest.builder()
-                .organizationId("test-organization-id")
-                .build();
+final class AssociateOrganizationBillingManagerRequestTest {
+
+    @Test
+    void noBillingManagerId() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    AssociateOrganizationBillingManagerRequest.builder()
+                            .organizationId("test-organization-id")
+                            .build();
+                });
     }
 
-    @Test(expected = IllegalStateException.class)
-    public void noOrganizationId() {
-        AssociateOrganizationBillingManagerRequest.builder()
-                .billingManagerId("test-billing-manager-id")
-                .build();
+    @Test
+    void noOrganizationId() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    AssociateOrganizationBillingManagerRequest.builder()
+                            .billingManagerId("test-billing-manager-id")
+                            .build();
+                });
     }
 
     @Test
-    public void valid() {
+    void valid() {
         AssociateOrganizationBillingManagerRequest.builder()
                 .billingManagerId("test-billing-manager-id")
                 .organizationId("test-organization-id")
diff --git a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/organizations/AssociateOrganizationManagerByUsernameRequestTest.java b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/organizations/AssociateOrganizationManagerByUsernameRequestTest.java
index eea00258454..366ba6c2757 100644
--- a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/organizations/AssociateOrganizationManagerByUsernameRequestTest.java
+++ b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/organizations/AssociateOrganizationManagerByUsernameRequestTest.java
@@ -16,24 +16,36 @@
 
 package org.cloudfoundry.client.v2.organizations;
 
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
-public final class AssociateOrganizationManagerByUsernameRequestTest {
+import org.junit.jupiter.api.Test;
 
-    @Test(expected = IllegalStateException.class)
-    public void noOrganizationId() {
-        AssociateOrganizationManagerByUsernameRequest.builder().username("test-username").build();
+final class AssociateOrganizationManagerByUsernameRequestTest {
+
+    @Test
+    void noOrganizationId() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    AssociateOrganizationManagerByUsernameRequest.builder()
+                            .username("test-username")
+                            .build();
+                });
     }
 
-    @Test(expected = IllegalStateException.class)
-    public void noUsername() {
-        AssociateOrganizationManagerByUsernameRequest.builder()
-                .organizationId("test-organization-id")
-                .build();
+    @Test
+    void noUsername() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    AssociateOrganizationManagerByUsernameRequest.builder()
+                            .organizationId("test-organization-id")
+                            .build();
+                });
     }
 
     @Test
-    public void valid() {
+    void valid() {
         AssociateOrganizationManagerByUsernameRequest.builder()
                 .organizationId("test-organization-id")
                 .username("test-username")
diff --git a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/organizations/AssociateOrganizationManagerRequestTest.java b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/organizations/AssociateOrganizationManagerRequestTest.java
index 81303c4a306..3cf278048d8 100644
--- a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/organizations/AssociateOrganizationManagerRequestTest.java
+++ b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/organizations/AssociateOrganizationManagerRequestTest.java
@@ -16,24 +16,36 @@
 
 package org.cloudfoundry.client.v2.organizations;
 
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
-public final class AssociateOrganizationManagerRequestTest {
+import org.junit.jupiter.api.Test;
 
-    @Test(expected = IllegalStateException.class)
-    public void noManagerId() {
-        AssociateOrganizationManagerRequest.builder()
-                .organizationId("test-organization-id")
-                .build();
+final class AssociateOrganizationManagerRequestTest {
+
+    @Test
+    void noManagerId() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    AssociateOrganizationManagerRequest.builder()
+                            .organizationId("test-organization-id")
+                            .build();
+                });
     }
 
-    @Test(expected = IllegalStateException.class)
-    public void noOrganizationId() {
-        AssociateOrganizationManagerRequest.builder().managerId("test-manager-id").build();
+    @Test
+    void noOrganizationId() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    AssociateOrganizationManagerRequest.builder()
+                            .managerId("test-manager-id")
+                            .build();
+                });
     }
 
     @Test
-    public void valid() {
+    void valid() {
         AssociateOrganizationManagerRequest.builder()
                 .organizationId("test-organization-id")
                 .managerId("test-manager-id")
diff --git a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/organizations/AssociateOrganizationPrivateDomainRequestTest.java b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/organizations/AssociateOrganizationPrivateDomainRequestTest.java
index 1ca06d2409c..8dbe8a9f079 100644
--- a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/organizations/AssociateOrganizationPrivateDomainRequestTest.java
+++ b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/organizations/AssociateOrganizationPrivateDomainRequestTest.java
@@ -16,26 +16,36 @@
 
 package org.cloudfoundry.client.v2.organizations;
 
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
-public final class AssociateOrganizationPrivateDomainRequestTest {
+import org.junit.jupiter.api.Test;
 
-    @Test(expected = IllegalStateException.class)
-    public void noOrganizationId() {
-        AssociateOrganizationPrivateDomainRequest.builder()
-                .privateDomainId("test-private-domain-id")
-                .build();
+final class AssociateOrganizationPrivateDomainRequestTest {
+
+    @Test
+    void noOrganizationId() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    AssociateOrganizationPrivateDomainRequest.builder()
+                            .privateDomainId("test-private-domain-id")
+                            .build();
+                });
     }
 
-    @Test(expected = IllegalStateException.class)
-    public void noPrivateDomainId() {
-        AssociateOrganizationPrivateDomainRequest.builder()
-                .organizationId("test-organization-id")
-                .build();
+    @Test
+    void noPrivateDomainId() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    AssociateOrganizationPrivateDomainRequest.builder()
+                            .organizationId("test-organization-id")
+                            .build();
+                });
     }
 
     @Test
-    public void valid() {
+    void valid() {
         AssociateOrganizationPrivateDomainRequest.builder()
                 .organizationId("test-organization-id")
                 .privateDomainId("test-private-domain-id")
diff --git a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/organizations/AssociateOrganizationUserByUsernameRequestTest.java b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/organizations/AssociateOrganizationUserByUsernameRequestTest.java
index 6ebb62b0f23..24e84be7c52 100644
--- a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/organizations/AssociateOrganizationUserByUsernameRequestTest.java
+++ b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/organizations/AssociateOrganizationUserByUsernameRequestTest.java
@@ -16,24 +16,36 @@
 
 package org.cloudfoundry.client.v2.organizations;
 
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
-public final class AssociateOrganizationUserByUsernameRequestTest {
+import org.junit.jupiter.api.Test;
 
-    @Test(expected = IllegalStateException.class)
-    public void noOrganizationId() {
-        AssociateOrganizationUserByUsernameRequest.builder().username("test-username").build();
+final class AssociateOrganizationUserByUsernameRequestTest {
+
+    @Test
+    void noOrganizationId() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    AssociateOrganizationUserByUsernameRequest.builder()
+                            .username("test-username")
+                            .build();
+                });
     }
 
-    @Test(expected = IllegalStateException.class)
-    public void noUsername() {
-        AssociateOrganizationUserByUsernameRequest.builder()
-                .organizationId("test-organization-id")
-                .build();
+    @Test
+    void noUsername() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    AssociateOrganizationUserByUsernameRequest.builder()
+                            .organizationId("test-organization-id")
+                            .build();
+                });
     }
 
     @Test
-    public void valid() {
+    void valid() {
         AssociateOrganizationUserByUsernameRequest.builder()
                 .organizationId("test-organization-id")
                 .username("test-username")
diff --git a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/organizations/AssociateOrganizationUserRequestTest.java b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/organizations/AssociateOrganizationUserRequestTest.java
index 701d609908f..b51071dea81 100644
--- a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/organizations/AssociateOrganizationUserRequestTest.java
+++ b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/organizations/AssociateOrganizationUserRequestTest.java
@@ -16,22 +16,34 @@
 
 package org.cloudfoundry.client.v2.organizations;
 
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
-public final class AssociateOrganizationUserRequestTest {
+import org.junit.jupiter.api.Test;
 
-    @Test(expected = IllegalStateException.class)
-    public void noOrganizationId() {
-        AssociateOrganizationUserRequest.builder().userId("test-user-id").build();
+final class AssociateOrganizationUserRequestTest {
+
+    @Test
+    void noOrganizationId() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    AssociateOrganizationUserRequest.builder().userId("test-user-id").build();
+                });
     }
 
-    @Test(expected = IllegalStateException.class)
-    public void noUserId() {
-        AssociateOrganizationUserRequest.builder().organizationId("test-organization-id").build();
+    @Test
+    void noUserId() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    AssociateOrganizationUserRequest.builder()
+                            .organizationId("test-organization-id")
+                            .build();
+                });
     }
 
     @Test
-    public void valid() {
+    void valid() {
         AssociateOrganizationUserRequest.builder()
                 .organizationId("test-organization-id")
                 .userId("test-user-id")
diff --git a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/organizations/CreateOrganizationRequestTest.java b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/organizations/CreateOrganizationRequestTest.java
index 886acad03f3..606201208a6 100644
--- a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/organizations/CreateOrganizationRequestTest.java
+++ b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/organizations/CreateOrganizationRequestTest.java
@@ -16,17 +16,23 @@
 
 package org.cloudfoundry.client.v2.organizations;
 
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
-public final class CreateOrganizationRequestTest {
+import org.junit.jupiter.api.Test;
 
-    @Test(expected = IllegalStateException.class)
-    public void noName() {
-        CreateOrganizationRequest.builder().build();
+final class CreateOrganizationRequestTest {
+
+    @Test
+    void noName() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    CreateOrganizationRequest.builder().build();
+                });
     }
 
     @Test
-    public void valid() {
+    void valid() {
         CreateOrganizationRequest.builder().name("test-name").build();
     }
 }
diff --git a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/organizations/DeleteOrganizationRequestTest.java b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/organizations/DeleteOrganizationRequestTest.java
index 5483f6f92b8..ebb435e454e 100644
--- a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/organizations/DeleteOrganizationRequestTest.java
+++ b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/organizations/DeleteOrganizationRequestTest.java
@@ -16,17 +16,23 @@
 
 package org.cloudfoundry.client.v2.organizations;
 
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
-public final class DeleteOrganizationRequestTest {
+import org.junit.jupiter.api.Test;
 
-    @Test(expected = IllegalStateException.class)
-    public void noOrganizationId() {
-        DeleteOrganizationRequest.builder().build();
+final class DeleteOrganizationRequestTest {
+
+    @Test
+    void noOrganizationId() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    DeleteOrganizationRequest.builder().build();
+                });
     }
 
     @Test
-    public void valid() {
+    void valid() {
         DeleteOrganizationRequest.builder().organizationId("test-organization-id").build();
     }
 }
diff --git a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/organizations/GetOrganizationInstanceUsageRequestTest.java b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/organizations/GetOrganizationInstanceUsageRequestTest.java
index 1f46bc66931..fd71d36d5fa 100644
--- a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/organizations/GetOrganizationInstanceUsageRequestTest.java
+++ b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/organizations/GetOrganizationInstanceUsageRequestTest.java
@@ -16,17 +16,23 @@
 
 package org.cloudfoundry.client.v2.organizations;
 
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
-public final class GetOrganizationInstanceUsageRequestTest {
+import org.junit.jupiter.api.Test;
 
-    @Test(expected = IllegalStateException.class)
-    public void noOrganizationId() {
-        GetOrganizationInstanceUsageRequest.builder().build();
+final class GetOrganizationInstanceUsageRequestTest {
+
+    @Test
+    void noOrganizationId() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    GetOrganizationInstanceUsageRequest.builder().build();
+                });
     }
 
     @Test
-    public void valid() {
+    void valid() {
         GetOrganizationInstanceUsageRequest.builder()
                 .organizationId("test-organization-id")
                 .build();
diff --git a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/organizations/GetOrganizationMemoryUsageRequestTest.java b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/organizations/GetOrganizationMemoryUsageRequestTest.java
index a1e4ba001c2..babe1ed2af7 100644
--- a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/organizations/GetOrganizationMemoryUsageRequestTest.java
+++ b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/organizations/GetOrganizationMemoryUsageRequestTest.java
@@ -16,17 +16,23 @@
 
 package org.cloudfoundry.client.v2.organizations;
 
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
-public final class GetOrganizationMemoryUsageRequestTest {
+import org.junit.jupiter.api.Test;
 
-    @Test(expected = IllegalStateException.class)
-    public void noOrganizationId() {
-        GetOrganizationMemoryUsageRequest.builder().build();
+final class GetOrganizationMemoryUsageRequestTest {
+
+    @Test
+    void noOrganizationId() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    GetOrganizationMemoryUsageRequest.builder().build();
+                });
     }
 
     @Test
-    public void valid() {
+    void valid() {
         GetOrganizationMemoryUsageRequest.builder().organizationId("test-organization-id").build();
     }
 }
diff --git a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/organizations/GetOrganizationRequestTest.java b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/organizations/GetOrganizationRequestTest.java
index f8fb003ea1e..e3adfbf00f4 100644
--- a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/organizations/GetOrganizationRequestTest.java
+++ b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/organizations/GetOrganizationRequestTest.java
@@ -16,17 +16,23 @@
 
 package org.cloudfoundry.client.v2.organizations;
 
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
-public final class GetOrganizationRequestTest {
+import org.junit.jupiter.api.Test;
 
-    @Test(expected = IllegalStateException.class)
-    public void noOrganizationId() {
-        GetOrganizationRequest.builder().build();
+final class GetOrganizationRequestTest {
+
+    @Test
+    void noOrganizationId() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    GetOrganizationRequest.builder().build();
+                });
     }
 
     @Test
-    public void valid() {
+    void valid() {
         GetOrganizationRequest.builder().organizationId("test-organization-id").build();
     }
 }
diff --git a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/organizations/GetOrganizationUserRolesRequestTest.java b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/organizations/GetOrganizationUserRolesRequestTest.java
index 117d3e53948..dd5fde08dfa 100644
--- a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/organizations/GetOrganizationUserRolesRequestTest.java
+++ b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/organizations/GetOrganizationUserRolesRequestTest.java
@@ -16,17 +16,23 @@
 
 package org.cloudfoundry.client.v2.organizations;
 
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
-public final class GetOrganizationUserRolesRequestTest {
+import org.junit.jupiter.api.Test;
 
-    @Test(expected = IllegalStateException.class)
-    public void noOrganizationId() {
-        GetOrganizationUserRolesRequest.builder().build();
+final class GetOrganizationUserRolesRequestTest {
+
+    @Test
+    void noOrganizationId() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    GetOrganizationUserRolesRequest.builder().build();
+                });
     }
 
     @Test
-    public void valid() {
+    void valid() {
         GetOrganizationUserRolesRequest.builder().organizationId("test-organization-id").build();
     }
 }
diff --git a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/organizations/ListOrganizationAuditorsRequestTest.java b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/organizations/ListOrganizationAuditorsRequestTest.java
index 8fd857f392a..70f35491ed2 100644
--- a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/organizations/ListOrganizationAuditorsRequestTest.java
+++ b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/organizations/ListOrganizationAuditorsRequestTest.java
@@ -16,17 +16,23 @@
 
 package org.cloudfoundry.client.v2.organizations;
 
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
-public final class ListOrganizationAuditorsRequestTest {
+import org.junit.jupiter.api.Test;
 
-    @Test(expected = IllegalStateException.class)
-    public void noOrganizationId() {
-        ListOrganizationAuditorsRequest.builder().build();
+final class ListOrganizationAuditorsRequestTest {
+
+    @Test
+    void noOrganizationId() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    ListOrganizationAuditorsRequest.builder().build();
+                });
     }
 
     @Test
-    public void valid() {
+    void valid() {
         ListOrganizationAuditorsRequest.builder().organizationId("test-organization-id").build();
     }
 }
diff --git a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/organizations/ListOrganizationBillingManagersRequestTest.java b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/organizations/ListOrganizationBillingManagersRequestTest.java
index c879342b78f..c811386e70a 100644
--- a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/organizations/ListOrganizationBillingManagersRequestTest.java
+++ b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/organizations/ListOrganizationBillingManagersRequestTest.java
@@ -16,17 +16,23 @@
 
 package org.cloudfoundry.client.v2.organizations;
 
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
-public final class ListOrganizationBillingManagersRequestTest {
+import org.junit.jupiter.api.Test;
 
-    @Test(expected = IllegalStateException.class)
-    public void noOrganizationId() {
-        ListOrganizationBillingManagersRequest.builder().build();
+final class ListOrganizationBillingManagersRequestTest {
+
+    @Test
+    void noOrganizationId() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    ListOrganizationBillingManagersRequest.builder().build();
+                });
     }
 
     @Test
-    public void valid() {
+    void valid() {
         ListOrganizationBillingManagersRequest.builder()
                 .organizationId("test-organization-id")
                 .build();
diff --git a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/organizations/ListOrganizationDomainsRequestTest.java b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/organizations/ListOrganizationDomainsRequestTest.java
index 44944d5fbd3..683faf68fd9 100644
--- a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/organizations/ListOrganizationDomainsRequestTest.java
+++ b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/organizations/ListOrganizationDomainsRequestTest.java
@@ -16,17 +16,23 @@
 
 package org.cloudfoundry.client.v2.organizations;
 
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
-public final class ListOrganizationDomainsRequestTest {
+import org.junit.jupiter.api.Test;
 
-    @Test(expected = IllegalStateException.class)
-    public void noOrganizationId() {
-        ListOrganizationDomainsRequest.builder().build();
+final class ListOrganizationDomainsRequestTest {
+
+    @Test
+    void noOrganizationId() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    ListOrganizationDomainsRequest.builder().build();
+                });
     }
 
     @Test
-    public void valid() {
+    void valid() {
         ListOrganizationDomainsRequest.builder().organizationId("test-organization-id").build();
     }
 }
diff --git a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/organizations/ListOrganizationManagersRequestTest.java b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/organizations/ListOrganizationManagersRequestTest.java
index 7abc9e686f7..7378bab7c6a 100644
--- a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/organizations/ListOrganizationManagersRequestTest.java
+++ b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/organizations/ListOrganizationManagersRequestTest.java
@@ -16,17 +16,23 @@
 
 package org.cloudfoundry.client.v2.organizations;
 
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
-public final class ListOrganizationManagersRequestTest {
+import org.junit.jupiter.api.Test;
 
-    @Test(expected = IllegalStateException.class)
-    public void noOrganizationId() {
-        ListOrganizationManagersRequest.builder().build();
+final class ListOrganizationManagersRequestTest {
+
+    @Test
+    void noOrganizationId() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    ListOrganizationManagersRequest.builder().build();
+                });
     }
 
     @Test
-    public void valid() {
+    void valid() {
         ListOrganizationManagersRequest.builder().organizationId("test-organization-id").build();
     }
 }
diff --git a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/organizations/ListOrganizationPrivateDomainsRequestTest.java b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/organizations/ListOrganizationPrivateDomainsRequestTest.java
index f55090e1c45..d0d2f757206 100644
--- a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/organizations/ListOrganizationPrivateDomainsRequestTest.java
+++ b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/organizations/ListOrganizationPrivateDomainsRequestTest.java
@@ -16,17 +16,23 @@
 
 package org.cloudfoundry.client.v2.organizations;
 
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
-public final class ListOrganizationPrivateDomainsRequestTest {
+import org.junit.jupiter.api.Test;
 
-    @Test(expected = IllegalStateException.class)
-    public void noOrganizationId() {
-        ListOrganizationPrivateDomainsRequest.builder().build();
+final class ListOrganizationPrivateDomainsRequestTest {
+
+    @Test
+    void noOrganizationId() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    ListOrganizationPrivateDomainsRequest.builder().build();
+                });
     }
 
     @Test
-    public void valid() {
+    void valid() {
         ListOrganizationPrivateDomainsRequest.builder()
                 .organizationId("test-organization-id")
                 .build();
diff --git a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/organizations/ListOrganizationServicesRequestTest.java b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/organizations/ListOrganizationServicesRequestTest.java
index 6be20fec996..ce2e240ff78 100644
--- a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/organizations/ListOrganizationServicesRequestTest.java
+++ b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/organizations/ListOrganizationServicesRequestTest.java
@@ -16,17 +16,23 @@
 
 package org.cloudfoundry.client.v2.organizations;
 
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
-public final class ListOrganizationServicesRequestTest {
+import org.junit.jupiter.api.Test;
 
-    @Test(expected = IllegalStateException.class)
-    public void noOrganizationId() {
-        ListOrganizationServicesRequest.builder().build();
+final class ListOrganizationServicesRequestTest {
+
+    @Test
+    void noOrganizationId() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    ListOrganizationServicesRequest.builder().build();
+                });
     }
 
     @Test
-    public void valid() {
+    void valid() {
         ListOrganizationServicesRequest.builder().organizationId("test-organization-id").build();
     }
 }
diff --git a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/organizations/ListOrganizationSpaceQuotaDefinitionsRequestTest.java b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/organizations/ListOrganizationSpaceQuotaDefinitionsRequestTest.java
index 3600de4b94a..cb512c43673 100644
--- a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/organizations/ListOrganizationSpaceQuotaDefinitionsRequestTest.java
+++ b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/organizations/ListOrganizationSpaceQuotaDefinitionsRequestTest.java
@@ -16,17 +16,23 @@
 
 package org.cloudfoundry.client.v2.organizations;
 
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
-public final class ListOrganizationSpaceQuotaDefinitionsRequestTest {
+import org.junit.jupiter.api.Test;
 
-    @Test(expected = IllegalStateException.class)
-    public void noOrganizationId() {
-        ListOrganizationSpaceQuotaDefinitionsRequest.builder().build();
+final class ListOrganizationSpaceQuotaDefinitionsRequestTest {
+
+    @Test
+    void noOrganizationId() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    ListOrganizationSpaceQuotaDefinitionsRequest.builder().build();
+                });
     }
 
     @Test
-    public void valid() {
+    void valid() {
         ListOrganizationSpaceQuotaDefinitionsRequest.builder()
                 .organizationId("test-organization-id")
                 .build();
diff --git a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/organizations/ListOrganizationSpacesRequestTest.java b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/organizations/ListOrganizationSpacesRequestTest.java
index b86f7fe44a9..d406499507f 100644
--- a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/organizations/ListOrganizationSpacesRequestTest.java
+++ b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/organizations/ListOrganizationSpacesRequestTest.java
@@ -16,17 +16,23 @@
 
 package org.cloudfoundry.client.v2.organizations;
 
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
-public final class ListOrganizationSpacesRequestTest {
+import org.junit.jupiter.api.Test;
 
-    @Test(expected = IllegalStateException.class)
-    public void noOrganizationId() {
-        ListOrganizationSpacesRequest.builder().build();
+final class ListOrganizationSpacesRequestTest {
+
+    @Test
+    void noOrganizationId() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    ListOrganizationSpacesRequest.builder().build();
+                });
     }
 
     @Test
-    public void valid() {
+    void valid() {
         ListOrganizationSpacesRequest.builder().organizationId("test-organization-id").build();
     }
 }
diff --git a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/organizations/ListOrganizationUsersRequestTest.java b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/organizations/ListOrganizationUsersRequestTest.java
index 420dc1942bc..7830c40b252 100644
--- a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/organizations/ListOrganizationUsersRequestTest.java
+++ b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/organizations/ListOrganizationUsersRequestTest.java
@@ -16,17 +16,23 @@
 
 package org.cloudfoundry.client.v2.organizations;
 
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
-public final class ListOrganizationUsersRequestTest {
+import org.junit.jupiter.api.Test;
 
-    @Test(expected = IllegalStateException.class)
-    public void noOrganizationId() {
-        ListOrganizationUsersRequest.builder().build();
+final class ListOrganizationUsersRequestTest {
+
+    @Test
+    void noOrganizationId() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    ListOrganizationUsersRequest.builder().build();
+                });
     }
 
     @Test
-    public void valid() {
+    void valid() {
         ListOrganizationUsersRequest.builder().organizationId("test-organization-id").build();
     }
 }
diff --git a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/organizations/ListOrganizationsRequestTest.java b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/organizations/ListOrganizationsRequestTest.java
index b8a49bfa4d7..f791761a189 100644
--- a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/organizations/ListOrganizationsRequestTest.java
+++ b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/organizations/ListOrganizationsRequestTest.java
@@ -16,12 +16,12 @@
 
 package org.cloudfoundry.client.v2.organizations;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
-public final class ListOrganizationsRequestTest {
+final class ListOrganizationsRequestTest {
 
     @Test
-    public void valid() {
+    void valid() {
         ListOrganizationsRequest.builder().build();
     }
 }
diff --git a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/organizations/RemoveOrganizationAuditorByUsernameRequestTest.java b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/organizations/RemoveOrganizationAuditorByUsernameRequestTest.java
index c5579e963cf..bef8ab1422b 100644
--- a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/organizations/RemoveOrganizationAuditorByUsernameRequestTest.java
+++ b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/organizations/RemoveOrganizationAuditorByUsernameRequestTest.java
@@ -16,24 +16,36 @@
 
 package org.cloudfoundry.client.v2.organizations;
 
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
-public final class RemoveOrganizationAuditorByUsernameRequestTest {
+import org.junit.jupiter.api.Test;
 
-    @Test(expected = IllegalStateException.class)
-    public void noOrganizationId() {
-        RemoveOrganizationAuditorByUsernameRequest.builder().username("test-username").build();
+final class RemoveOrganizationAuditorByUsernameRequestTest {
+
+    @Test
+    void noOrganizationId() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    RemoveOrganizationAuditorByUsernameRequest.builder()
+                            .username("test-username")
+                            .build();
+                });
     }
 
-    @Test(expected = IllegalStateException.class)
-    public void noUsername() {
-        RemoveOrganizationAuditorByUsernameRequest.builder()
-                .organizationId("test-organization-id")
-                .build();
+    @Test
+    void noUsername() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    RemoveOrganizationAuditorByUsernameRequest.builder()
+                            .organizationId("test-organization-id")
+                            .build();
+                });
     }
 
     @Test
-    public void valid() {
+    void valid() {
         RemoveOrganizationAuditorByUsernameRequest.builder()
                 .username("test-username")
                 .organizationId("test-organization-id")
diff --git a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/organizations/RemoveOrganizationAuditorRequestTest.java b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/organizations/RemoveOrganizationAuditorRequestTest.java
index 55459d31a5b..ff079221087 100644
--- a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/organizations/RemoveOrganizationAuditorRequestTest.java
+++ b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/organizations/RemoveOrganizationAuditorRequestTest.java
@@ -16,22 +16,34 @@
 
 package org.cloudfoundry.client.v2.organizations;
 
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
-public final class RemoveOrganizationAuditorRequestTest {
+import org.junit.jupiter.api.Test;
 
-    @Test(expected = IllegalStateException.class)
-    public void noAuditorId() {
-        RemoveOrganizationAuditorRequest.builder().organizationId("test-organization-id").build();
+final class RemoveOrganizationAuditorRequestTest {
+
+    @Test
+    void noAuditorId() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    RemoveOrganizationAuditorRequest.builder()
+                            .organizationId("test-organization-id")
+                            .build();
+                });
     }
 
-    @Test(expected = IllegalStateException.class)
-    public void noOrganizationId() {
-        RemoveOrganizationAuditorRequest.builder().auditorId("test-auditor-id").build();
+    @Test
+    void noOrganizationId() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    RemoveOrganizationAuditorRequest.builder().auditorId("test-auditor-id").build();
+                });
     }
 
     @Test
-    public void valid() {
+    void valid() {
         RemoveOrganizationAuditorRequest.builder()
                 .auditorId("test-auditor-id")
                 .organizationId("test-organization-id")
diff --git a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/organizations/RemoveOrganizationBillingManagerByUsernameRequestTest.java b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/organizations/RemoveOrganizationBillingManagerByUsernameRequestTest.java
index b1995c996b0..ae9c64c265b 100644
--- a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/organizations/RemoveOrganizationBillingManagerByUsernameRequestTest.java
+++ b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/organizations/RemoveOrganizationBillingManagerByUsernameRequestTest.java
@@ -16,26 +16,36 @@
 
 package org.cloudfoundry.client.v2.organizations;
 
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
-public final class RemoveOrganizationBillingManagerByUsernameRequestTest {
+import org.junit.jupiter.api.Test;
 
-    @Test(expected = IllegalStateException.class)
-    public void noOrganizationId() {
-        RemoveOrganizationBillingManagerByUsernameRequest.builder()
-                .username("test-username")
-                .build();
+final class RemoveOrganizationBillingManagerByUsernameRequestTest {
+
+    @Test
+    void noOrganizationId() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    RemoveOrganizationBillingManagerByUsernameRequest.builder()
+                            .username("test-username")
+                            .build();
+                });
     }
 
-    @Test(expected = IllegalStateException.class)
-    public void noUsername() {
-        RemoveOrganizationBillingManagerByUsernameRequest.builder()
-                .organizationId("test-organization-id")
-                .build();
+    @Test
+    void noUsername() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    RemoveOrganizationBillingManagerByUsernameRequest.builder()
+                            .organizationId("test-organization-id")
+                            .build();
+                });
     }
 
     @Test
-    public void valid() {
+    void valid() {
         RemoveOrganizationBillingManagerByUsernameRequest.builder()
                 .organizationId("test-organization-id")
                 .username("test-username")
diff --git a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/organizations/RemoveOrganizationBillingManagerRequestTest.java b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/organizations/RemoveOrganizationBillingManagerRequestTest.java
index 1f4b284dff3..a114dac5226 100644
--- a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/organizations/RemoveOrganizationBillingManagerRequestTest.java
+++ b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/organizations/RemoveOrganizationBillingManagerRequestTest.java
@@ -16,26 +16,36 @@
 
 package org.cloudfoundry.client.v2.organizations;
 
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
-public final class RemoveOrganizationBillingManagerRequestTest {
+import org.junit.jupiter.api.Test;
 
-    @Test(expected = IllegalStateException.class)
-    public void noBillingManagerId() {
-        RemoveOrganizationBillingManagerRequest.builder()
-                .organizationId("test-organization-id")
-                .build();
+final class RemoveOrganizationBillingManagerRequestTest {
+
+    @Test
+    void noBillingManagerId() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    RemoveOrganizationBillingManagerRequest.builder()
+                            .organizationId("test-organization-id")
+                            .build();
+                });
     }
 
-    @Test(expected = IllegalStateException.class)
-    public void noOrganizationId() {
-        RemoveOrganizationBillingManagerRequest.builder()
-                .billingManagerId("test-billing-manager-id")
-                .build();
+    @Test
+    void noOrganizationId() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    RemoveOrganizationBillingManagerRequest.builder()
+                            .billingManagerId("test-billing-manager-id")
+                            .build();
+                });
     }
 
     @Test
-    public void valid() {
+    void valid() {
         RemoveOrganizationBillingManagerRequest.builder()
                 .billingManagerId("test-billing-manager-id")
                 .organizationId("test-organization-id")
diff --git a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/organizations/RemoveOrganizationManagerByUsernameRequestTest.java b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/organizations/RemoveOrganizationManagerByUsernameRequestTest.java
index 3a5803f0125..6b670d7d8ca 100644
--- a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/organizations/RemoveOrganizationManagerByUsernameRequestTest.java
+++ b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/organizations/RemoveOrganizationManagerByUsernameRequestTest.java
@@ -16,24 +16,36 @@
 
 package org.cloudfoundry.client.v2.organizations;
 
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
-public final class RemoveOrganizationManagerByUsernameRequestTest {
+import org.junit.jupiter.api.Test;
 
-    @Test(expected = IllegalStateException.class)
-    public void noOrganizationId() {
-        RemoveOrganizationManagerByUsernameRequest.builder().username("test-username").build();
+final class RemoveOrganizationManagerByUsernameRequestTest {
+
+    @Test
+    void noOrganizationId() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    RemoveOrganizationManagerByUsernameRequest.builder()
+                            .username("test-username")
+                            .build();
+                });
     }
 
-    @Test(expected = IllegalStateException.class)
-    public void noUsername() {
-        RemoveOrganizationManagerByUsernameRequest.builder()
-                .organizationId("test-organization-id")
-                .build();
+    @Test
+    void noUsername() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    RemoveOrganizationManagerByUsernameRequest.builder()
+                            .organizationId("test-organization-id")
+                            .build();
+                });
     }
 
     @Test
-    public void valid() {
+    void valid() {
         RemoveOrganizationManagerByUsernameRequest.builder()
                 .organizationId("test-organization-id")
                 .username("test-username")
diff --git a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/organizations/RemoveOrganizationManagerRequestTest.java b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/organizations/RemoveOrganizationManagerRequestTest.java
index 6dadc264139..cbc6c9086ca 100644
--- a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/organizations/RemoveOrganizationManagerRequestTest.java
+++ b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/organizations/RemoveOrganizationManagerRequestTest.java
@@ -16,22 +16,34 @@
 
 package org.cloudfoundry.client.v2.organizations;
 
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
-public final class RemoveOrganizationManagerRequestTest {
+import org.junit.jupiter.api.Test;
 
-    @Test(expected = IllegalStateException.class)
-    public void noManagerId() {
-        RemoveOrganizationManagerRequest.builder().organizationId("test-organization-id").build();
+final class RemoveOrganizationManagerRequestTest {
+
+    @Test
+    void noManagerId() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    RemoveOrganizationManagerRequest.builder()
+                            .organizationId("test-organization-id")
+                            .build();
+                });
     }
 
-    @Test(expected = IllegalStateException.class)
-    public void noOrganizationId() {
-        RemoveOrganizationManagerRequest.builder().managerId("test-manager-id").build();
+    @Test
+    void noOrganizationId() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    RemoveOrganizationManagerRequest.builder().managerId("test-manager-id").build();
+                });
     }
 
     @Test
-    public void valid() {
+    void valid() {
         RemoveOrganizationManagerRequest.builder()
                 .managerId("test-manager-id")
                 .organizationId("test-organization-id")
diff --git a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/organizations/RemoveOrganizationPrivateDomainRequestTest.java b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/organizations/RemoveOrganizationPrivateDomainRequestTest.java
index 0a58dd1acc0..882f6a477ba 100644
--- a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/organizations/RemoveOrganizationPrivateDomainRequestTest.java
+++ b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/organizations/RemoveOrganizationPrivateDomainRequestTest.java
@@ -16,26 +16,36 @@
 
 package org.cloudfoundry.client.v2.organizations;
 
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
-public final class RemoveOrganizationPrivateDomainRequestTest {
+import org.junit.jupiter.api.Test;
 
-    @Test(expected = IllegalStateException.class)
-    public void noOrganizationId() {
-        RemoveOrganizationPrivateDomainRequest.builder()
-                .privateDomainId("test-private-domain-id")
-                .build();
+final class RemoveOrganizationPrivateDomainRequestTest {
+
+    @Test
+    void noOrganizationId() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    RemoveOrganizationPrivateDomainRequest.builder()
+                            .privateDomainId("test-private-domain-id")
+                            .build();
+                });
     }
 
-    @Test(expected = IllegalStateException.class)
-    public void noPrivateDomainId() {
-        RemoveOrganizationPrivateDomainRequest.builder()
-                .organizationId("test-organization-id")
-                .build();
+    @Test
+    void noPrivateDomainId() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    RemoveOrganizationPrivateDomainRequest.builder()
+                            .organizationId("test-organization-id")
+                            .build();
+                });
     }
 
     @Test
-    public void valid() {
+    void valid() {
         RemoveOrganizationPrivateDomainRequest.builder()
                 .organizationId("test-organization-id")
                 .privateDomainId("test-private-domain-id")
diff --git a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/organizations/RemoveOrganizationUserByUsernameRequestTest.java b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/organizations/RemoveOrganizationUserByUsernameRequestTest.java
index bd938abcbe5..2bba7bd692a 100644
--- a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/organizations/RemoveOrganizationUserByUsernameRequestTest.java
+++ b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/organizations/RemoveOrganizationUserByUsernameRequestTest.java
@@ -16,24 +16,36 @@
 
 package org.cloudfoundry.client.v2.organizations;
 
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
-public final class RemoveOrganizationUserByUsernameRequestTest {
+import org.junit.jupiter.api.Test;
 
-    @Test(expected = IllegalStateException.class)
-    public void noOrganizationId() {
-        RemoveOrganizationUserByUsernameRequest.builder().username("test-username").build();
+final class RemoveOrganizationUserByUsernameRequestTest {
+
+    @Test
+    void noOrganizationId() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    RemoveOrganizationUserByUsernameRequest.builder()
+                            .username("test-username")
+                            .build();
+                });
     }
 
-    @Test(expected = IllegalStateException.class)
-    public void noUsername() {
-        RemoveOrganizationUserByUsernameRequest.builder()
-                .organizationId("test-organization-id")
-                .build();
+    @Test
+    void noUsername() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    RemoveOrganizationUserByUsernameRequest.builder()
+                            .organizationId("test-organization-id")
+                            .build();
+                });
     }
 
     @Test
-    public void valid() {
+    void valid() {
         RemoveOrganizationUserByUsernameRequest.builder()
                 .organizationId("test-organization-id")
                 .username("test-username")
diff --git a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/organizations/RemoveOrganizationUserRequestTest.java b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/organizations/RemoveOrganizationUserRequestTest.java
index fe8131acea5..6fc22c80473 100644
--- a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/organizations/RemoveOrganizationUserRequestTest.java
+++ b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/organizations/RemoveOrganizationUserRequestTest.java
@@ -16,22 +16,34 @@
 
 package org.cloudfoundry.client.v2.organizations;
 
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
-public final class RemoveOrganizationUserRequestTest {
+import org.junit.jupiter.api.Test;
 
-    @Test(expected = IllegalStateException.class)
-    public void noOrganizationId() {
-        RemoveOrganizationUserRequest.builder().userId("test-user-id").build();
+final class RemoveOrganizationUserRequestTest {
+
+    @Test
+    void noOrganizationId() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    RemoveOrganizationUserRequest.builder().userId("test-user-id").build();
+                });
     }
 
-    @Test(expected = IllegalStateException.class)
-    public void noUserId() {
-        RemoveOrganizationUserRequest.builder().organizationId("test-organization-id").build();
+    @Test
+    void noUserId() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    RemoveOrganizationUserRequest.builder()
+                            .organizationId("test-organization-id")
+                            .build();
+                });
     }
 
     @Test
-    public void valid() {
+    void valid() {
         RemoveOrganizationUserRequest.builder()
                 .organizationId("test-organization-id")
                 .userId("test-user-id")
diff --git a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/organizations/SummaryOrganizationRequestTest.java b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/organizations/SummaryOrganizationRequestTest.java
index 38a9a75e5a5..7327526b3a8 100644
--- a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/organizations/SummaryOrganizationRequestTest.java
+++ b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/organizations/SummaryOrganizationRequestTest.java
@@ -16,17 +16,23 @@
 
 package org.cloudfoundry.client.v2.organizations;
 
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
-public final class SummaryOrganizationRequestTest {
+import org.junit.jupiter.api.Test;
 
-    @Test(expected = IllegalStateException.class)
-    public void noOrganizationId() {
-        SummaryOrganizationRequest.builder().build();
+final class SummaryOrganizationRequestTest {
+
+    @Test
+    void noOrganizationId() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    SummaryOrganizationRequest.builder().build();
+                });
     }
 
     @Test
-    public void valid() {
+    void valid() {
         SummaryOrganizationRequest.builder().organizationId("test-organization-id").build();
     }
 }
diff --git a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/organizations/UpdateOrganizationRequestTest.java b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/organizations/UpdateOrganizationRequestTest.java
index cf0853fa84f..0f6b061911a 100644
--- a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/organizations/UpdateOrganizationRequestTest.java
+++ b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/organizations/UpdateOrganizationRequestTest.java
@@ -16,17 +16,23 @@
 
 package org.cloudfoundry.client.v2.organizations;
 
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
-public final class UpdateOrganizationRequestTest {
+import org.junit.jupiter.api.Test;
 
-    @Test(expected = IllegalStateException.class)
-    public void noOrganizationId() {
-        UpdateOrganizationRequest.builder().build();
+final class UpdateOrganizationRequestTest {
+
+    @Test
+    void noOrganizationId() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    UpdateOrganizationRequest.builder().build();
+                });
     }
 
     @Test
-    public void valid() {
+    void valid() {
         UpdateOrganizationRequest.builder().organizationId("test-organization-id").build();
     }
 }
diff --git a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/privatedomains/CreatePrivateDomainRequestTest.java b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/privatedomains/CreatePrivateDomainRequestTest.java
index 0b9077f5902..3a6512c7c7d 100644
--- a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/privatedomains/CreatePrivateDomainRequestTest.java
+++ b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/privatedomains/CreatePrivateDomainRequestTest.java
@@ -16,24 +16,34 @@
 
 package org.cloudfoundry.client.v2.privatedomains;
 
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
-public final class CreatePrivateDomainRequestTest {
+import org.junit.jupiter.api.Test;
 
-    @Test(expected = IllegalStateException.class)
-    public void noName() {
-        CreatePrivateDomainRequest.builder()
-                .owningOrganizationId("test-owning-organization-id")
-                .build();
+final class CreatePrivateDomainRequestTest {
+
+    @Test
+    void noName() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    CreatePrivateDomainRequest.builder()
+                            .owningOrganizationId("test-owning-organization-id")
+                            .build();
+                });
     }
 
-    @Test(expected = IllegalStateException.class)
-    public void noOwningOrganizationId() {
-        CreatePrivateDomainRequest.builder().name("test-name").build();
+    @Test
+    void noOwningOrganizationId() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    CreatePrivateDomainRequest.builder().name("test-name").build();
+                });
     }
 
     @Test
-    public void valid() {
+    void valid() {
         CreatePrivateDomainRequest.builder()
                 .name("test-name")
                 .owningOrganizationId("test-owning-organization-id")
diff --git a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/privatedomains/DeletePrivateDomainRequestTest.java b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/privatedomains/DeletePrivateDomainRequestTest.java
index c6f3d6a53fc..6f7729e90d2 100644
--- a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/privatedomains/DeletePrivateDomainRequestTest.java
+++ b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/privatedomains/DeletePrivateDomainRequestTest.java
@@ -16,17 +16,23 @@
 
 package org.cloudfoundry.client.v2.privatedomains;
 
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
-public final class DeletePrivateDomainRequestTest {
+import org.junit.jupiter.api.Test;
 
-    @Test(expected = IllegalStateException.class)
-    public void noPrivateDomainId() {
-        DeletePrivateDomainRequest.builder().build();
+final class DeletePrivateDomainRequestTest {
+
+    @Test
+    void noPrivateDomainId() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    DeletePrivateDomainRequest.builder().build();
+                });
     }
 
     @Test
-    public void valid() {
+    void valid() {
         DeletePrivateDomainRequest.builder().privateDomainId("test-private-domain-id").build();
     }
 }
diff --git a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/privatedomains/GetPrivateDomainRequestTest.java b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/privatedomains/GetPrivateDomainRequestTest.java
index d2c415a3937..5e177b784d6 100644
--- a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/privatedomains/GetPrivateDomainRequestTest.java
+++ b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/privatedomains/GetPrivateDomainRequestTest.java
@@ -16,17 +16,23 @@
 
 package org.cloudfoundry.client.v2.privatedomains;
 
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
-public final class GetPrivateDomainRequestTest {
+import org.junit.jupiter.api.Test;
 
-    @Test(expected = IllegalStateException.class)
-    public void noPrivateDomainId() {
-        GetPrivateDomainRequest.builder().build();
+final class GetPrivateDomainRequestTest {
+
+    @Test
+    void noPrivateDomainId() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    GetPrivateDomainRequest.builder().build();
+                });
     }
 
     @Test
-    public void valid() {
+    void valid() {
         GetPrivateDomainRequest.builder().privateDomainId("test-private-domain-id").build();
     }
 }
diff --git a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/privatedomains/ListPrivateDomainSharedOrganizationsRequestTest.java b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/privatedomains/ListPrivateDomainSharedOrganizationsRequestTest.java
index 3bf008e60d7..0146b71b6f0 100644
--- a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/privatedomains/ListPrivateDomainSharedOrganizationsRequestTest.java
+++ b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/privatedomains/ListPrivateDomainSharedOrganizationsRequestTest.java
@@ -16,17 +16,23 @@
 
 package org.cloudfoundry.client.v2.privatedomains;
 
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
-public final class ListPrivateDomainSharedOrganizationsRequestTest {
+import org.junit.jupiter.api.Test;
 
-    @Test(expected = IllegalStateException.class)
-    public void noPrivateDomainId() {
-        ListPrivateDomainSharedOrganizationsRequest.builder().build();
+final class ListPrivateDomainSharedOrganizationsRequestTest {
+
+    @Test
+    void noPrivateDomainId() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    ListPrivateDomainSharedOrganizationsRequest.builder().build();
+                });
     }
 
     @Test
-    public void valid() {
+    void valid() {
         ListPrivateDomainSharedOrganizationsRequest.builder()
                 .privateDomainId("test-privatedomain-id")
                 .build();
diff --git a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/privatedomains/ListPrivateDomainsRequestTest.java b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/privatedomains/ListPrivateDomainsRequestTest.java
index a49e7429bed..e023944bbe4 100644
--- a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/privatedomains/ListPrivateDomainsRequestTest.java
+++ b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/privatedomains/ListPrivateDomainsRequestTest.java
@@ -16,12 +16,12 @@
 
 package org.cloudfoundry.client.v2.privatedomains;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
-public final class ListPrivateDomainsRequestTest {
+final class ListPrivateDomainsRequestTest {
 
     @Test
-    public void valid() {
+    void valid() {
         ListPrivateDomainsRequest.builder().build();
     }
 }
diff --git a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/routemappings/CreateRouteMappingRequestTest.java b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/routemappings/CreateRouteMappingRequestTest.java
index d91c4bf2e4e..0ccb0e3d07d 100644
--- a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/routemappings/CreateRouteMappingRequestTest.java
+++ b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/routemappings/CreateRouteMappingRequestTest.java
@@ -16,22 +16,32 @@
 
 package org.cloudfoundry.client.v2.routemappings;
 
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
-public final class CreateRouteMappingRequestTest {
+import org.junit.jupiter.api.Test;
 
-    @Test(expected = IllegalStateException.class)
-    public void noApplicationId() {
-        CreateRouteMappingRequest.builder().routeId("route-id").build();
+final class CreateRouteMappingRequestTest {
+
+    @Test
+    void noApplicationId() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    CreateRouteMappingRequest.builder().routeId("route-id").build();
+                });
     }
 
-    @Test(expected = IllegalStateException.class)
-    public void noRouteId() {
-        CreateRouteMappingRequest.builder().applicationId("application-id").build();
+    @Test
+    void noRouteId() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    CreateRouteMappingRequest.builder().applicationId("application-id").build();
+                });
     }
 
     @Test
-    public void valid() {
+    void valid() {
         CreateRouteMappingRequest.builder()
                 .applicationId("application-id")
                 .routeId("route-id")
diff --git a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/routemappings/DeleteRouteMappingRequestTest.java b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/routemappings/DeleteRouteMappingRequestTest.java
index 67cce99b4b8..d63635a8ac6 100644
--- a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/routemappings/DeleteRouteMappingRequestTest.java
+++ b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/routemappings/DeleteRouteMappingRequestTest.java
@@ -16,17 +16,23 @@
 
 package org.cloudfoundry.client.v2.routemappings;
 
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
-public final class DeleteRouteMappingRequestTest {
+import org.junit.jupiter.api.Test;
 
-    @Test(expected = IllegalStateException.class)
-    public void noRouteMappingId() {
-        DeleteRouteMappingRequest.builder().build();
+final class DeleteRouteMappingRequestTest {
+
+    @Test
+    void noRouteMappingId() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    DeleteRouteMappingRequest.builder().build();
+                });
     }
 
     @Test
-    public void valid() {
+    void valid() {
         DeleteRouteMappingRequest.builder().routeMappingId("route-mapping-id").build();
     }
 }
diff --git a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/routemappings/GetRouteMappingRequestTest.java b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/routemappings/GetRouteMappingRequestTest.java
index 5f832212271..5a6f689f591 100644
--- a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/routemappings/GetRouteMappingRequestTest.java
+++ b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/routemappings/GetRouteMappingRequestTest.java
@@ -16,17 +16,23 @@
 
 package org.cloudfoundry.client.v2.routemappings;
 
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
-public final class GetRouteMappingRequestTest {
+import org.junit.jupiter.api.Test;
 
-    @Test(expected = IllegalStateException.class)
-    public void noRouteMappingId() {
-        GetRouteMappingRequest.builder().build();
+final class GetRouteMappingRequestTest {
+
+    @Test
+    void noRouteMappingId() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    GetRouteMappingRequest.builder().build();
+                });
     }
 
     @Test
-    public void valid() {
+    void valid() {
         GetRouteMappingRequest.builder().routeMappingId("route-mapping-id").build();
     }
 }
diff --git a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/routemappings/ListRouteMappingsRequestTest.java b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/routemappings/ListRouteMappingsRequestTest.java
index 0118787a433..8dcf551d047 100644
--- a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/routemappings/ListRouteMappingsRequestTest.java
+++ b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/routemappings/ListRouteMappingsRequestTest.java
@@ -16,12 +16,12 @@
 
 package org.cloudfoundry.client.v2.routemappings;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
-public final class ListRouteMappingsRequestTest {
+final class ListRouteMappingsRequestTest {
 
     @Test
-    public void valid() {
+    void valid() {
         ListRouteMappingsRequest.builder().build();
     }
 }
diff --git a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/routes/AssociateRouteApplicationRequestTest.java b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/routes/AssociateRouteApplicationRequestTest.java
index 0e64f2e81ef..88748e7db34 100644
--- a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/routes/AssociateRouteApplicationRequestTest.java
+++ b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/routes/AssociateRouteApplicationRequestTest.java
@@ -16,22 +16,32 @@
 
 package org.cloudfoundry.client.v2.routes;
 
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
-public final class AssociateRouteApplicationRequestTest {
+import org.junit.jupiter.api.Test;
 
-    @Test(expected = IllegalStateException.class)
-    public void noApplicationId() {
-        AssociateRouteApplicationRequest.builder().routeId("test-route-id").build();
+final class AssociateRouteApplicationRequestTest {
+
+    @Test
+    void noApplicationId() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    AssociateRouteApplicationRequest.builder().routeId("test-route-id").build();
+                });
     }
 
-    @Test(expected = IllegalStateException.class)
-    public void noRouteId() {
-        AssociateRouteApplicationRequest.builder().applicationId("test-app-id").build();
+    @Test
+    void noRouteId() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    AssociateRouteApplicationRequest.builder().applicationId("test-app-id").build();
+                });
     }
 
     @Test
-    public void valid() {
+    void valid() {
         AssociateRouteApplicationRequest.builder()
                 .applicationId("test-app-id")
                 .routeId("test-route-id")
diff --git a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/routes/CreateRouteRequestTest.java b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/routes/CreateRouteRequestTest.java
index 2b54c96e113..1fbc2ecfe87 100644
--- a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/routes/CreateRouteRequestTest.java
+++ b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/routes/CreateRouteRequestTest.java
@@ -16,22 +16,32 @@
 
 package org.cloudfoundry.client.v2.routes;
 
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
-public final class CreateRouteRequestTest {
+import org.junit.jupiter.api.Test;
 
-    @Test(expected = IllegalStateException.class)
-    public void noDomainId() {
-        CreateRouteRequest.builder().spaceId("test-space-id").build();
+final class CreateRouteRequestTest {
+
+    @Test
+    void noDomainId() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    CreateRouteRequest.builder().spaceId("test-space-id").build();
+                });
     }
 
-    @Test(expected = IllegalStateException.class)
-    public void noSpaceId() {
-        CreateRouteRequest.builder().domainId("test-domain-id").build();
+    @Test
+    void noSpaceId() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    CreateRouteRequest.builder().domainId("test-domain-id").build();
+                });
     }
 
     @Test
-    public void valid() {
+    void valid() {
         CreateRouteRequest.builder().domainId("test-domain-id").spaceId("test-space-id").build();
     }
 }
diff --git a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/routes/DeleteRouteRequestTest.java b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/routes/DeleteRouteRequestTest.java
index 45a8f761242..63d50c2b4cb 100644
--- a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/routes/DeleteRouteRequestTest.java
+++ b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/routes/DeleteRouteRequestTest.java
@@ -16,17 +16,23 @@
 
 package org.cloudfoundry.client.v2.routes;
 
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
-public final class DeleteRouteRequestTest {
+import org.junit.jupiter.api.Test;
 
-    @Test(expected = IllegalStateException.class)
-    public void noRouteId() {
-        DeleteRouteRequest.builder().build();
+final class DeleteRouteRequestTest {
+
+    @Test
+    void noRouteId() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    DeleteRouteRequest.builder().build();
+                });
     }
 
     @Test
-    public void valid() {
+    void valid() {
         DeleteRouteRequest.builder().routeId("test-route-id").build();
     }
 }
diff --git a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/routes/GetRouteRequestTest.java b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/routes/GetRouteRequestTest.java
index fff7e6eeda8..ba02a7f55e7 100644
--- a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/routes/GetRouteRequestTest.java
+++ b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/routes/GetRouteRequestTest.java
@@ -16,17 +16,23 @@
 
 package org.cloudfoundry.client.v2.routes;
 
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
-public final class GetRouteRequestTest {
+import org.junit.jupiter.api.Test;
 
-    @Test(expected = IllegalStateException.class)
-    public void noRouteId() {
-        GetRouteRequest.builder().build();
+final class GetRouteRequestTest {
+
+    @Test
+    void noRouteId() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    GetRouteRequest.builder().build();
+                });
     }
 
     @Test
-    public void valid() {
+    void valid() {
         GetRouteRequest.builder().routeId("test-route-id").build();
     }
 }
diff --git a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/routes/ListRouteApplicationsRequestTest.java b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/routes/ListRouteApplicationsRequestTest.java
index 779bf59da1f..ae46cbb33c1 100644
--- a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/routes/ListRouteApplicationsRequestTest.java
+++ b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/routes/ListRouteApplicationsRequestTest.java
@@ -16,17 +16,23 @@
 
 package org.cloudfoundry.client.v2.routes;
 
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
-public final class ListRouteApplicationsRequestTest {
+import org.junit.jupiter.api.Test;
 
-    @Test(expected = IllegalStateException.class)
-    public void noRouteId() {
-        ListRouteApplicationsRequest.builder().build();
+final class ListRouteApplicationsRequestTest {
+
+    @Test
+    void noRouteId() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    ListRouteApplicationsRequest.builder().build();
+                });
     }
 
     @Test
-    public void valid() {
+    void valid() {
         ListRouteApplicationsRequest.builder().routeId("test-route-id").build();
     }
 }
diff --git a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/routes/ListRouteMappingsRequestTest.java b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/routes/ListRouteMappingsRequestTest.java
index 3457706ad7e..513ab6221a5 100644
--- a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/routes/ListRouteMappingsRequestTest.java
+++ b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/routes/ListRouteMappingsRequestTest.java
@@ -16,17 +16,23 @@
 
 package org.cloudfoundry.client.v2.routes;
 
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
-public final class ListRouteMappingsRequestTest {
+import org.junit.jupiter.api.Test;
 
-    @Test(expected = IllegalStateException.class)
-    public void noRouteId() {
-        ListRouteMappingsRequest.builder().build();
+final class ListRouteMappingsRequestTest {
+
+    @Test
+    void noRouteId() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    ListRouteMappingsRequest.builder().build();
+                });
     }
 
     @Test
-    public void valid() {
+    void valid() {
         ListRouteMappingsRequest.builder().routeId("test-route-id").build();
     }
 }
diff --git a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/routes/ListRoutesRequestTest.java b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/routes/ListRoutesRequestTest.java
index 682a479fcf9..8ee1503d76f 100644
--- a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/routes/ListRoutesRequestTest.java
+++ b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/routes/ListRoutesRequestTest.java
@@ -16,12 +16,12 @@
 
 package org.cloudfoundry.client.v2.routes;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
-public final class ListRoutesRequestTest {
+final class ListRoutesRequestTest {
 
     @Test
-    public void valid() {
+    void valid() {
         ListRoutesRequest.builder().build();
     }
 }
diff --git a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/routes/RemoveRouteApplicationRequestTest.java b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/routes/RemoveRouteApplicationRequestTest.java
index a5c341abe1f..91daa76f681 100644
--- a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/routes/RemoveRouteApplicationRequestTest.java
+++ b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/routes/RemoveRouteApplicationRequestTest.java
@@ -16,22 +16,32 @@
 
 package org.cloudfoundry.client.v2.routes;
 
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
-public final class RemoveRouteApplicationRequestTest {
+import org.junit.jupiter.api.Test;
 
-    @Test(expected = IllegalStateException.class)
-    public void noApplicationId() {
-        RemoveRouteApplicationRequest.builder().routeId("test-route-id").build();
+final class RemoveRouteApplicationRequestTest {
+
+    @Test
+    void noApplicationId() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    RemoveRouteApplicationRequest.builder().routeId("test-route-id").build();
+                });
     }
 
-    @Test(expected = IllegalStateException.class)
-    public void noRouteId() {
-        RemoveRouteApplicationRequest.builder().applicationId("test-app-id").build();
+    @Test
+    void noRouteId() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    RemoveRouteApplicationRequest.builder().applicationId("test-app-id").build();
+                });
     }
 
     @Test
-    public void valid() {
+    void valid() {
         RemoveRouteApplicationRequest.builder()
                 .applicationId("test-app-id")
                 .routeId("test-route-id")
diff --git a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/routes/RouteExistsRequestTest.java b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/routes/RouteExistsRequestTest.java
index 2ae04131850..0a55c965566 100644
--- a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/routes/RouteExistsRequestTest.java
+++ b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/routes/RouteExistsRequestTest.java
@@ -16,17 +16,23 @@
 
 package org.cloudfoundry.client.v2.routes;
 
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
-public final class RouteExistsRequestTest {
+import org.junit.jupiter.api.Test;
 
-    @Test(expected = IllegalStateException.class)
-    public void noDomainId() {
-        RouteExistsRequest.builder().build();
+final class RouteExistsRequestTest {
+
+    @Test
+    void noDomainId() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    RouteExistsRequest.builder().build();
+                });
     }
 
     @Test
-    public void valid() {
+    void valid() {
         RouteExistsRequest.builder().domainId("test-domain-id").build();
     }
 }
diff --git a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/routes/UpdateRouteRequestTest.java b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/routes/UpdateRouteRequestTest.java
index 4cd1bd7aebc..6a21d8160ac 100644
--- a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/routes/UpdateRouteRequestTest.java
+++ b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/routes/UpdateRouteRequestTest.java
@@ -16,17 +16,23 @@
 
 package org.cloudfoundry.client.v2.routes;
 
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
-public final class UpdateRouteRequestTest {
+import org.junit.jupiter.api.Test;
 
-    @Test(expected = IllegalStateException.class)
-    public void noRouteId() {
-        UpdateRouteRequest.builder().build();
+final class UpdateRouteRequestTest {
+
+    @Test
+    void noRouteId() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    UpdateRouteRequest.builder().build();
+                });
     }
 
     @Test
-    public void valid() {
+    void valid() {
         UpdateRouteRequest.builder().routeId("test-route-id").build();
     }
 }
diff --git a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/securitygroups/AssociateSecurityGroupSpaceRequestTest.java b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/securitygroups/AssociateSecurityGroupSpaceRequestTest.java
index c0c64e9a7f0..eb3dafdf31f 100644
--- a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/securitygroups/AssociateSecurityGroupSpaceRequestTest.java
+++ b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/securitygroups/AssociateSecurityGroupSpaceRequestTest.java
@@ -16,24 +16,34 @@
 
 package org.cloudfoundry.client.v2.securitygroups;
 
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
-public final class AssociateSecurityGroupSpaceRequestTest {
+import org.junit.jupiter.api.Test;
 
-    @Test(expected = IllegalStateException.class)
-    public void noSecurityGroupId() {
-        AssociateSecurityGroupSpaceRequest.builder().spaceId("test-space-id").build();
+final class AssociateSecurityGroupSpaceRequestTest {
+
+    @Test
+    void noSecurityGroupId() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    AssociateSecurityGroupSpaceRequest.builder().spaceId("test-space-id").build();
+                });
     }
 
-    @Test(expected = IllegalStateException.class)
-    public void noSpaceId() {
-        AssociateSecurityGroupSpaceRequest.builder()
-                .securityGroupId("test-security-group-id")
-                .build();
+    @Test
+    void noSpaceId() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    AssociateSecurityGroupSpaceRequest.builder()
+                            .securityGroupId("test-security-group-id")
+                            .build();
+                });
     }
 
     @Test
-    public void valid() {
+    void valid() {
         AssociateSecurityGroupSpaceRequest.builder()
                 .securityGroupId("test-security-group-id")
                 .spaceId("test-space-id")
diff --git a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/securitygroups/CreateSecurityGroupRequestTest.java b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/securitygroups/CreateSecurityGroupRequestTest.java
index 3daf51c4518..9ce9d97be82 100644
--- a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/securitygroups/CreateSecurityGroupRequestTest.java
+++ b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/securitygroups/CreateSecurityGroupRequestTest.java
@@ -16,20 +16,26 @@
 
 package org.cloudfoundry.client.v2.securitygroups;
 
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
-public class CreateSecurityGroupRequestTest {
+import org.junit.jupiter.api.Test;
 
-    @Test(expected = IllegalStateException.class)
-    public void noName() {
-        CreateSecurityGroupRequest.builder()
-                .rule(RuleEntity.builder().build())
-                .spaceId("test-space-id")
-                .build();
+class CreateSecurityGroupRequestTest {
+
+    @Test
+    void noName() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    CreateSecurityGroupRequest.builder()
+                            .rule(RuleEntity.builder().build())
+                            .spaceId("test-space-id")
+                            .build();
+                });
     }
 
     @Test
-    public void validMax() {
+    void validMax() {
         CreateSecurityGroupRequest.builder()
                 .name("test-security-group-name")
                 .rule(RuleEntity.builder().build())
@@ -38,7 +44,7 @@ public void validMax() {
     }
 
     @Test
-    public void validMin() {
+    void validMin() {
         CreateSecurityGroupRequest.builder().name("test-security-group-name").build();
     }
 }
diff --git a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/securitygroups/DeleteSecurityGroupRequestTest.java b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/securitygroups/DeleteSecurityGroupRequestTest.java
index da1cd9ece9a..b56fa8ab8a0 100644
--- a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/securitygroups/DeleteSecurityGroupRequestTest.java
+++ b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/securitygroups/DeleteSecurityGroupRequestTest.java
@@ -16,17 +16,23 @@
 
 package org.cloudfoundry.client.v2.securitygroups;
 
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
-public final class DeleteSecurityGroupRequestTest {
+import org.junit.jupiter.api.Test;
 
-    @Test(expected = IllegalStateException.class)
-    public void noSecurityGroupId() {
-        DeleteSecurityGroupRequest.builder().async(true).build();
+final class DeleteSecurityGroupRequestTest {
+
+    @Test
+    void noSecurityGroupId() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    DeleteSecurityGroupRequest.builder().async(true).build();
+                });
     }
 
     @Test
-    public void validMax() {
+    void validMax() {
         DeleteSecurityGroupRequest.builder()
                 .securityGroupId("test-security-group-id")
                 .async(true)
@@ -34,7 +40,7 @@ public void validMax() {
     }
 
     @Test
-    public void validMin() {
+    void validMin() {
         DeleteSecurityGroupRequest.builder().securityGroupId("test-security-group-id").build();
     }
 }
diff --git a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/securitygroups/GetSecurityGroupRequestTest.java b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/securitygroups/GetSecurityGroupRequestTest.java
index 0833aef95ce..74342cbe204 100644
--- a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/securitygroups/GetSecurityGroupRequestTest.java
+++ b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/securitygroups/GetSecurityGroupRequestTest.java
@@ -16,17 +16,23 @@
 
 package org.cloudfoundry.client.v2.securitygroups;
 
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
-public class GetSecurityGroupRequestTest {
+import org.junit.jupiter.api.Test;
 
-    @Test(expected = IllegalStateException.class)
-    public void noSecurityGroupId() {
-        GetSecurityGroupRequest.builder().build();
+class GetSecurityGroupRequestTest {
+
+    @Test
+    void noSecurityGroupId() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    GetSecurityGroupRequest.builder().build();
+                });
     }
 
     @Test
-    public void valid() {
+    void valid() {
         GetSecurityGroupRequest.builder().securityGroupId("test-security-group-id").build();
     }
 }
diff --git a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/securitygroups/ListSecurityGroupRunningDefaultsRequestTest.java b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/securitygroups/ListSecurityGroupRunningDefaultsRequestTest.java
index 2f8e4d4de43..f178dc3cd62 100644
--- a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/securitygroups/ListSecurityGroupRunningDefaultsRequestTest.java
+++ b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/securitygroups/ListSecurityGroupRunningDefaultsRequestTest.java
@@ -16,12 +16,12 @@
 
 package org.cloudfoundry.client.v2.securitygroups;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
-public final class ListSecurityGroupRunningDefaultsRequestTest {
+final class ListSecurityGroupRunningDefaultsRequestTest {
 
     @Test
-    public void valid() {
+    void valid() {
         ListSecurityGroupRunningDefaultsRequest.builder().build();
     }
 }
diff --git a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/securitygroups/ListSecurityGroupSpacesRequestTest.java b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/securitygroups/ListSecurityGroupSpacesRequestTest.java
index e66ccb8df42..485783f6e3d 100644
--- a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/securitygroups/ListSecurityGroupSpacesRequestTest.java
+++ b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/securitygroups/ListSecurityGroupSpacesRequestTest.java
@@ -16,17 +16,23 @@
 
 package org.cloudfoundry.client.v2.securitygroups;
 
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
-public final class ListSecurityGroupSpacesRequestTest {
+import org.junit.jupiter.api.Test;
 
-    @Test(expected = IllegalStateException.class)
-    public void noSecurityGroupId() {
-        ListSecurityGroupSpacesRequest.builder().build();
+final class ListSecurityGroupSpacesRequestTest {
+
+    @Test
+    void noSecurityGroupId() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    ListSecurityGroupSpacesRequest.builder().build();
+                });
     }
 
     @Test
-    public void valid() {
+    void valid() {
         ListSecurityGroupSpacesRequest.builder().securityGroupId("test-security-group-id").build();
     }
 }
diff --git a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/securitygroups/ListSecurityGroupStagingDefaultsRequestTest.java b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/securitygroups/ListSecurityGroupStagingDefaultsRequestTest.java
index c283bfca395..af060d20926 100644
--- a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/securitygroups/ListSecurityGroupStagingDefaultsRequestTest.java
+++ b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/securitygroups/ListSecurityGroupStagingDefaultsRequestTest.java
@@ -16,12 +16,12 @@
 
 package org.cloudfoundry.client.v2.securitygroups;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
-public final class ListSecurityGroupStagingDefaultsRequestTest {
+final class ListSecurityGroupStagingDefaultsRequestTest {
 
     @Test
-    public void valid() {
+    void valid() {
         ListSecurityGroupStagingDefaultsRequest.builder().build();
     }
 }
diff --git a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/securitygroups/ListSecurityGroupsRequestTest.java b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/securitygroups/ListSecurityGroupsRequestTest.java
index d9da0637071..f359244c730 100644
--- a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/securitygroups/ListSecurityGroupsRequestTest.java
+++ b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/securitygroups/ListSecurityGroupsRequestTest.java
@@ -16,12 +16,12 @@
 
 package org.cloudfoundry.client.v2.securitygroups;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
-public final class ListSecurityGroupsRequestTest {
+final class ListSecurityGroupsRequestTest {
 
     @Test
-    public void valid() {
+    void valid() {
         ListSecurityGroupsRequest.builder().build();
     }
 }
diff --git a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/securitygroups/RemoveSecurityGroupRunningDefaultRequestTest.java b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/securitygroups/RemoveSecurityGroupRunningDefaultRequestTest.java
index f104b711932..c00653120d2 100644
--- a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/securitygroups/RemoveSecurityGroupRunningDefaultRequestTest.java
+++ b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/securitygroups/RemoveSecurityGroupRunningDefaultRequestTest.java
@@ -16,17 +16,23 @@
 
 package org.cloudfoundry.client.v2.securitygroups;
 
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
-public final class RemoveSecurityGroupRunningDefaultRequestTest {
+import org.junit.jupiter.api.Test;
 
-    @Test(expected = IllegalStateException.class)
-    public void noSecurityGroupRunningDefaultId() {
-        RemoveSecurityGroupRunningDefaultRequest.builder().build();
+final class RemoveSecurityGroupRunningDefaultRequestTest {
+
+    @Test
+    void noSecurityGroupRunningDefaultId() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    RemoveSecurityGroupRunningDefaultRequest.builder().build();
+                });
     }
 
     @Test
-    public void valid() {
+    void valid() {
         RemoveSecurityGroupRunningDefaultRequest.builder()
                 .securityGroupId("test-security-group-default-id")
                 .build();
diff --git a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/securitygroups/RemoveSecurityGroupSpaceRequestTest.java b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/securitygroups/RemoveSecurityGroupSpaceRequestTest.java
index 5c09720ad08..34a62bd5f86 100644
--- a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/securitygroups/RemoveSecurityGroupSpaceRequestTest.java
+++ b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/securitygroups/RemoveSecurityGroupSpaceRequestTest.java
@@ -16,22 +16,34 @@
 
 package org.cloudfoundry.client.v2.securitygroups;
 
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
-public final class RemoveSecurityGroupSpaceRequestTest {
+import org.junit.jupiter.api.Test;
 
-    @Test(expected = IllegalStateException.class)
-    public void noSecurityGroupId() {
-        RemoveSecurityGroupSpaceRequest.builder().spaceId("test-space-id").build();
+final class RemoveSecurityGroupSpaceRequestTest {
+
+    @Test
+    void noSecurityGroupId() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    RemoveSecurityGroupSpaceRequest.builder().spaceId("test-space-id").build();
+                });
     }
 
-    @Test(expected = IllegalStateException.class)
-    public void noSpaceId() {
-        RemoveSecurityGroupSpaceRequest.builder().securityGroupId("test-security-group-id").build();
+    @Test
+    void noSpaceId() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    RemoveSecurityGroupSpaceRequest.builder()
+                            .securityGroupId("test-security-group-id")
+                            .build();
+                });
     }
 
     @Test
-    public void valid() {
+    void valid() {
         RemoveSecurityGroupSpaceRequest.builder()
                 .securityGroupId("test-security-group-id")
                 .spaceId("test-space-id")
diff --git a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/securitygroups/RemoveSecurityGroupStagingDefaultRequestTest.java b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/securitygroups/RemoveSecurityGroupStagingDefaultRequestTest.java
index 54a5b8f12a5..fd7bc5fcc22 100644
--- a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/securitygroups/RemoveSecurityGroupStagingDefaultRequestTest.java
+++ b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/securitygroups/RemoveSecurityGroupStagingDefaultRequestTest.java
@@ -16,17 +16,23 @@
 
 package org.cloudfoundry.client.v2.securitygroups;
 
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
-public final class RemoveSecurityGroupStagingDefaultRequestTest {
+import org.junit.jupiter.api.Test;
 
-    @Test(expected = IllegalStateException.class)
-    public void noSecurityGroupStagingDefaultId() {
-        RemoveSecurityGroupStagingDefaultRequest.builder().build();
+final class RemoveSecurityGroupStagingDefaultRequestTest {
+
+    @Test
+    void noSecurityGroupStagingDefaultId() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    RemoveSecurityGroupStagingDefaultRequest.builder().build();
+                });
     }
 
     @Test
-    public void valid() {
+    void valid() {
         RemoveSecurityGroupStagingDefaultRequest.builder()
                 .securityGroupId("test-security-group-default-id")
                 .build();
diff --git a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/securitygroups/SetSecurityGroupRunningDefaultRequestTest.java b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/securitygroups/SetSecurityGroupRunningDefaultRequestTest.java
index 2195b7c83c3..8039cb0ac79 100644
--- a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/securitygroups/SetSecurityGroupRunningDefaultRequestTest.java
+++ b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/securitygroups/SetSecurityGroupRunningDefaultRequestTest.java
@@ -16,17 +16,23 @@
 
 package org.cloudfoundry.client.v2.securitygroups;
 
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
-public final class SetSecurityGroupRunningDefaultRequestTest {
+import org.junit.jupiter.api.Test;
 
-    @Test(expected = IllegalStateException.class)
-    public void noSecurityGroupRunningDefaultId() {
-        SetSecurityGroupRunningDefaultRequest.builder().build();
+final class SetSecurityGroupRunningDefaultRequestTest {
+
+    @Test
+    void noSecurityGroupRunningDefaultId() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    SetSecurityGroupRunningDefaultRequest.builder().build();
+                });
     }
 
     @Test
-    public void valid() {
+    void valid() {
         SetSecurityGroupRunningDefaultRequest.builder()
                 .securityGroupId("test-security-group-default-id")
                 .build();
diff --git a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/securitygroups/SetSecurityGroupStagingDefaultRequestTest.java b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/securitygroups/SetSecurityGroupStagingDefaultRequestTest.java
index 64332ab070b..92c5d21e4ca 100644
--- a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/securitygroups/SetSecurityGroupStagingDefaultRequestTest.java
+++ b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/securitygroups/SetSecurityGroupStagingDefaultRequestTest.java
@@ -16,17 +16,23 @@
 
 package org.cloudfoundry.client.v2.securitygroups;
 
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
-public final class SetSecurityGroupStagingDefaultRequestTest {
+import org.junit.jupiter.api.Test;
 
-    @Test(expected = IllegalStateException.class)
-    public void noSecurityGroupStagingDefaultId() {
-        SetSecurityGroupStagingDefaultRequest.builder().build();
+final class SetSecurityGroupStagingDefaultRequestTest {
+
+    @Test
+    void noSecurityGroupStagingDefaultId() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    SetSecurityGroupStagingDefaultRequest.builder().build();
+                });
     }
 
     @Test
-    public void valid() {
+    void valid() {
         SetSecurityGroupStagingDefaultRequest.builder()
                 .securityGroupId("test-security-group-default-id")
                 .build();
diff --git a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/securitygroups/UpdateSecurityGroupRequestTest.java b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/securitygroups/UpdateSecurityGroupRequestTest.java
index bf2ca7c3001..314524835c1 100644
--- a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/securitygroups/UpdateSecurityGroupRequestTest.java
+++ b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/securitygroups/UpdateSecurityGroupRequestTest.java
@@ -16,21 +16,27 @@
 
 package org.cloudfoundry.client.v2.securitygroups;
 
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
-public class UpdateSecurityGroupRequestTest {
+import org.junit.jupiter.api.Test;
 
-    @Test(expected = IllegalStateException.class)
-    public void noId() {
-        UpdateSecurityGroupRequest.builder()
-                .name("test-security-group-name")
-                .rule(RuleEntity.builder().build())
-                .spaceId("test-space-id")
-                .build();
+class UpdateSecurityGroupRequestTest {
+
+    @Test
+    void noId() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    UpdateSecurityGroupRequest.builder()
+                            .name("test-security-group-name")
+                            .rule(RuleEntity.builder().build())
+                            .spaceId("test-space-id")
+                            .build();
+                });
     }
 
     @Test
-    public void valid() {
+    void valid() {
         UpdateSecurityGroupRequest.builder()
                 .name("test-security-group-name")
                 .rule(RuleEntity.builder().build())
diff --git a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/servicebindings/CreateServiceBindingRequestTest.java b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/servicebindings/CreateServiceBindingRequestTest.java
index 5fcd5da51f0..82bcda07f72 100644
--- a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/servicebindings/CreateServiceBindingRequestTest.java
+++ b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/servicebindings/CreateServiceBindingRequestTest.java
@@ -16,22 +16,34 @@
 
 package org.cloudfoundry.client.v2.servicebindings;
 
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
-public final class CreateServiceBindingRequestTest {
+import org.junit.jupiter.api.Test;
 
-    @Test(expected = IllegalStateException.class)
-    public void noApplicationId() {
-        CreateServiceBindingRequest.builder().serviceInstanceId("test-service-instance-id").build();
+final class CreateServiceBindingRequestTest {
+
+    @Test
+    void noApplicationId() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    CreateServiceBindingRequest.builder()
+                            .serviceInstanceId("test-service-instance-id")
+                            .build();
+                });
     }
 
-    @Test(expected = IllegalStateException.class)
-    public void noServiceInstanceId() {
-        CreateServiceBindingRequest.builder().applicationId("app-id").build();
+    @Test
+    void noServiceInstanceId() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    CreateServiceBindingRequest.builder().applicationId("app-id").build();
+                });
     }
 
     @Test
-    public void valid() {
+    void valid() {
         CreateServiceBindingRequest.builder()
                 .applicationId("app-id")
                 .serviceInstanceId("test-service-instance-id")
diff --git a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/servicebindings/DeleteServiceBindingRequestTest.java b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/servicebindings/DeleteServiceBindingRequestTest.java
index 233577c41aa..5ff67177fcf 100644
--- a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/servicebindings/DeleteServiceBindingRequestTest.java
+++ b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/servicebindings/DeleteServiceBindingRequestTest.java
@@ -16,17 +16,23 @@
 
 package org.cloudfoundry.client.v2.servicebindings;
 
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
-public final class DeleteServiceBindingRequestTest {
+import org.junit.jupiter.api.Test;
 
-    @Test(expected = IllegalStateException.class)
-    public void noServiceBindingId() {
-        DeleteServiceBindingRequest.builder().build();
+final class DeleteServiceBindingRequestTest {
+
+    @Test
+    void noServiceBindingId() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    DeleteServiceBindingRequest.builder().build();
+                });
     }
 
     @Test
-    public void valid() {
+    void valid() {
         DeleteServiceBindingRequest.builder().serviceBindingId("test-service-binding-id").build();
     }
 }
diff --git a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/servicebindings/GetServiceBindingParametersRequestTest.java b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/servicebindings/GetServiceBindingParametersRequestTest.java
index 0f5d243afec..d88fb8f3850 100644
--- a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/servicebindings/GetServiceBindingParametersRequestTest.java
+++ b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/servicebindings/GetServiceBindingParametersRequestTest.java
@@ -16,17 +16,23 @@
 
 package org.cloudfoundry.client.v2.servicebindings;
 
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
-public final class GetServiceBindingParametersRequestTest {
+import org.junit.jupiter.api.Test;
 
-    @Test(expected = IllegalStateException.class)
-    public void noServiceInstanceId() {
-        GetServiceBindingParametersRequest.builder().build();
+final class GetServiceBindingParametersRequestTest {
+
+    @Test
+    void noServiceInstanceId() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    GetServiceBindingParametersRequest.builder().build();
+                });
     }
 
     @Test
-    public void valid() {
+    void valid() {
         GetServiceBindingParametersRequest.builder()
                 .serviceBindingId("test-service-instance-id")
                 .build();
diff --git a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/servicebindings/GetServiceBindingRequestTest.java b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/servicebindings/GetServiceBindingRequestTest.java
index bbd9613f502..7e8b0c8f0f6 100644
--- a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/servicebindings/GetServiceBindingRequestTest.java
+++ b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/servicebindings/GetServiceBindingRequestTest.java
@@ -16,17 +16,23 @@
 
 package org.cloudfoundry.client.v2.servicebindings;
 
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
-public final class GetServiceBindingRequestTest {
+import org.junit.jupiter.api.Test;
 
-    @Test(expected = IllegalStateException.class)
-    public void noServiceBindingId() {
-        GetServiceBindingRequest.builder().build();
+final class GetServiceBindingRequestTest {
+
+    @Test
+    void noServiceBindingId() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    GetServiceBindingRequest.builder().build();
+                });
     }
 
     @Test
-    public void valid() {
+    void valid() {
         GetServiceBindingRequest.builder().serviceBindingId("test-service-binding-id").build();
     }
 }
diff --git a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/servicebindings/ListServiceBindingsRequestTest.java b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/servicebindings/ListServiceBindingsRequestTest.java
index 0975d9d6833..5de3bad21d4 100644
--- a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/servicebindings/ListServiceBindingsRequestTest.java
+++ b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/servicebindings/ListServiceBindingsRequestTest.java
@@ -16,12 +16,12 @@
 
 package org.cloudfoundry.client.v2.servicebindings;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
-public final class ListServiceBindingsRequestTest {
+final class ListServiceBindingsRequestTest {
 
     @Test
-    public void valid() {
+    void valid() {
         ListServiceBindingsRequest.builder().build();
     }
 }
diff --git a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/servicebrokers/CreateServiceBrokerRequestTest.java b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/servicebrokers/CreateServiceBrokerRequestTest.java
index b57f6e377b7..9ac37b8d99c 100644
--- a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/servicebrokers/CreateServiceBrokerRequestTest.java
+++ b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/servicebrokers/CreateServiceBrokerRequestTest.java
@@ -16,48 +16,66 @@
 
 package org.cloudfoundry.client.v2.servicebrokers;
 
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
-public final class CreateServiceBrokerRequestTest {
+import org.junit.jupiter.api.Test;
 
-    @Test(expected = IllegalStateException.class)
-    public void noAuthenticationPassword() {
-        CreateServiceBrokerRequest.builder()
-                .name("name")
-                .authenticationUsername("username")
-                .brokerUrl("http://somewhere-over-the-rainbow.org")
-                .build();
+final class CreateServiceBrokerRequestTest {
+
+    @Test
+    void noAuthenticationPassword() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    CreateServiceBrokerRequest.builder()
+                            .name("name")
+                            .authenticationUsername("username")
+                            .brokerUrl("http://somewhere-over-the-rainbow.org")
+                            .build();
+                });
     }
 
-    @Test(expected = IllegalStateException.class)
-    public void noAuthenticationUsername() {
-        CreateServiceBrokerRequest.builder()
-                .name("name")
-                .authenticationPassword("password")
-                .brokerUrl("http://somewhere-over-the-rainbow.org")
-                .build();
+    @Test
+    void noAuthenticationUsername() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    CreateServiceBrokerRequest.builder()
+                            .name("name")
+                            .authenticationPassword("password")
+                            .brokerUrl("http://somewhere-over-the-rainbow.org")
+                            .build();
+                });
     }
 
-    @Test(expected = IllegalStateException.class)
-    public void noBrokerUrl() {
-        CreateServiceBrokerRequest.builder()
-                .name("name")
-                .authenticationPassword("password")
-                .authenticationUsername("username")
-                .build();
+    @Test
+    void noBrokerUrl() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    CreateServiceBrokerRequest.builder()
+                            .name("name")
+                            .authenticationPassword("password")
+                            .authenticationUsername("username")
+                            .build();
+                });
     }
 
-    @Test(expected = IllegalStateException.class)
-    public void noName() {
-        CreateServiceBrokerRequest.builder()
-                .authenticationPassword("password")
-                .authenticationUsername("username")
-                .brokerUrl("http://somewhere-over-the-rainbow.org")
-                .build();
+    @Test
+    void noName() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    CreateServiceBrokerRequest.builder()
+                            .authenticationPassword("password")
+                            .authenticationUsername("username")
+                            .brokerUrl("http://somewhere-over-the-rainbow.org")
+                            .build();
+                });
     }
 
     @Test
-    public void valid() {
+    void valid() {
         CreateServiceBrokerRequest.builder()
                 .name("name")
                 .authenticationPassword("password")
diff --git a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/servicebrokers/DeleteServiceBrokerRequestTest.java b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/servicebrokers/DeleteServiceBrokerRequestTest.java
index 1a3782f7416..ddd65ec5897 100644
--- a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/servicebrokers/DeleteServiceBrokerRequestTest.java
+++ b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/servicebrokers/DeleteServiceBrokerRequestTest.java
@@ -16,17 +16,23 @@
 
 package org.cloudfoundry.client.v2.servicebrokers;
 
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
-public final class DeleteServiceBrokerRequestTest {
+import org.junit.jupiter.api.Test;
 
-    @Test(expected = IllegalStateException.class)
-    public void noServiceBrokerId() {
-        DeleteServiceBrokerRequest.builder().build();
+final class DeleteServiceBrokerRequestTest {
+
+    @Test
+    void noServiceBrokerId() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    DeleteServiceBrokerRequest.builder().build();
+                });
     }
 
     @Test
-    public void valid() {
+    void valid() {
         DeleteServiceBrokerRequest.builder().serviceBrokerId("test-service-broker-id").build();
     }
 }
diff --git a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/servicebrokers/GetServiceBrokerRequestTest.java b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/servicebrokers/GetServiceBrokerRequestTest.java
index 933be2236d7..f5f468fab08 100644
--- a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/servicebrokers/GetServiceBrokerRequestTest.java
+++ b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/servicebrokers/GetServiceBrokerRequestTest.java
@@ -16,17 +16,23 @@
 
 package org.cloudfoundry.client.v2.servicebrokers;
 
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
-public final class GetServiceBrokerRequestTest {
+import org.junit.jupiter.api.Test;
 
-    @Test(expected = IllegalStateException.class)
-    public void noServiceBrokerId() {
-        GetServiceBrokerRequest.builder().build();
+final class GetServiceBrokerRequestTest {
+
+    @Test
+    void noServiceBrokerId() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    GetServiceBrokerRequest.builder().build();
+                });
     }
 
     @Test
-    public void valid() {
+    void valid() {
         GetServiceBrokerRequest.builder().serviceBrokerId("test-service-broker-id").build();
     }
 }
diff --git a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/servicebrokers/ListServiceBrokersRequestTest.java b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/servicebrokers/ListServiceBrokersRequestTest.java
index e5d02cc952d..b30f7bcde06 100644
--- a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/servicebrokers/ListServiceBrokersRequestTest.java
+++ b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/servicebrokers/ListServiceBrokersRequestTest.java
@@ -16,12 +16,12 @@
 
 package org.cloudfoundry.client.v2.servicebrokers;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
-public final class ListServiceBrokersRequestTest {
+final class ListServiceBrokersRequestTest {
 
     @Test
-    public void valid() {
+    void valid() {
         ListServiceBrokersRequest.builder().build();
     }
 }
diff --git a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/servicebrokers/UpdateServiceBrokerRequestTest.java b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/servicebrokers/UpdateServiceBrokerRequestTest.java
index f47c6606b30..48f21adab62 100644
--- a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/servicebrokers/UpdateServiceBrokerRequestTest.java
+++ b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/servicebrokers/UpdateServiceBrokerRequestTest.java
@@ -16,17 +16,23 @@
 
 package org.cloudfoundry.client.v2.servicebrokers;
 
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
-public final class UpdateServiceBrokerRequestTest {
+import org.junit.jupiter.api.Test;
 
-    @Test(expected = IllegalStateException.class)
-    public void noServiceBrokerId() {
-        UpdateServiceBrokerRequest.builder().build();
+final class UpdateServiceBrokerRequestTest {
+
+    @Test
+    void noServiceBrokerId() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    UpdateServiceBrokerRequest.builder().build();
+                });
     }
 
     @Test
-    public void valid() {
+    void valid() {
         UpdateServiceBrokerRequest.builder().serviceBrokerId("test-service-broker-id").build();
     }
 }
diff --git a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/serviceinstances/BindServiceInstanceRouteRequestTest.java b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/serviceinstances/BindServiceInstanceRouteRequestTest.java
index a64b0fb5ce5..c197144da83 100644
--- a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/serviceinstances/BindServiceInstanceRouteRequestTest.java
+++ b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/serviceinstances/BindServiceInstanceRouteRequestTest.java
@@ -16,24 +16,34 @@
 
 package org.cloudfoundry.client.v2.serviceinstances;
 
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
-public final class BindServiceInstanceRouteRequestTest {
+import org.junit.jupiter.api.Test;
 
-    @Test(expected = IllegalStateException.class)
-    public void noRouteId() {
-        BindServiceInstanceRouteRequest.builder()
-                .serviceInstanceId("test-service-instance-id")
-                .build();
+final class BindServiceInstanceRouteRequestTest {
+
+    @Test
+    void noRouteId() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    BindServiceInstanceRouteRequest.builder()
+                            .serviceInstanceId("test-service-instance-id")
+                            .build();
+                });
     }
 
-    @Test(expected = IllegalStateException.class)
-    public void noServiceInstanceId() {
-        BindServiceInstanceRouteRequest.builder().routeId("test-route-id").build();
+    @Test
+    void noServiceInstanceId() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    BindServiceInstanceRouteRequest.builder().routeId("test-route-id").build();
+                });
     }
 
     @Test
-    public void valid() {
+    void valid() {
         BindServiceInstanceRouteRequest.builder()
                 .serviceInstanceId("test-service-instance-id")
                 .routeId("test-route-id")
diff --git a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/serviceinstances/CreateServiceInstanceRequestTest.java b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/serviceinstances/CreateServiceInstanceRequestTest.java
index ea33a2dec40..dba9d3f0b48 100644
--- a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/serviceinstances/CreateServiceInstanceRequestTest.java
+++ b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/serviceinstances/CreateServiceInstanceRequestTest.java
@@ -16,33 +16,47 @@
 
 package org.cloudfoundry.client.v2.serviceinstances;
 
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
-public final class CreateServiceInstanceRequestTest {
+import org.junit.jupiter.api.Test;
 
-    @Test(expected = IllegalStateException.class)
-    public void noName() {
-        CreateServiceInstanceRequest.builder()
-                .servicePlanId("service-plan-id")
-                .spaceId("space-id")
-                .build();
+final class CreateServiceInstanceRequestTest {
+
+    @Test
+    void noName() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    CreateServiceInstanceRequest.builder()
+                            .servicePlanId("service-plan-id")
+                            .spaceId("space-id")
+                            .build();
+                });
     }
 
-    @Test(expected = IllegalStateException.class)
-    public void noServicePlanId() {
-        CreateServiceInstanceRequest.builder().name("name").spaceId("space-id").build();
+    @Test
+    void noServicePlanId() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    CreateServiceInstanceRequest.builder().name("name").spaceId("space-id").build();
+                });
     }
 
-    @Test(expected = IllegalStateException.class)
-    public void noSpaceId() {
-        CreateServiceInstanceRequest.builder()
-                .name("name")
-                .servicePlanId("service-plan-id")
-                .build();
+    @Test
+    void noSpaceId() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    CreateServiceInstanceRequest.builder()
+                            .name("name")
+                            .servicePlanId("service-plan-id")
+                            .build();
+                });
     }
 
     @Test
-    public void valid() {
+    void valid() {
         CreateServiceInstanceRequest.builder()
                 .name("name")
                 .servicePlanId("service-plan-id")
diff --git a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/serviceinstances/DeleteServiceInstanceRequestTest.java b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/serviceinstances/DeleteServiceInstanceRequestTest.java
index 7ca73f72260..c6b6292b057 100644
--- a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/serviceinstances/DeleteServiceInstanceRequestTest.java
+++ b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/serviceinstances/DeleteServiceInstanceRequestTest.java
@@ -16,17 +16,23 @@
 
 package org.cloudfoundry.client.v2.serviceinstances;
 
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
-public final class DeleteServiceInstanceRequestTest {
+import org.junit.jupiter.api.Test;
 
-    @Test(expected = IllegalStateException.class)
-    public void noServiceInstanceId() {
-        DeleteServiceInstanceRequest.builder().build();
+final class DeleteServiceInstanceRequestTest {
+
+    @Test
+    void noServiceInstanceId() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    DeleteServiceInstanceRequest.builder().build();
+                });
     }
 
     @Test
-    public void valid() {
+    void valid() {
         DeleteServiceInstanceRequest.builder()
                 .serviceInstanceId("test-service-instance-id")
                 .build();
diff --git a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/serviceinstances/GetServiceInstanceParametersRequestTest.java b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/serviceinstances/GetServiceInstanceParametersRequestTest.java
index 42331ae4fe1..18f83a12073 100644
--- a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/serviceinstances/GetServiceInstanceParametersRequestTest.java
+++ b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/serviceinstances/GetServiceInstanceParametersRequestTest.java
@@ -16,17 +16,23 @@
 
 package org.cloudfoundry.client.v2.serviceinstances;
 
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
-public final class GetServiceInstanceParametersRequestTest {
+import org.junit.jupiter.api.Test;
 
-    @Test(expected = IllegalStateException.class)
-    public void noServiceInstanceId() {
-        GetServiceInstanceParametersRequest.builder().build();
+final class GetServiceInstanceParametersRequestTest {
+
+    @Test
+    void noServiceInstanceId() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    GetServiceInstanceParametersRequest.builder().build();
+                });
     }
 
     @Test
-    public void valid() {
+    void valid() {
         GetServiceInstanceParametersRequest.builder()
                 .serviceInstanceId("test-service-instance-id")
                 .build();
diff --git a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/serviceinstances/GetServiceInstancePermissionsRequestTest.java b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/serviceinstances/GetServiceInstancePermissionsRequestTest.java
index c80bf3df83e..89d068da84b 100644
--- a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/serviceinstances/GetServiceInstancePermissionsRequestTest.java
+++ b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/serviceinstances/GetServiceInstancePermissionsRequestTest.java
@@ -16,17 +16,23 @@
 
 package org.cloudfoundry.client.v2.serviceinstances;
 
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
-public final class GetServiceInstancePermissionsRequestTest {
+import org.junit.jupiter.api.Test;
 
-    @Test(expected = IllegalStateException.class)
-    public void noServiceInstanceId() {
-        GetServiceInstancePermissionsRequest.builder().build();
+final class GetServiceInstancePermissionsRequestTest {
+
+    @Test
+    void noServiceInstanceId() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    GetServiceInstancePermissionsRequest.builder().build();
+                });
     }
 
     @Test
-    public void valid() {
+    void valid() {
         GetServiceInstancePermissionsRequest.builder()
                 .serviceInstanceId("test-service-instance-id")
                 .build();
diff --git a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/serviceinstances/GetServiceInstanceRequestTest.java b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/serviceinstances/GetServiceInstanceRequestTest.java
index c9e50c6fe34..16333855b69 100644
--- a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/serviceinstances/GetServiceInstanceRequestTest.java
+++ b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/serviceinstances/GetServiceInstanceRequestTest.java
@@ -16,17 +16,23 @@
 
 package org.cloudfoundry.client.v2.serviceinstances;
 
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
-public final class GetServiceInstanceRequestTest {
+import org.junit.jupiter.api.Test;
 
-    @Test(expected = IllegalStateException.class)
-    public void noServiceInstanceId() {
-        GetServiceInstanceRequest.builder().build();
+final class GetServiceInstanceRequestTest {
+
+    @Test
+    void noServiceInstanceId() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    GetServiceInstanceRequest.builder().build();
+                });
     }
 
     @Test
-    public void valid() {
+    void valid() {
         GetServiceInstanceRequest.builder().serviceInstanceId("test-service-instance-id").build();
     }
 }
diff --git a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/serviceinstances/ListServiceInstanceRoutesRequestTest.java b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/serviceinstances/ListServiceInstanceRoutesRequestTest.java
index 399091fafab..b9aade264cd 100644
--- a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/serviceinstances/ListServiceInstanceRoutesRequestTest.java
+++ b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/serviceinstances/ListServiceInstanceRoutesRequestTest.java
@@ -16,17 +16,23 @@
 
 package org.cloudfoundry.client.v2.serviceinstances;
 
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
-public final class ListServiceInstanceRoutesRequestTest {
+import org.junit.jupiter.api.Test;
 
-    @Test(expected = IllegalStateException.class)
-    public void noServiceInstanceId() {
-        ListServiceInstanceRoutesRequest.builder().build();
+final class ListServiceInstanceRoutesRequestTest {
+
+    @Test
+    void noServiceInstanceId() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    ListServiceInstanceRoutesRequest.builder().build();
+                });
     }
 
     @Test
-    public void valid() {
+    void valid() {
         ListServiceInstanceRoutesRequest.builder()
                 .serviceInstanceId("test-service-instance-id")
                 .build();
diff --git a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/serviceinstances/ListServiceInstanceServiceBindingsRequestTest.java b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/serviceinstances/ListServiceInstanceServiceBindingsRequestTest.java
index b38ce060064..fdbf2273fcf 100644
--- a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/serviceinstances/ListServiceInstanceServiceBindingsRequestTest.java
+++ b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/serviceinstances/ListServiceInstanceServiceBindingsRequestTest.java
@@ -16,17 +16,23 @@
 
 package org.cloudfoundry.client.v2.serviceinstances;
 
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
-public final class ListServiceInstanceServiceBindingsRequestTest {
+import org.junit.jupiter.api.Test;
 
-    @Test(expected = IllegalStateException.class)
-    public void noServiceInstanceId() {
-        ListServiceInstanceServiceBindingsRequest.builder().build();
+final class ListServiceInstanceServiceBindingsRequestTest {
+
+    @Test
+    void noServiceInstanceId() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    ListServiceInstanceServiceBindingsRequest.builder().build();
+                });
     }
 
     @Test
-    public void valid() {
+    void valid() {
         ListServiceInstanceServiceBindingsRequest.builder()
                 .serviceInstanceId("test-service-instance-id")
                 .build();
diff --git a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/serviceinstances/ListServiceInstanceServiceKeysRequestTest.java b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/serviceinstances/ListServiceInstanceServiceKeysRequestTest.java
index 48739409f9a..9d1b0e59b53 100644
--- a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/serviceinstances/ListServiceInstanceServiceKeysRequestTest.java
+++ b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/serviceinstances/ListServiceInstanceServiceKeysRequestTest.java
@@ -16,17 +16,23 @@
 
 package org.cloudfoundry.client.v2.serviceinstances;
 
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
-public final class ListServiceInstanceServiceKeysRequestTest {
+import org.junit.jupiter.api.Test;
 
-    @Test(expected = IllegalStateException.class)
-    public void noServiceInstanceId() {
-        ListServiceInstanceServiceBindingsRequest.builder().build();
+final class ListServiceInstanceServiceKeysRequestTest {
+
+    @Test
+    void noServiceInstanceId() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    ListServiceInstanceServiceBindingsRequest.builder().build();
+                });
     }
 
     @Test
-    public void valid() {
+    void valid() {
         ListServiceInstanceServiceKeysRequest.builder()
                 .serviceInstanceId("test-service-instance-id")
                 .build();
diff --git a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/serviceinstances/ListServiceInstancesRequestTest.java b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/serviceinstances/ListServiceInstancesRequestTest.java
index cc29c8c8bf2..39be651b5b4 100644
--- a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/serviceinstances/ListServiceInstancesRequestTest.java
+++ b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/serviceinstances/ListServiceInstancesRequestTest.java
@@ -16,12 +16,12 @@
 
 package org.cloudfoundry.client.v2.serviceinstances;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
-public final class ListServiceInstancesRequestTest {
+final class ListServiceInstancesRequestTest {
 
     @Test
-    public void valid() {
+    void valid() {
         ListServiceInstancesRequest.builder().build();
     }
 }
diff --git a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/serviceinstances/UnbindServiceInstanceRouteRequestTest.java b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/serviceinstances/UnbindServiceInstanceRouteRequestTest.java
index af768af98ac..a8b6f06494e 100644
--- a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/serviceinstances/UnbindServiceInstanceRouteRequestTest.java
+++ b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/serviceinstances/UnbindServiceInstanceRouteRequestTest.java
@@ -16,24 +16,34 @@
 
 package org.cloudfoundry.client.v2.serviceinstances;
 
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
-public final class UnbindServiceInstanceRouteRequestTest {
+import org.junit.jupiter.api.Test;
 
-    @Test(expected = IllegalStateException.class)
-    public void noRouteId() {
-        UnbindServiceInstanceRouteRequest.builder()
-                .serviceInstanceId("test-service-instance-id")
-                .build();
+final class UnbindServiceInstanceRouteRequestTest {
+
+    @Test
+    void noRouteId() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    UnbindServiceInstanceRouteRequest.builder()
+                            .serviceInstanceId("test-service-instance-id")
+                            .build();
+                });
     }
 
-    @Test(expected = IllegalStateException.class)
-    public void noServiceInstanceId() {
-        UnbindServiceInstanceRouteRequest.builder().routeId("test-route-id").build();
+    @Test
+    void noServiceInstanceId() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    UnbindServiceInstanceRouteRequest.builder().routeId("test-route-id").build();
+                });
     }
 
     @Test
-    public void valid() {
+    void valid() {
         UnbindServiceInstanceRouteRequest.builder()
                 .serviceInstanceId("test-service-instance-id")
                 .routeId("test-route-id")
diff --git a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/serviceinstances/UpdateServiceInstanceRequestTest.java b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/serviceinstances/UpdateServiceInstanceRequestTest.java
index 2452e86c21a..40bef084792 100644
--- a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/serviceinstances/UpdateServiceInstanceRequestTest.java
+++ b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/serviceinstances/UpdateServiceInstanceRequestTest.java
@@ -16,17 +16,23 @@
 
 package org.cloudfoundry.client.v2.serviceinstances;
 
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
-public final class UpdateServiceInstanceRequestTest {
+import org.junit.jupiter.api.Test;
 
-    @Test(expected = IllegalStateException.class)
-    public void noServiceInstanceId() {
-        UpdateServiceInstanceRequest.builder().build();
+final class UpdateServiceInstanceRequestTest {
+
+    @Test
+    void noServiceInstanceId() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    UpdateServiceInstanceRequest.builder().build();
+                });
     }
 
     @Test
-    public void valid() {
+    void valid() {
         UpdateServiceInstanceRequest.builder()
                 .serviceInstanceId("test-service-instance-id")
                 .build();
diff --git a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/servicekeys/CreateServiceKeyRequestTest.java b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/servicekeys/CreateServiceKeyRequestTest.java
index ead6e0b82b1..390d2118a95 100644
--- a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/servicekeys/CreateServiceKeyRequestTest.java
+++ b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/servicekeys/CreateServiceKeyRequestTest.java
@@ -16,22 +16,34 @@
 
 package org.cloudfoundry.client.v2.servicekeys;
 
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
-public final class CreateServiceKeyRequestTest {
+import org.junit.jupiter.api.Test;
 
-    @Test(expected = IllegalStateException.class)
-    public void noName() {
-        CreateServiceKeyRequest.builder().serviceInstanceId("service-instance-id").build();
+final class CreateServiceKeyRequestTest {
+
+    @Test
+    void noName() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    CreateServiceKeyRequest.builder()
+                            .serviceInstanceId("service-instance-id")
+                            .build();
+                });
     }
 
-    @Test(expected = IllegalStateException.class)
-    public void noServiceInstanceId() {
-        CreateServiceKeyRequest.builder().name("name").build();
+    @Test
+    void noServiceInstanceId() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    CreateServiceKeyRequest.builder().name("name").build();
+                });
     }
 
     @Test
-    public void valid() {
+    void valid() {
         CreateServiceKeyRequest.builder()
                 .name("name")
                 .serviceInstanceId("service-instance-id")
diff --git a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/servicekeys/DeleteServiceKeyRequestTest.java b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/servicekeys/DeleteServiceKeyRequestTest.java
index dad2318b475..f7ce2051226 100644
--- a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/servicekeys/DeleteServiceKeyRequestTest.java
+++ b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/servicekeys/DeleteServiceKeyRequestTest.java
@@ -16,17 +16,23 @@
 
 package org.cloudfoundry.client.v2.servicekeys;
 
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
-public final class DeleteServiceKeyRequestTest {
+import org.junit.jupiter.api.Test;
 
-    @Test(expected = IllegalStateException.class)
-    public void noServiceKeyId() {
-        DeleteServiceKeyRequest.builder().build();
+final class DeleteServiceKeyRequestTest {
+
+    @Test
+    void noServiceKeyId() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    DeleteServiceKeyRequest.builder().build();
+                });
     }
 
     @Test
-    public void valid() {
+    void valid() {
         DeleteServiceKeyRequest.builder().serviceKeyId("test-service-key-id").build();
     }
 }
diff --git a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/servicekeys/GetServiceKeyRequestTest.java b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/servicekeys/GetServiceKeyRequestTest.java
index ca5b3de804b..131c7a6dcc3 100644
--- a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/servicekeys/GetServiceKeyRequestTest.java
+++ b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/servicekeys/GetServiceKeyRequestTest.java
@@ -16,17 +16,23 @@
 
 package org.cloudfoundry.client.v2.servicekeys;
 
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
-public final class GetServiceKeyRequestTest {
+import org.junit.jupiter.api.Test;
 
-    @Test(expected = IllegalStateException.class)
-    public void noServiceKeyId() {
-        GetServiceKeyRequest.builder().build();
+final class GetServiceKeyRequestTest {
+
+    @Test
+    void noServiceKeyId() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    GetServiceKeyRequest.builder().build();
+                });
     }
 
     @Test
-    public void valid() {
+    void valid() {
         GetServiceKeyRequest.builder().serviceKeyId("test-service-key-id").build();
     }
 }
diff --git a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/servicekeys/ListServiceKeysRequestTest.java b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/servicekeys/ListServiceKeysRequestTest.java
index a08dd1f3bfd..37707d54619 100644
--- a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/servicekeys/ListServiceKeysRequestTest.java
+++ b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/servicekeys/ListServiceKeysRequestTest.java
@@ -16,12 +16,12 @@
 
 package org.cloudfoundry.client.v2.servicekeys;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
-public final class ListServiceKeysRequestTest {
+final class ListServiceKeysRequestTest {
 
     @Test
-    public void valid() {
+    void valid() {
         ListServiceKeysRequest.builder().build();
     }
 }
diff --git a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/serviceplans/DeleteServicePlanRequestTest.java b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/serviceplans/DeleteServicePlanRequestTest.java
index ef92c42efc0..dc6aba9c647 100644
--- a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/serviceplans/DeleteServicePlanRequestTest.java
+++ b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/serviceplans/DeleteServicePlanRequestTest.java
@@ -16,17 +16,23 @@
 
 package org.cloudfoundry.client.v2.serviceplans;
 
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
-public final class DeleteServicePlanRequestTest {
+import org.junit.jupiter.api.Test;
 
-    @Test(expected = IllegalStateException.class)
-    public void noServicePlanId() {
-        DeleteServicePlanRequest.builder().build();
+final class DeleteServicePlanRequestTest {
+
+    @Test
+    void noServicePlanId() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    DeleteServicePlanRequest.builder().build();
+                });
     }
 
     @Test
-    public void valid() {
+    void valid() {
         DeleteServicePlanRequest.builder().servicePlanId("test-id").build();
     }
 }
diff --git a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/serviceplans/GetServicePlanRequestTest.java b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/serviceplans/GetServicePlanRequestTest.java
index 2a96a33570d..6f2b2965e77 100644
--- a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/serviceplans/GetServicePlanRequestTest.java
+++ b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/serviceplans/GetServicePlanRequestTest.java
@@ -16,17 +16,23 @@
 
 package org.cloudfoundry.client.v2.serviceplans;
 
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
-public final class GetServicePlanRequestTest {
+import org.junit.jupiter.api.Test;
 
-    @Test(expected = IllegalStateException.class)
-    public void noServicePlanId() {
-        GetServicePlanRequest.builder().build();
+final class GetServicePlanRequestTest {
+
+    @Test
+    void noServicePlanId() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    GetServicePlanRequest.builder().build();
+                });
     }
 
     @Test
-    public void valid() {
+    void valid() {
         GetServicePlanRequest.builder().servicePlanId("test-service-plan-id").build();
     }
 }
diff --git a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/serviceplans/ListServicePlanServiceInstancesRequestTest.java b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/serviceplans/ListServicePlanServiceInstancesRequestTest.java
index aa303792c60..c50bf9be5b8 100644
--- a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/serviceplans/ListServicePlanServiceInstancesRequestTest.java
+++ b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/serviceplans/ListServicePlanServiceInstancesRequestTest.java
@@ -16,17 +16,23 @@
 
 package org.cloudfoundry.client.v2.serviceplans;
 
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
-public final class ListServicePlanServiceInstancesRequestTest {
+import org.junit.jupiter.api.Test;
 
-    @Test(expected = IllegalStateException.class)
-    public void noServicePlanId() {
-        ListServicePlanServiceInstancesRequest.builder().build();
+final class ListServicePlanServiceInstancesRequestTest {
+
+    @Test
+    void noServicePlanId() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    ListServicePlanServiceInstancesRequest.builder().build();
+                });
     }
 
     @Test
-    public void valid() {
+    void valid() {
         ListServicePlanServiceInstancesRequest.builder()
                 .servicePlanId("test-service-plan-id")
                 .build();
diff --git a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/serviceplans/ListServicePlansRequestTest.java b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/serviceplans/ListServicePlansRequestTest.java
index f0b39f3d748..64bd98c4605 100644
--- a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/serviceplans/ListServicePlansRequestTest.java
+++ b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/serviceplans/ListServicePlansRequestTest.java
@@ -16,12 +16,12 @@
 
 package org.cloudfoundry.client.v2.serviceplans;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
-public final class ListServicePlansRequestTest {
+final class ListServicePlansRequestTest {
 
     @Test
-    public void valid() {
+    void valid() {
         ListServicePlansRequest.builder().build();
     }
 }
diff --git a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/serviceplans/UpdateServicePlanRequestTest.java b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/serviceplans/UpdateServicePlanRequestTest.java
index 43d8d7e0639..7b609a6cdd9 100644
--- a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/serviceplans/UpdateServicePlanRequestTest.java
+++ b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/serviceplans/UpdateServicePlanRequestTest.java
@@ -16,17 +16,23 @@
 
 package org.cloudfoundry.client.v2.serviceplans;
 
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
-public final class UpdateServicePlanRequestTest {
+import org.junit.jupiter.api.Test;
 
-    @Test(expected = IllegalStateException.class)
-    public void noServicePlanId() {
-        UpdateServicePlanRequest.builder().build();
+final class UpdateServicePlanRequestTest {
+
+    @Test
+    void noServicePlanId() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    UpdateServicePlanRequest.builder().build();
+                });
     }
 
     @Test
-    public void valid() {
+    void valid() {
         UpdateServicePlanRequest.builder().servicePlanId("test-service-plan-id").build();
     }
 }
diff --git a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/serviceplanvisibilities/CreateServicePlanVisibilityRequestTest.java b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/serviceplanvisibilities/CreateServicePlanVisibilityRequestTest.java
index 5eefa5ea828..bb5616831d8 100644
--- a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/serviceplanvisibilities/CreateServicePlanVisibilityRequestTest.java
+++ b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/serviceplanvisibilities/CreateServicePlanVisibilityRequestTest.java
@@ -16,22 +16,36 @@
 
 package org.cloudfoundry.client.v2.serviceplanvisibilities;
 
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
-public final class CreateServicePlanVisibilityRequestTest {
+import org.junit.jupiter.api.Test;
 
-    @Test(expected = IllegalStateException.class)
-    public void noOrganizationId() {
-        CreateServicePlanVisibilityRequest.builder().servicePlanId("service-plan-id").build();
+final class CreateServicePlanVisibilityRequestTest {
+
+    @Test
+    void noOrganizationId() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    CreateServicePlanVisibilityRequest.builder()
+                            .servicePlanId("service-plan-id")
+                            .build();
+                });
     }
 
-    @Test(expected = IllegalStateException.class)
-    public void noServicePlanId() {
-        CreateServicePlanVisibilityRequest.builder().organizationId("organization-id").build();
+    @Test
+    void noServicePlanId() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    CreateServicePlanVisibilityRequest.builder()
+                            .organizationId("organization-id")
+                            .build();
+                });
     }
 
     @Test
-    public void valid() {
+    void valid() {
         CreateServicePlanVisibilityRequest.builder()
                 .organizationId("organization-id")
                 .servicePlanId("service-plan-id")
diff --git a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/serviceplanvisibilities/DeleteServicePlanVisibilityRequestTest.java b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/serviceplanvisibilities/DeleteServicePlanVisibilityRequestTest.java
index 2ca6173f89c..7a2f04eea1d 100644
--- a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/serviceplanvisibilities/DeleteServicePlanVisibilityRequestTest.java
+++ b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/serviceplanvisibilities/DeleteServicePlanVisibilityRequestTest.java
@@ -16,17 +16,23 @@
 
 package org.cloudfoundry.client.v2.serviceplanvisibilities;
 
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
-public final class DeleteServicePlanVisibilityRequestTest {
+import org.junit.jupiter.api.Test;
 
-    @Test(expected = IllegalStateException.class)
-    public void noServicePlanVisibilityId() {
-        DeleteServicePlanVisibilityRequest.builder().build();
+final class DeleteServicePlanVisibilityRequestTest {
+
+    @Test
+    void noServicePlanVisibilityId() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    DeleteServicePlanVisibilityRequest.builder().build();
+                });
     }
 
     @Test
-    public void valid() {
+    void valid() {
         DeleteServicePlanVisibilityRequest.builder()
                 .servicePlanVisibilityId("test-service-plan-visibility-id")
                 .build();
diff --git a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/serviceplanvisibilities/GetServicePlanVisibilityRequestTest.java b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/serviceplanvisibilities/GetServicePlanVisibilityRequestTest.java
index b5ba849ea86..3aff415908a 100644
--- a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/serviceplanvisibilities/GetServicePlanVisibilityRequestTest.java
+++ b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/serviceplanvisibilities/GetServicePlanVisibilityRequestTest.java
@@ -16,17 +16,23 @@
 
 package org.cloudfoundry.client.v2.serviceplanvisibilities;
 
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
-public final class GetServicePlanVisibilityRequestTest {
+import org.junit.jupiter.api.Test;
 
-    @Test(expected = IllegalStateException.class)
-    public void noServicePlanVisibilityId() {
-        GetServicePlanVisibilityRequest.builder().build();
+final class GetServicePlanVisibilityRequestTest {
+
+    @Test
+    void noServicePlanVisibilityId() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    GetServicePlanVisibilityRequest.builder().build();
+                });
     }
 
     @Test
-    public void valid() {
+    void valid() {
         GetServicePlanVisibilityRequest.builder()
                 .servicePlanVisibilityId("test-service-plan-visibility-id")
                 .build();
diff --git a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/serviceplanvisibilities/ListServicePlanVisibilitiesRequestTest.java b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/serviceplanvisibilities/ListServicePlanVisibilitiesRequestTest.java
index 30e2168b932..f2a9cd3137d 100644
--- a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/serviceplanvisibilities/ListServicePlanVisibilitiesRequestTest.java
+++ b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/serviceplanvisibilities/ListServicePlanVisibilitiesRequestTest.java
@@ -16,12 +16,12 @@
 
 package org.cloudfoundry.client.v2.serviceplanvisibilities;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
-public final class ListServicePlanVisibilitiesRequestTest {
+final class ListServicePlanVisibilitiesRequestTest {
 
     @Test
-    public void valid() {
+    void valid() {
         ListServicePlanVisibilitiesRequest.builder().build();
     }
 }
diff --git a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/serviceplanvisibilities/UpdateServicePlanVisibilityRequestTest.java b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/serviceplanvisibilities/UpdateServicePlanVisibilityRequestTest.java
index 21054ac97f0..991e0b2d5cc 100644
--- a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/serviceplanvisibilities/UpdateServicePlanVisibilityRequestTest.java
+++ b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/serviceplanvisibilities/UpdateServicePlanVisibilityRequestTest.java
@@ -16,36 +16,50 @@
 
 package org.cloudfoundry.client.v2.serviceplanvisibilities;
 
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
-public final class UpdateServicePlanVisibilityRequestTest {
+import org.junit.jupiter.api.Test;
 
-    @Test(expected = IllegalStateException.class)
-    public void noOrganizationId() {
-        UpdateServicePlanVisibilityRequest.builder()
-                .servicePlanId("service-plan-id")
-                .servicePlanVisibilityId("test-service-plan-visibility-id")
-                .build();
+final class UpdateServicePlanVisibilityRequestTest {
+
+    @Test
+    void noOrganizationId() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    UpdateServicePlanVisibilityRequest.builder()
+                            .servicePlanId("service-plan-id")
+                            .servicePlanVisibilityId("test-service-plan-visibility-id")
+                            .build();
+                });
     }
 
-    @Test(expected = IllegalStateException.class)
-    public void noServicePlanId() {
-        UpdateServicePlanVisibilityRequest.builder()
-                .organizationId("organization-id")
-                .servicePlanVisibilityId("test-service-plan-visibility-id")
-                .build();
+    @Test
+    void noServicePlanId() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    UpdateServicePlanVisibilityRequest.builder()
+                            .organizationId("organization-id")
+                            .servicePlanVisibilityId("test-service-plan-visibility-id")
+                            .build();
+                });
     }
 
-    @Test(expected = IllegalStateException.class)
-    public void noServicePlanVisibilityId() {
-        UpdateServicePlanVisibilityRequest.builder()
-                .organizationId("organization-id")
-                .servicePlanId("service-plan-id")
-                .build();
+    @Test
+    void noServicePlanVisibilityId() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    UpdateServicePlanVisibilityRequest.builder()
+                            .organizationId("organization-id")
+                            .servicePlanId("service-plan-id")
+                            .build();
+                });
     }
 
     @Test
-    public void valid() {
+    void valid() {
         UpdateServicePlanVisibilityRequest.builder()
                 .organizationId("organization-id")
                 .servicePlanId("service-plan-id")
diff --git a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/services/DeleteServiceRequestTest.java b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/services/DeleteServiceRequestTest.java
index 3ec310c1a39..36fc2611de4 100644
--- a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/services/DeleteServiceRequestTest.java
+++ b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/services/DeleteServiceRequestTest.java
@@ -16,17 +16,23 @@
 
 package org.cloudfoundry.client.v2.services;
 
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
-public final class DeleteServiceRequestTest {
+import org.junit.jupiter.api.Test;
 
-    @Test(expected = IllegalStateException.class)
-    public void noServiceId() {
-        DeleteServiceRequest.builder().build();
+final class DeleteServiceRequestTest {
+
+    @Test
+    void noServiceId() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    DeleteServiceRequest.builder().build();
+                });
     }
 
     @Test
-    public void valid() {
+    void valid() {
         DeleteServiceRequest.builder().serviceId("test-service-id").build();
     }
 }
diff --git a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/services/GetServiceRequestTest.java b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/services/GetServiceRequestTest.java
index 847db23408b..f482cad30a3 100644
--- a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/services/GetServiceRequestTest.java
+++ b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/services/GetServiceRequestTest.java
@@ -16,17 +16,23 @@
 
 package org.cloudfoundry.client.v2.services;
 
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
-public final class GetServiceRequestTest {
+import org.junit.jupiter.api.Test;
 
-    @Test(expected = IllegalStateException.class)
-    public void noServiceId() {
-        GetServiceRequest.builder().build();
+final class GetServiceRequestTest {
+
+    @Test
+    void noServiceId() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    GetServiceRequest.builder().build();
+                });
     }
 
     @Test
-    public void valid() {
+    void valid() {
         GetServiceRequest.builder().serviceId("test-service-id").build();
     }
 }
diff --git a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/services/ListServiceServicePlansRequestTest.java b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/services/ListServiceServicePlansRequestTest.java
index 8370979cee2..6bef9e71f55 100644
--- a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/services/ListServiceServicePlansRequestTest.java
+++ b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/services/ListServiceServicePlansRequestTest.java
@@ -16,17 +16,23 @@
 
 package org.cloudfoundry.client.v2.services;
 
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
-public final class ListServiceServicePlansRequestTest {
+import org.junit.jupiter.api.Test;
 
-    @Test(expected = IllegalStateException.class)
-    public void noServiceId() {
-        ListServiceServicePlansRequest.builder().build();
+final class ListServiceServicePlansRequestTest {
+
+    @Test
+    void noServiceId() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    ListServiceServicePlansRequest.builder().build();
+                });
     }
 
     @Test
-    public void valid() {
+    void valid() {
         ListServiceServicePlansRequest.builder().serviceId("test-service-id").build();
     }
 }
diff --git a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/services/ListServicesRequestTest.java b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/services/ListServicesRequestTest.java
index 4838d8007ef..f45b3e02a94 100644
--- a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/services/ListServicesRequestTest.java
+++ b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/services/ListServicesRequestTest.java
@@ -16,12 +16,12 @@
 
 package org.cloudfoundry.client.v2.services;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
-public final class ListServicesRequestTest {
+final class ListServicesRequestTest {
 
     @Test
-    public void valid() {
+    void valid() {
         ListServicesRequest.builder().build();
     }
 }
diff --git a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/serviceusageevents/GetServiceUsageEventRequestTest.java b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/serviceusageevents/GetServiceUsageEventRequestTest.java
index fca6b8f7026..d9814893902 100644
--- a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/serviceusageevents/GetServiceUsageEventRequestTest.java
+++ b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/serviceusageevents/GetServiceUsageEventRequestTest.java
@@ -16,17 +16,23 @@
 
 package org.cloudfoundry.client.v2.serviceusageevents;
 
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
-public final class GetServiceUsageEventRequestTest {
+import org.junit.jupiter.api.Test;
 
-    @Test(expected = IllegalStateException.class)
-    public void noServiceUsageEventId() {
-        GetServiceUsageEventRequest.builder().build();
+final class GetServiceUsageEventRequestTest {
+
+    @Test
+    void noServiceUsageEventId() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    GetServiceUsageEventRequest.builder().build();
+                });
     }
 
     @Test
-    public void valid() {
+    void valid() {
         GetServiceUsageEventRequest.builder()
                 .serviceUsageEventId("test-service-usage-event-id")
                 .build();
diff --git a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/serviceusageevents/ListServiceUsageEventsRequestTest.java b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/serviceusageevents/ListServiceUsageEventsRequestTest.java
index 3d7dab01e0f..93e872c65d8 100644
--- a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/serviceusageevents/ListServiceUsageEventsRequestTest.java
+++ b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/serviceusageevents/ListServiceUsageEventsRequestTest.java
@@ -16,12 +16,12 @@
 
 package org.cloudfoundry.client.v2.serviceusageevents;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
-public final class ListServiceUsageEventsRequestTest {
+final class ListServiceUsageEventsRequestTest {
 
     @Test
-    public void valid() {
+    void valid() {
         ListServiceUsageEventsRequest.builder().build();
     }
 }
diff --git a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/serviceusageevents/PurgeAndReseedServiceUsageEventsRequestTest.java b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/serviceusageevents/PurgeAndReseedServiceUsageEventsRequestTest.java
index 768b1201b17..c9cdef4a1a1 100644
--- a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/serviceusageevents/PurgeAndReseedServiceUsageEventsRequestTest.java
+++ b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/serviceusageevents/PurgeAndReseedServiceUsageEventsRequestTest.java
@@ -16,12 +16,12 @@
 
 package org.cloudfoundry.client.v2.serviceusageevents;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
-public final class PurgeAndReseedServiceUsageEventsRequestTest {
+final class PurgeAndReseedServiceUsageEventsRequestTest {
 
     @Test
-    public void valid() {
+    void valid() {
         PurgeAndReseedServiceUsageEventsRequest.builder().build();
     }
 }
diff --git a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/shareddomains/CreateSharedDomainRequestTest.java b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/shareddomains/CreateSharedDomainRequestTest.java
index a91979284da..c3ea8d08b9f 100644
--- a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/shareddomains/CreateSharedDomainRequestTest.java
+++ b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/shareddomains/CreateSharedDomainRequestTest.java
@@ -16,17 +16,23 @@
 
 package org.cloudfoundry.client.v2.shareddomains;
 
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
-public final class CreateSharedDomainRequestTest {
+import org.junit.jupiter.api.Test;
 
-    @Test(expected = IllegalStateException.class)
-    public void noName() {
-        CreateSharedDomainRequest.builder().build();
+final class CreateSharedDomainRequestTest {
+
+    @Test
+    void noName() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    CreateSharedDomainRequest.builder().build();
+                });
     }
 
     @Test
-    public void valid() {
+    void valid() {
         CreateSharedDomainRequest.builder().name("test-test-name").build();
     }
 }
diff --git a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/shareddomains/DeleteSharedDomainRequestTest.java b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/shareddomains/DeleteSharedDomainRequestTest.java
index 684c8cdcf2f..0e6af6ed0f9 100644
--- a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/shareddomains/DeleteSharedDomainRequestTest.java
+++ b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/shareddomains/DeleteSharedDomainRequestTest.java
@@ -16,17 +16,23 @@
 
 package org.cloudfoundry.client.v2.shareddomains;
 
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
-public final class DeleteSharedDomainRequestTest {
+import org.junit.jupiter.api.Test;
 
-    @Test(expected = IllegalStateException.class)
-    public void noId() {
-        DeleteSharedDomainRequest.builder().build();
+final class DeleteSharedDomainRequestTest {
+
+    @Test
+    void noId() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    DeleteSharedDomainRequest.builder().build();
+                });
     }
 
     @Test
-    public void valid() {
+    void valid() {
         DeleteSharedDomainRequest.builder().sharedDomainId("test-shared-domain-id").build();
     }
 }
diff --git a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/shareddomains/GetSharedDomainRequestTest.java b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/shareddomains/GetSharedDomainRequestTest.java
index c30c0614994..8ff92993174 100644
--- a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/shareddomains/GetSharedDomainRequestTest.java
+++ b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/shareddomains/GetSharedDomainRequestTest.java
@@ -16,17 +16,23 @@
 
 package org.cloudfoundry.client.v2.shareddomains;
 
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
-public final class GetSharedDomainRequestTest {
+import org.junit.jupiter.api.Test;
 
-    @Test(expected = IllegalStateException.class)
-    public void noId() {
-        GetSharedDomainRequest.builder().build();
+final class GetSharedDomainRequestTest {
+
+    @Test
+    void noId() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    GetSharedDomainRequest.builder().build();
+                });
     }
 
     @Test
-    public void valid() {
+    void valid() {
         GetSharedDomainRequest.builder().sharedDomainId("test-shared-domain-id").build();
     }
 }
diff --git a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/shareddomains/ListSharedDomainsRequestTest.java b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/shareddomains/ListSharedDomainsRequestTest.java
index ef8442dc162..d49885c0a59 100644
--- a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/shareddomains/ListSharedDomainsRequestTest.java
+++ b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/shareddomains/ListSharedDomainsRequestTest.java
@@ -16,12 +16,12 @@
 
 package org.cloudfoundry.client.v2.shareddomains;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
-public final class ListSharedDomainsRequestTest {
+final class ListSharedDomainsRequestTest {
 
     @Test
-    public void valid() {
+    void valid() {
         ListSharedDomainsRequest.builder().name("test-name").build();
     }
 }
diff --git a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/spacequotadefinitions/AssociateSpaceQuotaDefinitionRequestTest.java b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/spacequotadefinitions/AssociateSpaceQuotaDefinitionRequestTest.java
index 3c58e7c192d..cf41899c990 100644
--- a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/spacequotadefinitions/AssociateSpaceQuotaDefinitionRequestTest.java
+++ b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/spacequotadefinitions/AssociateSpaceQuotaDefinitionRequestTest.java
@@ -16,24 +16,34 @@
 
 package org.cloudfoundry.client.v2.spacequotadefinitions;
 
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
-public final class AssociateSpaceQuotaDefinitionRequestTest {
+import org.junit.jupiter.api.Test;
 
-    @Test(expected = IllegalStateException.class)
-    public void noSpaceId() {
-        AssociateSpaceQuotaDefinitionRequest.builder()
-                .spaceQuotaDefinitionId("test-space-quota-definition-id")
-                .build();
+final class AssociateSpaceQuotaDefinitionRequestTest {
+
+    @Test
+    void noSpaceId() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    AssociateSpaceQuotaDefinitionRequest.builder()
+                            .spaceQuotaDefinitionId("test-space-quota-definition-id")
+                            .build();
+                });
     }
 
-    @Test(expected = IllegalStateException.class)
-    public void noSpaceQuotaDefinitionId() {
-        AssociateSpaceQuotaDefinitionRequest.builder().spaceId("test-space-id").build();
+    @Test
+    void noSpaceQuotaDefinitionId() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    AssociateSpaceQuotaDefinitionRequest.builder().spaceId("test-space-id").build();
+                });
     }
 
     @Test
-    public void valid() {
+    void valid() {
         AssociateSpaceQuotaDefinitionRequest.builder()
                 .spaceId("test-space-id")
                 .spaceQuotaDefinitionId("test-space-quota-definition-id")
diff --git a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/spacequotadefinitions/CreateSpaceQuotaDefinitionRequestTest.java b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/spacequotadefinitions/CreateSpaceQuotaDefinitionRequestTest.java
index 2cf68e64436..f72b7b5d6b6 100644
--- a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/spacequotadefinitions/CreateSpaceQuotaDefinitionRequestTest.java
+++ b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/spacequotadefinitions/CreateSpaceQuotaDefinitionRequestTest.java
@@ -16,78 +16,104 @@
 
 package org.cloudfoundry.client.v2.spacequotadefinitions;
 
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
-public final class CreateSpaceQuotaDefinitionRequestTest {
+import org.junit.jupiter.api.Test;
 
-    @Test(expected = IllegalStateException.class)
-    public void noMemoryLimit() {
-        CreateSpaceQuotaDefinitionRequest.builder()
-                .name("test-space-quota-definition-name")
-                .nonBasicServicesAllowed(true)
-                .organizationId("test-organization-id")
-                .totalRoutes(1)
-                .totalServices(1)
-                .build();
+final class CreateSpaceQuotaDefinitionRequestTest {
+
+    @Test
+    void noMemoryLimit() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    CreateSpaceQuotaDefinitionRequest.builder()
+                            .name("test-space-quota-definition-name")
+                            .nonBasicServicesAllowed(true)
+                            .organizationId("test-organization-id")
+                            .totalRoutes(1)
+                            .totalServices(1)
+                            .build();
+                });
     }
 
-    @Test(expected = IllegalStateException.class)
-    public void noName() {
-        CreateSpaceQuotaDefinitionRequest.builder()
-                .memoryLimit(100)
-                .nonBasicServicesAllowed(true)
-                .organizationId("test-organization-id")
-                .totalRoutes(1)
-                .totalServices(1)
-                .build();
+    @Test
+    void noName() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    CreateSpaceQuotaDefinitionRequest.builder()
+                            .memoryLimit(100)
+                            .nonBasicServicesAllowed(true)
+                            .organizationId("test-organization-id")
+                            .totalRoutes(1)
+                            .totalServices(1)
+                            .build();
+                });
     }
 
-    @Test(expected = IllegalStateException.class)
-    public void noNonBasicServicesAllowed() {
-        CreateSpaceQuotaDefinitionRequest.builder()
-                .memoryLimit(100)
-                .name("test-space-quota-definition-name")
-                .organizationId("test-organization-id")
-                .totalRoutes(1)
-                .totalServices(1)
-                .build();
+    @Test
+    void noNonBasicServicesAllowed() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    CreateSpaceQuotaDefinitionRequest.builder()
+                            .memoryLimit(100)
+                            .name("test-space-quota-definition-name")
+                            .organizationId("test-organization-id")
+                            .totalRoutes(1)
+                            .totalServices(1)
+                            .build();
+                });
     }
 
-    @Test(expected = IllegalStateException.class)
-    public void noOrganizationId() {
-        CreateSpaceQuotaDefinitionRequest.builder()
-                .memoryLimit(100)
-                .name("test-space-quota-definition-name")
-                .nonBasicServicesAllowed(true)
-                .totalRoutes(1)
-                .totalServices(1)
-                .build();
+    @Test
+    void noOrganizationId() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    CreateSpaceQuotaDefinitionRequest.builder()
+                            .memoryLimit(100)
+                            .name("test-space-quota-definition-name")
+                            .nonBasicServicesAllowed(true)
+                            .totalRoutes(1)
+                            .totalServices(1)
+                            .build();
+                });
     }
 
-    @Test(expected = IllegalStateException.class)
-    public void noTotalRoutes() {
-        CreateSpaceQuotaDefinitionRequest.builder()
-                .memoryLimit(100)
-                .name("test-space-quota-definition-name")
-                .nonBasicServicesAllowed(true)
-                .organizationId("test-organization-id")
-                .totalServices(1)
-                .build();
+    @Test
+    void noTotalRoutes() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    CreateSpaceQuotaDefinitionRequest.builder()
+                            .memoryLimit(100)
+                            .name("test-space-quota-definition-name")
+                            .nonBasicServicesAllowed(true)
+                            .organizationId("test-organization-id")
+                            .totalServices(1)
+                            .build();
+                });
     }
 
-    @Test(expected = IllegalStateException.class)
-    public void noTotalServices() {
-        CreateSpaceQuotaDefinitionRequest.builder()
-                .memoryLimit(100)
-                .name("test-space-quota-definition-name")
-                .nonBasicServicesAllowed(true)
-                .organizationId("test-organization-id")
-                .totalRoutes(1)
-                .build();
+    @Test
+    void noTotalServices() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    CreateSpaceQuotaDefinitionRequest.builder()
+                            .memoryLimit(100)
+                            .name("test-space-quota-definition-name")
+                            .nonBasicServicesAllowed(true)
+                            .organizationId("test-organization-id")
+                            .totalRoutes(1)
+                            .build();
+                });
     }
 
     @Test
-    public void valid() {
+    void valid() {
         CreateSpaceQuotaDefinitionRequest.builder()
                 .memoryLimit(100)
                 .name("test-space-quota-definition-name")
diff --git a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/spacequotadefinitions/DeleteSpaceQuotaDefinitionRequestTest.java b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/spacequotadefinitions/DeleteSpaceQuotaDefinitionRequestTest.java
index 58014ee51d4..e7605cda46d 100644
--- a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/spacequotadefinitions/DeleteSpaceQuotaDefinitionRequestTest.java
+++ b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/spacequotadefinitions/DeleteSpaceQuotaDefinitionRequestTest.java
@@ -16,17 +16,23 @@
 
 package org.cloudfoundry.client.v2.spacequotadefinitions;
 
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
-public final class DeleteSpaceQuotaDefinitionRequestTest {
+import org.junit.jupiter.api.Test;
 
-    @Test(expected = IllegalStateException.class)
-    public void noSpaceQuotaDefinitionId() {
-        DeleteSpaceQuotaDefinitionRequest.builder().build();
+final class DeleteSpaceQuotaDefinitionRequestTest {
+
+    @Test
+    void noSpaceQuotaDefinitionId() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    DeleteSpaceQuotaDefinitionRequest.builder().build();
+                });
     }
 
     @Test
-    public void valid() {
+    void valid() {
         DeleteSpaceQuotaDefinitionRequest.builder()
                 .spaceQuotaDefinitionId("test-space-quota-definition-id")
                 .build();
diff --git a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/spacequotadefinitions/GetSpaceQuotaDefinitionRequestTest.java b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/spacequotadefinitions/GetSpaceQuotaDefinitionRequestTest.java
index d41a92694bc..258f31d481a 100644
--- a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/spacequotadefinitions/GetSpaceQuotaDefinitionRequestTest.java
+++ b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/spacequotadefinitions/GetSpaceQuotaDefinitionRequestTest.java
@@ -16,17 +16,23 @@
 
 package org.cloudfoundry.client.v2.spacequotadefinitions;
 
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
-public final class GetSpaceQuotaDefinitionRequestTest {
+import org.junit.jupiter.api.Test;
 
-    @Test(expected = IllegalStateException.class)
-    public void noSpaceQuotaDefinitionId() {
-        GetSpaceQuotaDefinitionRequest.builder().build();
+final class GetSpaceQuotaDefinitionRequestTest {
+
+    @Test
+    void noSpaceQuotaDefinitionId() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    GetSpaceQuotaDefinitionRequest.builder().build();
+                });
     }
 
     @Test
-    public void valid() {
+    void valid() {
         GetSpaceQuotaDefinitionRequest.builder()
                 .spaceQuotaDefinitionId("test-space-quota-definition-id")
                 .build();
diff --git a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/spacequotadefinitions/ListSpaceQuotaDefinitionSpacesRequestTest.java b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/spacequotadefinitions/ListSpaceQuotaDefinitionSpacesRequestTest.java
index 5b563d89d9c..3db3e6e982c 100644
--- a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/spacequotadefinitions/ListSpaceQuotaDefinitionSpacesRequestTest.java
+++ b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/spacequotadefinitions/ListSpaceQuotaDefinitionSpacesRequestTest.java
@@ -16,17 +16,23 @@
 
 package org.cloudfoundry.client.v2.spacequotadefinitions;
 
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
-public final class ListSpaceQuotaDefinitionSpacesRequestTest {
+import org.junit.jupiter.api.Test;
 
-    @Test(expected = IllegalStateException.class)
-    public void noSpaceQuotaDefinitionId() {
-        ListSpaceQuotaDefinitionSpacesRequest.builder().build();
+final class ListSpaceQuotaDefinitionSpacesRequestTest {
+
+    @Test
+    void noSpaceQuotaDefinitionId() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    ListSpaceQuotaDefinitionSpacesRequest.builder().build();
+                });
     }
 
     @Test
-    public void valid() {
+    void valid() {
         ListSpaceQuotaDefinitionSpacesRequest.builder()
                 .spaceQuotaDefinitionId("test-space-quota-definition-id")
                 .build();
diff --git a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/spacequotadefinitions/ListSpaceQuotaDefinitionsRequestTest.java b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/spacequotadefinitions/ListSpaceQuotaDefinitionsRequestTest.java
index 774d72a8d3b..4cff4f0b88c 100644
--- a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/spacequotadefinitions/ListSpaceQuotaDefinitionsRequestTest.java
+++ b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/spacequotadefinitions/ListSpaceQuotaDefinitionsRequestTest.java
@@ -16,12 +16,12 @@
 
 package org.cloudfoundry.client.v2.spacequotadefinitions;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
-public final class ListSpaceQuotaDefinitionsRequestTest {
+final class ListSpaceQuotaDefinitionsRequestTest {
 
     @Test
-    public void valid() {
+    void valid() {
         ListSpaceQuotaDefinitionsRequest.builder().build();
     }
 }
diff --git a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/spacequotadefinitions/RemoveSpaceQuotaDefinitionRequestTest.java b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/spacequotadefinitions/RemoveSpaceQuotaDefinitionRequestTest.java
index 72eb7da5e69..f4ec4643aac 100644
--- a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/spacequotadefinitions/RemoveSpaceQuotaDefinitionRequestTest.java
+++ b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/spacequotadefinitions/RemoveSpaceQuotaDefinitionRequestTest.java
@@ -16,24 +16,34 @@
 
 package org.cloudfoundry.client.v2.spacequotadefinitions;
 
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
-public final class RemoveSpaceQuotaDefinitionRequestTest {
+import org.junit.jupiter.api.Test;
 
-    @Test(expected = IllegalStateException.class)
-    public void noSpaceId() {
-        RemoveSpaceQuotaDefinitionRequest.builder()
-                .spaceQuotaDefinitionId("test-space-quota-definition-id")
-                .build();
+final class RemoveSpaceQuotaDefinitionRequestTest {
+
+    @Test
+    void noSpaceId() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    RemoveSpaceQuotaDefinitionRequest.builder()
+                            .spaceQuotaDefinitionId("test-space-quota-definition-id")
+                            .build();
+                });
     }
 
-    @Test(expected = IllegalStateException.class)
-    public void noSpaceQuotaDefinitionId() {
-        RemoveSpaceQuotaDefinitionRequest.builder().spaceId("test-space-id").build();
+    @Test
+    void noSpaceQuotaDefinitionId() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    RemoveSpaceQuotaDefinitionRequest.builder().spaceId("test-space-id").build();
+                });
     }
 
     @Test
-    public void valid() {
+    void valid() {
         RemoveSpaceQuotaDefinitionRequest.builder()
                 .spaceId("test-space-id")
                 .spaceQuotaDefinitionId("test-space-quota-definition-id")
diff --git a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/spacequotadefinitions/UpdateSpaceQuotaDefinitionRequestTest.java b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/spacequotadefinitions/UpdateSpaceQuotaDefinitionRequestTest.java
index 34481bf99a6..0b860edc49f 100644
--- a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/spacequotadefinitions/UpdateSpaceQuotaDefinitionRequestTest.java
+++ b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/spacequotadefinitions/UpdateSpaceQuotaDefinitionRequestTest.java
@@ -16,17 +16,23 @@
 
 package org.cloudfoundry.client.v2.spacequotadefinitions;
 
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
-public final class UpdateSpaceQuotaDefinitionRequestTest {
+import org.junit.jupiter.api.Test;
 
-    @Test(expected = IllegalStateException.class)
-    public void noSpaceQuotaDefinitionId() {
-        UpdateSpaceQuotaDefinitionRequest.builder().build();
+final class UpdateSpaceQuotaDefinitionRequestTest {
+
+    @Test
+    void noSpaceQuotaDefinitionId() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    UpdateSpaceQuotaDefinitionRequest.builder().build();
+                });
     }
 
     @Test
-    public void valid() {
+    void valid() {
         UpdateSpaceQuotaDefinitionRequest.builder()
                 .spaceQuotaDefinitionId("test-space-quota-definition-id")
                 .build();
diff --git a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/spaces/AssociateSpaceAuditorByUsernameRequestTest.java b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/spaces/AssociateSpaceAuditorByUsernameRequestTest.java
index f62f11b1ac4..f9825c7e498 100644
--- a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/spaces/AssociateSpaceAuditorByUsernameRequestTest.java
+++ b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/spaces/AssociateSpaceAuditorByUsernameRequestTest.java
@@ -16,22 +16,36 @@
 
 package org.cloudfoundry.client.v2.spaces;
 
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
-public final class AssociateSpaceAuditorByUsernameRequestTest {
+import org.junit.jupiter.api.Test;
 
-    @Test(expected = IllegalStateException.class)
-    public void noSpaceId() {
-        AssociateSpaceAuditorByUsernameRequest.builder().username("test-username").build();
+final class AssociateSpaceAuditorByUsernameRequestTest {
+
+    @Test
+    void noSpaceId() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    AssociateSpaceAuditorByUsernameRequest.builder()
+                            .username("test-username")
+                            .build();
+                });
     }
 
-    @Test(expected = IllegalStateException.class)
-    public void noUsername() {
-        AssociateSpaceAuditorByUsernameRequest.builder().spaceId("test-space-id").build();
+    @Test
+    void noUsername() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    AssociateSpaceAuditorByUsernameRequest.builder()
+                            .spaceId("test-space-id")
+                            .build();
+                });
     }
 
     @Test
-    public void valid() {
+    void valid() {
         AssociateSpaceAuditorByUsernameRequest.builder()
                 .spaceId("test-space-id")
                 .username("test-username")
diff --git a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/spaces/AssociateSpaceAuditorRequestTest.java b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/spaces/AssociateSpaceAuditorRequestTest.java
index 5493f1414e4..35471eec91d 100644
--- a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/spaces/AssociateSpaceAuditorRequestTest.java
+++ b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/spaces/AssociateSpaceAuditorRequestTest.java
@@ -16,22 +16,32 @@
 
 package org.cloudfoundry.client.v2.spaces;
 
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
-public final class AssociateSpaceAuditorRequestTest {
+import org.junit.jupiter.api.Test;
 
-    @Test(expected = IllegalStateException.class)
-    public void noAuditorId() {
-        AssociateSpaceAuditorRequest.builder().spaceId("test-space-id").build();
+final class AssociateSpaceAuditorRequestTest {
+
+    @Test
+    void noAuditorId() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    AssociateSpaceAuditorRequest.builder().spaceId("test-space-id").build();
+                });
     }
 
-    @Test(expected = IllegalStateException.class)
-    public void noSpaceId() {
-        AssociateSpaceAuditorRequest.builder().auditorId("test-auditor-id").build();
+    @Test
+    void noSpaceId() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    AssociateSpaceAuditorRequest.builder().auditorId("test-auditor-id").build();
+                });
     }
 
     @Test
-    public void valid() {
+    void valid() {
         AssociateSpaceAuditorRequest.builder()
                 .auditorId("test-auditor-id")
                 .spaceId("test-space-id")
diff --git a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/spaces/AssociateSpaceDeveloperByUsernameRequestTest.java b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/spaces/AssociateSpaceDeveloperByUsernameRequestTest.java
index 17ed08c35c8..81b01d3f6eb 100644
--- a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/spaces/AssociateSpaceDeveloperByUsernameRequestTest.java
+++ b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/spaces/AssociateSpaceDeveloperByUsernameRequestTest.java
@@ -16,22 +16,36 @@
 
 package org.cloudfoundry.client.v2.spaces;
 
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
-public final class AssociateSpaceDeveloperByUsernameRequestTest {
+import org.junit.jupiter.api.Test;
 
-    @Test(expected = IllegalStateException.class)
-    public void noSpaceId() {
-        AssociateSpaceDeveloperByUsernameRequest.builder().username("test-username").build();
+final class AssociateSpaceDeveloperByUsernameRequestTest {
+
+    @Test
+    void noSpaceId() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    AssociateSpaceDeveloperByUsernameRequest.builder()
+                            .username("test-username")
+                            .build();
+                });
     }
 
-    @Test(expected = IllegalStateException.class)
-    public void noUsername() {
-        AssociateSpaceDeveloperByUsernameRequest.builder().spaceId("test-space-id").build();
+    @Test
+    void noUsername() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    AssociateSpaceDeveloperByUsernameRequest.builder()
+                            .spaceId("test-space-id")
+                            .build();
+                });
     }
 
     @Test
-    public void valid() {
+    void valid() {
         AssociateSpaceDeveloperByUsernameRequest.builder()
                 .spaceId("test-space-id")
                 .username("test-username")
diff --git a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/spaces/AssociateSpaceDeveloperRequestTest.java b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/spaces/AssociateSpaceDeveloperRequestTest.java
index 21f3c11e9bb..e9e145d9e73 100644
--- a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/spaces/AssociateSpaceDeveloperRequestTest.java
+++ b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/spaces/AssociateSpaceDeveloperRequestTest.java
@@ -16,22 +16,34 @@
 
 package org.cloudfoundry.client.v2.spaces;
 
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
-public final class AssociateSpaceDeveloperRequestTest {
+import org.junit.jupiter.api.Test;
 
-    @Test(expected = IllegalStateException.class)
-    public void noDeveloperId() {
-        AssociateSpaceDeveloperRequest.builder().spaceId("test-space-id").build();
+final class AssociateSpaceDeveloperRequestTest {
+
+    @Test
+    void noDeveloperId() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    AssociateSpaceDeveloperRequest.builder().spaceId("test-space-id").build();
+                });
     }
 
-    @Test(expected = IllegalStateException.class)
-    public void noSpaceId() {
-        AssociateSpaceDeveloperRequest.builder().developerId("test-developer-id").build();
+    @Test
+    void noSpaceId() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    AssociateSpaceDeveloperRequest.builder()
+                            .developerId("test-developer-id")
+                            .build();
+                });
     }
 
     @Test
-    public void valid() {
+    void valid() {
         AssociateSpaceDeveloperRequest.builder()
                 .developerId("test-developer-id")
                 .spaceId("test-space-id")
diff --git a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/spaces/AssociateSpaceManagerByUsernameRequestTest.java b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/spaces/AssociateSpaceManagerByUsernameRequestTest.java
index 0ecb17d33e3..8cb5e641990 100644
--- a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/spaces/AssociateSpaceManagerByUsernameRequestTest.java
+++ b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/spaces/AssociateSpaceManagerByUsernameRequestTest.java
@@ -16,22 +16,36 @@
 
 package org.cloudfoundry.client.v2.spaces;
 
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
-public final class AssociateSpaceManagerByUsernameRequestTest {
+import org.junit.jupiter.api.Test;
 
-    @Test(expected = IllegalStateException.class)
-    public void noSpaceId() {
-        AssociateSpaceManagerByUsernameRequest.builder().username("test-username").build();
+final class AssociateSpaceManagerByUsernameRequestTest {
+
+    @Test
+    void noSpaceId() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    AssociateSpaceManagerByUsernameRequest.builder()
+                            .username("test-username")
+                            .build();
+                });
     }
 
-    @Test(expected = IllegalStateException.class)
-    public void noUsername() {
-        AssociateSpaceManagerByUsernameRequest.builder().spaceId("test-space-id").build();
+    @Test
+    void noUsername() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    AssociateSpaceManagerByUsernameRequest.builder()
+                            .spaceId("test-space-id")
+                            .build();
+                });
     }
 
     @Test
-    public void valid() {
+    void valid() {
         AssociateSpaceManagerByUsernameRequest.builder()
                 .spaceId("test-space-id")
                 .username("test-username")
diff --git a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/spaces/AssociateSpaceManagerRequestTest.java b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/spaces/AssociateSpaceManagerRequestTest.java
index 0101d4ff878..743bb785f80 100644
--- a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/spaces/AssociateSpaceManagerRequestTest.java
+++ b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/spaces/AssociateSpaceManagerRequestTest.java
@@ -16,22 +16,32 @@
 
 package org.cloudfoundry.client.v2.spaces;
 
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
-public final class AssociateSpaceManagerRequestTest {
+import org.junit.jupiter.api.Test;
 
-    @Test(expected = IllegalStateException.class)
-    public void noManagerId() {
-        AssociateSpaceManagerRequest.builder().spaceId("test-space-id").build();
+final class AssociateSpaceManagerRequestTest {
+
+    @Test
+    void noManagerId() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    AssociateSpaceManagerRequest.builder().spaceId("test-space-id").build();
+                });
     }
 
-    @Test(expected = IllegalStateException.class)
-    public void noSpaceId() {
-        AssociateSpaceManagerRequest.builder().managerId("test-manager-id").build();
+    @Test
+    void noSpaceId() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    AssociateSpaceManagerRequest.builder().managerId("test-manager-id").build();
+                });
     }
 
     @Test
-    public void valid() {
+    void valid() {
         AssociateSpaceManagerRequest.builder()
                 .managerId("test-manager-id")
                 .spaceId("test-space-id")
diff --git a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/spaces/AssociateSpaceSecurityGroupRequestTest.java b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/spaces/AssociateSpaceSecurityGroupRequestTest.java
index 5ce6d3bd6ba..d20f3f21d88 100644
--- a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/spaces/AssociateSpaceSecurityGroupRequestTest.java
+++ b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/spaces/AssociateSpaceSecurityGroupRequestTest.java
@@ -16,24 +16,34 @@
 
 package org.cloudfoundry.client.v2.spaces;
 
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
-public final class AssociateSpaceSecurityGroupRequestTest {
+import org.junit.jupiter.api.Test;
 
-    @Test(expected = IllegalStateException.class)
-    public void noSecurityGroupId() {
-        AssociateSpaceSecurityGroupRequest.builder().spaceId("test-space-id").build();
+final class AssociateSpaceSecurityGroupRequestTest {
+
+    @Test
+    void noSecurityGroupId() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    AssociateSpaceSecurityGroupRequest.builder().spaceId("test-space-id").build();
+                });
     }
 
-    @Test(expected = IllegalStateException.class)
-    public void noSpaceId() {
-        AssociateSpaceSecurityGroupRequest.builder()
-                .securityGroupId("test-security-group-id")
-                .build();
+    @Test
+    void noSpaceId() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    AssociateSpaceSecurityGroupRequest.builder()
+                            .securityGroupId("test-security-group-id")
+                            .build();
+                });
     }
 
     @Test
-    public void valid() {
+    void valid() {
         AssociateSpaceSecurityGroupRequest.builder()
                 .securityGroupId("test-security-group-id")
                 .spaceId("test-space-id")
diff --git a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/spaces/CreateSpaceRequestTest.java b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/spaces/CreateSpaceRequestTest.java
index d505d581539..93d4eb4db48 100644
--- a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/spaces/CreateSpaceRequestTest.java
+++ b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/spaces/CreateSpaceRequestTest.java
@@ -16,22 +16,32 @@
 
 package org.cloudfoundry.client.v2.spaces;
 
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
-public final class CreateSpaceRequestTest {
+import org.junit.jupiter.api.Test;
 
-    @Test(expected = IllegalStateException.class)
-    public void noName() {
-        CreateSpaceRequest.builder().organizationId("test-organization-id").build();
+final class CreateSpaceRequestTest {
+
+    @Test
+    void noName() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    CreateSpaceRequest.builder().organizationId("test-organization-id").build();
+                });
     }
 
-    @Test(expected = IllegalStateException.class)
-    public void noOrganizationId() {
-        CreateSpaceRequest.builder().name("test-name").build();
+    @Test
+    void noOrganizationId() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    CreateSpaceRequest.builder().name("test-name").build();
+                });
     }
 
     @Test
-    public void valid() {
+    void valid() {
         CreateSpaceRequest.builder()
                 .name("test-name")
                 .organizationId("test-organization-id")
diff --git a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/spaces/DeleteSpaceRequestTest.java b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/spaces/DeleteSpaceRequestTest.java
index 28022d8a4f7..dd9a9ad261c 100644
--- a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/spaces/DeleteSpaceRequestTest.java
+++ b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/spaces/DeleteSpaceRequestTest.java
@@ -16,17 +16,23 @@
 
 package org.cloudfoundry.client.v2.spaces;
 
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
-public final class DeleteSpaceRequestTest {
+import org.junit.jupiter.api.Test;
 
-    @Test(expected = IllegalStateException.class)
-    public void noSpaceId() {
-        DeleteSpaceRequest.builder().build();
+final class DeleteSpaceRequestTest {
+
+    @Test
+    void noSpaceId() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    DeleteSpaceRequest.builder().build();
+                });
     }
 
     @Test
-    public void valid() {
+    void valid() {
         DeleteSpaceRequest.builder().spaceId("space-test-id").build();
     }
 }
diff --git a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/spaces/GetSpaceRequestTest.java b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/spaces/GetSpaceRequestTest.java
index 9206bffd682..9006eb4c1dc 100644
--- a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/spaces/GetSpaceRequestTest.java
+++ b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/spaces/GetSpaceRequestTest.java
@@ -16,17 +16,23 @@
 
 package org.cloudfoundry.client.v2.spaces;
 
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
-public final class GetSpaceRequestTest {
+import org.junit.jupiter.api.Test;
 
-    @Test(expected = IllegalStateException.class)
-    public void noSpaceId() {
-        GetSpaceRequest.builder().build();
+final class GetSpaceRequestTest {
+
+    @Test
+    void noSpaceId() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    GetSpaceRequest.builder().build();
+                });
     }
 
     @Test
-    public void valid() {
+    void valid() {
         GetSpaceRequest.builder().spaceId("test-space-id").build();
     }
 }
diff --git a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/spaces/GetSpaceSummaryRequestTest.java b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/spaces/GetSpaceSummaryRequestTest.java
index ec0ad31311c..afe549dafa2 100644
--- a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/spaces/GetSpaceSummaryRequestTest.java
+++ b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/spaces/GetSpaceSummaryRequestTest.java
@@ -16,17 +16,23 @@
 
 package org.cloudfoundry.client.v2.spaces;
 
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
-public final class GetSpaceSummaryRequestTest {
+import org.junit.jupiter.api.Test;
 
-    @Test(expected = IllegalStateException.class)
-    public void noSpaceId() {
-        GetSpaceSummaryRequest.builder().build();
+final class GetSpaceSummaryRequestTest {
+
+    @Test
+    void noSpaceId() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    GetSpaceSummaryRequest.builder().build();
+                });
     }
 
     @Test
-    public void valid() {
+    void valid() {
         GetSpaceSummaryRequest.builder().spaceId("test-space-id").build();
     }
 }
diff --git a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/spaces/ListSpaceApplicationsRequestTest.java b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/spaces/ListSpaceApplicationsRequestTest.java
index 30e60dfc6c5..6137ca29561 100644
--- a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/spaces/ListSpaceApplicationsRequestTest.java
+++ b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/spaces/ListSpaceApplicationsRequestTest.java
@@ -16,17 +16,23 @@
 
 package org.cloudfoundry.client.v2.spaces;
 
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
-public final class ListSpaceApplicationsRequestTest {
+import org.junit.jupiter.api.Test;
 
-    @Test(expected = IllegalStateException.class)
-    public void noSpaceId() {
-        ListSpaceApplicationsRequest.builder().build();
+final class ListSpaceApplicationsRequestTest {
+
+    @Test
+    void noSpaceId() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    ListSpaceApplicationsRequest.builder().build();
+                });
     }
 
     @Test
-    public void valid() {
+    void valid() {
         ListSpaceApplicationsRequest.builder().spaceId("test-space-id").build();
     }
 }
diff --git a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/spaces/ListSpaceAuditorsRequestTest.java b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/spaces/ListSpaceAuditorsRequestTest.java
index f67a675d52f..a5602392f30 100644
--- a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/spaces/ListSpaceAuditorsRequestTest.java
+++ b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/spaces/ListSpaceAuditorsRequestTest.java
@@ -16,17 +16,23 @@
 
 package org.cloudfoundry.client.v2.spaces;
 
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
-public final class ListSpaceAuditorsRequestTest {
+import org.junit.jupiter.api.Test;
 
-    @Test(expected = IllegalStateException.class)
-    public void noSpaceId() {
-        ListSpaceAuditorsRequest.builder().build();
+final class ListSpaceAuditorsRequestTest {
+
+    @Test
+    void noSpaceId() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    ListSpaceAuditorsRequest.builder().build();
+                });
     }
 
     @Test
-    public void valid() {
+    void valid() {
         ListSpaceAuditorsRequest.builder().spaceId("test-space-id").build();
     }
 }
diff --git a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/spaces/ListSpaceDevelopersRequestTest.java b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/spaces/ListSpaceDevelopersRequestTest.java
index 1a115297999..3b9ae1bb7c6 100644
--- a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/spaces/ListSpaceDevelopersRequestTest.java
+++ b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/spaces/ListSpaceDevelopersRequestTest.java
@@ -16,17 +16,23 @@
 
 package org.cloudfoundry.client.v2.spaces;
 
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
-public final class ListSpaceDevelopersRequestTest {
+import org.junit.jupiter.api.Test;
 
-    @Test(expected = IllegalStateException.class)
-    public void noSpaceId() {
-        ListSpaceDevelopersRequest.builder().build();
+final class ListSpaceDevelopersRequestTest {
+
+    @Test
+    void noSpaceId() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    ListSpaceDevelopersRequest.builder().build();
+                });
     }
 
     @Test
-    public void valid() {
+    void valid() {
         ListSpaceDevelopersRequest.builder().spaceId("test-space-id").build();
     }
 }
diff --git a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/spaces/ListSpaceDomainsRequestTest.java b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/spaces/ListSpaceDomainsRequestTest.java
index 5e6c33fe4f9..7bfb2fca328 100644
--- a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/spaces/ListSpaceDomainsRequestTest.java
+++ b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/spaces/ListSpaceDomainsRequestTest.java
@@ -16,17 +16,23 @@
 
 package org.cloudfoundry.client.v2.spaces;
 
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
-public final class ListSpaceDomainsRequestTest {
+import org.junit.jupiter.api.Test;
 
-    @Test(expected = IllegalStateException.class)
-    public void noSpaceId() {
-        ListSpaceDomainsRequest.builder().build();
+final class ListSpaceDomainsRequestTest {
+
+    @Test
+    void noSpaceId() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    ListSpaceDomainsRequest.builder().build();
+                });
     }
 
     @Test
-    public void valid() {
+    void valid() {
         ListSpaceDomainsRequest.builder().spaceId("test-space-id").build();
     }
 }
diff --git a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/spaces/ListSpaceEventsRequestTest.java b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/spaces/ListSpaceEventsRequestTest.java
index 705477a63c3..ec24c2e9276 100644
--- a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/spaces/ListSpaceEventsRequestTest.java
+++ b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/spaces/ListSpaceEventsRequestTest.java
@@ -16,17 +16,23 @@
 
 package org.cloudfoundry.client.v2.spaces;
 
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
-public final class ListSpaceEventsRequestTest {
+import org.junit.jupiter.api.Test;
 
-    @Test(expected = IllegalStateException.class)
-    public void noSpaceId() {
-        ListSpaceEventsRequest.builder().build();
+final class ListSpaceEventsRequestTest {
+
+    @Test
+    void noSpaceId() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    ListSpaceEventsRequest.builder().build();
+                });
     }
 
     @Test
-    public void valid() {
+    void valid() {
         ListSpaceEventsRequest.builder().spaceId("test-space-id").build();
     }
 }
diff --git a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/spaces/ListSpaceManagersRequestTest.java b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/spaces/ListSpaceManagersRequestTest.java
index d4ca31222d5..2db92fba0c4 100644
--- a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/spaces/ListSpaceManagersRequestTest.java
+++ b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/spaces/ListSpaceManagersRequestTest.java
@@ -16,17 +16,23 @@
 
 package org.cloudfoundry.client.v2.spaces;
 
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
-public final class ListSpaceManagersRequestTest {
+import org.junit.jupiter.api.Test;
 
-    @Test(expected = IllegalStateException.class)
-    public void noSpaceId() {
-        ListSpaceManagersRequest.builder().build();
+final class ListSpaceManagersRequestTest {
+
+    @Test
+    void noSpaceId() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    ListSpaceManagersRequest.builder().build();
+                });
     }
 
     @Test
-    public void valid() {
+    void valid() {
         ListSpaceManagersRequest.builder().spaceId("test-space-id").build();
     }
 }
diff --git a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/spaces/ListSpaceRoutesRequestTest.java b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/spaces/ListSpaceRoutesRequestTest.java
index 99d6a2a6035..9bfe95f3777 100644
--- a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/spaces/ListSpaceRoutesRequestTest.java
+++ b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/spaces/ListSpaceRoutesRequestTest.java
@@ -16,17 +16,23 @@
 
 package org.cloudfoundry.client.v2.spaces;
 
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
-public final class ListSpaceRoutesRequestTest {
+import org.junit.jupiter.api.Test;
 
-    @Test(expected = IllegalStateException.class)
-    public void noSpaceId() {
-        ListSpaceRoutesRequest.builder().build();
+final class ListSpaceRoutesRequestTest {
+
+    @Test
+    void noSpaceId() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    ListSpaceRoutesRequest.builder().build();
+                });
     }
 
     @Test
-    public void valid() {
+    void valid() {
         ListSpaceRoutesRequest.builder().spaceId("test-space-id").build();
     }
 }
diff --git a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/spaces/ListSpaceSecurityGroupsRequestTest.java b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/spaces/ListSpaceSecurityGroupsRequestTest.java
index f242950e58d..2ff3d879bab 100644
--- a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/spaces/ListSpaceSecurityGroupsRequestTest.java
+++ b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/spaces/ListSpaceSecurityGroupsRequestTest.java
@@ -16,17 +16,23 @@
 
 package org.cloudfoundry.client.v2.spaces;
 
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
-public final class ListSpaceSecurityGroupsRequestTest {
+import org.junit.jupiter.api.Test;
 
-    @Test(expected = IllegalStateException.class)
-    public void noSpaceId() {
-        ListSpaceSecurityGroupsRequest.builder().build();
+final class ListSpaceSecurityGroupsRequestTest {
+
+    @Test
+    void noSpaceId() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    ListSpaceSecurityGroupsRequest.builder().build();
+                });
     }
 
     @Test
-    public void valid() {
+    void valid() {
         ListSpaceSecurityGroupsRequest.builder().spaceId("test-space-id").build();
     }
 }
diff --git a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/spaces/ListSpaceServiceInstancesRequestTest.java b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/spaces/ListSpaceServiceInstancesRequestTest.java
index 80ec1e87592..5c1e9c49de2 100644
--- a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/spaces/ListSpaceServiceInstancesRequestTest.java
+++ b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/spaces/ListSpaceServiceInstancesRequestTest.java
@@ -16,17 +16,23 @@
 
 package org.cloudfoundry.client.v2.spaces;
 
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
-public final class ListSpaceServiceInstancesRequestTest {
+import org.junit.jupiter.api.Test;
 
-    @Test(expected = IllegalStateException.class)
-    public void noSpaceId() {
-        ListSpaceServiceInstancesRequest.builder().build();
+final class ListSpaceServiceInstancesRequestTest {
+
+    @Test
+    void noSpaceId() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    ListSpaceServiceInstancesRequest.builder().build();
+                });
     }
 
     @Test
-    public void valid() {
+    void valid() {
         ListSpaceServiceInstancesRequest.builder().spaceId("test-space-id").build();
     }
 }
diff --git a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/spaces/ListSpaceServicesRequestTest.java b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/spaces/ListSpaceServicesRequestTest.java
index 1a4e06a48d0..f3994812d51 100644
--- a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/spaces/ListSpaceServicesRequestTest.java
+++ b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/spaces/ListSpaceServicesRequestTest.java
@@ -16,17 +16,23 @@
 
 package org.cloudfoundry.client.v2.spaces;
 
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
-public final class ListSpaceServicesRequestTest {
+import org.junit.jupiter.api.Test;
 
-    @Test(expected = IllegalStateException.class)
-    public void noSpaceId() {
-        ListSpaceServicesRequest.builder().build();
+final class ListSpaceServicesRequestTest {
+
+    @Test
+    void noSpaceId() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    ListSpaceServicesRequest.builder().build();
+                });
     }
 
     @Test
-    public void valid() {
+    void valid() {
         ListSpaceServicesRequest.builder().spaceId("test-space-id").build();
     }
 }
diff --git a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/spaces/ListSpaceUserRolesRequestTest.java b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/spaces/ListSpaceUserRolesRequestTest.java
index 270120639f2..531953f0cd4 100644
--- a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/spaces/ListSpaceUserRolesRequestTest.java
+++ b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/spaces/ListSpaceUserRolesRequestTest.java
@@ -16,17 +16,23 @@
 
 package org.cloudfoundry.client.v2.spaces;
 
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
-public final class ListSpaceUserRolesRequestTest {
+import org.junit.jupiter.api.Test;
 
-    @Test(expected = IllegalStateException.class)
-    public void noSpaceId() {
-        ListSpaceUserRolesRequest.builder().build();
+final class ListSpaceUserRolesRequestTest {
+
+    @Test
+    void noSpaceId() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    ListSpaceUserRolesRequest.builder().build();
+                });
     }
 
     @Test
-    public void valid() {
+    void valid() {
         ListSpaceUserRolesRequest.builder().spaceId("test-space-id").build();
     }
 }
diff --git a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/spaces/ListSpacesRequestTest.java b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/spaces/ListSpacesRequestTest.java
index c9a6edc9a70..3d48ca57b80 100644
--- a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/spaces/ListSpacesRequestTest.java
+++ b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/spaces/ListSpacesRequestTest.java
@@ -16,12 +16,12 @@
 
 package org.cloudfoundry.client.v2.spaces;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
-public final class ListSpacesRequestTest {
+final class ListSpacesRequestTest {
 
     @Test
-    public void valid() {
+    void valid() {
         ListSpacesRequest.builder().build();
     }
 }
diff --git a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/spaces/RemoveSpaceAuditorByUsernameRequestTest.java b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/spaces/RemoveSpaceAuditorByUsernameRequestTest.java
index 9195e42a5e7..fa263214b9e 100644
--- a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/spaces/RemoveSpaceAuditorByUsernameRequestTest.java
+++ b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/spaces/RemoveSpaceAuditorByUsernameRequestTest.java
@@ -16,22 +16,32 @@
 
 package org.cloudfoundry.client.v2.spaces;
 
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
-public final class RemoveSpaceAuditorByUsernameRequestTest {
+import org.junit.jupiter.api.Test;
 
-    @Test(expected = IllegalStateException.class)
-    public void noSpaceId() {
-        RemoveSpaceAuditorByUsernameRequest.builder().username("test-username").build();
+final class RemoveSpaceAuditorByUsernameRequestTest {
+
+    @Test
+    void noSpaceId() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    RemoveSpaceAuditorByUsernameRequest.builder().username("test-username").build();
+                });
     }
 
-    @Test(expected = IllegalStateException.class)
-    public void noUsername() {
-        RemoveSpaceAuditorByUsernameRequest.builder().spaceId("test-space-id").build();
+    @Test
+    void noUsername() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    RemoveSpaceAuditorByUsernameRequest.builder().spaceId("test-space-id").build();
+                });
     }
 
     @Test
-    public void valid() {
+    void valid() {
         RemoveSpaceAuditorByUsernameRequest.builder()
                 .spaceId("test-space-id")
                 .username("test-username")
diff --git a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/spaces/RemoveSpaceAuditorRequestTest.java b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/spaces/RemoveSpaceAuditorRequestTest.java
index 5ecdf69bd70..68df6faa52a 100644
--- a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/spaces/RemoveSpaceAuditorRequestTest.java
+++ b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/spaces/RemoveSpaceAuditorRequestTest.java
@@ -16,22 +16,32 @@
 
 package org.cloudfoundry.client.v2.spaces;
 
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
-public final class RemoveSpaceAuditorRequestTest {
+import org.junit.jupiter.api.Test;
 
-    @Test(expected = IllegalStateException.class)
-    public void noAuditorId() {
-        RemoveSpaceAuditorRequest.builder().spaceId("test-space-id").build();
+final class RemoveSpaceAuditorRequestTest {
+
+    @Test
+    void noAuditorId() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    RemoveSpaceAuditorRequest.builder().spaceId("test-space-id").build();
+                });
     }
 
-    @Test(expected = IllegalStateException.class)
-    public void noSpaceId() {
-        RemoveSpaceAuditorRequest.builder().auditorId("test-auditor-id").build();
+    @Test
+    void noSpaceId() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    RemoveSpaceAuditorRequest.builder().auditorId("test-auditor-id").build();
+                });
     }
 
     @Test
-    public void valid() {
+    void valid() {
         RemoveSpaceAuditorRequest.builder()
                 .auditorId("test-auditor-id")
                 .spaceId("test-space-id")
diff --git a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/spaces/RemoveSpaceDeveloperByUsernameRequestTest.java b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/spaces/RemoveSpaceDeveloperByUsernameRequestTest.java
index 95f92c06e0c..6456412c843 100644
--- a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/spaces/RemoveSpaceDeveloperByUsernameRequestTest.java
+++ b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/spaces/RemoveSpaceDeveloperByUsernameRequestTest.java
@@ -16,22 +16,36 @@
 
 package org.cloudfoundry.client.v2.spaces;
 
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
-public final class RemoveSpaceDeveloperByUsernameRequestTest {
+import org.junit.jupiter.api.Test;
 
-    @Test(expected = IllegalStateException.class)
-    public void noSpaceId() {
-        RemoveSpaceDeveloperByUsernameRequest.builder().username("test-username").build();
+final class RemoveSpaceDeveloperByUsernameRequestTest {
+
+    @Test
+    void noSpaceId() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    RemoveSpaceDeveloperByUsernameRequest.builder()
+                            .username("test-username")
+                            .build();
+                });
     }
 
-    @Test(expected = IllegalStateException.class)
-    public void noUsername() {
-        RemoveSpaceDeveloperByUsernameRequest.builder().spaceId("test-space-id").build();
+    @Test
+    void noUsername() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    RemoveSpaceDeveloperByUsernameRequest.builder()
+                            .spaceId("test-space-id")
+                            .build();
+                });
     }
 
     @Test
-    public void valid() {
+    void valid() {
         RemoveSpaceDeveloperByUsernameRequest.builder()
                 .spaceId("test-space-id")
                 .username("test-username")
diff --git a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/spaces/RemoveSpaceDeveloperRequestTest.java b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/spaces/RemoveSpaceDeveloperRequestTest.java
index 3a7a9718850..d2d4d0190ba 100644
--- a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/spaces/RemoveSpaceDeveloperRequestTest.java
+++ b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/spaces/RemoveSpaceDeveloperRequestTest.java
@@ -16,22 +16,32 @@
 
 package org.cloudfoundry.client.v2.spaces;
 
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
-public final class RemoveSpaceDeveloperRequestTest {
+import org.junit.jupiter.api.Test;
 
-    @Test(expected = IllegalStateException.class)
-    public void noDeveloperId() {
-        RemoveSpaceDeveloperRequest.builder().spaceId("test-space-id").build();
+final class RemoveSpaceDeveloperRequestTest {
+
+    @Test
+    void noDeveloperId() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    RemoveSpaceDeveloperRequest.builder().spaceId("test-space-id").build();
+                });
     }
 
-    @Test(expected = IllegalStateException.class)
-    public void noSpaceId() {
-        RemoveSpaceDeveloperRequest.builder().developerId("test-developer-id").build();
+    @Test
+    void noSpaceId() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    RemoveSpaceDeveloperRequest.builder().developerId("test-developer-id").build();
+                });
     }
 
     @Test
-    public void valid() {
+    void valid() {
         RemoveSpaceDeveloperRequest.builder()
                 .developerId("test-developer-id")
                 .spaceId("test-space-id")
diff --git a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/spaces/RemoveSpaceManagerByUsernameRequestTest.java b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/spaces/RemoveSpaceManagerByUsernameRequestTest.java
index 408524a0d08..42e92a192fc 100644
--- a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/spaces/RemoveSpaceManagerByUsernameRequestTest.java
+++ b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/spaces/RemoveSpaceManagerByUsernameRequestTest.java
@@ -16,22 +16,32 @@
 
 package org.cloudfoundry.client.v2.spaces;
 
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
-public final class RemoveSpaceManagerByUsernameRequestTest {
+import org.junit.jupiter.api.Test;
 
-    @Test(expected = IllegalStateException.class)
-    public void noSpaceId() {
-        RemoveSpaceManagerByUsernameRequest.builder().username("test-username").build();
+final class RemoveSpaceManagerByUsernameRequestTest {
+
+    @Test
+    void noSpaceId() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    RemoveSpaceManagerByUsernameRequest.builder().username("test-username").build();
+                });
     }
 
-    @Test(expected = IllegalStateException.class)
-    public void noUsername() {
-        RemoveSpaceManagerByUsernameRequest.builder().spaceId("test-space-id").build();
+    @Test
+    void noUsername() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    RemoveSpaceManagerByUsernameRequest.builder().spaceId("test-space-id").build();
+                });
     }
 
     @Test
-    public void valid() {
+    void valid() {
         RemoveSpaceManagerByUsernameRequest.builder()
                 .spaceId("test-space-id")
                 .username("test-username")
diff --git a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/spaces/RemoveSpaceManagerRequestTest.java b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/spaces/RemoveSpaceManagerRequestTest.java
index 5e1901effd0..93459f8b278 100644
--- a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/spaces/RemoveSpaceManagerRequestTest.java
+++ b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/spaces/RemoveSpaceManagerRequestTest.java
@@ -16,22 +16,32 @@
 
 package org.cloudfoundry.client.v2.spaces;
 
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
-public final class RemoveSpaceManagerRequestTest {
+import org.junit.jupiter.api.Test;
 
-    @Test(expected = IllegalStateException.class)
-    public void noManagerId() {
-        RemoveSpaceManagerRequest.builder().spaceId("test-id").build();
+final class RemoveSpaceManagerRequestTest {
+
+    @Test
+    void noManagerId() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    RemoveSpaceManagerRequest.builder().spaceId("test-id").build();
+                });
     }
 
-    @Test(expected = IllegalStateException.class)
-    public void noSpaceId() {
-        RemoveSpaceManagerRequest.builder().managerId("test-manager-id").build();
+    @Test
+    void noSpaceId() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    RemoveSpaceManagerRequest.builder().managerId("test-manager-id").build();
+                });
     }
 
     @Test
-    public void valid() {
+    void valid() {
         RemoveSpaceManagerRequest.builder()
                 .managerId("test-manager-id")
                 .spaceId("test-space-id")
diff --git a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/spaces/RemoveSpaceSecurityGroupRequestTest.java b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/spaces/RemoveSpaceSecurityGroupRequestTest.java
index e7fca3e807d..4db6a9c135d 100644
--- a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/spaces/RemoveSpaceSecurityGroupRequestTest.java
+++ b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/spaces/RemoveSpaceSecurityGroupRequestTest.java
@@ -16,22 +16,34 @@
 
 package org.cloudfoundry.client.v2.spaces;
 
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
-public final class RemoveSpaceSecurityGroupRequestTest {
+import org.junit.jupiter.api.Test;
 
-    @Test(expected = IllegalStateException.class)
-    public void noSecurityGroupId() {
-        RemoveSpaceSecurityGroupRequest.builder().spaceId("test-space-id").build();
+final class RemoveSpaceSecurityGroupRequestTest {
+
+    @Test
+    void noSecurityGroupId() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    RemoveSpaceSecurityGroupRequest.builder().spaceId("test-space-id").build();
+                });
     }
 
-    @Test(expected = IllegalStateException.class)
-    public void noSpaceId() {
-        RemoveSpaceSecurityGroupRequest.builder().securityGroupId("test-security-group-id").build();
+    @Test
+    void noSpaceId() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    RemoveSpaceSecurityGroupRequest.builder()
+                            .securityGroupId("test-security-group-id")
+                            .build();
+                });
     }
 
     @Test
-    public void valid() {
+    void valid() {
         RemoveSpaceSecurityGroupRequest.builder()
                 .securityGroupId("test-security-group-id")
                 .spaceId("test-space-id")
diff --git a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/spaces/UpdateSpaceRequestTest.java b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/spaces/UpdateSpaceRequestTest.java
index 318269d0e30..6b8bebbf764 100644
--- a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/spaces/UpdateSpaceRequestTest.java
+++ b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/spaces/UpdateSpaceRequestTest.java
@@ -16,17 +16,23 @@
 
 package org.cloudfoundry.client.v2.spaces;
 
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
-public final class UpdateSpaceRequestTest {
+import org.junit.jupiter.api.Test;
 
-    @Test(expected = IllegalStateException.class)
-    public void noSpaceId() {
-        UpdateSpaceRequest.builder().build();
+final class UpdateSpaceRequestTest {
+
+    @Test
+    void noSpaceId() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    UpdateSpaceRequest.builder().build();
+                });
     }
 
     @Test
-    public void valid() {
+    void valid() {
         UpdateSpaceRequest.builder().spaceId("test-space-id").build();
     }
 }
diff --git a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/stacks/CreateStackRequestTest.java b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/stacks/CreateStackRequestTest.java
index c3d0626c972..317ff375c45 100644
--- a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/stacks/CreateStackRequestTest.java
+++ b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/stacks/CreateStackRequestTest.java
@@ -16,17 +16,23 @@
 
 package org.cloudfoundry.client.v2.stacks;
 
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
-public final class CreateStackRequestTest {
+import org.junit.jupiter.api.Test;
 
-    @Test(expected = IllegalStateException.class)
-    public void noName() {
-        CreateStackRequest.builder().build();
+final class CreateStackRequestTest {
+
+    @Test
+    void noName() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    CreateStackRequest.builder().build();
+                });
     }
 
     @Test
-    public void valid() {
+    void valid() {
         CreateStackRequest.builder()
                 .description("test-stack-description")
                 .name("test-stack-name")
diff --git a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/stacks/DeleteStackRequestTest.java b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/stacks/DeleteStackRequestTest.java
index 0be9600be39..f58750d2562 100644
--- a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/stacks/DeleteStackRequestTest.java
+++ b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/stacks/DeleteStackRequestTest.java
@@ -16,17 +16,23 @@
 
 package org.cloudfoundry.client.v2.stacks;
 
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
-public final class DeleteStackRequestTest {
+import org.junit.jupiter.api.Test;
 
-    @Test(expected = IllegalStateException.class)
-    public void noStackId() {
-        DeleteStackRequest.builder().build();
+final class DeleteStackRequestTest {
+
+    @Test
+    void noStackId() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    DeleteStackRequest.builder().build();
+                });
     }
 
     @Test
-    public void valid() {
+    void valid() {
         DeleteStackRequest.builder().async(true).stackId("test-stack-id").build();
     }
 }
diff --git a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/stacks/GetStackRequestTest.java b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/stacks/GetStackRequestTest.java
index 77d5b54ee26..2c47ba9a635 100644
--- a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/stacks/GetStackRequestTest.java
+++ b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/stacks/GetStackRequestTest.java
@@ -16,17 +16,23 @@
 
 package org.cloudfoundry.client.v2.stacks;
 
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
-public final class GetStackRequestTest {
+import org.junit.jupiter.api.Test;
 
-    @Test(expected = IllegalStateException.class)
-    public void noStackId() {
-        GetStackRequest.builder().build();
+final class GetStackRequestTest {
+
+    @Test
+    void noStackId() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    GetStackRequest.builder().build();
+                });
     }
 
     @Test
-    public void valid() {
+    void valid() {
         GetStackRequest.builder().stackId("test-stack-id").build();
     }
 }
diff --git a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/stacks/ListStacksRequestTest.java b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/stacks/ListStacksRequestTest.java
index 3a2348add66..98ee20c4974 100644
--- a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/stacks/ListStacksRequestTest.java
+++ b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/stacks/ListStacksRequestTest.java
@@ -16,12 +16,12 @@
 
 package org.cloudfoundry.client.v2.stacks;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
-public final class ListStacksRequestTest {
+final class ListStacksRequestTest {
 
     @Test
-    public void valid() {
+    void valid() {
         ListStacksRequest.builder().build();
     }
 }
diff --git a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/userprovidedserviceinstances/AssociateUserProvidedServiceInstanceRouteRequestTest.java b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/userprovidedserviceinstances/AssociateUserProvidedServiceInstanceRouteRequestTest.java
index fd40efc1846..de93461da52 100644
--- a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/userprovidedserviceinstances/AssociateUserProvidedServiceInstanceRouteRequestTest.java
+++ b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/userprovidedserviceinstances/AssociateUserProvidedServiceInstanceRouteRequestTest.java
@@ -16,24 +16,36 @@
 
 package org.cloudfoundry.client.v2.userprovidedserviceinstances;
 
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
-public final class AssociateUserProvidedServiceInstanceRouteRequestTest {
+import org.junit.jupiter.api.Test;
 
-    @Test(expected = IllegalStateException.class)
-    public void noRouteId() {
-        AssociateUserProvidedServiceInstanceRouteRequest.builder()
-                .userProvidedServiceInstanceId("test-user-provided-service-instance-id")
-                .build();
+final class AssociateUserProvidedServiceInstanceRouteRequestTest {
+
+    @Test
+    void noRouteId() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    AssociateUserProvidedServiceInstanceRouteRequest.builder()
+                            .userProvidedServiceInstanceId("test-user-provided-service-instance-id")
+                            .build();
+                });
     }
 
-    @Test(expected = IllegalStateException.class)
-    public void noUserProvidedServiceInstanceId() {
-        AssociateUserProvidedServiceInstanceRouteRequest.builder().routeId("test-route-id").build();
+    @Test
+    void noUserProvidedServiceInstanceId() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    AssociateUserProvidedServiceInstanceRouteRequest.builder()
+                            .routeId("test-route-id")
+                            .build();
+                });
     }
 
     @Test
-    public void valid() {
+    void valid() {
         AssociateUserProvidedServiceInstanceRouteRequest.builder()
                 .parameter("test-key", "test-value")
                 .routeId("test-route-id")
diff --git a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/userprovidedserviceinstances/CreateUserProvidedServiceInstanceRequestTest.java b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/userprovidedserviceinstances/CreateUserProvidedServiceInstanceRequestTest.java
index 6fff5e9fbcc..4ee4cf2b63f 100644
--- a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/userprovidedserviceinstances/CreateUserProvidedServiceInstanceRequestTest.java
+++ b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/userprovidedserviceinstances/CreateUserProvidedServiceInstanceRequestTest.java
@@ -16,22 +16,32 @@
 
 package org.cloudfoundry.client.v2.userprovidedserviceinstances;
 
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
-public final class CreateUserProvidedServiceInstanceRequestTest {
+import org.junit.jupiter.api.Test;
 
-    @Test(expected = IllegalStateException.class)
-    public void noName() {
-        CreateUserProvidedServiceInstanceRequest.builder().spaceId("space-id").build();
+final class CreateUserProvidedServiceInstanceRequestTest {
+
+    @Test
+    void noName() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    CreateUserProvidedServiceInstanceRequest.builder().spaceId("space-id").build();
+                });
     }
 
-    @Test(expected = IllegalStateException.class)
-    public void noSpaceId() {
-        CreateUserProvidedServiceInstanceRequest.builder().name("name").build();
+    @Test
+    void noSpaceId() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    CreateUserProvidedServiceInstanceRequest.builder().name("name").build();
+                });
     }
 
     @Test
-    public void valid() {
+    void valid() {
         CreateUserProvidedServiceInstanceRequest.builder().name("name").spaceId("space-id").build();
     }
 }
diff --git a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/userprovidedserviceinstances/DeleteUserProvidedServiceInstanceRequestTest.java b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/userprovidedserviceinstances/DeleteUserProvidedServiceInstanceRequestTest.java
index 22183ba8692..e995ac6e489 100644
--- a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/userprovidedserviceinstances/DeleteUserProvidedServiceInstanceRequestTest.java
+++ b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/userprovidedserviceinstances/DeleteUserProvidedServiceInstanceRequestTest.java
@@ -16,17 +16,23 @@
 
 package org.cloudfoundry.client.v2.userprovidedserviceinstances;
 
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
-public final class DeleteUserProvidedServiceInstanceRequestTest {
+import org.junit.jupiter.api.Test;
 
-    @Test(expected = IllegalStateException.class)
-    public void noUserProvidedServiceInstanceId() {
-        DeleteUserProvidedServiceInstanceRequest.builder().build();
+final class DeleteUserProvidedServiceInstanceRequestTest {
+
+    @Test
+    void noUserProvidedServiceInstanceId() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    DeleteUserProvidedServiceInstanceRequest.builder().build();
+                });
     }
 
     @Test
-    public void valid() {
+    void valid() {
         DeleteUserProvidedServiceInstanceRequest.builder()
                 .userProvidedServiceInstanceId("test-user-provided-service-instance-id")
                 .build();
diff --git a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/userprovidedserviceinstances/GetUserProvidedServiceInstanceRequestTest.java b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/userprovidedserviceinstances/GetUserProvidedServiceInstanceRequestTest.java
index 1216db93d6c..072903fa268 100644
--- a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/userprovidedserviceinstances/GetUserProvidedServiceInstanceRequestTest.java
+++ b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/userprovidedserviceinstances/GetUserProvidedServiceInstanceRequestTest.java
@@ -16,17 +16,23 @@
 
 package org.cloudfoundry.client.v2.userprovidedserviceinstances;
 
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
-public final class GetUserProvidedServiceInstanceRequestTest {
+import org.junit.jupiter.api.Test;
 
-    @Test(expected = IllegalStateException.class)
-    public void noUserProvidedServiceInstanceId() {
-        GetUserProvidedServiceInstanceRequest.builder().build();
+final class GetUserProvidedServiceInstanceRequestTest {
+
+    @Test
+    void noUserProvidedServiceInstanceId() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    GetUserProvidedServiceInstanceRequest.builder().build();
+                });
     }
 
     @Test
-    public void valid() {
+    void valid() {
         GetUserProvidedServiceInstanceRequest.builder()
                 .userProvidedServiceInstanceId("test-user-provided-service-instance-id")
                 .build();
diff --git a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/userprovidedserviceinstances/ListUserProvidedServiceInstanceRoutesRequestTest.java b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/userprovidedserviceinstances/ListUserProvidedServiceInstanceRoutesRequestTest.java
index bf9434dfab7..c9210e8e99e 100644
--- a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/userprovidedserviceinstances/ListUserProvidedServiceInstanceRoutesRequestTest.java
+++ b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/userprovidedserviceinstances/ListUserProvidedServiceInstanceRoutesRequestTest.java
@@ -16,17 +16,23 @@
 
 package org.cloudfoundry.client.v2.userprovidedserviceinstances;
 
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
-public final class ListUserProvidedServiceInstanceRoutesRequestTest {
+import org.junit.jupiter.api.Test;
 
-    @Test(expected = IllegalStateException.class)
-    public void noUserProvidedServiceInstanceId() {
-        ListUserProvidedServiceInstanceRoutesRequest.builder().build();
+final class ListUserProvidedServiceInstanceRoutesRequestTest {
+
+    @Test
+    void noUserProvidedServiceInstanceId() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    ListUserProvidedServiceInstanceRoutesRequest.builder().build();
+                });
     }
 
     @Test
-    public void valid() {
+    void valid() {
         ListUserProvidedServiceInstanceRoutesRequest.builder()
                 .userProvidedServiceInstanceId("test-user-provided-service-instance-id")
                 .build();
diff --git a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/userprovidedserviceinstances/ListUserProvidedServiceInstanceServiceBindingsRequestTest.java b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/userprovidedserviceinstances/ListUserProvidedServiceInstanceServiceBindingsRequestTest.java
index 67b1cc00503..869aa2d54d6 100644
--- a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/userprovidedserviceinstances/ListUserProvidedServiceInstanceServiceBindingsRequestTest.java
+++ b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/userprovidedserviceinstances/ListUserProvidedServiceInstanceServiceBindingsRequestTest.java
@@ -16,17 +16,23 @@
 
 package org.cloudfoundry.client.v2.userprovidedserviceinstances;
 
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
-public final class ListUserProvidedServiceInstanceServiceBindingsRequestTest {
+import org.junit.jupiter.api.Test;
 
-    @Test(expected = IllegalStateException.class)
-    public void noUserProvidedServiceInstanceId() {
-        ListUserProvidedServiceInstanceServiceBindingsRequest.builder().build();
+final class ListUserProvidedServiceInstanceServiceBindingsRequestTest {
+
+    @Test
+    void noUserProvidedServiceInstanceId() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    ListUserProvidedServiceInstanceServiceBindingsRequest.builder().build();
+                });
     }
 
     @Test
-    public void valid() {
+    void valid() {
         ListUserProvidedServiceInstanceServiceBindingsRequest.builder()
                 .userProvidedServiceInstanceId("test-user-provided-service-instance-id")
                 .build();
diff --git a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/userprovidedserviceinstances/ListUserProvidedServiceInstancesRequestTest.java b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/userprovidedserviceinstances/ListUserProvidedServiceInstancesRequestTest.java
index 206a3655d78..b2621a0d0ad 100644
--- a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/userprovidedserviceinstances/ListUserProvidedServiceInstancesRequestTest.java
+++ b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/userprovidedserviceinstances/ListUserProvidedServiceInstancesRequestTest.java
@@ -16,12 +16,12 @@
 
 package org.cloudfoundry.client.v2.userprovidedserviceinstances;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
-public final class ListUserProvidedServiceInstancesRequestTest {
+final class ListUserProvidedServiceInstancesRequestTest {
 
     @Test
-    public void valid() {
+    void valid() {
         ListUserProvidedServiceInstancesRequest.builder().build();
     }
 }
diff --git a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/userprovidedserviceinstances/RemoveRouteWithUserProvidedServiceInstanceRequestTest.java b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/userprovidedserviceinstances/RemoveRouteWithUserProvidedServiceInstanceRequestTest.java
index 2591d19b823..52db7a3dcaf 100644
--- a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/userprovidedserviceinstances/RemoveRouteWithUserProvidedServiceInstanceRequestTest.java
+++ b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/userprovidedserviceinstances/RemoveRouteWithUserProvidedServiceInstanceRequestTest.java
@@ -16,24 +16,36 @@
 
 package org.cloudfoundry.client.v2.userprovidedserviceinstances;
 
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
-public final class RemoveRouteWithUserProvidedServiceInstanceRequestTest {
+import org.junit.jupiter.api.Test;
 
-    @Test(expected = IllegalStateException.class)
-    public void noRouteId() {
-        RemoveUserProvidedServiceInstanceRouteRequest.builder()
-                .userProvidedServiceInstanceId("test-user-provided-service-instance-id")
-                .build();
+final class RemoveRouteWithUserProvidedServiceInstanceRequestTest {
+
+    @Test
+    void noRouteId() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    RemoveUserProvidedServiceInstanceRouteRequest.builder()
+                            .userProvidedServiceInstanceId("test-user-provided-service-instance-id")
+                            .build();
+                });
     }
 
-    @Test(expected = IllegalStateException.class)
-    public void noUserProvidedServiceInstanceId() {
-        RemoveUserProvidedServiceInstanceRouteRequest.builder().routeId("test-route-id").build();
+    @Test
+    void noUserProvidedServiceInstanceId() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    RemoveUserProvidedServiceInstanceRouteRequest.builder()
+                            .routeId("test-route-id")
+                            .build();
+                });
     }
 
     @Test
-    public void valid() {
+    void valid() {
         RemoveUserProvidedServiceInstanceRouteRequest.builder()
                 .routeId("test-route-id")
                 .userProvidedServiceInstanceId("test-user-provided-service-instance-id")
diff --git a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/userprovidedserviceinstances/UpdateUserProvidedServiceInstanceRequestTest.java b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/userprovidedserviceinstances/UpdateUserProvidedServiceInstanceRequestTest.java
index 3d23d1ac975..66f532edff2 100644
--- a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/userprovidedserviceinstances/UpdateUserProvidedServiceInstanceRequestTest.java
+++ b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/userprovidedserviceinstances/UpdateUserProvidedServiceInstanceRequestTest.java
@@ -16,17 +16,23 @@
 
 package org.cloudfoundry.client.v2.userprovidedserviceinstances;
 
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
-public final class UpdateUserProvidedServiceInstanceRequestTest {
+import org.junit.jupiter.api.Test;
 
-    @Test(expected = IllegalStateException.class)
-    public void noUserProvidedServiceInstanceId() {
-        UpdateUserProvidedServiceInstanceRequest.builder().build();
+final class UpdateUserProvidedServiceInstanceRequestTest {
+
+    @Test
+    void noUserProvidedServiceInstanceId() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    UpdateUserProvidedServiceInstanceRequest.builder().build();
+                });
     }
 
     @Test
-    public void valid() {
+    void valid() {
         UpdateUserProvidedServiceInstanceRequest.builder()
                 .userProvidedServiceInstanceId("test-id")
                 .build();
diff --git a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/users/AssociateUserAuditedOrganizationRequestTest.java b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/users/AssociateUserAuditedOrganizationRequestTest.java
index b52215f79e7..e2b5b90a6cd 100644
--- a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/users/AssociateUserAuditedOrganizationRequestTest.java
+++ b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/users/AssociateUserAuditedOrganizationRequestTest.java
@@ -16,24 +16,36 @@
 
 package org.cloudfoundry.client.v2.users;
 
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
-public final class AssociateUserAuditedOrganizationRequestTest {
+import org.junit.jupiter.api.Test;
 
-    @Test(expected = IllegalStateException.class)
-    public void noAuditedOrganizationId() {
-        AssociateUserAuditedOrganizationRequest.builder().userId("test-user-id").build();
+final class AssociateUserAuditedOrganizationRequestTest {
+
+    @Test
+    void noAuditedOrganizationId() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    AssociateUserAuditedOrganizationRequest.builder()
+                            .userId("test-user-id")
+                            .build();
+                });
     }
 
-    @Test(expected = IllegalStateException.class)
-    public void noUserId() {
-        AssociateUserAuditedOrganizationRequest.builder()
-                .auditedOrganizationId("test-managed-space-id")
-                .build();
+    @Test
+    void noUserId() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    AssociateUserAuditedOrganizationRequest.builder()
+                            .auditedOrganizationId("test-managed-space-id")
+                            .build();
+                });
     }
 
     @Test
-    public void valid() {
+    void valid() {
         AssociateUserAuditedOrganizationRequest.builder()
                 .auditedOrganizationId("test-managed-space-id")
                 .userId("test-user-id")
diff --git a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/users/AssociateUserAuditedSpaceRequestTest.java b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/users/AssociateUserAuditedSpaceRequestTest.java
index 836c228d693..e41b002d0ca 100644
--- a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/users/AssociateUserAuditedSpaceRequestTest.java
+++ b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/users/AssociateUserAuditedSpaceRequestTest.java
@@ -16,22 +16,34 @@
 
 package org.cloudfoundry.client.v2.users;
 
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
-public final class AssociateUserAuditedSpaceRequestTest {
+import org.junit.jupiter.api.Test;
 
-    @Test(expected = IllegalStateException.class)
-    public void noAuditedSpaceId() {
-        AssociateUserAuditedSpaceRequest.builder().userId("test-user-id").build();
+final class AssociateUserAuditedSpaceRequestTest {
+
+    @Test
+    void noAuditedSpaceId() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    AssociateUserAuditedSpaceRequest.builder().userId("test-user-id").build();
+                });
     }
 
-    @Test(expected = IllegalStateException.class)
-    public void noUserId() {
-        AssociateUserAuditedSpaceRequest.builder().auditedSpaceId("test-managed-space-id").build();
+    @Test
+    void noUserId() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    AssociateUserAuditedSpaceRequest.builder()
+                            .auditedSpaceId("test-managed-space-id")
+                            .build();
+                });
     }
 
     @Test
-    public void valid() {
+    void valid() {
         AssociateUserAuditedSpaceRequest.builder()
                 .auditedSpaceId("test-managed-space-id")
                 .userId("test-user-id")
diff --git a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/users/AssociateUserBillingManagedOrganizationRequestTest.java b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/users/AssociateUserBillingManagedOrganizationRequestTest.java
index f3b5673d80c..7f23a48ed32 100644
--- a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/users/AssociateUserBillingManagedOrganizationRequestTest.java
+++ b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/users/AssociateUserBillingManagedOrganizationRequestTest.java
@@ -16,24 +16,36 @@
 
 package org.cloudfoundry.client.v2.users;
 
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
-public final class AssociateUserBillingManagedOrganizationRequestTest {
+import org.junit.jupiter.api.Test;
 
-    @Test(expected = IllegalStateException.class)
-    public void noManagedOrganizationId() {
-        AssociateUserBillingManagedOrganizationRequest.builder().userId("test-user-id").build();
+final class AssociateUserBillingManagedOrganizationRequestTest {
+
+    @Test
+    void noManagedOrganizationId() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    AssociateUserBillingManagedOrganizationRequest.builder()
+                            .userId("test-user-id")
+                            .build();
+                });
     }
 
-    @Test(expected = IllegalStateException.class)
-    public void noUserId() {
-        AssociateUserBillingManagedOrganizationRequest.builder()
-                .billingManagedOrganizationId("test-managed-space-id")
-                .build();
+    @Test
+    void noUserId() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    AssociateUserBillingManagedOrganizationRequest.builder()
+                            .billingManagedOrganizationId("test-managed-space-id")
+                            .build();
+                });
     }
 
     @Test
-    public void valid() {
+    void valid() {
         AssociateUserBillingManagedOrganizationRequest.builder()
                 .billingManagedOrganizationId("test-managed-space-id")
                 .userId("test-user-id")
diff --git a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/users/AssociateUserManagedOrganizationRequestTest.java b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/users/AssociateUserManagedOrganizationRequestTest.java
index e625c2b742b..2fa1459ad64 100644
--- a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/users/AssociateUserManagedOrganizationRequestTest.java
+++ b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/users/AssociateUserManagedOrganizationRequestTest.java
@@ -16,24 +16,36 @@
 
 package org.cloudfoundry.client.v2.users;
 
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
-public final class AssociateUserManagedOrganizationRequestTest {
+import org.junit.jupiter.api.Test;
 
-    @Test(expected = IllegalStateException.class)
-    public void noManagedOrganizationId() {
-        AssociateUserManagedOrganizationRequest.builder().userId("test-user-id").build();
+final class AssociateUserManagedOrganizationRequestTest {
+
+    @Test
+    void noManagedOrganizationId() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    AssociateUserManagedOrganizationRequest.builder()
+                            .userId("test-user-id")
+                            .build();
+                });
     }
 
-    @Test(expected = IllegalStateException.class)
-    public void noUserId() {
-        AssociateUserManagedOrganizationRequest.builder()
-                .managedOrganizationId("test-managed-space-id")
-                .build();
+    @Test
+    void noUserId() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    AssociateUserManagedOrganizationRequest.builder()
+                            .managedOrganizationId("test-managed-space-id")
+                            .build();
+                });
     }
 
     @Test
-    public void valid() {
+    void valid() {
         AssociateUserManagedOrganizationRequest.builder()
                 .managedOrganizationId("test-managed-space-id")
                 .userId("test-user-id")
diff --git a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/users/AssociateUserManagedSpaceRequestTest.java b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/users/AssociateUserManagedSpaceRequestTest.java
index 6a80c37d3e7..8cec84fb09c 100644
--- a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/users/AssociateUserManagedSpaceRequestTest.java
+++ b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/users/AssociateUserManagedSpaceRequestTest.java
@@ -16,22 +16,34 @@
 
 package org.cloudfoundry.client.v2.users;
 
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
-public final class AssociateUserManagedSpaceRequestTest {
+import org.junit.jupiter.api.Test;
 
-    @Test(expected = IllegalStateException.class)
-    public void noManagedSpaceId() {
-        AssociateUserManagedSpaceRequest.builder().userId("test-user-id").build();
+final class AssociateUserManagedSpaceRequestTest {
+
+    @Test
+    void noManagedSpaceId() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    AssociateUserManagedSpaceRequest.builder().userId("test-user-id").build();
+                });
     }
 
-    @Test(expected = IllegalStateException.class)
-    public void noUserId() {
-        AssociateUserManagedSpaceRequest.builder().managedSpaceId("test-managed-space-id").build();
+    @Test
+    void noUserId() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    AssociateUserManagedSpaceRequest.builder()
+                            .managedSpaceId("test-managed-space-id")
+                            .build();
+                });
     }
 
     @Test
-    public void valid() {
+    void valid() {
         AssociateUserManagedSpaceRequest.builder()
                 .managedSpaceId("test-managed-space-id")
                 .userId("test-user-id")
diff --git a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/users/AssociateUserOrganizationRequestTest.java b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/users/AssociateUserOrganizationRequestTest.java
index 46eff089f40..df031cede18 100644
--- a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/users/AssociateUserOrganizationRequestTest.java
+++ b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/users/AssociateUserOrganizationRequestTest.java
@@ -16,22 +16,34 @@
 
 package org.cloudfoundry.client.v2.users;
 
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
-public final class AssociateUserOrganizationRequestTest {
+import org.junit.jupiter.api.Test;
 
-    @Test(expected = IllegalStateException.class)
-    public void noOrganizationId() {
-        AssociateUserOrganizationRequest.builder().userId("test-user-id").build();
+final class AssociateUserOrganizationRequestTest {
+
+    @Test
+    void noOrganizationId() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    AssociateUserOrganizationRequest.builder().userId("test-user-id").build();
+                });
     }
 
-    @Test(expected = IllegalStateException.class)
-    public void noUserId() {
-        AssociateUserOrganizationRequest.builder().organizationId("test-space-id").build();
+    @Test
+    void noUserId() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    AssociateUserOrganizationRequest.builder()
+                            .organizationId("test-space-id")
+                            .build();
+                });
     }
 
     @Test
-    public void valid() {
+    void valid() {
         AssociateUserOrganizationRequest.builder()
                 .organizationId("test-space-id")
                 .userId("test-user-id")
diff --git a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/users/AssociateUserSpaceRequestTest.java b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/users/AssociateUserSpaceRequestTest.java
index 55b9bc460b0..e9204212f93 100644
--- a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/users/AssociateUserSpaceRequestTest.java
+++ b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/users/AssociateUserSpaceRequestTest.java
@@ -16,22 +16,32 @@
 
 package org.cloudfoundry.client.v2.users;
 
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
-public final class AssociateUserSpaceRequestTest {
+import org.junit.jupiter.api.Test;
 
-    @Test(expected = IllegalStateException.class)
-    public void noSpaceId() {
-        AssociateUserSpaceRequest.builder().userId("test-user-id").build();
+final class AssociateUserSpaceRequestTest {
+
+    @Test
+    void noSpaceId() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    AssociateUserSpaceRequest.builder().userId("test-user-id").build();
+                });
     }
 
-    @Test(expected = IllegalStateException.class)
-    public void noUserId() {
-        AssociateUserSpaceRequest.builder().spaceId("test-space-id").build();
+    @Test
+    void noUserId() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    AssociateUserSpaceRequest.builder().spaceId("test-space-id").build();
+                });
     }
 
     @Test
-    public void valid() {
+    void valid() {
         AssociateUserSpaceRequest.builder().spaceId("test-space-id").userId("test-user-id").build();
     }
 }
diff --git a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/users/CreateUserRequestTest.java b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/users/CreateUserRequestTest.java
index efdfa0da79b..eb9afbe10ee 100644
--- a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/users/CreateUserRequestTest.java
+++ b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/users/CreateUserRequestTest.java
@@ -16,17 +16,23 @@
 
 package org.cloudfoundry.client.v2.users;
 
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
-public final class CreateUserRequestTest {
+import org.junit.jupiter.api.Test;
 
-    @Test(expected = IllegalStateException.class)
-    public void noUaaId() {
-        CreateUserRequest.builder().defaultSpaceId("test-space-id").build();
+final class CreateUserRequestTest {
+
+    @Test
+    void noUaaId() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    CreateUserRequest.builder().defaultSpaceId("test-space-id").build();
+                });
     }
 
     @Test
-    public void valid() {
+    void valid() {
         CreateUserRequest.builder().defaultSpaceId("test-space-id").uaaId("test-uaa-id").build();
     }
 }
diff --git a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/users/DeleteUserRequestTest.java b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/users/DeleteUserRequestTest.java
index ed6a070eb0c..93ae30866c1 100644
--- a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/users/DeleteUserRequestTest.java
+++ b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/users/DeleteUserRequestTest.java
@@ -16,17 +16,23 @@
 
 package org.cloudfoundry.client.v2.users;
 
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
-public final class DeleteUserRequestTest {
+import org.junit.jupiter.api.Test;
 
-    @Test(expected = IllegalStateException.class)
-    public void noUserId() {
-        DeleteUserRequest.builder().async(true).build();
+final class DeleteUserRequestTest {
+
+    @Test
+    void noUserId() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    DeleteUserRequest.builder().async(true).build();
+                });
     }
 
     @Test
-    public void valid() {
+    void valid() {
         DeleteUserRequest.builder().userId("test-user-id").build();
     }
 }
diff --git a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/users/GetUserRequestTest.java b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/users/GetUserRequestTest.java
index 84bcc3f72f3..d2f8302d404 100644
--- a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/users/GetUserRequestTest.java
+++ b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/users/GetUserRequestTest.java
@@ -16,17 +16,23 @@
 
 package org.cloudfoundry.client.v2.users;
 
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
-public final class GetUserRequestTest {
+import org.junit.jupiter.api.Test;
 
-    @Test(expected = IllegalStateException.class)
-    public void noUserId() {
-        GetUserRequest.builder().build();
+final class GetUserRequestTest {
+
+    @Test
+    void noUserId() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    GetUserRequest.builder().build();
+                });
     }
 
     @Test
-    public void valid() {
+    void valid() {
         GetUserRequest.builder().userId("test-user-id").build();
     }
 }
diff --git a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/users/ListUserAuditedOrganizationsRequestTest.java b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/users/ListUserAuditedOrganizationsRequestTest.java
index 9dcd1230563..0bec49f0323 100644
--- a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/users/ListUserAuditedOrganizationsRequestTest.java
+++ b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/users/ListUserAuditedOrganizationsRequestTest.java
@@ -16,17 +16,23 @@
 
 package org.cloudfoundry.client.v2.users;
 
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
-public final class ListUserAuditedOrganizationsRequestTest {
+import org.junit.jupiter.api.Test;
 
-    @Test(expected = IllegalStateException.class)
-    public void noUserId() {
-        ListUserAuditedOrganizationsRequest.builder().build();
+final class ListUserAuditedOrganizationsRequestTest {
+
+    @Test
+    void noUserId() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    ListUserAuditedOrganizationsRequest.builder().build();
+                });
     }
 
     @Test
-    public void valid() {
+    void valid() {
         ListUserAuditedOrganizationsRequest.builder().userId("test-user-id").build();
     }
 }
diff --git a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/users/ListUserAuditedSpacesRequestTest.java b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/users/ListUserAuditedSpacesRequestTest.java
index e8fd841744f..c7df5296134 100644
--- a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/users/ListUserAuditedSpacesRequestTest.java
+++ b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/users/ListUserAuditedSpacesRequestTest.java
@@ -16,17 +16,23 @@
 
 package org.cloudfoundry.client.v2.users;
 
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
-public final class ListUserAuditedSpacesRequestTest {
+import org.junit.jupiter.api.Test;
 
-    @Test(expected = IllegalStateException.class)
-    public void noUserId() {
-        ListUserAuditedSpacesRequest.builder().build();
+final class ListUserAuditedSpacesRequestTest {
+
+    @Test
+    void noUserId() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    ListUserAuditedSpacesRequest.builder().build();
+                });
     }
 
     @Test
-    public void valid() {
+    void valid() {
         ListUserAuditedSpacesRequest.builder().userId("test-user-id").build();
     }
 }
diff --git a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/users/ListUserBillingManagedOrganizationsRequestTest.java b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/users/ListUserBillingManagedOrganizationsRequestTest.java
index 998597d005e..6e1c64bd96f 100644
--- a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/users/ListUserBillingManagedOrganizationsRequestTest.java
+++ b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/users/ListUserBillingManagedOrganizationsRequestTest.java
@@ -16,17 +16,23 @@
 
 package org.cloudfoundry.client.v2.users;
 
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
-public final class ListUserBillingManagedOrganizationsRequestTest {
+import org.junit.jupiter.api.Test;
 
-    @Test(expected = IllegalStateException.class)
-    public void noUserId() {
-        ListUserBillingManagedOrganizationsRequest.builder().build();
+final class ListUserBillingManagedOrganizationsRequestTest {
+
+    @Test
+    void noUserId() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    ListUserBillingManagedOrganizationsRequest.builder().build();
+                });
     }
 
     @Test
-    public void valid() {
+    void valid() {
         ListUserBillingManagedOrganizationsRequest.builder().userId("test-user-id").build();
     }
 }
diff --git a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/users/ListUserManagedOrganizationsRequestTest.java b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/users/ListUserManagedOrganizationsRequestTest.java
index b42cbb34358..d8badeacf1b 100644
--- a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/users/ListUserManagedOrganizationsRequestTest.java
+++ b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/users/ListUserManagedOrganizationsRequestTest.java
@@ -16,17 +16,23 @@
 
 package org.cloudfoundry.client.v2.users;
 
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
-public final class ListUserManagedOrganizationsRequestTest {
+import org.junit.jupiter.api.Test;
 
-    @Test(expected = IllegalStateException.class)
-    public void noUserId() {
-        ListUserManagedOrganizationsRequest.builder().build();
+final class ListUserManagedOrganizationsRequestTest {
+
+    @Test
+    void noUserId() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    ListUserManagedOrganizationsRequest.builder().build();
+                });
     }
 
     @Test
-    public void valid() {
+    void valid() {
         ListUserManagedOrganizationsRequest.builder().userId("test-user-id").build();
     }
 }
diff --git a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/users/ListUserManagedSpacesRequestTest.java b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/users/ListUserManagedSpacesRequestTest.java
index 23225294d0e..5e42e7311c2 100644
--- a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/users/ListUserManagedSpacesRequestTest.java
+++ b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/users/ListUserManagedSpacesRequestTest.java
@@ -16,17 +16,23 @@
 
 package org.cloudfoundry.client.v2.users;
 
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
-public final class ListUserManagedSpacesRequestTest {
+import org.junit.jupiter.api.Test;
 
-    @Test(expected = IllegalStateException.class)
-    public void noUserId() {
-        ListUserManagedSpacesRequest.builder().build();
+final class ListUserManagedSpacesRequestTest {
+
+    @Test
+    void noUserId() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    ListUserManagedSpacesRequest.builder().build();
+                });
     }
 
     @Test
-    public void valid() {
+    void valid() {
         ListUserManagedSpacesRequest.builder().userId("test-user-id").build();
     }
 }
diff --git a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/users/ListUserOrganizationsRequestTest.java b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/users/ListUserOrganizationsRequestTest.java
index e31458aa1e7..8436c250ffe 100644
--- a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/users/ListUserOrganizationsRequestTest.java
+++ b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/users/ListUserOrganizationsRequestTest.java
@@ -16,17 +16,23 @@
 
 package org.cloudfoundry.client.v2.users;
 
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
-public final class ListUserOrganizationsRequestTest {
+import org.junit.jupiter.api.Test;
 
-    @Test(expected = IllegalStateException.class)
-    public void noUserId() {
-        ListUserOrganizationsRequest.builder().build();
+final class ListUserOrganizationsRequestTest {
+
+    @Test
+    void noUserId() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    ListUserOrganizationsRequest.builder().build();
+                });
     }
 
     @Test
-    public void valid() {
+    void valid() {
         ListUserOrganizationsRequest.builder().userId("test-user-id").build();
     }
 }
diff --git a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/users/ListUserSpacesRequestTest.java b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/users/ListUserSpacesRequestTest.java
index 9a58eae3416..f331c2b03c9 100644
--- a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/users/ListUserSpacesRequestTest.java
+++ b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/users/ListUserSpacesRequestTest.java
@@ -16,17 +16,23 @@
 
 package org.cloudfoundry.client.v2.users;
 
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
-public final class ListUserSpacesRequestTest {
+import org.junit.jupiter.api.Test;
 
-    @Test(expected = IllegalStateException.class)
-    public void noUserId() {
-        ListUserSpacesRequest.builder().build();
+final class ListUserSpacesRequestTest {
+
+    @Test
+    void noUserId() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    ListUserSpacesRequest.builder().build();
+                });
     }
 
     @Test
-    public void valid() {
+    void valid() {
         ListUserSpacesRequest.builder().userId("test-user-id").build();
     }
 }
diff --git a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/users/ListUsersRequestTest.java b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/users/ListUsersRequestTest.java
index a8ce99eae97..26ebce64b13 100644
--- a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/users/ListUsersRequestTest.java
+++ b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/users/ListUsersRequestTest.java
@@ -16,12 +16,12 @@
 
 package org.cloudfoundry.client.v2.users;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
-public final class ListUsersRequestTest {
+final class ListUsersRequestTest {
 
     @Test
-    public void valid() {
+    void valid() {
         ListUsersRequest.builder().build();
     }
 }
diff --git a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/users/RemoveUserAuditedOrganizationRequestTest.java b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/users/RemoveUserAuditedOrganizationRequestTest.java
index 59b25e2e7ad..83089b91ac5 100644
--- a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/users/RemoveUserAuditedOrganizationRequestTest.java
+++ b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/users/RemoveUserAuditedOrganizationRequestTest.java
@@ -16,24 +16,34 @@
 
 package org.cloudfoundry.client.v2.users;
 
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
-public final class RemoveUserAuditedOrganizationRequestTest {
+import org.junit.jupiter.api.Test;
 
-    @Test(expected = IllegalStateException.class)
-    public void noAuditedOrganizationId() {
-        RemoveUserAuditedOrganizationRequest.builder().userId("test-user-id").build();
+final class RemoveUserAuditedOrganizationRequestTest {
+
+    @Test
+    void noAuditedOrganizationId() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    RemoveUserAuditedOrganizationRequest.builder().userId("test-user-id").build();
+                });
     }
 
-    @Test(expected = IllegalStateException.class)
-    public void noUserId() {
-        RemoveUserAuditedOrganizationRequest.builder()
-                .auditedOrganizationId("test-space-id")
-                .build();
+    @Test
+    void noUserId() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    RemoveUserAuditedOrganizationRequest.builder()
+                            .auditedOrganizationId("test-space-id")
+                            .build();
+                });
     }
 
     @Test
-    public void valid() {
+    void valid() {
         RemoveUserAuditedOrganizationRequest.builder()
                 .auditedOrganizationId("test-space-id")
                 .userId("test-user-id")
diff --git a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/users/RemoveUserAuditedSpaceRequestTest.java b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/users/RemoveUserAuditedSpaceRequestTest.java
index 4d3726625aa..fde7796fa75 100644
--- a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/users/RemoveUserAuditedSpaceRequestTest.java
+++ b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/users/RemoveUserAuditedSpaceRequestTest.java
@@ -16,22 +16,32 @@
 
 package org.cloudfoundry.client.v2.users;
 
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
-public final class RemoveUserAuditedSpaceRequestTest {
+import org.junit.jupiter.api.Test;
 
-    @Test(expected = IllegalStateException.class)
-    public void noAuditedSpaceId() {
-        RemoveUserAuditedSpaceRequest.builder().userId("test-user-id").build();
+final class RemoveUserAuditedSpaceRequestTest {
+
+    @Test
+    void noAuditedSpaceId() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    RemoveUserAuditedSpaceRequest.builder().userId("test-user-id").build();
+                });
     }
 
-    @Test(expected = IllegalStateException.class)
-    public void noUserId() {
-        RemoveUserManagedSpaceRequest.builder().managedSpaceId("test-space-id").build();
+    @Test
+    void noUserId() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    RemoveUserManagedSpaceRequest.builder().managedSpaceId("test-space-id").build();
+                });
     }
 
     @Test
-    public void valid() {
+    void valid() {
         RemoveUserManagedSpaceRequest.builder()
                 .managedSpaceId("test-space-id")
                 .userId("test-user-id")
diff --git a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/users/RemoveUserBillingManagedOrganizationRequestTest.java b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/users/RemoveUserBillingManagedOrganizationRequestTest.java
index e1ee0511013..ee5f967a1f7 100644
--- a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/users/RemoveUserBillingManagedOrganizationRequestTest.java
+++ b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/users/RemoveUserBillingManagedOrganizationRequestTest.java
@@ -16,24 +16,36 @@
 
 package org.cloudfoundry.client.v2.users;
 
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
-public final class RemoveUserBillingManagedOrganizationRequestTest {
+import org.junit.jupiter.api.Test;
 
-    @Test(expected = IllegalStateException.class)
-    public void noBillingManagedOrganizationId() {
-        RemoveUserBillingManagedOrganizationRequest.builder().userId("test-user-id").build();
+final class RemoveUserBillingManagedOrganizationRequestTest {
+
+    @Test
+    void noBillingManagedOrganizationId() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    RemoveUserBillingManagedOrganizationRequest.builder()
+                            .userId("test-user-id")
+                            .build();
+                });
     }
 
-    @Test(expected = IllegalStateException.class)
-    public void noUserId() {
-        RemoveUserBillingManagedOrganizationRequest.builder()
-                .billingManagedOrganizationId("test-space-id")
-                .build();
+    @Test
+    void noUserId() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    RemoveUserBillingManagedOrganizationRequest.builder()
+                            .billingManagedOrganizationId("test-space-id")
+                            .build();
+                });
     }
 
     @Test
-    public void valid() {
+    void valid() {
         RemoveUserBillingManagedOrganizationRequest.builder()
                 .billingManagedOrganizationId("test-space-id")
                 .userId("test-user-id")
diff --git a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/users/RemoveUserManagedOrganizationRequestTest.java b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/users/RemoveUserManagedOrganizationRequestTest.java
index 3a5fc533f83..2ee5ce01204 100644
--- a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/users/RemoveUserManagedOrganizationRequestTest.java
+++ b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/users/RemoveUserManagedOrganizationRequestTest.java
@@ -16,24 +16,34 @@
 
 package org.cloudfoundry.client.v2.users;
 
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
-public final class RemoveUserManagedOrganizationRequestTest {
+import org.junit.jupiter.api.Test;
 
-    @Test(expected = IllegalStateException.class)
-    public void noManagedOrganizationId() {
-        RemoveUserManagedOrganizationRequest.builder().userId("test-user-id").build();
+final class RemoveUserManagedOrganizationRequestTest {
+
+    @Test
+    void noManagedOrganizationId() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    RemoveUserManagedOrganizationRequest.builder().userId("test-user-id").build();
+                });
     }
 
-    @Test(expected = IllegalStateException.class)
-    public void noUserId() {
-        RemoveUserManagedOrganizationRequest.builder()
-                .managedOrganizationId("test-space-id")
-                .build();
+    @Test
+    void noUserId() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    RemoveUserManagedOrganizationRequest.builder()
+                            .managedOrganizationId("test-space-id")
+                            .build();
+                });
     }
 
     @Test
-    public void valid() {
+    void valid() {
         RemoveUserManagedOrganizationRequest.builder()
                 .managedOrganizationId("test-space-id")
                 .userId("test-user-id")
diff --git a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/users/RemoveUserManagedSpaceRequestTest.java b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/users/RemoveUserManagedSpaceRequestTest.java
index c95a5f5d855..a279910d9fd 100644
--- a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/users/RemoveUserManagedSpaceRequestTest.java
+++ b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/users/RemoveUserManagedSpaceRequestTest.java
@@ -16,22 +16,32 @@
 
 package org.cloudfoundry.client.v2.users;
 
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
-public final class RemoveUserManagedSpaceRequestTest {
+import org.junit.jupiter.api.Test;
 
-    @Test(expected = IllegalStateException.class)
-    public void noManagedSpaceId() {
-        RemoveUserManagedSpaceRequest.builder().userId("test-user-id").build();
+final class RemoveUserManagedSpaceRequestTest {
+
+    @Test
+    void noManagedSpaceId() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    RemoveUserManagedSpaceRequest.builder().userId("test-user-id").build();
+                });
     }
 
-    @Test(expected = IllegalStateException.class)
-    public void noUserId() {
-        RemoveUserManagedSpaceRequest.builder().managedSpaceId("test-space-id").build();
+    @Test
+    void noUserId() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    RemoveUserManagedSpaceRequest.builder().managedSpaceId("test-space-id").build();
+                });
     }
 
     @Test
-    public void valid() {
+    void valid() {
         RemoveUserManagedSpaceRequest.builder()
                 .managedSpaceId("test-space-id")
                 .userId("test-user-id")
diff --git a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/users/RemoveUserOrganizationRequestTest.java b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/users/RemoveUserOrganizationRequestTest.java
index 416b40570e6..cd89a8b57eb 100644
--- a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/users/RemoveUserOrganizationRequestTest.java
+++ b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/users/RemoveUserOrganizationRequestTest.java
@@ -16,22 +16,32 @@
 
 package org.cloudfoundry.client.v2.users;
 
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
-public final class RemoveUserOrganizationRequestTest {
+import org.junit.jupiter.api.Test;
 
-    @Test(expected = IllegalStateException.class)
-    public void noOrganizationId() {
-        RemoveUserOrganizationRequest.builder().userId("test-user-id").build();
+final class RemoveUserOrganizationRequestTest {
+
+    @Test
+    void noOrganizationId() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    RemoveUserOrganizationRequest.builder().userId("test-user-id").build();
+                });
     }
 
-    @Test(expected = IllegalStateException.class)
-    public void noUserId() {
-        RemoveUserOrganizationRequest.builder().organizationId("test-space-id").build();
+    @Test
+    void noUserId() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    RemoveUserOrganizationRequest.builder().organizationId("test-space-id").build();
+                });
     }
 
     @Test
-    public void valid() {
+    void valid() {
         RemoveUserOrganizationRequest.builder()
                 .organizationId("test-space-id")
                 .userId("test-user-id")
diff --git a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/users/RemoveUserSpaceRequestTest.java b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/users/RemoveUserSpaceRequestTest.java
index 45d3259dfc5..5ff8dddc33c 100644
--- a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/users/RemoveUserSpaceRequestTest.java
+++ b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/users/RemoveUserSpaceRequestTest.java
@@ -16,22 +16,32 @@
 
 package org.cloudfoundry.client.v2.users;
 
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
-public final class RemoveUserSpaceRequestTest {
+import org.junit.jupiter.api.Test;
 
-    @Test(expected = IllegalStateException.class)
-    public void noSpaceId() {
-        RemoveUserSpaceRequest.builder().userId("test-user-id").build();
+final class RemoveUserSpaceRequestTest {
+
+    @Test
+    void noSpaceId() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    RemoveUserSpaceRequest.builder().userId("test-user-id").build();
+                });
     }
 
-    @Test(expected = IllegalStateException.class)
-    public void noUserId() {
-        RemoveUserSpaceRequest.builder().spaceId("test-space-id").build();
+    @Test
+    void noUserId() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    RemoveUserSpaceRequest.builder().spaceId("test-space-id").build();
+                });
     }
 
     @Test
-    public void valid() {
+    void valid() {
         RemoveUserSpaceRequest.builder().spaceId("test-space-id").userId("test-user-id").build();
     }
 }
diff --git a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/users/SummaryUserRequestTest.java b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/users/SummaryUserRequestTest.java
index 086a79941f7..15cead1bc5b 100644
--- a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/users/SummaryUserRequestTest.java
+++ b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/users/SummaryUserRequestTest.java
@@ -16,17 +16,23 @@
 
 package org.cloudfoundry.client.v2.users;
 
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
-public final class SummaryUserRequestTest {
+import org.junit.jupiter.api.Test;
 
-    @Test(expected = IllegalStateException.class)
-    public void noUaaId() {
-        SummaryUserRequest.builder().build();
+final class SummaryUserRequestTest {
+
+    @Test
+    void noUaaId() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    SummaryUserRequest.builder().build();
+                });
     }
 
     @Test
-    public void valid() {
+    void valid() {
         SummaryUserRequest.builder().userId("test-uaa-id").build();
     }
 }
diff --git a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/users/UpdateUserRequestTest.java b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/users/UpdateUserRequestTest.java
index 880f2fd7509..366b83308c4 100644
--- a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/users/UpdateUserRequestTest.java
+++ b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/users/UpdateUserRequestTest.java
@@ -16,17 +16,23 @@
 
 package org.cloudfoundry.client.v2.users;
 
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
-public final class UpdateUserRequestTest {
+import org.junit.jupiter.api.Test;
 
-    @Test(expected = IllegalStateException.class)
-    public void noUaaId() {
-        UpdateUserRequest.builder().defaultSpaceId("test-space-id").build();
+final class UpdateUserRequestTest {
+
+    @Test
+    void noUaaId() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    UpdateUserRequest.builder().defaultSpaceId("test-space-id").build();
+                });
     }
 
     @Test
-    public void valid() {
+    void valid() {
         UpdateUserRequest.builder().defaultSpaceId("test-space-id").userId("test-uaa-id").build();
     }
 }
diff --git a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v3/ClientV3ExceptionTest.java b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v3/ClientV3ExceptionTest.java
index f373069ada3..132b276d131 100644
--- a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v3/ClientV3ExceptionTest.java
+++ b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v3/ClientV3ExceptionTest.java
@@ -19,12 +19,12 @@
 import static org.assertj.core.api.Assertions.assertThat;
 
 import java.util.Arrays;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
-public final class ClientV3ExceptionTest {
+final class ClientV3ExceptionTest {
 
     @Test
-    public void test() {
+    void test() {
         ClientV3Exception exception =
                 new ClientV3Exception(
                         -1,
diff --git a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v3/PaginatedRequestTest.java b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v3/PaginatedRequestTest.java
index e8898910144..0508387587b 100644
--- a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v3/PaginatedRequestTest.java
+++ b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v3/PaginatedRequestTest.java
@@ -16,34 +16,48 @@
 
 package org.cloudfoundry.client.v3;
 
+import static org.junit.jupiter.api.Assertions.assertThrows;
+
 import org.immutables.value.Value;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
-public final class PaginatedRequestTest {
+final class PaginatedRequestTest {
 
-    @Test(expected = IllegalStateException.class)
-    public void excessivePerPage() {
-        StubPaginatedRequest.builder().perPage(10_000).build();
+    @Test
+    void excessivePerPage() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    StubPaginatedRequest.builder().perPage(10_000).build();
+                });
     }
 
     @Test
-    public void validNoValues() {
+    void validNoValues() {
         StubPaginatedRequest.builder().build();
     }
 
     @Test
-    public void validValues() {
+    void validValues() {
         StubPaginatedRequest.builder().page(10).perPage(10).orderBy("name").build();
     }
 
-    @Test(expected = IllegalStateException.class)
-    public void zeroPage() {
-        StubPaginatedRequest.builder().page(0).build();
+    @Test
+    void zeroPage() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    StubPaginatedRequest.builder().page(0).build();
+                });
     }
 
-    @Test(expected = IllegalStateException.class)
-    public void zeroPerPage() {
-        StubPaginatedRequest.builder().perPage(0).build();
+    @Test
+    void zeroPerPage() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    StubPaginatedRequest.builder().perPage(0).build();
+                });
     }
 
     @Value.Immutable
diff --git a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v3/PaginationTest.java b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v3/PaginationTest.java
index c763c89aef9..22d093daa68 100644
--- a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v3/PaginationTest.java
+++ b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v3/PaginationTest.java
@@ -16,12 +16,12 @@
 
 package org.cloudfoundry.client.v3;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
-public final class PaginationTest {
+final class PaginationTest {
 
     @Test
-    public void valid() {
+    void valid() {
         Pagination.builder().build();
     }
 }
diff --git a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v3/RelationshipTest.java b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v3/RelationshipTest.java
index 07b7bde7793..61d59c23d6d 100644
--- a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v3/RelationshipTest.java
+++ b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v3/RelationshipTest.java
@@ -16,17 +16,23 @@
 
 package org.cloudfoundry.client.v3;
 
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
-public final class RelationshipTest {
+import org.junit.jupiter.api.Test;
 
-    @Test(expected = IllegalStateException.class)
-    public void noId() {
-        Relationship.builder().build();
+final class RelationshipTest {
+
+    @Test
+    void noId() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    Relationship.builder().build();
+                });
     }
 
     @Test
-    public void valid() {
+    void valid() {
         Relationship.builder().id("test-id").build();
     }
 }
diff --git a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v3/ResourceTest.java b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v3/ResourceTest.java
index cc37b8d5f6f..c719158072c 100644
--- a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v3/ResourceTest.java
+++ b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v3/ResourceTest.java
@@ -16,23 +16,36 @@
 
 package org.cloudfoundry.client.v3;
 
+import static org.junit.jupiter.api.Assertions.assertThrows;
+
 import org.immutables.value.Value;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
-public final class ResourceTest {
+final class ResourceTest {
 
-    @Test(expected = IllegalStateException.class)
-    public void noCreatedAt() {
-        StubResource.builder().id("test-id").updatedAt("test-updated-at").build();
+    @Test
+    void noCreatedAt() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    StubResource.builder().id("test-id").updatedAt("test-updated-at").build();
+                });
     }
 
-    @Test(expected = IllegalStateException.class)
-    public void noId() {
-        StubResource.builder().createdAt("test-created-at").updatedAt("test-updated-at").build();
+    @Test
+    void noId() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    StubResource.builder()
+                            .createdAt("test-created-at")
+                            .updatedAt("test-updated-at")
+                            .build();
+                });
     }
 
     @Test
-    public void valid() {
+    void valid() {
         StubResource.builder()
                 .createdAt("test-created-at")
                 .id("test-id")
diff --git a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v3/ToManyRelationshipTest.java b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v3/ToManyRelationshipTest.java
index 5640a7c6c14..7bf5aca72a7 100644
--- a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v3/ToManyRelationshipTest.java
+++ b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v3/ToManyRelationshipTest.java
@@ -16,12 +16,12 @@
 
 package org.cloudfoundry.client.v3;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
-public final class ToManyRelationshipTest {
+final class ToManyRelationshipTest {
 
     @Test
-    public void valid() {
+    void valid() {
         ToManyRelationship.builder().build();
     }
 }
diff --git a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v3/ToOneRelationshipTest.java b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v3/ToOneRelationshipTest.java
index a0d75903110..7811874d968 100644
--- a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v3/ToOneRelationshipTest.java
+++ b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v3/ToOneRelationshipTest.java
@@ -16,12 +16,12 @@
 
 package org.cloudfoundry.client.v3;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
-public final class ToOneRelationshipTest {
+final class ToOneRelationshipTest {
 
     @Test
-    public void valid() {
+    void valid() {
         ToOneRelationship.builder().build();
     }
 }
diff --git a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v3/admin/ClearBuildpackCacheRequestTest.java b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v3/admin/ClearBuildpackCacheRequestTest.java
index 5a7284bc618..b615797fba8 100644
--- a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v3/admin/ClearBuildpackCacheRequestTest.java
+++ b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v3/admin/ClearBuildpackCacheRequestTest.java
@@ -16,12 +16,12 @@
 
 package org.cloudfoundry.client.v3.admin;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
-public class ClearBuildpackCacheRequestTest {
+class ClearBuildpackCacheRequestTest {
 
     @Test
-    public void valid() {
+    void valid() {
         ClearBuildpackCacheRequest.builder().build();
     }
 }
diff --git a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v3/applications/CreateApplicationRequestTest.java b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v3/applications/CreateApplicationRequestTest.java
index 2e2b9504b01..0dc40da21f5 100644
--- a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v3/applications/CreateApplicationRequestTest.java
+++ b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v3/applications/CreateApplicationRequestTest.java
@@ -16,32 +16,45 @@
 
 package org.cloudfoundry.client.v3.applications;
 
+import static org.junit.jupiter.api.Assertions.assertThrows;
+
 import org.cloudfoundry.client.v3.Relationship;
 import org.cloudfoundry.client.v3.ToOneRelationship;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
-public final class CreateApplicationRequestTest {
+final class CreateApplicationRequestTest {
 
-    @Test(expected = IllegalStateException.class)
-    public void noName() {
-        CreateApplicationRequest.builder()
-                .relationships(
-                        ApplicationRelationships.builder()
-                                .space(
-                                        ToOneRelationship.builder()
-                                                .data(Relationship.builder().id("test-id").build())
-                                                .build())
-                                .build())
-                .build();
+    @Test
+    void noName() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    CreateApplicationRequest.builder()
+                            .relationships(
+                                    ApplicationRelationships.builder()
+                                            .space(
+                                                    ToOneRelationship.builder()
+                                                            .data(
+                                                                    Relationship.builder()
+                                                                            .id("test-id")
+                                                                            .build())
+                                                            .build())
+                                            .build())
+                            .build();
+                });
     }
 
-    @Test(expected = IllegalStateException.class)
-    public void noRelationships() {
-        CreateApplicationRequest.builder().name("test-name").build();
+    @Test
+    void noRelationships() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    CreateApplicationRequest.builder().name("test-name").build();
+                });
     }
 
     @Test
-    public void valid() {
+    void valid() {
         CreateApplicationRequest.builder()
                 .name("test-name")
                 .relationships(
diff --git a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v3/applications/DeleteApplicationRequestTest.java b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v3/applications/DeleteApplicationRequestTest.java
index 5f407fa779f..fd4c6d65634 100644
--- a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v3/applications/DeleteApplicationRequestTest.java
+++ b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v3/applications/DeleteApplicationRequestTest.java
@@ -16,17 +16,23 @@
 
 package org.cloudfoundry.client.v3.applications;
 
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
-public final class DeleteApplicationRequestTest {
+import org.junit.jupiter.api.Test;
 
-    @Test(expected = IllegalStateException.class)
-    public void noApplicationId() {
-        DeleteApplicationRequest.builder().build();
+final class DeleteApplicationRequestTest {
+
+    @Test
+    void noApplicationId() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    DeleteApplicationRequest.builder().build();
+                });
     }
 
     @Test
-    public void valid() {
+    void valid() {
         DeleteApplicationRequest.builder().applicationId("test-application-id").build();
     }
 }
diff --git a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v3/applications/GetApplicationCurrentDropletRelationshipRequestTest.java b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v3/applications/GetApplicationCurrentDropletRelationshipRequestTest.java
index 88d6ca27172..0ceef66e61d 100644
--- a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v3/applications/GetApplicationCurrentDropletRelationshipRequestTest.java
+++ b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v3/applications/GetApplicationCurrentDropletRelationshipRequestTest.java
@@ -16,17 +16,23 @@
 
 package org.cloudfoundry.client.v3.applications;
 
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
-public final class GetApplicationCurrentDropletRelationshipRequestTest {
+import org.junit.jupiter.api.Test;
 
-    @Test(expected = IllegalStateException.class)
-    public void noApplicationId() {
-        GetApplicationCurrentDropletRelationshipRequest.builder().build();
+final class GetApplicationCurrentDropletRelationshipRequestTest {
+
+    @Test
+    void noApplicationId() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    GetApplicationCurrentDropletRelationshipRequest.builder().build();
+                });
     }
 
     @Test
-    public void valid() {
+    void valid() {
         GetApplicationCurrentDropletRelationshipRequest.builder()
                 .applicationId("test-application-id")
                 .build();
diff --git a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v3/applications/GetApplicationCurrentDropletRequestTest.java b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v3/applications/GetApplicationCurrentDropletRequestTest.java
index 56818e67b2b..0f0bcd51c56 100644
--- a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v3/applications/GetApplicationCurrentDropletRequestTest.java
+++ b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v3/applications/GetApplicationCurrentDropletRequestTest.java
@@ -16,17 +16,23 @@
 
 package org.cloudfoundry.client.v3.applications;
 
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
-public final class GetApplicationCurrentDropletRequestTest {
+import org.junit.jupiter.api.Test;
 
-    @Test(expected = IllegalStateException.class)
-    public void noApplicationId() {
-        GetApplicationCurrentDropletRequest.builder().build();
+final class GetApplicationCurrentDropletRequestTest {
+
+    @Test
+    void noApplicationId() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    GetApplicationCurrentDropletRequest.builder().build();
+                });
     }
 
     @Test
-    public void valid() {
+    void valid() {
         GetApplicationCurrentDropletRequest.builder().applicationId("test-application-id").build();
     }
 }
diff --git a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v3/applications/GetApplicationEnvironmentRequestTest.java b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v3/applications/GetApplicationEnvironmentRequestTest.java
index bed7ba084d4..cb5e7d01940 100644
--- a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v3/applications/GetApplicationEnvironmentRequestTest.java
+++ b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v3/applications/GetApplicationEnvironmentRequestTest.java
@@ -16,17 +16,23 @@
 
 package org.cloudfoundry.client.v3.applications;
 
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
-public final class GetApplicationEnvironmentRequestTest {
+import org.junit.jupiter.api.Test;
 
-    @Test(expected = IllegalStateException.class)
-    public void noApplicationId() {
-        GetApplicationEnvironmentRequest.builder().build();
+final class GetApplicationEnvironmentRequestTest {
+
+    @Test
+    void noApplicationId() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    GetApplicationEnvironmentRequest.builder().build();
+                });
     }
 
     @Test
-    public void valid() {
+    void valid() {
         GetApplicationEnvironmentRequest.builder().applicationId("test-application-id").build();
     }
 }
diff --git a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v3/applications/GetApplicationEnvironmentVariablesRequestTest.java b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v3/applications/GetApplicationEnvironmentVariablesRequestTest.java
index 76d6fa8734f..0a798cb24a1 100644
--- a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v3/applications/GetApplicationEnvironmentVariablesRequestTest.java
+++ b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v3/applications/GetApplicationEnvironmentVariablesRequestTest.java
@@ -16,17 +16,23 @@
 
 package org.cloudfoundry.client.v3.applications;
 
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
-public final class GetApplicationEnvironmentVariablesRequestTest {
+import org.junit.jupiter.api.Test;
 
-    @Test(expected = IllegalStateException.class)
-    public void noApplicationId() {
-        GetApplicationEnvironmentVariablesRequest.builder().build();
+final class GetApplicationEnvironmentVariablesRequestTest {
+
+    @Test
+    void noApplicationId() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    GetApplicationEnvironmentVariablesRequest.builder().build();
+                });
     }
 
     @Test
-    public void valid() {
+    void valid() {
         GetApplicationEnvironmentVariablesRequest.builder()
                 .applicationId("test-application-id")
                 .build();
diff --git a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v3/applications/GetApplicationFeatureRequestTest.java b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v3/applications/GetApplicationFeatureRequestTest.java
index 13a1cdcd687..c93daec7aa7 100644
--- a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v3/applications/GetApplicationFeatureRequestTest.java
+++ b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v3/applications/GetApplicationFeatureRequestTest.java
@@ -16,22 +16,34 @@
 
 package org.cloudfoundry.client.v3.applications;
 
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
-public final class GetApplicationFeatureRequestTest {
+import org.junit.jupiter.api.Test;
 
-    @Test(expected = IllegalStateException.class)
-    public void noApplicationId() {
-        GetApplicationFeatureRequest.builder().applicationId("test-application-id").build();
+final class GetApplicationFeatureRequestTest {
+
+    @Test
+    void noApplicationId() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    GetApplicationFeatureRequest.builder()
+                            .applicationId("test-application-id")
+                            .build();
+                });
     }
 
-    @Test(expected = IllegalStateException.class)
-    public void noFeatureName() {
-        GetApplicationFeatureRequest.builder().featureName("test-feature-name").build();
+    @Test
+    void noFeatureName() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    GetApplicationFeatureRequest.builder().featureName("test-feature-name").build();
+                });
     }
 
     @Test
-    public void valid() {
+    void valid() {
         GetApplicationFeatureRequest.builder()
                 .applicationId("test-application-id")
                 .featureName("test-feature-name")
diff --git a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v3/applications/GetApplicationPermissionRequestTest.java b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v3/applications/GetApplicationPermissionRequestTest.java
index 39a4e581a9c..bda99882973 100644
--- a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v3/applications/GetApplicationPermissionRequestTest.java
+++ b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v3/applications/GetApplicationPermissionRequestTest.java
@@ -16,17 +16,23 @@
 
 package org.cloudfoundry.client.v3.applications;
 
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
-public final class GetApplicationPermissionRequestTest {
+import org.junit.jupiter.api.Test;
 
-    @Test(expected = IllegalStateException.class)
-    public void noApplicationId() {
-        GetApplicationPermissionsRequest.builder().build();
+final class GetApplicationPermissionRequestTest {
+
+    @Test
+    void noApplicationId() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    GetApplicationPermissionsRequest.builder().build();
+                });
     }
 
     @Test
-    public void valid() {
+    void valid() {
         GetApplicationPermissionsRequest.builder().applicationId("test-application-id").build();
     }
 }
diff --git a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v3/applications/GetApplicationProcessRequestTest.java b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v3/applications/GetApplicationProcessRequestTest.java
index 621d3ef974a..c54a26a852a 100644
--- a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v3/applications/GetApplicationProcessRequestTest.java
+++ b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v3/applications/GetApplicationProcessRequestTest.java
@@ -16,22 +16,34 @@
 
 package org.cloudfoundry.client.v3.applications;
 
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
-public final class GetApplicationProcessRequestTest {
+import org.junit.jupiter.api.Test;
 
-    @Test(expected = IllegalStateException.class)
-    public void noApplicationId() {
-        GetApplicationProcessRequest.builder().type("test-type").build();
+final class GetApplicationProcessRequestTest {
+
+    @Test
+    void noApplicationId() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    GetApplicationProcessRequest.builder().type("test-type").build();
+                });
     }
 
-    @Test(expected = IllegalStateException.class)
-    public void noType() {
-        GetApplicationProcessRequest.builder().applicationId("test-application-id").build();
+    @Test
+    void noType() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    GetApplicationProcessRequest.builder()
+                            .applicationId("test-application-id")
+                            .build();
+                });
     }
 
     @Test
-    public void valid() {
+    void valid() {
         GetApplicationProcessRequest.builder()
                 .applicationId("test-application-id")
                 .type("test-type")
diff --git a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v3/applications/GetApplicationProcessStatisticsRequestTest.java b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v3/applications/GetApplicationProcessStatisticsRequestTest.java
index 8b40fbc7f48..cf356a499cf 100644
--- a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v3/applications/GetApplicationProcessStatisticsRequestTest.java
+++ b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v3/applications/GetApplicationProcessStatisticsRequestTest.java
@@ -16,25 +16,37 @@
 
 package org.cloudfoundry.client.v3.applications;
 
+import static org.junit.jupiter.api.Assertions.assertThrows;
+
 import org.cloudfoundry.client.v3.processes.ProcessState;
 import org.cloudfoundry.client.v3.processes.ProcessStatisticsResource;
 import org.cloudfoundry.client.v3.processes.ProcessUsage;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
-public final class GetApplicationProcessStatisticsRequestTest {
+final class GetApplicationProcessStatisticsRequestTest {
 
-    @Test(expected = IllegalStateException.class)
-    public void noApplicationId() {
-        GetApplicationProcessStatisticsRequest.builder().type("test-type").build();
+    @Test
+    void noApplicationId() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    GetApplicationProcessStatisticsRequest.builder().type("test-type").build();
+                });
     }
 
-    @Test(expected = IllegalStateException.class)
-    public void noType() {
-        GetApplicationProcessStatisticsRequest.builder().applicationId("test-id").build();
+    @Test
+    void noType() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    GetApplicationProcessStatisticsRequest.builder()
+                            .applicationId("test-id")
+                            .build();
+                });
     }
 
     @Test
-    public void valid() {
+    void valid() {
         GetApplicationProcessStatisticsRequest.builder()
                 .applicationId("test-id")
                 .type("test-type")
@@ -42,7 +54,7 @@ public void valid() {
     }
 
     @Test
-    public void validDownResource() {
+    void validDownResource() {
         ProcessStatisticsResource processStatisticsResource =
                 ProcessStatisticsResource.builder()
                         .type("web")
@@ -55,22 +67,26 @@ public void validDownResource() {
                 .build();
     }
 
-    @Test(expected = IllegalStateException.class)
-    public void invalidRunningResource() {
-        ProcessStatisticsResource processStatisticsResource =
-                ProcessStatisticsResource.builder()
-                        .type("web")
-                        .index(0)
-                        .state(ProcessState.RUNNING)
-                        .uptime(0L)
-                        .build();
-        GetApplicationProcessStatisticsResponse.builder()
-                .resource(processStatisticsResource)
-                .build();
+    @Test
+    void invalidRunningResource() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    ProcessStatisticsResource processStatisticsResource =
+                            ProcessStatisticsResource.builder()
+                                    .type("web")
+                                    .index(0)
+                                    .state(ProcessState.RUNNING)
+                                    .uptime(0L)
+                                    .build();
+                    GetApplicationProcessStatisticsResponse.builder()
+                            .resource(processStatisticsResource)
+                            .build();
+                });
     }
 
     @Test
-    public void validRunningResponse() {
+    void validRunningResponse() {
         ProcessUsage processUsage =
                 ProcessUsage.builder()
                         .time("")
diff --git a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v3/applications/GetApplicationRequestTest.java b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v3/applications/GetApplicationRequestTest.java
index eff24dda575..5da0ace17e2 100644
--- a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v3/applications/GetApplicationRequestTest.java
+++ b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v3/applications/GetApplicationRequestTest.java
@@ -16,17 +16,23 @@
 
 package org.cloudfoundry.client.v3.applications;
 
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
-public final class GetApplicationRequestTest {
+import org.junit.jupiter.api.Test;
 
-    @Test(expected = IllegalStateException.class)
-    public void noApplicationId() {
-        GetApplicationRequest.builder().build();
+final class GetApplicationRequestTest {
+
+    @Test
+    void noApplicationId() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    GetApplicationRequest.builder().build();
+                });
     }
 
     @Test
-    public void valid() {
+    void valid() {
         GetApplicationRequest.builder().applicationId("test-application-id").build();
     }
 }
diff --git a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v3/applications/GetApplicationSshEnabledRequestTest.java b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v3/applications/GetApplicationSshEnabledRequestTest.java
index ed2bd43fd00..dfc67c22b3f 100644
--- a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v3/applications/GetApplicationSshEnabledRequestTest.java
+++ b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v3/applications/GetApplicationSshEnabledRequestTest.java
@@ -16,17 +16,23 @@
 
 package org.cloudfoundry.client.v3.applications;
 
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
-public final class GetApplicationSshEnabledRequestTest {
+import org.junit.jupiter.api.Test;
 
-    @Test(expected = IllegalStateException.class)
-    public void noApplicationId() {
-        GetApplicationSshEnabledRequest.builder().build();
+final class GetApplicationSshEnabledRequestTest {
+
+    @Test
+    void noApplicationId() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    GetApplicationSshEnabledRequest.builder().build();
+                });
     }
 
     @Test
-    public void valid() {
+    void valid() {
         GetApplicationSshEnabledRequest.builder().applicationId("test-application-id").build();
     }
 }
diff --git a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v3/applications/ListApplicationBuildsRequestTest.java b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v3/applications/ListApplicationBuildsRequestTest.java
index 8db153568a6..d36ef9cebf9 100644
--- a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v3/applications/ListApplicationBuildsRequestTest.java
+++ b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v3/applications/ListApplicationBuildsRequestTest.java
@@ -16,17 +16,23 @@
 
 package org.cloudfoundry.client.v3.applications;
 
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
-public final class ListApplicationBuildsRequestTest {
+import org.junit.jupiter.api.Test;
 
-    @Test(expected = IllegalStateException.class)
-    public void noApplicationId() {
-        ListApplicationBuildsRequest.builder().build();
+final class ListApplicationBuildsRequestTest {
+
+    @Test
+    void noApplicationId() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    ListApplicationBuildsRequest.builder().build();
+                });
     }
 
     @Test
-    public void valid() {
+    void valid() {
         ListApplicationBuildsRequest.builder().applicationId("test-application-id").build();
     }
 }
diff --git a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v3/applications/ListApplicationDropletsRequestTest.java b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v3/applications/ListApplicationDropletsRequestTest.java
index 50871ad58d3..b5fc29a7216 100644
--- a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v3/applications/ListApplicationDropletsRequestTest.java
+++ b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v3/applications/ListApplicationDropletsRequestTest.java
@@ -16,17 +16,23 @@
 
 package org.cloudfoundry.client.v3.applications;
 
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
-public final class ListApplicationDropletsRequestTest {
+import org.junit.jupiter.api.Test;
 
-    @Test(expected = IllegalStateException.class)
-    public void noApplicationId() {
-        ListApplicationDropletsRequest.builder().build();
+final class ListApplicationDropletsRequestTest {
+
+    @Test
+    void noApplicationId() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    ListApplicationDropletsRequest.builder().build();
+                });
     }
 
     @Test
-    public void valid() {
+    void valid() {
         ListApplicationDropletsRequest.builder().applicationId("test-application-id").build();
     }
 }
diff --git a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v3/applications/ListApplicationFeaturesRequestTest.java b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v3/applications/ListApplicationFeaturesRequestTest.java
index 2eb9575aaab..829f029c3cd 100644
--- a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v3/applications/ListApplicationFeaturesRequestTest.java
+++ b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v3/applications/ListApplicationFeaturesRequestTest.java
@@ -16,17 +16,23 @@
 
 package org.cloudfoundry.client.v3.applications;
 
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
-public final class ListApplicationFeaturesRequestTest {
+import org.junit.jupiter.api.Test;
 
-    @Test(expected = IllegalStateException.class)
-    public void noApplicationId() {
-        ListApplicationFeaturesRequest.builder().build();
+final class ListApplicationFeaturesRequestTest {
+
+    @Test
+    void noApplicationId() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    ListApplicationFeaturesRequest.builder().build();
+                });
     }
 
     @Test
-    public void valid() {
+    void valid() {
         ListApplicationFeaturesRequest.builder().applicationId("test-application-id").build();
     }
 }
diff --git a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v3/applications/ListApplicationPackagesRequestTest.java b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v3/applications/ListApplicationPackagesRequestTest.java
index 2d62e7e15b2..a4d304a35b9 100644
--- a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v3/applications/ListApplicationPackagesRequestTest.java
+++ b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v3/applications/ListApplicationPackagesRequestTest.java
@@ -16,17 +16,23 @@
 
 package org.cloudfoundry.client.v3.applications;
 
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
-public final class ListApplicationPackagesRequestTest {
+import org.junit.jupiter.api.Test;
 
-    @Test(expected = IllegalStateException.class)
-    public void noApplicationId() {
-        ListApplicationPackagesRequest.builder().build();
+final class ListApplicationPackagesRequestTest {
+
+    @Test
+    void noApplicationId() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    ListApplicationPackagesRequest.builder().build();
+                });
     }
 
     @Test
-    public void valid() {
+    void valid() {
         ListApplicationPackagesRequest.builder().applicationId("test-application-id").build();
     }
 }
diff --git a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v3/applications/ListApplicationProcessesRequestTest.java b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v3/applications/ListApplicationProcessesRequestTest.java
index fb85dad0f8e..f4698c080c1 100644
--- a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v3/applications/ListApplicationProcessesRequestTest.java
+++ b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v3/applications/ListApplicationProcessesRequestTest.java
@@ -16,17 +16,23 @@
 
 package org.cloudfoundry.client.v3.applications;
 
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
-public final class ListApplicationProcessesRequestTest {
+import org.junit.jupiter.api.Test;
 
-    @Test(expected = IllegalStateException.class)
-    public void noApplicationId() {
-        ListApplicationProcessesRequest.builder().build();
+final class ListApplicationProcessesRequestTest {
+
+    @Test
+    void noApplicationId() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    ListApplicationProcessesRequest.builder().build();
+                });
     }
 
     @Test
-    public void valid() {
+    void valid() {
         ListApplicationProcessesRequest.builder().applicationId("test-application-id").build();
     }
 }
diff --git a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v3/applications/ListApplicationRoutesRequestTest.java b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v3/applications/ListApplicationRoutesRequestTest.java
index 13d623505b7..4661c3aafa7 100644
--- a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v3/applications/ListApplicationRoutesRequestTest.java
+++ b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v3/applications/ListApplicationRoutesRequestTest.java
@@ -16,17 +16,23 @@
 
 package org.cloudfoundry.client.v3.applications;
 
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
-public final class ListApplicationRoutesRequestTest {
+import org.junit.jupiter.api.Test;
 
-    @Test(expected = IllegalStateException.class)
-    public void noApplicationId() {
-        ListApplicationRoutesRequest.builder().build();
+final class ListApplicationRoutesRequestTest {
+
+    @Test
+    void noApplicationId() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    ListApplicationRoutesRequest.builder().build();
+                });
     }
 
     @Test
-    public void valid() {
+    void valid() {
         ListApplicationRoutesRequest.builder().applicationId("test-application-id").build();
     }
 }
diff --git a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v3/applications/ListApplicationTasksRequestTest.java b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v3/applications/ListApplicationTasksRequestTest.java
index 1bd08d18b30..219f0bab753 100644
--- a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v3/applications/ListApplicationTasksRequestTest.java
+++ b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v3/applications/ListApplicationTasksRequestTest.java
@@ -16,17 +16,23 @@
 
 package org.cloudfoundry.client.v3.applications;
 
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
-public final class ListApplicationTasksRequestTest {
+import org.junit.jupiter.api.Test;
 
-    @Test(expected = IllegalStateException.class)
-    public void noApplicationId() {
-        ListApplicationTasksRequest.builder().build();
+final class ListApplicationTasksRequestTest {
+
+    @Test
+    void noApplicationId() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    ListApplicationTasksRequest.builder().build();
+                });
     }
 
     @Test
-    public void valid() {
+    void valid() {
         ListApplicationTasksRequest.builder().applicationId("test-application-id").build();
     }
 }
diff --git a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v3/applications/ListApplicationsRequestTest.java b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v3/applications/ListApplicationsRequestTest.java
index b40ee491fb8..0873397aa9d 100644
--- a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v3/applications/ListApplicationsRequestTest.java
+++ b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v3/applications/ListApplicationsRequestTest.java
@@ -16,12 +16,12 @@
 
 package org.cloudfoundry.client.v3.applications;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
-public final class ListApplicationsRequestTest {
+final class ListApplicationsRequestTest {
 
     @Test
-    public void valid() {
+    void valid() {
         ListApplicationsRequest.builder().build();
     }
 }
diff --git a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v3/applications/RelationshipsTest.java b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v3/applications/RelationshipsTest.java
index 9c7d99a28d2..c875469dd1f 100644
--- a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v3/applications/RelationshipsTest.java
+++ b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v3/applications/RelationshipsTest.java
@@ -16,19 +16,25 @@
 
 package org.cloudfoundry.client.v3.applications;
 
+import static org.junit.jupiter.api.Assertions.assertThrows;
+
 import org.cloudfoundry.client.v3.Relationship;
 import org.cloudfoundry.client.v3.ToOneRelationship;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
-public final class RelationshipsTest {
+final class RelationshipsTest {
 
-    @Test(expected = IllegalStateException.class)
-    public void noSpace() {
-        ApplicationRelationships.builder().build();
+    @Test
+    void noSpace() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    ApplicationRelationships.builder().build();
+                });
     }
 
     @Test
-    public void valid() {
+    void valid() {
         ApplicationRelationships.builder()
                 .space(
                         ToOneRelationship.builder()
diff --git a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v3/applications/RestartApplicationRequestTest.java b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v3/applications/RestartApplicationRequestTest.java
index 0385586a328..4ef6b0ae4a4 100644
--- a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v3/applications/RestartApplicationRequestTest.java
+++ b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v3/applications/RestartApplicationRequestTest.java
@@ -16,17 +16,23 @@
 
 package org.cloudfoundry.client.v3.applications;
 
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
-public final class RestartApplicationRequestTest {
+import org.junit.jupiter.api.Test;
 
-    @Test(expected = IllegalStateException.class)
-    public void noApplicationId() {
-        RestartApplicationRequest.builder().build();
+final class RestartApplicationRequestTest {
+
+    @Test
+    void noApplicationId() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    RestartApplicationRequest.builder().build();
+                });
     }
 
     @Test
-    public void valid() {
+    void valid() {
         RestartApplicationRequest.builder().applicationId("test-application-id").build();
     }
 }
diff --git a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v3/applications/ScaleApplicationRequestTest.java b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v3/applications/ScaleApplicationRequestTest.java
index 33e64f83fb0..3be74cb2839 100644
--- a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v3/applications/ScaleApplicationRequestTest.java
+++ b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v3/applications/ScaleApplicationRequestTest.java
@@ -16,22 +16,32 @@
 
 package org.cloudfoundry.client.v3.applications;
 
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
-public final class ScaleApplicationRequestTest {
+import org.junit.jupiter.api.Test;
 
-    @Test(expected = IllegalStateException.class)
-    public void noApplicationId() {
-        ScaleApplicationRequest.builder().type("web").build();
+final class ScaleApplicationRequestTest {
+
+    @Test
+    void noApplicationId() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    ScaleApplicationRequest.builder().type("web").build();
+                });
     }
 
-    @Test(expected = IllegalStateException.class)
-    public void noType() {
-        ScaleApplicationRequest.builder().applicationId("test-application-id").build();
+    @Test
+    void noType() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    ScaleApplicationRequest.builder().applicationId("test-application-id").build();
+                });
     }
 
     @Test
-    public void valid() {
+    void valid() {
         ScaleApplicationRequest.builder().applicationId("test-application-id").type("web").build();
     }
 }
diff --git a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v3/applications/SetApplicationCurrentDropletRequestTest.java b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v3/applications/SetApplicationCurrentDropletRequestTest.java
index 0e50ef8d8fd..f4e418f549c 100644
--- a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v3/applications/SetApplicationCurrentDropletRequestTest.java
+++ b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v3/applications/SetApplicationCurrentDropletRequestTest.java
@@ -16,25 +16,37 @@
 
 package org.cloudfoundry.client.v3.applications;
 
+import static org.junit.jupiter.api.Assertions.assertThrows;
+
 import org.cloudfoundry.client.v3.Relationship;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
-public final class SetApplicationCurrentDropletRequestTest {
+final class SetApplicationCurrentDropletRequestTest {
 
-    @Test(expected = IllegalStateException.class)
-    public void noApplicationId() {
-        SetApplicationCurrentDropletRequest.builder()
-                .data(Relationship.builder().id("test-droplet-id").build())
-                .build();
+    @Test
+    void noApplicationId() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    SetApplicationCurrentDropletRequest.builder()
+                            .data(Relationship.builder().id("test-droplet-id").build())
+                            .build();
+                });
     }
 
-    @Test(expected = IllegalStateException.class)
-    public void noDropletId() {
-        SetApplicationCurrentDropletRequest.builder().applicationId("test-application-id").build();
+    @Test
+    void noDropletId() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    SetApplicationCurrentDropletRequest.builder()
+                            .applicationId("test-application-id")
+                            .build();
+                });
     }
 
     @Test
-    public void valid() {
+    void valid() {
         SetApplicationCurrentDropletRequest.builder()
                 .applicationId("test-application-id")
                 .data(Relationship.builder().id("test-droplet-id").build())
diff --git a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v3/applications/StartApplicationRequestTest.java b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v3/applications/StartApplicationRequestTest.java
index 2dae453fd94..808a72ec47a 100644
--- a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v3/applications/StartApplicationRequestTest.java
+++ b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v3/applications/StartApplicationRequestTest.java
@@ -16,17 +16,23 @@
 
 package org.cloudfoundry.client.v3.applications;
 
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
-public final class StartApplicationRequestTest {
+import org.junit.jupiter.api.Test;
 
-    @Test(expected = IllegalStateException.class)
-    public void noApplicationId() {
-        StartApplicationRequest.builder().build();
+final class StartApplicationRequestTest {
+
+    @Test
+    void noApplicationId() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    StartApplicationRequest.builder().build();
+                });
     }
 
     @Test
-    public void valid() {
+    void valid() {
         StartApplicationRequest.builder().applicationId("test-application-id").build();
     }
 }
diff --git a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v3/applications/StopApplicationRequestTest.java b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v3/applications/StopApplicationRequestTest.java
index 8c057b2bacb..d3a3e8db4d6 100644
--- a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v3/applications/StopApplicationRequestTest.java
+++ b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v3/applications/StopApplicationRequestTest.java
@@ -16,17 +16,23 @@
 
 package org.cloudfoundry.client.v3.applications;
 
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
-public final class StopApplicationRequestTest {
+import org.junit.jupiter.api.Test;
 
-    @Test(expected = IllegalStateException.class)
-    public void noApplicationId() {
-        StopApplicationRequest.builder().build();
+final class StopApplicationRequestTest {
+
+    @Test
+    void noApplicationId() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    StopApplicationRequest.builder().build();
+                });
     }
 
     @Test
-    public void valid() {
+    void valid() {
         StopApplicationRequest.builder().applicationId("test-application-id").build();
     }
 }
diff --git a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v3/applications/TerminateApplicationInstanceRequestTest.java b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v3/applications/TerminateApplicationInstanceRequestTest.java
index 8a769d75d2b..69ce66acb4f 100644
--- a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v3/applications/TerminateApplicationInstanceRequestTest.java
+++ b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v3/applications/TerminateApplicationInstanceRequestTest.java
@@ -16,33 +16,50 @@
 
 package org.cloudfoundry.client.v3.applications;
 
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
-public final class TerminateApplicationInstanceRequestTest {
+import org.junit.jupiter.api.Test;
 
-    @Test(expected = IllegalStateException.class)
-    public void noApplicationId() {
-        TerminateApplicationInstanceRequest.builder().index("test-index").type("test-type").build();
+final class TerminateApplicationInstanceRequestTest {
+
+    @Test
+    void noApplicationId() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    TerminateApplicationInstanceRequest.builder()
+                            .index("test-index")
+                            .type("test-type")
+                            .build();
+                });
     }
 
-    @Test(expected = IllegalStateException.class)
-    public void noIndex() {
-        TerminateApplicationInstanceRequest.builder()
-                .applicationId("test-application-id")
-                .type("test-type")
-                .build();
+    @Test
+    void noIndex() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    TerminateApplicationInstanceRequest.builder()
+                            .applicationId("test-application-id")
+                            .type("test-type")
+                            .build();
+                });
     }
 
-    @Test(expected = IllegalStateException.class)
-    public void noType() {
-        TerminateApplicationInstanceRequest.builder()
-                .applicationId("test-application-id")
-                .index("test-index")
-                .build();
+    @Test
+    void noType() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    TerminateApplicationInstanceRequest.builder()
+                            .applicationId("test-application-id")
+                            .index("test-index")
+                            .build();
+                });
     }
 
     @Test
-    public void valid() {
+    void valid() {
         TerminateApplicationInstanceRequest.builder()
                 .applicationId("test-application-id")
                 .index("test-index")
diff --git a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v3/applications/UpdateApplicationEnvironmentVariablesRequestTest.java b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v3/applications/UpdateApplicationEnvironmentVariablesRequestTest.java
index b961745e094..c682248dbc4 100644
--- a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v3/applications/UpdateApplicationEnvironmentVariablesRequestTest.java
+++ b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v3/applications/UpdateApplicationEnvironmentVariablesRequestTest.java
@@ -16,17 +16,23 @@
 
 package org.cloudfoundry.client.v3.applications;
 
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
-public final class UpdateApplicationEnvironmentVariablesRequestTest {
+import org.junit.jupiter.api.Test;
 
-    @Test(expected = IllegalStateException.class)
-    public void noApplicationId() {
-        UpdateApplicationEnvironmentVariablesRequest.builder().build();
+final class UpdateApplicationEnvironmentVariablesRequestTest {
+
+    @Test
+    void noApplicationId() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    UpdateApplicationEnvironmentVariablesRequest.builder().build();
+                });
     }
 
     @Test
-    public void valid() {
+    void valid() {
         UpdateApplicationEnvironmentVariablesRequest.builder()
                 .applicationId("test-application-id")
                 .build();
diff --git a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v3/applications/UpdateApplicationFeatureRequestTest.java b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v3/applications/UpdateApplicationFeatureRequestTest.java
index 7df9024f974..25bffaaba8b 100644
--- a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v3/applications/UpdateApplicationFeatureRequestTest.java
+++ b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v3/applications/UpdateApplicationFeatureRequestTest.java
@@ -16,36 +16,50 @@
 
 package org.cloudfoundry.client.v3.applications;
 
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
-public final class UpdateApplicationFeatureRequestTest {
+import org.junit.jupiter.api.Test;
 
-    @Test(expected = IllegalStateException.class)
-    public void noApplicationId() {
-        UpdateApplicationFeatureRequest.builder()
-                .applicationId("test-application-id")
-                .enabled(true)
-                .build();
+final class UpdateApplicationFeatureRequestTest {
+
+    @Test
+    void noApplicationId() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    UpdateApplicationFeatureRequest.builder()
+                            .applicationId("test-application-id")
+                            .enabled(true)
+                            .build();
+                });
     }
 
-    @Test(expected = IllegalStateException.class)
-    public void noEnabled() {
-        UpdateApplicationFeatureRequest.builder()
-                .applicationId("test-application-id")
-                .featureName("test-feature-name")
-                .build();
+    @Test
+    void noEnabled() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    UpdateApplicationFeatureRequest.builder()
+                            .applicationId("test-application-id")
+                            .featureName("test-feature-name")
+                            .build();
+                });
     }
 
-    @Test(expected = IllegalStateException.class)
-    public void noFeatureName() {
-        UpdateApplicationFeatureRequest.builder()
-                .enabled(true)
-                .featureName("test-feature-name")
-                .build();
+    @Test
+    void noFeatureName() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    UpdateApplicationFeatureRequest.builder()
+                            .enabled(true)
+                            .featureName("test-feature-name")
+                            .build();
+                });
     }
 
     @Test
-    public void valid() {
+    void valid() {
         UpdateApplicationFeatureRequest.builder()
                 .applicationId("test-application-id")
                 .enabled(true)
diff --git a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v3/applications/UpdateApplicationRequestTest.java b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v3/applications/UpdateApplicationRequestTest.java
index 3f33e1dfd10..e89fba24795 100644
--- a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v3/applications/UpdateApplicationRequestTest.java
+++ b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v3/applications/UpdateApplicationRequestTest.java
@@ -16,17 +16,23 @@
 
 package org.cloudfoundry.client.v3.applications;
 
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
-public final class UpdateApplicationRequestTest {
+import org.junit.jupiter.api.Test;
 
-    @Test(expected = IllegalStateException.class)
-    public void noApplicationId() {
-        UpdateApplicationRequest.builder().build();
+final class UpdateApplicationRequestTest {
+
+    @Test
+    void noApplicationId() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    UpdateApplicationRequest.builder().build();
+                });
     }
 
     @Test
-    public void valid() {
+    void valid() {
         UpdateApplicationRequest.builder().applicationId("test-application-id").build();
     }
 }
diff --git a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v3/auditevents/GetAuditEventRequestTest.java b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v3/auditevents/GetAuditEventRequestTest.java
index 569d7dfbabb..8df04f393c7 100644
--- a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v3/auditevents/GetAuditEventRequestTest.java
+++ b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v3/auditevents/GetAuditEventRequestTest.java
@@ -16,17 +16,23 @@
 
 package org.cloudfoundry.client.v3.auditevents;
 
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
-public final class GetAuditEventRequestTest {
+import org.junit.jupiter.api.Test;
 
-    @Test(expected = IllegalStateException.class)
-    public void invalid() {
-        GetAuditEventRequest.builder().build();
+final class GetAuditEventRequestTest {
+
+    @Test
+    void invalid() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    GetAuditEventRequest.builder().build();
+                });
     }
 
     @Test
-    public void valid() {
+    void valid() {
         GetAuditEventRequest.builder().eventId("test-event-id").build();
     }
 }
diff --git a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v3/auditevents/ListAuditEventsRequestTest.java b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v3/auditevents/ListAuditEventsRequestTest.java
index b7ebf7b7af9..a9c2ed2c803 100644
--- a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v3/auditevents/ListAuditEventsRequestTest.java
+++ b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v3/auditevents/ListAuditEventsRequestTest.java
@@ -16,17 +16,23 @@
 
 package org.cloudfoundry.client.v3.auditevents;
 
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
-public class ListAuditEventsRequestTest {
+import org.junit.jupiter.api.Test;
 
-    @Test(expected = Exception.class)
-    public void invalidWithNullableCollection() {
-        ListAuditEventsRequest.builder().organizationIds((String[]) null).build();
+class ListAuditEventsRequestTest {
+
+    @Test
+    void invalidWithNullableCollection() {
+        assertThrows(
+                Exception.class,
+                () -> {
+                    ListAuditEventsRequest.builder().organizationIds((String[]) null).build();
+                });
     }
 
     @Test
-    public void valid() {
+    void valid() {
         ListAuditEventsRequest.builder()
                 .organizationIds("organization-id-1", "organization-id-2")
                 .type("test-type")
@@ -36,7 +42,7 @@ public void valid() {
     }
 
     @Test
-    public void validWithEmptyCollections() {
+    void validWithEmptyCollections() {
         ListAuditEventsRequest.builder().build();
     }
 }
diff --git a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v3/buildpacks/CreateBuildpackRequestTest.java b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v3/buildpacks/CreateBuildpackRequestTest.java
index 302a6ea734c..d651d79d3d8 100644
--- a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v3/buildpacks/CreateBuildpackRequestTest.java
+++ b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v3/buildpacks/CreateBuildpackRequestTest.java
@@ -16,17 +16,23 @@
 
 package org.cloudfoundry.client.v3.buildpacks;
 
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
-public final class CreateBuildpackRequestTest {
+import org.junit.jupiter.api.Test;
 
-    @Test(expected = IllegalStateException.class)
-    public void noName() {
-        CreateBuildpackRequest.builder().build();
+final class CreateBuildpackRequestTest {
+
+    @Test
+    void noName() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    CreateBuildpackRequest.builder().build();
+                });
     }
 
     @Test
-    public void valid() {
+    void valid() {
         CreateBuildpackRequest.builder().name("test-buildpack-name").build();
     }
 }
diff --git a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v3/buildpacks/DeleteBuildpackRequestTest.java b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v3/buildpacks/DeleteBuildpackRequestTest.java
index b31e8887709..bfd20111da2 100644
--- a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v3/buildpacks/DeleteBuildpackRequestTest.java
+++ b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v3/buildpacks/DeleteBuildpackRequestTest.java
@@ -16,17 +16,23 @@
 
 package org.cloudfoundry.client.v3.buildpacks;
 
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
-public class DeleteBuildpackRequestTest {
+import org.junit.jupiter.api.Test;
 
-    @Test(expected = IllegalStateException.class)
-    public void noBuildpackId() {
-        DeleteBuildpackRequest.builder().build();
+class DeleteBuildpackRequestTest {
+
+    @Test
+    void noBuildpackId() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    DeleteBuildpackRequest.builder().build();
+                });
     }
 
     @Test
-    public void valid() {
+    void valid() {
         DeleteBuildpackRequest.builder().buildpackId("test-buildpack-id").build();
     }
 }
diff --git a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v3/buildpacks/GetBuildpackRequestTest.java b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v3/buildpacks/GetBuildpackRequestTest.java
index 04da5d1179f..056a192d61d 100644
--- a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v3/buildpacks/GetBuildpackRequestTest.java
+++ b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v3/buildpacks/GetBuildpackRequestTest.java
@@ -16,17 +16,23 @@
 
 package org.cloudfoundry.client.v3.buildpacks;
 
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
-public final class GetBuildpackRequestTest {
+import org.junit.jupiter.api.Test;
 
-    @Test(expected = IllegalStateException.class)
-    public void noBuildpackId() {
-        GetBuildpackRequest.builder().build();
+final class GetBuildpackRequestTest {
+
+    @Test
+    void noBuildpackId() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    GetBuildpackRequest.builder().build();
+                });
     }
 
     @Test
-    public void valid() {
+    void valid() {
         GetBuildpackRequest.builder().buildpackId("test-buildpack-id").build();
     }
 }
diff --git a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v3/buildpacks/ListBuildpacksRequestTest.java b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v3/buildpacks/ListBuildpacksRequestTest.java
index 85cf2ce5f49..133a26e0a79 100644
--- a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v3/buildpacks/ListBuildpacksRequestTest.java
+++ b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v3/buildpacks/ListBuildpacksRequestTest.java
@@ -16,12 +16,12 @@
 
 package org.cloudfoundry.client.v3.buildpacks;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
-public final class ListBuildpacksRequestTest {
+final class ListBuildpacksRequestTest {
 
     @Test
-    public void valid() {
+    void valid() {
         ListBuildpacksRequest.builder().build();
     }
 }
diff --git a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v3/buildpacks/UpdateBuildpackRequestTest.java b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v3/buildpacks/UpdateBuildpackRequestTest.java
index 6dfdc69d6e1..a867cbc2960 100644
--- a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v3/buildpacks/UpdateBuildpackRequestTest.java
+++ b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v3/buildpacks/UpdateBuildpackRequestTest.java
@@ -16,17 +16,23 @@
 
 package org.cloudfoundry.client.v3.buildpacks;
 
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
-public final class UpdateBuildpackRequestTest {
+import org.junit.jupiter.api.Test;
 
-    @Test(expected = IllegalStateException.class)
-    public void noBuildpackId() {
-        UpdateBuildpackRequest.builder().build();
+final class UpdateBuildpackRequestTest {
+
+    @Test
+    void noBuildpackId() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    UpdateBuildpackRequest.builder().build();
+                });
     }
 
     @Test
-    public void valid() {
+    void valid() {
         UpdateBuildpackRequest.builder().buildpackId("test-buildpack-id").build();
     }
 }
diff --git a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v3/buildpacks/UploadBuildpackRequestTest.java b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v3/buildpacks/UploadBuildpackRequestTest.java
index a63264b76ca..41ce1f0e316 100644
--- a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v3/buildpacks/UploadBuildpackRequestTest.java
+++ b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v3/buildpacks/UploadBuildpackRequestTest.java
@@ -16,26 +16,36 @@
 
 package org.cloudfoundry.client.v3.buildpacks;
 
+import static org.junit.jupiter.api.Assertions.assertThrows;
+
 import java.nio.file.Path;
 import java.nio.file.Paths;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
-public final class UploadBuildpackRequestTest {
+final class UploadBuildpackRequestTest {
 
     private static final Path TEST_BUILDPACK = Paths.get("/");
 
-    @Test(expected = IllegalStateException.class)
-    public void noBits() {
-        UploadBuildpackRequest.builder().buildpackId("test-buildpack-id").build();
+    @Test
+    void noBits() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    UploadBuildpackRequest.builder().buildpackId("test-buildpack-id").build();
+                });
     }
 
-    @Test(expected = IllegalStateException.class)
-    public void noBuildpackId() {
-        UploadBuildpackRequest.builder().bits(TEST_BUILDPACK).build();
+    @Test
+    void noBuildpackId() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    UploadBuildpackRequest.builder().bits(TEST_BUILDPACK).build();
+                });
     }
 
     @Test
-    public void valid() {
+    void valid() {
         UploadBuildpackRequest.builder()
                 .bits(TEST_BUILDPACK)
                 .buildpackId("test-buildpack-id")
diff --git a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v3/builds/CreateBuildRequestTest.java b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v3/builds/CreateBuildRequestTest.java
index b4af8151eab..b8d90feea92 100644
--- a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v3/builds/CreateBuildRequestTest.java
+++ b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v3/builds/CreateBuildRequestTest.java
@@ -16,18 +16,24 @@
 
 package org.cloudfoundry.client.v3.builds;
 
+import static org.junit.jupiter.api.Assertions.assertThrows;
+
 import org.cloudfoundry.client.v3.Relationship;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
-public final class CreateBuildRequestTest {
+final class CreateBuildRequestTest {
 
-    @Test(expected = IllegalStateException.class)
-    public void noPackage() {
-        CreateBuildRequest.builder().build();
+    @Test
+    void noPackage() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    CreateBuildRequest.builder().build();
+                });
     }
 
     @Test
-    public void valid() {
+    void valid() {
         CreateBuildRequest.builder()
                 .getPackage(Relationship.builder().id("test-id").build())
                 .build();
diff --git a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v3/builds/GetBuildRequestTest.java b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v3/builds/GetBuildRequestTest.java
index fd268ba3299..92da8db1803 100644
--- a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v3/builds/GetBuildRequestTest.java
+++ b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v3/builds/GetBuildRequestTest.java
@@ -16,17 +16,23 @@
 
 package org.cloudfoundry.client.v3.builds;
 
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
-public final class GetBuildRequestTest {
+import org.junit.jupiter.api.Test;
 
-    @Test(expected = IllegalStateException.class)
-    public void noBuildId() {
-        GetBuildRequest.builder().build();
+final class GetBuildRequestTest {
+
+    @Test
+    void noBuildId() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    GetBuildRequest.builder().build();
+                });
     }
 
     @Test
-    public void valid() {
+    void valid() {
         GetBuildRequest.builder().buildId("test-build-id").build();
     }
 }
diff --git a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v3/builds/ListBuildsRequestTest.java b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v3/builds/ListBuildsRequestTest.java
index 97dbbce391b..2b86372df57 100644
--- a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v3/builds/ListBuildsRequestTest.java
+++ b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v3/builds/ListBuildsRequestTest.java
@@ -16,12 +16,12 @@
 
 package org.cloudfoundry.client.v3.builds;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
-public final class ListBuildsRequestTest {
+final class ListBuildsRequestTest {
 
     @Test
-    public void valid() {
+    void valid() {
         ListBuildsRequest.builder().build();
     }
 }
diff --git a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v3/deployments/CancelDeploymentRequestTest.java b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v3/deployments/CancelDeploymentRequestTest.java
index af0ed07c52d..548b0d152f4 100644
--- a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v3/deployments/CancelDeploymentRequestTest.java
+++ b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v3/deployments/CancelDeploymentRequestTest.java
@@ -16,17 +16,23 @@
 
 package org.cloudfoundry.client.v3.deployments;
 
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
-public final class CancelDeploymentRequestTest {
+import org.junit.jupiter.api.Test;
 
-    @Test(expected = IllegalStateException.class)
-    public void noDeploymentId() {
-        CancelDeploymentRequest.builder().build();
+final class CancelDeploymentRequestTest {
+
+    @Test
+    void noDeploymentId() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    CancelDeploymentRequest.builder().build();
+                });
     }
 
     @Test
-    public void valid() {
+    void valid() {
         CancelDeploymentRequest.builder().deploymentId("test-deployment-id").build();
     }
 }
diff --git a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v3/deployments/CreateDeploymentRequestTest.java b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v3/deployments/CreateDeploymentRequestTest.java
index baa15f506f7..12f08517607 100644
--- a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v3/deployments/CreateDeploymentRequestTest.java
+++ b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v3/deployments/CreateDeploymentRequestTest.java
@@ -16,14 +16,16 @@
 
 package org.cloudfoundry.client.v3.deployments;
 
+import static org.junit.jupiter.api.Assertions.assertThrows;
+
 import org.cloudfoundry.client.v3.Relationship;
 import org.cloudfoundry.client.v3.ToOneRelationship;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
-public final class CreateDeploymentRequestTest {
+final class CreateDeploymentRequestTest {
 
     @Test
-    public void noDropletValid() {
+    void noDropletValid() {
         CreateDeploymentRequest.builder()
                 .relationships(
                         DeploymentRelationships.builder()
@@ -35,15 +37,19 @@ public void noDropletValid() {
                 .build();
     }
 
-    @Test(expected = IllegalStateException.class)
-    public void noRelationships() {
-        CreateDeploymentRequest.builder()
-                .droplet(Relationship.builder().id("droplet-id").build())
-                .build();
+    @Test
+    void noRelationships() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    CreateDeploymentRequest.builder()
+                            .droplet(Relationship.builder().id("droplet-id").build())
+                            .build();
+                });
     }
 
     @Test
-    public void valid() {
+    void valid() {
         CreateDeploymentRequest.builder()
                 .droplet(Relationship.builder().id("droplet-id").build())
                 .relationships(
diff --git a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v3/deployments/GetDeploymentTest.java b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v3/deployments/GetDeploymentTest.java
index 2b88f59146e..c8d6e7185cc 100644
--- a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v3/deployments/GetDeploymentTest.java
+++ b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v3/deployments/GetDeploymentTest.java
@@ -16,17 +16,23 @@
 
 package org.cloudfoundry.client.v3.deployments;
 
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
-public final class GetDeploymentTest {
+import org.junit.jupiter.api.Test;
 
-    @Test(expected = IllegalStateException.class)
-    public void noDeploymentId() {
-        GetDeploymentRequest.builder().build();
+final class GetDeploymentTest {
+
+    @Test
+    void noDeploymentId() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    GetDeploymentRequest.builder().build();
+                });
     }
 
     @Test
-    public void valid() {
+    void valid() {
         GetDeploymentRequest.builder().deploymentId("deployment-id").build();
     }
 }
diff --git a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v3/deployments/ListDeploymentsRequestTest.java b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v3/deployments/ListDeploymentsRequestTest.java
index 8c7ba9b8ff1..d53ff39a44b 100644
--- a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v3/deployments/ListDeploymentsRequestTest.java
+++ b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v3/deployments/ListDeploymentsRequestTest.java
@@ -16,12 +16,12 @@
 
 package org.cloudfoundry.client.v3.deployments;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
-public final class ListDeploymentsRequestTest {
+final class ListDeploymentsRequestTest {
 
     @Test
-    public void valid() {
+    void valid() {
         ListDeploymentsRequest.builder().build();
     }
 }
diff --git a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v3/domains/CheckReservedRoutesRequestTest.java b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v3/domains/CheckReservedRoutesRequestTest.java
index 9ef9505a189..7ea33ab19f0 100644
--- a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v3/domains/CheckReservedRoutesRequestTest.java
+++ b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v3/domains/CheckReservedRoutesRequestTest.java
@@ -16,17 +16,23 @@
 
 package org.cloudfoundry.client.v3.domains;
 
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
-public final class CheckReservedRoutesRequestTest {
+import org.junit.jupiter.api.Test;
 
-    @Test(expected = IllegalStateException.class)
-    public void noDomainId() {
-        CheckReservedRoutesRequest.builder().build();
+final class CheckReservedRoutesRequestTest {
+
+    @Test
+    void noDomainId() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    CheckReservedRoutesRequest.builder().build();
+                });
     }
 
     @Test
-    public void valid() {
+    void valid() {
         CheckReservedRoutesRequest.builder().domainId("test-domain-id").build();
     }
 }
diff --git a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v3/domains/CreateDomainRequestTest.java b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v3/domains/CreateDomainRequestTest.java
index 0d11f90e095..eb7b345d796 100644
--- a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v3/domains/CreateDomainRequestTest.java
+++ b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v3/domains/CreateDomainRequestTest.java
@@ -16,20 +16,26 @@
 
 package org.cloudfoundry.client.v3.domains;
 
+import static org.junit.jupiter.api.Assertions.assertThrows;
+
 import org.cloudfoundry.client.v3.Relationship;
 import org.cloudfoundry.client.v3.ToManyRelationship;
 import org.cloudfoundry.client.v3.ToOneRelationship;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
-public final class CreateDomainRequestTest {
+final class CreateDomainRequestTest {
 
-    @Test(expected = IllegalStateException.class)
-    public void noName() {
-        CreateDomainRequest.builder().build();
+    @Test
+    void noName() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    CreateDomainRequest.builder().build();
+                });
     }
 
     @Test
-    public void valid() {
+    void valid() {
         CreateDomainRequest.builder()
                 .name("test-domain-name")
                 .internal(true)
diff --git a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v3/domains/DeleteDomainRequestTest.java b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v3/domains/DeleteDomainRequestTest.java
index 1bb86a442e6..4d04cb22058 100644
--- a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v3/domains/DeleteDomainRequestTest.java
+++ b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v3/domains/DeleteDomainRequestTest.java
@@ -16,17 +16,23 @@
 
 package org.cloudfoundry.client.v3.domains;
 
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
-public final class DeleteDomainRequestTest {
+import org.junit.jupiter.api.Test;
 
-    @Test(expected = IllegalStateException.class)
-    public void noDomainId() {
-        DeleteDomainRequest.builder().build();
+final class DeleteDomainRequestTest {
+
+    @Test
+    void noDomainId() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    DeleteDomainRequest.builder().build();
+                });
     }
 
     @Test
-    public void valid() {
+    void valid() {
         DeleteDomainRequest.builder().domainId("test-domain-id").build();
     }
 }
diff --git a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v3/domains/GetDomainRequestTest.java b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v3/domains/GetDomainRequestTest.java
index 322f18e6cdd..59c05097259 100644
--- a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v3/domains/GetDomainRequestTest.java
+++ b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v3/domains/GetDomainRequestTest.java
@@ -16,17 +16,23 @@
 
 package org.cloudfoundry.client.v3.domains;
 
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
-public final class GetDomainRequestTest {
+import org.junit.jupiter.api.Test;
 
-    @Test(expected = IllegalStateException.class)
-    public void noDomainId() {
-        GetDomainRequest.builder().build();
+final class GetDomainRequestTest {
+
+    @Test
+    void noDomainId() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    GetDomainRequest.builder().build();
+                });
     }
 
     @Test
-    public void valid() {
+    void valid() {
         GetDomainRequest.builder().domainId("test-domain-id").build();
     }
 }
diff --git a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v3/domains/ListDomainsRequestTest.java b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v3/domains/ListDomainsRequestTest.java
index ca5e247bd91..deec018d139 100644
--- a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v3/domains/ListDomainsRequestTest.java
+++ b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v3/domains/ListDomainsRequestTest.java
@@ -16,12 +16,12 @@
 
 package org.cloudfoundry.client.v3.domains;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
-public final class ListDomainsRequestTest {
+final class ListDomainsRequestTest {
 
     @Test
-    public void valid() {
+    void valid() {
         ListDomainsRequest.builder().build();
     }
 }
diff --git a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v3/domains/ShareDomainRequestTest.java b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v3/domains/ShareDomainRequestTest.java
index c50196728de..6ccf8b1c751 100644
--- a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v3/domains/ShareDomainRequestTest.java
+++ b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v3/domains/ShareDomainRequestTest.java
@@ -16,28 +16,38 @@
 
 package org.cloudfoundry.client.v3.domains;
 
+import static org.junit.jupiter.api.Assertions.assertThrows;
+
 import org.cloudfoundry.client.v3.Relationship;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
-public final class ShareDomainRequestTest {
+final class ShareDomainRequestTest {
 
-    @Test(expected = IllegalStateException.class)
-    public void emptyRelationship() {
-        ShareDomainRequest.builder()
-                .domainId("test-domain-id")
-                .data(Relationship.builder().build())
-                .build();
+    @Test
+    void emptyRelationship() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    ShareDomainRequest.builder()
+                            .domainId("test-domain-id")
+                            .data(Relationship.builder().build())
+                            .build();
+                });
     }
 
-    @Test(expected = IllegalStateException.class)
-    public void noDomainId() {
-        ShareDomainRequest.builder()
-                .data(Relationship.builder().id("shared-organization-id").build())
-                .build();
+    @Test
+    void noDomainId() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    ShareDomainRequest.builder()
+                            .data(Relationship.builder().id("shared-organization-id").build())
+                            .build();
+                });
     }
 
     @Test
-    public void valid() {
+    void valid() {
         ShareDomainRequest.builder()
                 .domainId("test-domain-id")
                 .data(Relationship.builder().id("shared-organization-id").build())
diff --git a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v3/domains/UnshareDomainRequestTest.java b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v3/domains/UnshareDomainRequestTest.java
index f91e2d82e11..62528c20f8b 100644
--- a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v3/domains/UnshareDomainRequestTest.java
+++ b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v3/domains/UnshareDomainRequestTest.java
@@ -16,22 +16,32 @@
 
 package org.cloudfoundry.client.v3.domains;
 
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
-public final class UnshareDomainRequestTest {
+import org.junit.jupiter.api.Test;
 
-    @Test(expected = IllegalStateException.class)
-    public void noDomainId() {
-        UnshareDomainRequest.builder().organizationId("test-org-id").build();
+final class UnshareDomainRequestTest {
+
+    @Test
+    void noDomainId() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    UnshareDomainRequest.builder().organizationId("test-org-id").build();
+                });
     }
 
-    @Test(expected = IllegalStateException.class)
-    public void noOrganizationId() {
-        UnshareDomainRequest.builder().domainId("test-domain-id").build();
+    @Test
+    void noOrganizationId() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    UnshareDomainRequest.builder().domainId("test-domain-id").build();
+                });
     }
 
     @Test
-    public void valid() {
+    void valid() {
         UnshareDomainRequest.builder()
                 .domainId("test-domain-id")
                 .organizationId("test-org-id")
diff --git a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v3/domains/UpdateDomainRequestTest.java b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v3/domains/UpdateDomainRequestTest.java
index 7dff451aefc..06c1b56cb1a 100644
--- a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v3/domains/UpdateDomainRequestTest.java
+++ b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v3/domains/UpdateDomainRequestTest.java
@@ -16,18 +16,24 @@
 
 package org.cloudfoundry.client.v3.domains;
 
+import static org.junit.jupiter.api.Assertions.assertThrows;
+
 import org.cloudfoundry.client.v3.Metadata;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
-public final class UpdateDomainRequestTest {
+final class UpdateDomainRequestTest {
 
-    @Test(expected = IllegalStateException.class)
-    public void noDomainId() {
-        UpdateDomainRequest.builder().build();
+    @Test
+    void noDomainId() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    UpdateDomainRequest.builder().build();
+                });
     }
 
     @Test
-    public void valid() {
+    void valid() {
         UpdateDomainRequest.builder()
                 .domainId("test-domain-id")
                 .metadata(Metadata.builder().label("test-label-key", "test-label-value").build())
diff --git a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v3/droplets/CopyDropletRequestTest.java b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v3/droplets/CopyDropletRequestTest.java
index 1aeb82b2dc5..58216e90025 100644
--- a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v3/droplets/CopyDropletRequestTest.java
+++ b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v3/droplets/CopyDropletRequestTest.java
@@ -16,32 +16,45 @@
 
 package org.cloudfoundry.client.v3.droplets;
 
+import static org.junit.jupiter.api.Assertions.assertThrows;
+
 import org.cloudfoundry.client.v3.Relationship;
 import org.cloudfoundry.client.v3.ToOneRelationship;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
-public final class CopyDropletRequestTest {
+final class CopyDropletRequestTest {
 
-    @Test(expected = IllegalStateException.class)
-    public void noRelationships() {
-        CopyDropletRequest.builder().sourceDropletId("test-source-id").build();
+    @Test
+    void noRelationships() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    CopyDropletRequest.builder().sourceDropletId("test-source-id").build();
+                });
     }
 
-    @Test(expected = IllegalStateException.class)
-    public void noSourceDropletId() {
-        CopyDropletRequest.builder()
-                .relationships(
-                        DropletRelationships.builder()
-                                .application(
-                                        ToOneRelationship.builder()
-                                                .data(Relationship.builder().id("test-id").build())
-                                                .build())
-                                .build())
-                .build();
+    @Test
+    void noSourceDropletId() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    CopyDropletRequest.builder()
+                            .relationships(
+                                    DropletRelationships.builder()
+                                            .application(
+                                                    ToOneRelationship.builder()
+                                                            .data(
+                                                                    Relationship.builder()
+                                                                            .id("test-id")
+                                                                            .build())
+                                                            .build())
+                                            .build())
+                            .build();
+                });
     }
 
     @Test
-    public void valid() {
+    void valid() {
         CopyDropletRequest.builder()
                 .relationships(
                         DropletRelationships.builder()
diff --git a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v3/droplets/DeleteDropletRequestTest.java b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v3/droplets/DeleteDropletRequestTest.java
index a544819600c..f9954e1ad99 100644
--- a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v3/droplets/DeleteDropletRequestTest.java
+++ b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v3/droplets/DeleteDropletRequestTest.java
@@ -16,17 +16,23 @@
 
 package org.cloudfoundry.client.v3.droplets;
 
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
-public final class DeleteDropletRequestTest {
+import org.junit.jupiter.api.Test;
 
-    @Test(expected = IllegalStateException.class)
-    public void noDropletId() {
-        DeleteDropletRequest.builder().build();
+final class DeleteDropletRequestTest {
+
+    @Test
+    void noDropletId() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    DeleteDropletRequest.builder().build();
+                });
     }
 
     @Test
-    public void valid() {
+    void valid() {
         DeleteDropletRequest.builder().dropletId("test-droplet-id").build();
     }
 }
diff --git a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v3/droplets/GetDropletRequestTest.java b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v3/droplets/GetDropletRequestTest.java
index 6d0f9693d94..99d5688c685 100644
--- a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v3/droplets/GetDropletRequestTest.java
+++ b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v3/droplets/GetDropletRequestTest.java
@@ -16,17 +16,23 @@
 
 package org.cloudfoundry.client.v3.droplets;
 
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
-public final class GetDropletRequestTest {
+import org.junit.jupiter.api.Test;
 
-    @Test(expected = IllegalStateException.class)
-    public void noDropletId() {
-        GetDropletRequest.builder().build();
+final class GetDropletRequestTest {
+
+    @Test
+    void noDropletId() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    GetDropletRequest.builder().build();
+                });
     }
 
     @Test
-    public void valid() {
+    void valid() {
         GetDropletRequest.builder().dropletId("test-droplet-id").build();
     }
 }
diff --git a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v3/droplets/ListDropletsRequestTest.java b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v3/droplets/ListDropletsRequestTest.java
index 85ab08b590b..020c4ae483e 100644
--- a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v3/droplets/ListDropletsRequestTest.java
+++ b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v3/droplets/ListDropletsRequestTest.java
@@ -16,12 +16,12 @@
 
 package org.cloudfoundry.client.v3.droplets;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
-public final class ListDropletsRequestTest {
+final class ListDropletsRequestTest {
 
     @Test
-    public void valid() {
+    void valid() {
         ListDropletsRequest.builder().build();
     }
 }
diff --git a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v3/isolationsegments/AddIsolationSegmentOrganizationEntitlementRequestTest.java b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v3/isolationsegments/AddIsolationSegmentOrganizationEntitlementRequestTest.java
index b14b446e9c0..34a1ab0f5e8 100644
--- a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v3/isolationsegments/AddIsolationSegmentOrganizationEntitlementRequestTest.java
+++ b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v3/isolationsegments/AddIsolationSegmentOrganizationEntitlementRequestTest.java
@@ -16,20 +16,26 @@
 
 package org.cloudfoundry.client.v3.isolationsegments;
 
+import static org.junit.jupiter.api.Assertions.assertThrows;
+
 import org.cloudfoundry.client.v3.Relationship;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
-public final class AddIsolationSegmentOrganizationEntitlementRequestTest {
+final class AddIsolationSegmentOrganizationEntitlementRequestTest {
 
-    @Test(expected = IllegalStateException.class)
-    public void noIsolationSegmentId() {
-        AddIsolationSegmentOrganizationEntitlementRequest.builder()
-                .data(Relationship.builder().id("test-organization-id").build())
-                .build();
+    @Test
+    void noIsolationSegmentId() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    AddIsolationSegmentOrganizationEntitlementRequest.builder()
+                            .data(Relationship.builder().id("test-organization-id").build())
+                            .build();
+                });
     }
 
     @Test
-    public void valid() {
+    void valid() {
         AddIsolationSegmentOrganizationEntitlementRequest.builder()
                 .isolationSegmentId("test-isolation-segment-id")
                 .build();
diff --git a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v3/isolationsegments/CreateIsolationSegmentRequestTest.java b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v3/isolationsegments/CreateIsolationSegmentRequestTest.java
index 184bdccb517..c057c8f79f5 100644
--- a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v3/isolationsegments/CreateIsolationSegmentRequestTest.java
+++ b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v3/isolationsegments/CreateIsolationSegmentRequestTest.java
@@ -16,17 +16,23 @@
 
 package org.cloudfoundry.client.v3.isolationsegments;
 
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
-public final class CreateIsolationSegmentRequestTest {
+import org.junit.jupiter.api.Test;
 
-    @Test(expected = IllegalStateException.class)
-    public void noName() {
-        CreateIsolationSegmentRequest.builder().build();
+final class CreateIsolationSegmentRequestTest {
+
+    @Test
+    void noName() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    CreateIsolationSegmentRequest.builder().build();
+                });
     }
 
     @Test
-    public void valid() {
+    void valid() {
         CreateIsolationSegmentRequest.builder().name("test-name").build();
     }
 }
diff --git a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v3/isolationsegments/DeleteIsolationSegmentRequestTest.java b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v3/isolationsegments/DeleteIsolationSegmentRequestTest.java
index 6864c86abc6..42e2e0514f8 100644
--- a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v3/isolationsegments/DeleteIsolationSegmentRequestTest.java
+++ b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v3/isolationsegments/DeleteIsolationSegmentRequestTest.java
@@ -16,17 +16,23 @@
 
 package org.cloudfoundry.client.v3.isolationsegments;
 
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
-public final class DeleteIsolationSegmentRequestTest {
+import org.junit.jupiter.api.Test;
 
-    @Test(expected = IllegalStateException.class)
-    public void noId() {
-        DeleteIsolationSegmentRequest.builder().build();
+final class DeleteIsolationSegmentRequestTest {
+
+    @Test
+    void noId() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    DeleteIsolationSegmentRequest.builder().build();
+                });
     }
 
     @Test
-    public void valid() {
+    void valid() {
         DeleteIsolationSegmentRequest.builder().isolationSegmentId("test-id").build();
     }
 }
diff --git a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v3/isolationsegments/GetIsolationSegmentRequestTest.java b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v3/isolationsegments/GetIsolationSegmentRequestTest.java
index 4a67dc02ae0..52a974f12dc 100644
--- a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v3/isolationsegments/GetIsolationSegmentRequestTest.java
+++ b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v3/isolationsegments/GetIsolationSegmentRequestTest.java
@@ -16,17 +16,23 @@
 
 package org.cloudfoundry.client.v3.isolationsegments;
 
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
-public final class GetIsolationSegmentRequestTest {
+import org.junit.jupiter.api.Test;
 
-    @Test(expected = IllegalStateException.class)
-    public void noId() {
-        GetIsolationSegmentRequest.builder().build();
+final class GetIsolationSegmentRequestTest {
+
+    @Test
+    void noId() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    GetIsolationSegmentRequest.builder().build();
+                });
     }
 
     @Test
-    public void valid() {
+    void valid() {
         GetIsolationSegmentRequest.builder().isolationSegmentId("test-id").build();
     }
 }
diff --git a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v3/isolationsegments/ListIsolationSegmentEntitledOrganizationsRequestTest.java b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v3/isolationsegments/ListIsolationSegmentEntitledOrganizationsRequestTest.java
index ea074cea2d8..b5b274323b8 100644
--- a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v3/isolationsegments/ListIsolationSegmentEntitledOrganizationsRequestTest.java
+++ b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v3/isolationsegments/ListIsolationSegmentEntitledOrganizationsRequestTest.java
@@ -16,17 +16,23 @@
 
 package org.cloudfoundry.client.v3.isolationsegments;
 
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
-public final class ListIsolationSegmentEntitledOrganizationsRequestTest {
+import org.junit.jupiter.api.Test;
 
-    @Test(expected = IllegalStateException.class)
-    public void noId() {
-        ListIsolationSegmentEntitledOrganizationsRequest.builder().build();
+final class ListIsolationSegmentEntitledOrganizationsRequestTest {
+
+    @Test
+    void noId() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    ListIsolationSegmentEntitledOrganizationsRequest.builder().build();
+                });
     }
 
     @Test
-    public void valid() {
+    void valid() {
         ListIsolationSegmentEntitledOrganizationsRequest.builder()
                 .isolationSegmentId("test-isolation-segment-id")
                 .build();
diff --git a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v3/isolationsegments/ListIsolationSegmentOrganizationsRelationshipRequestTest.java b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v3/isolationsegments/ListIsolationSegmentOrganizationsRelationshipRequestTest.java
index a445a36d347..16bb9b2c318 100644
--- a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v3/isolationsegments/ListIsolationSegmentOrganizationsRelationshipRequestTest.java
+++ b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v3/isolationsegments/ListIsolationSegmentOrganizationsRelationshipRequestTest.java
@@ -16,17 +16,23 @@
 
 package org.cloudfoundry.client.v3.isolationsegments;
 
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
-public final class ListIsolationSegmentOrganizationsRelationshipRequestTest {
+import org.junit.jupiter.api.Test;
 
-    @Test(expected = IllegalStateException.class)
-    public void noIsolationSegmentId() {
-        ListIsolationSegmentOrganizationsRelationshipRequest.builder().build();
+final class ListIsolationSegmentOrganizationsRelationshipRequestTest {
+
+    @Test
+    void noIsolationSegmentId() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    ListIsolationSegmentOrganizationsRelationshipRequest.builder().build();
+                });
     }
 
     @Test
-    public void valid() {
+    void valid() {
         ListIsolationSegmentOrganizationsRelationshipRequest.builder()
                 .isolationSegmentId("test-isolation-segment-id")
                 .build();
diff --git a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v3/isolationsegments/ListIsolationSegmentSpacesRelationshipRequestTest.java b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v3/isolationsegments/ListIsolationSegmentSpacesRelationshipRequestTest.java
index 460cbc15b0a..30bdc449792 100644
--- a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v3/isolationsegments/ListIsolationSegmentSpacesRelationshipRequestTest.java
+++ b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v3/isolationsegments/ListIsolationSegmentSpacesRelationshipRequestTest.java
@@ -16,17 +16,23 @@
 
 package org.cloudfoundry.client.v3.isolationsegments;
 
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
-public final class ListIsolationSegmentSpacesRelationshipRequestTest {
+import org.junit.jupiter.api.Test;
 
-    @Test(expected = IllegalStateException.class)
-    public void noIsolationSegmentId() {
-        ListIsolationSegmentSpacesRelationshipRequest.builder().build();
+final class ListIsolationSegmentSpacesRelationshipRequestTest {
+
+    @Test
+    void noIsolationSegmentId() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    ListIsolationSegmentSpacesRelationshipRequest.builder().build();
+                });
     }
 
     @Test
-    public void valid() {
+    void valid() {
         ListIsolationSegmentSpacesRelationshipRequest.builder()
                 .isolationSegmentId("test-isolation-segment-id")
                 .build();
diff --git a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v3/isolationsegments/ListIsolationSegmentsRequestTest.java b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v3/isolationsegments/ListIsolationSegmentsRequestTest.java
index 634219b07b2..5ef5d75cf94 100644
--- a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v3/isolationsegments/ListIsolationSegmentsRequestTest.java
+++ b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v3/isolationsegments/ListIsolationSegmentsRequestTest.java
@@ -16,12 +16,12 @@
 
 package org.cloudfoundry.client.v3.isolationsegments;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
-public final class ListIsolationSegmentsRequestTest {
+final class ListIsolationSegmentsRequestTest {
 
     @Test
-    public void valid() {
+    void valid() {
         ListIsolationSegmentsRequest.builder().build();
     }
 }
diff --git a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v3/isolationsegments/RemoveIsolationSegmentOrganizationEntitlementRequestTest.java b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v3/isolationsegments/RemoveIsolationSegmentOrganizationEntitlementRequestTest.java
index d8d5450cfea..1e16c49d757 100644
--- a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v3/isolationsegments/RemoveIsolationSegmentOrganizationEntitlementRequestTest.java
+++ b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v3/isolationsegments/RemoveIsolationSegmentOrganizationEntitlementRequestTest.java
@@ -16,26 +16,36 @@
 
 package org.cloudfoundry.client.v3.isolationsegments;
 
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
-public final class RemoveIsolationSegmentOrganizationEntitlementRequestTest {
+import org.junit.jupiter.api.Test;
 
-    @Test(expected = IllegalStateException.class)
-    public void noIsolationSegmentId() {
-        RemoveIsolationSegmentOrganizationEntitlementRequest.builder()
-                .organizationId("test-organization-id")
-                .build();
+final class RemoveIsolationSegmentOrganizationEntitlementRequestTest {
+
+    @Test
+    void noIsolationSegmentId() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    RemoveIsolationSegmentOrganizationEntitlementRequest.builder()
+                            .organizationId("test-organization-id")
+                            .build();
+                });
     }
 
-    @Test(expected = IllegalStateException.class)
-    public void noOrganizationId() {
-        RemoveIsolationSegmentOrganizationEntitlementRequest.builder()
-                .isolationSegmentId("test-isolation-segment-id")
-                .build();
+    @Test
+    void noOrganizationId() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    RemoveIsolationSegmentOrganizationEntitlementRequest.builder()
+                            .isolationSegmentId("test-isolation-segment-id")
+                            .build();
+                });
     }
 
     @Test
-    public void valid() {
+    void valid() {
         RemoveIsolationSegmentOrganizationEntitlementRequest.builder()
                 .isolationSegmentId("test-isolation-segment-id")
                 .organizationId("test-organization-id")
diff --git a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v3/isolationsegments/UpdateIsolationSegmentRequestTest.java b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v3/isolationsegments/UpdateIsolationSegmentRequestTest.java
index 3e8b4cb5d53..088e67daa93 100644
--- a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v3/isolationsegments/UpdateIsolationSegmentRequestTest.java
+++ b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v3/isolationsegments/UpdateIsolationSegmentRequestTest.java
@@ -16,22 +16,32 @@
 
 package org.cloudfoundry.client.v3.isolationsegments;
 
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
-public final class UpdateIsolationSegmentRequestTest {
+import org.junit.jupiter.api.Test;
 
-    @Test(expected = IllegalStateException.class)
-    public void noId() {
-        UpdateIsolationSegmentRequest.builder().name("test-name").build();
+final class UpdateIsolationSegmentRequestTest {
+
+    @Test
+    void noId() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    UpdateIsolationSegmentRequest.builder().name("test-name").build();
+                });
     }
 
-    @Test(expected = IllegalStateException.class)
-    public void noName() {
-        UpdateIsolationSegmentRequest.builder().isolationSegmentId("test-id").build();
+    @Test
+    void noName() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    UpdateIsolationSegmentRequest.builder().isolationSegmentId("test-id").build();
+                });
     }
 
     @Test
-    public void valid() {
+    void valid() {
         UpdateIsolationSegmentRequest.builder()
                 .isolationSegmentId("test-id")
                 .name("test-name")
diff --git a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v3/organizations/AssignOrganizationDefaultIsolationSegmentRequestTest.java b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v3/organizations/AssignOrganizationDefaultIsolationSegmentRequestTest.java
index 6fbb3a2b29c..f41911de2a5 100644
--- a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v3/organizations/AssignOrganizationDefaultIsolationSegmentRequestTest.java
+++ b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v3/organizations/AssignOrganizationDefaultIsolationSegmentRequestTest.java
@@ -16,20 +16,26 @@
 
 package org.cloudfoundry.client.v3.organizations;
 
+import static org.junit.jupiter.api.Assertions.assertThrows;
+
 import org.cloudfoundry.client.v3.Relationship;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
-public final class AssignOrganizationDefaultIsolationSegmentRequestTest {
+final class AssignOrganizationDefaultIsolationSegmentRequestTest {
 
-    @Test(expected = IllegalStateException.class)
-    public void noOrganizationId() {
-        AssignOrganizationDefaultIsolationSegmentRequest.builder()
-                .data(Relationship.builder().id("test-isolation-segment-id").build())
-                .build();
+    @Test
+    void noOrganizationId() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    AssignOrganizationDefaultIsolationSegmentRequest.builder()
+                            .data(Relationship.builder().id("test-isolation-segment-id").build())
+                            .build();
+                });
     }
 
     @Test
-    public void validData() {
+    void validData() {
         AssignOrganizationDefaultIsolationSegmentRequest.builder()
                 .data(Relationship.builder().id("test-isolation-segment-id").build())
                 .organizationId("test-organization-id")
@@ -37,7 +43,7 @@ public void validData() {
     }
 
     @Test
-    public void validNoData() {
+    void validNoData() {
         AssignOrganizationDefaultIsolationSegmentRequest.builder()
                 .organizationId("test-organization-id")
                 .build();
diff --git a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v3/organizations/CreateOrganizationRequestTest.java b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v3/organizations/CreateOrganizationRequestTest.java
index 0a1361e06c3..36f9e8e5a6e 100644
--- a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v3/organizations/CreateOrganizationRequestTest.java
+++ b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v3/organizations/CreateOrganizationRequestTest.java
@@ -16,17 +16,23 @@
 
 package org.cloudfoundry.client.v3.organizations;
 
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
-public final class CreateOrganizationRequestTest {
+import org.junit.jupiter.api.Test;
 
-    @Test(expected = IllegalStateException.class)
-    public void noName() {
-        CreateOrganizationRequest.builder().build();
+final class CreateOrganizationRequestTest {
+
+    @Test
+    void noName() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    CreateOrganizationRequest.builder().build();
+                });
     }
 
     @Test
-    public void valid() {
+    void valid() {
         CreateOrganizationRequest.builder().name("test-name").build();
     }
 }
diff --git a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v3/organizations/DeleteOrganizationRequestTest.java b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v3/organizations/DeleteOrganizationRequestTest.java
index d8a3c6b2856..d76a8b7d6dc 100644
--- a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v3/organizations/DeleteOrganizationRequestTest.java
+++ b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v3/organizations/DeleteOrganizationRequestTest.java
@@ -16,17 +16,23 @@
 
 package org.cloudfoundry.client.v3.organizations;
 
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
-public final class DeleteOrganizationRequestTest {
+import org.junit.jupiter.api.Test;
 
-    @Test(expected = IllegalStateException.class)
-    public void noOrganizationId() {
-        GetOrganizationRequest.builder().build();
+final class DeleteOrganizationRequestTest {
+
+    @Test
+    void noOrganizationId() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    GetOrganizationRequest.builder().build();
+                });
     }
 
     @Test
-    public void valid() {
+    void valid() {
         GetOrganizationRequest.builder().organizationId("test-id").build();
     }
 }
diff --git a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v3/organizations/GetOrganizationDefaultIsolationSegmentRequestTest.java b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v3/organizations/GetOrganizationDefaultIsolationSegmentRequestTest.java
index 8ae39575995..aa469ff4ef5 100644
--- a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v3/organizations/GetOrganizationDefaultIsolationSegmentRequestTest.java
+++ b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v3/organizations/GetOrganizationDefaultIsolationSegmentRequestTest.java
@@ -16,17 +16,23 @@
 
 package org.cloudfoundry.client.v3.organizations;
 
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
-public final class GetOrganizationDefaultIsolationSegmentRequestTest {
+import org.junit.jupiter.api.Test;
 
-    @Test(expected = IllegalStateException.class)
-    public void noOrganizationId() {
-        GetOrganizationDefaultIsolationSegmentRequest.builder().build();
+final class GetOrganizationDefaultIsolationSegmentRequestTest {
+
+    @Test
+    void noOrganizationId() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    GetOrganizationDefaultIsolationSegmentRequest.builder().build();
+                });
     }
 
     @Test
-    public void valid() {
+    void valid() {
         GetOrganizationDefaultIsolationSegmentRequest.builder()
                 .organizationId("test-organization-id")
                 .build();
diff --git a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v3/organizations/GetOrganizationRequestTest.java b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v3/organizations/GetOrganizationRequestTest.java
index 269ffdf280d..647a9f73ccc 100644
--- a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v3/organizations/GetOrganizationRequestTest.java
+++ b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v3/organizations/GetOrganizationRequestTest.java
@@ -16,17 +16,23 @@
 
 package org.cloudfoundry.client.v3.organizations;
 
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
-public final class GetOrganizationRequestTest {
+import org.junit.jupiter.api.Test;
 
-    @Test(expected = IllegalStateException.class)
-    public void noOrganizationId() {
-        GetOrganizationRequest.builder().build();
+final class GetOrganizationRequestTest {
+
+    @Test
+    void noOrganizationId() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    GetOrganizationRequest.builder().build();
+                });
     }
 
     @Test
-    public void valid() {
+    void valid() {
         GetOrganizationRequest.builder().organizationId("test-id").build();
     }
 }
diff --git a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v3/organizations/GetOrganizationUsageSummaryRequestTest.java b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v3/organizations/GetOrganizationUsageSummaryRequestTest.java
index d16a986c28f..539c717d092 100644
--- a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v3/organizations/GetOrganizationUsageSummaryRequestTest.java
+++ b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v3/organizations/GetOrganizationUsageSummaryRequestTest.java
@@ -16,17 +16,23 @@
 
 package org.cloudfoundry.client.v3.organizations;
 
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
-public final class GetOrganizationUsageSummaryRequestTest {
+import org.junit.jupiter.api.Test;
 
-    @Test(expected = IllegalStateException.class)
-    public void noOrganizationId() {
-        GetOrganizationRequest.builder().build();
+final class GetOrganizationUsageSummaryRequestTest {
+
+    @Test
+    void noOrganizationId() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    GetOrganizationRequest.builder().build();
+                });
     }
 
     @Test
-    public void valid() {
+    void valid() {
         GetOrganizationRequest.builder().organizationId("test-id").build();
     }
 }
diff --git a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v3/organizations/ListOrganizationDomainsRequestTest.java b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v3/organizations/ListOrganizationDomainsRequestTest.java
index 437345f5698..8cfe13ae8c7 100644
--- a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v3/organizations/ListOrganizationDomainsRequestTest.java
+++ b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v3/organizations/ListOrganizationDomainsRequestTest.java
@@ -16,17 +16,23 @@
 
 package org.cloudfoundry.client.v3.organizations;
 
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
-public final class ListOrganizationDomainsRequestTest {
+import org.junit.jupiter.api.Test;
 
-    @Test(expected = IllegalStateException.class)
-    public void noOrganizationId() {
-        ListOrganizationDomainsRequest.builder().build();
+final class ListOrganizationDomainsRequestTest {
+
+    @Test
+    void noOrganizationId() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    ListOrganizationDomainsRequest.builder().build();
+                });
     }
 
     @Test
-    public void valid() {
+    void valid() {
         ListOrganizationDomainsRequest.builder().organizationId("test-organization-id").build();
     }
 }
diff --git a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v3/organizations/ListOrganizationsRequestTest.java b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v3/organizations/ListOrganizationsRequestTest.java
index b4189929597..c13dd848c9f 100644
--- a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v3/organizations/ListOrganizationsRequestTest.java
+++ b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v3/organizations/ListOrganizationsRequestTest.java
@@ -16,12 +16,12 @@
 
 package org.cloudfoundry.client.v3.organizations;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
-public final class ListOrganizationsRequestTest {
+final class ListOrganizationsRequestTest {
 
     @Test
-    public void valid() {
+    void valid() {
         ListOrganizationsRequest.builder().build();
     }
 }
diff --git a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v3/packages/CopyPackageRequestTest.java b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v3/packages/CopyPackageRequestTest.java
index b20d7cdb414..61e3308ecf6 100644
--- a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v3/packages/CopyPackageRequestTest.java
+++ b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v3/packages/CopyPackageRequestTest.java
@@ -16,32 +16,45 @@
 
 package org.cloudfoundry.client.v3.packages;
 
+import static org.junit.jupiter.api.Assertions.assertThrows;
+
 import org.cloudfoundry.client.v3.Relationship;
 import org.cloudfoundry.client.v3.ToOneRelationship;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
-public final class CopyPackageRequestTest {
+final class CopyPackageRequestTest {
 
-    @Test(expected = IllegalStateException.class)
-    public void noRelationships() {
-        CopyPackageRequest.builder().sourcePackageId("test-source-package-id").build();
+    @Test
+    void noRelationships() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    CopyPackageRequest.builder().sourcePackageId("test-source-package-id").build();
+                });
     }
 
-    @Test(expected = IllegalStateException.class)
-    public void noSourcePackageId() {
-        CopyPackageRequest.builder()
-                .relationships(
-                        PackageRelationships.builder()
-                                .application(
-                                        ToOneRelationship.builder()
-                                                .data(Relationship.builder().id("test-id").build())
-                                                .build())
-                                .build())
-                .build();
+    @Test
+    void noSourcePackageId() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    CopyPackageRequest.builder()
+                            .relationships(
+                                    PackageRelationships.builder()
+                                            .application(
+                                                    ToOneRelationship.builder()
+                                                            .data(
+                                                                    Relationship.builder()
+                                                                            .id("test-id")
+                                                                            .build())
+                                                            .build())
+                                            .build())
+                            .build();
+                });
     }
 
     @Test
-    public void valid() {
+    void valid() {
         CopyPackageRequest.builder()
                 .relationships(
                         PackageRelationships.builder()
diff --git a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v3/packages/CreatePackageRequestTest.java b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v3/packages/CreatePackageRequestTest.java
index 86f4685b901..3e53eae93e0 100644
--- a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v3/packages/CreatePackageRequestTest.java
+++ b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v3/packages/CreatePackageRequestTest.java
@@ -17,34 +17,49 @@
 package org.cloudfoundry.client.v3.packages;
 
 import static org.cloudfoundry.client.v3.packages.PackageType.BITS;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
 import org.cloudfoundry.client.v3.Relationship;
 import org.cloudfoundry.client.v3.ToOneRelationship;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
-public final class CreatePackageRequestTest {
+final class CreatePackageRequestTest {
 
-    @Test(expected = IllegalStateException.class)
-    public void noRelationships() {
-        CreatePackageRequest.builder().data(BitsData.builder().build()).type(BITS).build();
+    @Test
+    void noRelationships() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    CreatePackageRequest.builder()
+                            .data(BitsData.builder().build())
+                            .type(BITS)
+                            .build();
+                });
     }
 
-    @Test(expected = IllegalStateException.class)
-    public void noType() {
-        CreatePackageRequest.builder()
-                .data(BitsData.builder().build())
-                .relationships(
-                        PackageRelationships.builder()
-                                .application(
-                                        ToOneRelationship.builder()
-                                                .data(Relationship.builder().id("test-id").build())
-                                                .build())
-                                .build())
-                .build();
+    @Test
+    void noType() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    CreatePackageRequest.builder()
+                            .data(BitsData.builder().build())
+                            .relationships(
+                                    PackageRelationships.builder()
+                                            .application(
+                                                    ToOneRelationship.builder()
+                                                            .data(
+                                                                    Relationship.builder()
+                                                                            .id("test-id")
+                                                                            .build())
+                                                            .build())
+                                            .build())
+                            .build();
+                });
     }
 
     @Test
-    public void valid() {
+    void valid() {
         CreatePackageRequest.builder()
                 .data(BitsData.builder().build())
                 .relationships(
diff --git a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v3/packages/DeletePackageRequestTest.java b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v3/packages/DeletePackageRequestTest.java
index 16b3a9c1041..62aad388674 100644
--- a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v3/packages/DeletePackageRequestTest.java
+++ b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v3/packages/DeletePackageRequestTest.java
@@ -16,17 +16,23 @@
 
 package org.cloudfoundry.client.v3.packages;
 
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
-public final class DeletePackageRequestTest {
+import org.junit.jupiter.api.Test;
 
-    @Test(expected = IllegalStateException.class)
-    public void noPackageId() {
-        DeletePackageRequest.builder().build();
+final class DeletePackageRequestTest {
+
+    @Test
+    void noPackageId() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    DeletePackageRequest.builder().build();
+                });
     }
 
     @Test
-    public void valid() {
+    void valid() {
         DeletePackageRequest.builder().packageId("test-package-id").build();
     }
 }
diff --git a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v3/packages/DownloadPackageRequestTest.java b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v3/packages/DownloadPackageRequestTest.java
index 51f451a0644..f3554b4b63a 100644
--- a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v3/packages/DownloadPackageRequestTest.java
+++ b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v3/packages/DownloadPackageRequestTest.java
@@ -16,17 +16,23 @@
 
 package org.cloudfoundry.client.v3.packages;
 
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
-public final class DownloadPackageRequestTest {
+import org.junit.jupiter.api.Test;
 
-    @Test(expected = IllegalStateException.class)
-    public void noPackageId() {
-        DownloadPackageRequest.builder().build();
+final class DownloadPackageRequestTest {
+
+    @Test
+    void noPackageId() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    DownloadPackageRequest.builder().build();
+                });
     }
 
     @Test
-    public void valid() {
+    void valid() {
         DownloadPackageRequest.builder().packageId("test-package-id").build();
     }
 }
diff --git a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v3/packages/GetPackageRequestTest.java b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v3/packages/GetPackageRequestTest.java
index 4aacb035792..5edc4f7ec01 100644
--- a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v3/packages/GetPackageRequestTest.java
+++ b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v3/packages/GetPackageRequestTest.java
@@ -16,17 +16,23 @@
 
 package org.cloudfoundry.client.v3.packages;
 
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
-public final class GetPackageRequestTest {
+import org.junit.jupiter.api.Test;
 
-    @Test(expected = IllegalStateException.class)
-    public void noPackageId() {
-        GetPackageRequest.builder().build();
+final class GetPackageRequestTest {
+
+    @Test
+    void noPackageId() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    GetPackageRequest.builder().build();
+                });
     }
 
     @Test
-    public void valid() {
+    void valid() {
         GetPackageRequest.builder().packageId("test-package-id").build();
     }
 }
diff --git a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v3/packages/ListPackageDropletsRequestTest.java b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v3/packages/ListPackageDropletsRequestTest.java
index f3bdf84f581..26c192d3c83 100644
--- a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v3/packages/ListPackageDropletsRequestTest.java
+++ b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v3/packages/ListPackageDropletsRequestTest.java
@@ -16,17 +16,23 @@
 
 package org.cloudfoundry.client.v3.packages;
 
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
-public final class ListPackageDropletsRequestTest {
+import org.junit.jupiter.api.Test;
 
-    @Test(expected = IllegalStateException.class)
-    public void noPackageId() {
-        ListPackageDropletsRequest.builder().build();
+final class ListPackageDropletsRequestTest {
+
+    @Test
+    void noPackageId() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    ListPackageDropletsRequest.builder().build();
+                });
     }
 
     @Test
-    public void valid() {
+    void valid() {
         ListPackageDropletsRequest.builder().packageId("test-package-id").build();
     }
 }
diff --git a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v3/packages/ListPackagesRequestTest.java b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v3/packages/ListPackagesRequestTest.java
index 9178d69937f..ce69b412f28 100644
--- a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v3/packages/ListPackagesRequestTest.java
+++ b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v3/packages/ListPackagesRequestTest.java
@@ -16,12 +16,12 @@
 
 package org.cloudfoundry.client.v3.packages;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
-public final class ListPackagesRequestTest {
+final class ListPackagesRequestTest {
 
     @Test
-    public void valid() {
+    void valid() {
         ListPackagesRequest.builder().build();
     }
 }
diff --git a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v3/packages/UploadPackageRequestTest.java b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v3/packages/UploadPackageRequestTest.java
index 78478b12f70..2c35a6654b1 100644
--- a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v3/packages/UploadPackageRequestTest.java
+++ b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v3/packages/UploadPackageRequestTest.java
@@ -16,26 +16,36 @@
 
 package org.cloudfoundry.client.v3.packages;
 
+import static org.junit.jupiter.api.Assertions.assertThrows;
+
 import java.nio.file.Path;
 import java.nio.file.Paths;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
-public final class UploadPackageRequestTest {
+final class UploadPackageRequestTest {
 
     private static final Path TEST_PACKAGE = Paths.get("/");
 
-    @Test(expected = IllegalStateException.class)
-    public void neitherBitsNorResources() {
-        UploadPackageRequest.builder().packageId("test-package-id").build();
+    @Test
+    void neitherBitsNorResources() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    UploadPackageRequest.builder().packageId("test-package-id").build();
+                });
     }
 
-    @Test(expected = IllegalStateException.class)
-    public void noPackageId() {
-        UploadPackageRequest.builder().bits(TEST_PACKAGE).build();
+    @Test
+    void noPackageId() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    UploadPackageRequest.builder().bits(TEST_PACKAGE).build();
+                });
     }
 
     @Test
-    public void valid() {
+    void valid() {
         UploadPackageRequest.builder().bits(TEST_PACKAGE).packageId("test-package-id").build();
     }
 }
diff --git a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v3/processes/GetProcessRequestTest.java b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v3/processes/GetProcessRequestTest.java
index 6c462ae6739..543f6bb8e89 100644
--- a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v3/processes/GetProcessRequestTest.java
+++ b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v3/processes/GetProcessRequestTest.java
@@ -16,17 +16,23 @@
 
 package org.cloudfoundry.client.v3.processes;
 
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
-public final class GetProcessRequestTest {
+import org.junit.jupiter.api.Test;
 
-    @Test(expected = IllegalStateException.class)
-    public void noProcessId() {
-        GetProcessRequest.builder().build();
+final class GetProcessRequestTest {
+
+    @Test
+    void noProcessId() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    GetProcessRequest.builder().build();
+                });
     }
 
     @Test
-    public void valid() {
+    void valid() {
         GetProcessRequest.builder().processId("test-process-id").build();
     }
 }
diff --git a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v3/processes/GetProcessStatisticsRequestTest.java b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v3/processes/GetProcessStatisticsRequestTest.java
index 20dc7d04d16..bd0b94f369d 100644
--- a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v3/processes/GetProcessStatisticsRequestTest.java
+++ b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v3/processes/GetProcessStatisticsRequestTest.java
@@ -16,17 +16,23 @@
 
 package org.cloudfoundry.client.v3.processes;
 
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
-public final class GetProcessStatisticsRequestTest {
+import org.junit.jupiter.api.Test;
 
-    @Test(expected = IllegalStateException.class)
-    public void noProcessId() {
-        GetProcessStatisticsRequest.builder().build();
+final class GetProcessStatisticsRequestTest {
+
+    @Test
+    void noProcessId() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    GetProcessStatisticsRequest.builder().build();
+                });
     }
 
     @Test
-    public void valid() {
+    void valid() {
         GetProcessStatisticsRequest.builder().processId("test-id").build();
     }
 }
diff --git a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v3/processes/ListProcessesRequestTest.java b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v3/processes/ListProcessesRequestTest.java
index 89aedb295bc..abb468de440 100644
--- a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v3/processes/ListProcessesRequestTest.java
+++ b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v3/processes/ListProcessesRequestTest.java
@@ -16,12 +16,12 @@
 
 package org.cloudfoundry.client.v3.processes;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
-public final class ListProcessesRequestTest {
+final class ListProcessesRequestTest {
 
     @Test
-    public void valid() {
+    void valid() {
         ListProcessesRequest.builder().build();
     }
 }
diff --git a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v3/processes/ScaleProcessRequestTest.java b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v3/processes/ScaleProcessRequestTest.java
index 2f69b596f21..0e9772d3222 100644
--- a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v3/processes/ScaleProcessRequestTest.java
+++ b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v3/processes/ScaleProcessRequestTest.java
@@ -16,17 +16,23 @@
 
 package org.cloudfoundry.client.v3.processes;
 
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
-public final class ScaleProcessRequestTest {
+import org.junit.jupiter.api.Test;
 
-    @Test(expected = IllegalStateException.class)
-    public void noProcessId() {
-        ScaleProcessRequest.builder().build();
+final class ScaleProcessRequestTest {
+
+    @Test
+    void noProcessId() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    ScaleProcessRequest.builder().build();
+                });
     }
 
     @Test
-    public void valid() {
+    void valid() {
         ScaleProcessRequest.builder().processId("test-process-id").build();
     }
 }
diff --git a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v3/processes/TerminateProcessInstanceRequestTest.java b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v3/processes/TerminateProcessInstanceRequestTest.java
index 4a0e9f14b7b..ed9c253d378 100644
--- a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v3/processes/TerminateProcessInstanceRequestTest.java
+++ b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v3/processes/TerminateProcessInstanceRequestTest.java
@@ -16,22 +16,32 @@
 
 package org.cloudfoundry.client.v3.processes;
 
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
-public final class TerminateProcessInstanceRequestTest {
+import org.junit.jupiter.api.Test;
 
-    @Test(expected = IllegalStateException.class)
-    public void noIndex() {
-        TerminateProcessInstanceRequest.builder().processId("test-process-id").build();
+final class TerminateProcessInstanceRequestTest {
+
+    @Test
+    void noIndex() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    TerminateProcessInstanceRequest.builder().processId("test-process-id").build();
+                });
     }
 
-    @Test(expected = IllegalStateException.class)
-    public void noProcessId() {
-        TerminateProcessInstanceRequest.builder().index("test-index").build();
+    @Test
+    void noProcessId() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    TerminateProcessInstanceRequest.builder().index("test-index").build();
+                });
     }
 
     @Test
-    public void valid() {
+    void valid() {
         TerminateProcessInstanceRequest.builder()
                 .index("test-index")
                 .processId("test-process-id")
diff --git a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v3/processes/UpdateProcessRequestTest.java b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v3/processes/UpdateProcessRequestTest.java
index 37d99142738..9a1527a75e4 100644
--- a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v3/processes/UpdateProcessRequestTest.java
+++ b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v3/processes/UpdateProcessRequestTest.java
@@ -16,17 +16,23 @@
 
 package org.cloudfoundry.client.v3.processes;
 
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
-public final class UpdateProcessRequestTest {
+import org.junit.jupiter.api.Test;
 
-    @Test(expected = IllegalStateException.class)
-    public void noProcessId() {
-        UpdateProcessRequest.builder().build();
+final class UpdateProcessRequestTest {
+
+    @Test
+    void noProcessId() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    UpdateProcessRequest.builder().build();
+                });
     }
 
     @Test
-    public void valid() {
+    void valid() {
         UpdateProcessRequest.builder().processId("test-process-id").build();
     }
 }
diff --git a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v3/resourcematch/ListMatchingResourcesRequestTest.java b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v3/resourcematch/ListMatchingResourcesRequestTest.java
index 1a0c492db59..89c64c1fbb3 100644
--- a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v3/resourcematch/ListMatchingResourcesRequestTest.java
+++ b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v3/resourcematch/ListMatchingResourcesRequestTest.java
@@ -16,18 +16,24 @@
 
 package org.cloudfoundry.client.v3.resourcematch;
 
+import static org.junit.jupiter.api.Assertions.assertThrows;
+
 import org.cloudfoundry.client.v3.Checksum;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
-public class ListMatchingResourcesRequestTest {
+class ListMatchingResourcesRequestTest {
 
-    @Test(expected = IllegalStateException.class)
-    public void noResources() {
-        ListMatchingResourcesRequest.builder().build();
+    @Test
+    void noResources() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    ListMatchingResourcesRequest.builder().build();
+                });
     }
 
     @Test
-    public void valid() {
+    void valid() {
         ListMatchingResourcesRequest.builder()
                 .resource(
                         MatchedResource.builder()
diff --git a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v3/roles/CreateRoleRequestTest.java b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v3/roles/CreateRoleRequestTest.java
index fbdcbe24cb8..a1ff887af1a 100644
--- a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v3/roles/CreateRoleRequestTest.java
+++ b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v3/roles/CreateRoleRequestTest.java
@@ -16,117 +16,143 @@
 
 package org.cloudfoundry.client.v3.roles;
 
+import static org.junit.jupiter.api.Assertions.assertThrows;
+
 import org.cloudfoundry.client.v3.Relationship;
 import org.cloudfoundry.client.v3.ToOneRelationship;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
-public class CreateRoleRequestTest {
+class CreateRoleRequestTest {
 
-    @Test(expected = IllegalStateException.class)
-    public void invalidWithMissingOrgRelationship() {
-        CreateRoleRequest.builder()
-                .type(RoleType.ORGANIZATION_AUDITOR)
-                .relationships(
-                        RoleRelationships.builder()
-                                .user(
-                                        ToOneRelationship.builder()
-                                                .data(
-                                                        Relationship.builder()
-                                                                .id("test-user-id")
-                                                                .build())
-                                                .build())
-                                .build())
-                .build();
+    @Test
+    void invalidWithMissingOrgRelationship() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    CreateRoleRequest.builder()
+                            .type(RoleType.ORGANIZATION_AUDITOR)
+                            .relationships(
+                                    RoleRelationships.builder()
+                                            .user(
+                                                    ToOneRelationship.builder()
+                                                            .data(
+                                                                    Relationship.builder()
+                                                                            .id("test-user-id")
+                                                                            .build())
+                                                            .build())
+                                            .build())
+                            .build();
+                });
     }
 
-    @Test(expected = IllegalStateException.class)
-    public void invalidWithMissingSpaceRelationship() {
-        CreateRoleRequest.builder()
-                .type(RoleType.SPACE_AUDITOR)
-                .relationships(
-                        RoleRelationships.builder()
-                                .user(
-                                        ToOneRelationship.builder()
-                                                .data(
-                                                        Relationship.builder()
-                                                                .id("test-user-id")
-                                                                .build())
-                                                .build())
-                                .build())
-                .build();
+    @Test
+    void invalidWithMissingSpaceRelationship() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    CreateRoleRequest.builder()
+                            .type(RoleType.SPACE_AUDITOR)
+                            .relationships(
+                                    RoleRelationships.builder()
+                                            .user(
+                                                    ToOneRelationship.builder()
+                                                            .data(
+                                                                    Relationship.builder()
+                                                                            .id("test-user-id")
+                                                                            .build())
+                                                            .build())
+                                            .build())
+                            .build();
+                });
     }
 
-    @Test(expected = IllegalStateException.class)
-    public void invalidWithNoRelationships() {
-        CreateRoleRequest.builder().type(RoleType.ORGANIZATION_AUDITOR).build();
+    @Test
+    void invalidWithNoRelationships() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    CreateRoleRequest.builder().type(RoleType.ORGANIZATION_AUDITOR).build();
+                });
     }
 
-    @Test(expected = IllegalStateException.class)
-    public void invalidWithOrgRelationship() {
-        CreateRoleRequest.builder()
-                .type(RoleType.SPACE_AUDITOR)
-                .relationships(
-                        RoleRelationships.builder()
-                                .user(
-                                        ToOneRelationship.builder()
-                                                .data(
-                                                        Relationship.builder()
-                                                                .id("test-user-id")
-                                                                .build())
-                                                .build())
-                                .organization(
-                                        ToOneRelationship.builder()
-                                                .data(
-                                                        Relationship.builder()
-                                                                .id("test-org-id")
-                                                                .build())
-                                                .build())
-                                .build())
-                .build();
+    @Test
+    void invalidWithOrgRelationship() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    CreateRoleRequest.builder()
+                            .type(RoleType.SPACE_AUDITOR)
+                            .relationships(
+                                    RoleRelationships.builder()
+                                            .user(
+                                                    ToOneRelationship.builder()
+                                                            .data(
+                                                                    Relationship.builder()
+                                                                            .id("test-user-id")
+                                                                            .build())
+                                                            .build())
+                                            .organization(
+                                                    ToOneRelationship.builder()
+                                                            .data(
+                                                                    Relationship.builder()
+                                                                            .id("test-org-id")
+                                                                            .build())
+                                                            .build())
+                                            .build())
+                            .build();
+                });
     }
 
-    @Test(expected = IllegalStateException.class)
-    public void invalidWithSpaceRelationship() {
-        CreateRoleRequest.builder()
-                .type(RoleType.ORGANIZATION_AUDITOR)
-                .relationships(
-                        RoleRelationships.builder()
-                                .user(
-                                        ToOneRelationship.builder()
-                                                .data(
-                                                        Relationship.builder()
-                                                                .id("test-user-id")
-                                                                .build())
-                                                .build())
-                                .space(
-                                        ToOneRelationship.builder()
-                                                .data(
-                                                        Relationship.builder()
-                                                                .id("test-space-id")
-                                                                .build())
-                                                .build())
-                                .build())
-                .build();
+    @Test
+    void invalidWithSpaceRelationship() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    CreateRoleRequest.builder()
+                            .type(RoleType.ORGANIZATION_AUDITOR)
+                            .relationships(
+                                    RoleRelationships.builder()
+                                            .user(
+                                                    ToOneRelationship.builder()
+                                                            .data(
+                                                                    Relationship.builder()
+                                                                            .id("test-user-id")
+                                                                            .build())
+                                                            .build())
+                                            .space(
+                                                    ToOneRelationship.builder()
+                                                            .data(
+                                                                    Relationship.builder()
+                                                                            .id("test-space-id")
+                                                                            .build())
+                                                            .build())
+                                            .build())
+                            .build();
+                });
     }
 
-    @Test(expected = IllegalStateException.class)
-    public void invalidWithoutType() {
-        CreateRoleRequest.builder()
-                .relationships(
-                        RoleRelationships.builder()
-                                .user(
-                                        ToOneRelationship.builder()
-                                                .data(
-                                                        Relationship.builder()
-                                                                .id("test-user-id")
-                                                                .build())
-                                                .build())
-                                .build())
-                .build();
+    @Test
+    void invalidWithoutType() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    CreateRoleRequest.builder()
+                            .relationships(
+                                    RoleRelationships.builder()
+                                            .user(
+                                                    ToOneRelationship.builder()
+                                                            .data(
+                                                                    Relationship.builder()
+                                                                            .id("test-user-id")
+                                                                            .build())
+                                                            .build())
+                                            .build())
+                            .build();
+                });
     }
 
     @Test
-    public void validOrgRole() {
+    void validOrgRole() {
         CreateRoleRequest.builder()
                 .type(RoleType.ORGANIZATION_AUDITOR)
                 .relationships(
@@ -150,7 +176,7 @@ public void validOrgRole() {
     }
 
     @Test
-    public void validSpaceRole() {
+    void validSpaceRole() {
         CreateRoleRequest.builder()
                 .type(RoleType.SPACE_AUDITOR)
                 .relationships(
diff --git a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v3/roles/DeleteRoleRequestTest.java b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v3/roles/DeleteRoleRequestTest.java
index 2fc7321551a..0c0835b15ca 100644
--- a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v3/roles/DeleteRoleRequestTest.java
+++ b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v3/roles/DeleteRoleRequestTest.java
@@ -16,17 +16,23 @@
 
 package org.cloudfoundry.client.v3.roles;
 
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
-public class DeleteRoleRequestTest {
+import org.junit.jupiter.api.Test;
 
-    @Test(expected = IllegalStateException.class)
-    public void noRoleId() {
-        DeleteRoleRequest.builder().build();
+class DeleteRoleRequestTest {
+
+    @Test
+    void noRoleId() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    DeleteRoleRequest.builder().build();
+                });
     }
 
     @Test
-    public void valid() {
+    void valid() {
         DeleteRoleRequest.builder().roleId("test-role-id").build();
     }
 }
diff --git a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v3/roles/GetRoleRequestTest.java b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v3/roles/GetRoleRequestTest.java
index 6b7fdc8ce0d..5cd3a835120 100644
--- a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v3/roles/GetRoleRequestTest.java
+++ b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v3/roles/GetRoleRequestTest.java
@@ -16,17 +16,23 @@
 
 package org.cloudfoundry.client.v3.roles;
 
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
-public class GetRoleRequestTest {
+import org.junit.jupiter.api.Test;
 
-    @Test(expected = IllegalStateException.class)
-    public void noRoleId() {
-        GetRoleRequest.builder().build();
+class GetRoleRequestTest {
+
+    @Test
+    void noRoleId() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    GetRoleRequest.builder().build();
+                });
     }
 
     @Test
-    public void valid() {
+    void valid() {
         GetRoleRequest.builder().roleId("test-role-id").build();
     }
 }
diff --git a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v3/roles/ListRolesRequestTest.java b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v3/roles/ListRolesRequestTest.java
index a13d30875f6..165f7fc0f2d 100644
--- a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v3/roles/ListRolesRequestTest.java
+++ b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v3/roles/ListRolesRequestTest.java
@@ -16,12 +16,12 @@
 
 package org.cloudfoundry.client.v3.roles;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
-public class ListRolesRequestTest {
+class ListRolesRequestTest {
 
     @Test
-    public void valid() {
+    void valid() {
         ListRolesRequest.builder().build();
     }
 }
diff --git a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v3/routes/CreateRouteRequestTest.java b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v3/routes/CreateRouteRequestTest.java
index 4893dd609b6..602ec57f849 100644
--- a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v3/routes/CreateRouteRequestTest.java
+++ b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v3/routes/CreateRouteRequestTest.java
@@ -16,51 +16,65 @@
 
 package org.cloudfoundry.client.v3.routes;
 
+import static org.junit.jupiter.api.Assertions.assertThrows;
+
 import org.cloudfoundry.client.v3.Relationship;
 import org.cloudfoundry.client.v3.ToOneRelationship;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
-public final class CreateRouteRequestTest {
+final class CreateRouteRequestTest {
 
-    @Test(expected = IllegalStateException.class)
-    public void invalidWithMissingDomainRelationship() {
-        CreateRouteRequest.builder()
-                .relationships(
-                        RouteRelationships.builder()
-                                .space(
-                                        ToOneRelationship.builder()
-                                                .data(
-                                                        Relationship.builder()
-                                                                .id("test-space-id")
-                                                                .build())
-                                                .build())
-                                .build())
-                .build();
+    @Test
+    void invalidWithMissingDomainRelationship() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    CreateRouteRequest.builder()
+                            .relationships(
+                                    RouteRelationships.builder()
+                                            .space(
+                                                    ToOneRelationship.builder()
+                                                            .data(
+                                                                    Relationship.builder()
+                                                                            .id("test-space-id")
+                                                                            .build())
+                                                            .build())
+                                            .build())
+                            .build();
+                });
     }
 
-    @Test(expected = IllegalStateException.class)
-    public void invalidWithMissingRelationship() {
-        CreateRouteRequest.builder().build();
+    @Test
+    void invalidWithMissingRelationship() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    CreateRouteRequest.builder().build();
+                });
     }
 
-    @Test(expected = IllegalStateException.class)
-    public void invalidWithMissingSpaceRelationship() {
-        CreateRouteRequest.builder()
-                .relationships(
-                        RouteRelationships.builder()
-                                .domain(
-                                        ToOneRelationship.builder()
-                                                .data(
-                                                        Relationship.builder()
-                                                                .id("test-domain-id")
-                                                                .build())
-                                                .build())
-                                .build())
-                .build();
+    @Test
+    void invalidWithMissingSpaceRelationship() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    CreateRouteRequest.builder()
+                            .relationships(
+                                    RouteRelationships.builder()
+                                            .domain(
+                                                    ToOneRelationship.builder()
+                                                            .data(
+                                                                    Relationship.builder()
+                                                                            .id("test-domain-id")
+                                                                            .build())
+                                                            .build())
+                                            .build())
+                            .build();
+                });
     }
 
     @Test
-    public void valid() {
+    void valid() {
         CreateRouteRequest.builder()
                 .relationships(
                         RouteRelationships.builder()
diff --git a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v3/routes/DeleteRouteRequestTest.java b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v3/routes/DeleteRouteRequestTest.java
index 0c119180807..d0c38ee743a 100644
--- a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v3/routes/DeleteRouteRequestTest.java
+++ b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v3/routes/DeleteRouteRequestTest.java
@@ -16,17 +16,23 @@
 
 package org.cloudfoundry.client.v3.routes;
 
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
-public class DeleteRouteRequestTest {
+import org.junit.jupiter.api.Test;
 
-    @Test(expected = IllegalStateException.class)
-    public void noRouteId() {
-        DeleteRouteRequest.builder().build();
+class DeleteRouteRequestTest {
+
+    @Test
+    void noRouteId() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    DeleteRouteRequest.builder().build();
+                });
     }
 
     @Test
-    public void valid() {
+    void valid() {
         DeleteRouteRequest.builder().routeId("test-route-id").build();
     }
 }
diff --git a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v3/routes/GetRouteRequestTest.java b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v3/routes/GetRouteRequestTest.java
index 21bbdeeecb9..bab26f4dce5 100644
--- a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v3/routes/GetRouteRequestTest.java
+++ b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v3/routes/GetRouteRequestTest.java
@@ -16,17 +16,23 @@
 
 package org.cloudfoundry.client.v3.routes;
 
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
-public class GetRouteRequestTest {
+import org.junit.jupiter.api.Test;
 
-    @Test(expected = IllegalStateException.class)
-    public void noRouteId() {
-        GetRouteRequest.builder().build();
+class GetRouteRequestTest {
+
+    @Test
+    void noRouteId() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    GetRouteRequest.builder().build();
+                });
     }
 
     @Test
-    public void valid() {
+    void valid() {
         GetRouteRequest.builder().routeId("test-route-id").build();
     }
 }
diff --git a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v3/routes/InsertRouteDestinationsRequestTest.java b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v3/routes/InsertRouteDestinationsRequestTest.java
index a873dc0c983..423247ca4cc 100644
--- a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v3/routes/InsertRouteDestinationsRequestTest.java
+++ b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v3/routes/InsertRouteDestinationsRequestTest.java
@@ -16,75 +16,97 @@
 
 package org.cloudfoundry.client.v3.routes;
 
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
-public class InsertRouteDestinationsRequestTest {
+import org.junit.jupiter.api.Test;
 
-    @Test(expected = IllegalStateException.class)
-    public void noApplication() {
-        InsertRouteDestinationsRequest.builder()
-                .destination(
-                        Destination.builder()
-                                .destinationId("test-destination-id")
-                                .port(999)
-                                .build())
-                .routeId("test-route-id")
-                .build();
+class InsertRouteDestinationsRequestTest {
+
+    @Test
+    void noApplication() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    InsertRouteDestinationsRequest.builder()
+                            .destination(
+                                    Destination.builder()
+                                            .destinationId("test-destination-id")
+                                            .port(999)
+                                            .build())
+                            .routeId("test-route-id")
+                            .build();
+                });
     }
 
-    @Test(expected = IllegalStateException.class)
-    public void noApplicationId() {
-        InsertRouteDestinationsRequest.builder()
-                .destination(
-                        Destination.builder()
-                                .application(
-                                        Application.builder()
-                                                .process(
-                                                        Process.builder().type("test-type").build())
-                                                .build())
-                                .destinationId("test-destination-id")
-                                .port(999)
-                                .build())
-                .routeId("test-route-id")
-                .build();
+    @Test
+    void noApplicationId() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    InsertRouteDestinationsRequest.builder()
+                            .destination(
+                                    Destination.builder()
+                                            .application(
+                                                    Application.builder()
+                                                            .process(
+                                                                    Process.builder()
+                                                                            .type("test-type")
+                                                                            .build())
+                                                            .build())
+                                            .destinationId("test-destination-id")
+                                            .port(999)
+                                            .build())
+                            .routeId("test-route-id")
+                            .build();
+                });
     }
 
-    @Test(expected = IllegalStateException.class)
-    public void noRouteId() {
-        InsertRouteDestinationsRequest.builder()
-                .destination(
-                        Destination.builder()
-                                .application(
-                                        Application.builder()
-                                                .applicationId("test-application-id")
-                                                .process(
-                                                        Process.builder().type("test-type").build())
-                                                .build())
-                                .destinationId("test-destination-id")
-                                .port(999)
-                                .build())
-                .build();
+    @Test
+    void noRouteId() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    InsertRouteDestinationsRequest.builder()
+                            .destination(
+                                    Destination.builder()
+                                            .application(
+                                                    Application.builder()
+                                                            .applicationId("test-application-id")
+                                                            .process(
+                                                                    Process.builder()
+                                                                            .type("test-type")
+                                                                            .build())
+                                                            .build())
+                                            .destinationId("test-destination-id")
+                                            .port(999)
+                                            .build())
+                            .build();
+                });
     }
 
-    @Test(expected = IllegalStateException.class)
-    public void noType() {
-        InsertRouteDestinationsRequest.builder()
-                .destination(
-                        Destination.builder()
-                                .application(
-                                        Application.builder()
-                                                .applicationId("test-application-id")
-                                                .process(Process.builder().build())
-                                                .build())
-                                .destinationId("test-destination-id")
-                                .port(999)
-                                .build())
-                .routeId("test-route-id")
-                .build();
+    @Test
+    void noType() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    InsertRouteDestinationsRequest.builder()
+                            .destination(
+                                    Destination.builder()
+                                            .application(
+                                                    Application.builder()
+                                                            .applicationId("test-application-id")
+                                                            .process(Process.builder().build())
+                                                            .build())
+                                            .destinationId("test-destination-id")
+                                            .port(999)
+                                            .build())
+                            .routeId("test-route-id")
+                            .build();
+                });
     }
 
     @Test
-    public void valid() {
+    void valid() {
         InsertRouteDestinationsRequest.builder()
                 .destination(
                         Destination.builder()
diff --git a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v3/routes/ListRouteDestinationsRequestTest.java b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v3/routes/ListRouteDestinationsRequestTest.java
index c845dd98603..c3b9d09ac6c 100644
--- a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v3/routes/ListRouteDestinationsRequestTest.java
+++ b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v3/routes/ListRouteDestinationsRequestTest.java
@@ -16,17 +16,23 @@
 
 package org.cloudfoundry.client.v3.routes;
 
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
-public class ListRouteDestinationsRequestTest {
+import org.junit.jupiter.api.Test;
 
-    @Test(expected = IllegalStateException.class)
-    public void noRouteId() {
-        ListRouteDestinationsRequest.builder().build();
+class ListRouteDestinationsRequestTest {
+
+    @Test
+    void noRouteId() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    ListRouteDestinationsRequest.builder().build();
+                });
     }
 
     @Test
-    public void valid() {
+    void valid() {
         ListRouteDestinationsRequest.builder().routeId("test-route-destination-id").build();
     }
 }
diff --git a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v3/routes/RemoveRouteDestinationsRequestTest.java b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v3/routes/RemoveRouteDestinationsRequestTest.java
index 2e92f125b3a..515e261da91 100644
--- a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v3/routes/RemoveRouteDestinationsRequestTest.java
+++ b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v3/routes/RemoveRouteDestinationsRequestTest.java
@@ -16,22 +16,32 @@
 
 package org.cloudfoundry.client.v3.routes;
 
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
-public class RemoveRouteDestinationsRequestTest {
+import org.junit.jupiter.api.Test;
 
-    @Test(expected = IllegalStateException.class)
-    public void noDestinationId() {
-        RemoveRouteDestinationsRequest.builder().routeId("test-route-id").build();
+class RemoveRouteDestinationsRequestTest {
+
+    @Test
+    void noDestinationId() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    RemoveRouteDestinationsRequest.builder().routeId("test-route-id").build();
+                });
     }
 
-    @Test(expected = IllegalStateException.class)
-    public void noRouteId() {
-        RemoveRouteDestinationsRequest.builder().routeId("test-route-id").build();
+    @Test
+    void noRouteId() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    RemoveRouteDestinationsRequest.builder().routeId("test-route-id").build();
+                });
     }
 
     @Test
-    public void valid() {
+    void valid() {
         RemoveRouteDestinationsRequest.builder()
                 .destinationId("test-destination-id")
                 .routeId("test-route-id")
diff --git a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v3/routes/ReplaceRouteDestinationsRequestTest.java b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v3/routes/ReplaceRouteDestinationsRequestTest.java
index 29919168cb0..147477a3492 100644
--- a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v3/routes/ReplaceRouteDestinationsRequestTest.java
+++ b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v3/routes/ReplaceRouteDestinationsRequestTest.java
@@ -16,29 +16,37 @@
 
 package org.cloudfoundry.client.v3.routes;
 
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
-public class ReplaceRouteDestinationsRequestTest {
+import org.junit.jupiter.api.Test;
 
-    @Test(expected = IllegalStateException.class)
-    public void noRouteId() {
-        ReplaceRouteDestinationsRequest.builder()
-                .destination(
-                        Destination.builder()
-                                .application(
-                                        Application.builder()
-                                                .applicationId("test-application-id")
-                                                .process(
-                                                        Process.builder().type("test-type").build())
-                                                .build())
-                                .destinationId("test-destination-id")
-                                .port(999)
-                                .build())
-                .build();
+class ReplaceRouteDestinationsRequestTest {
+
+    @Test
+    void noRouteId() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    ReplaceRouteDestinationsRequest.builder()
+                            .destination(
+                                    Destination.builder()
+                                            .application(
+                                                    Application.builder()
+                                                            .applicationId("test-application-id")
+                                                            .process(
+                                                                    Process.builder()
+                                                                            .type("test-type")
+                                                                            .build())
+                                                            .build())
+                                            .destinationId("test-destination-id")
+                                            .port(999)
+                                            .build())
+                            .build();
+                });
     }
 
     @Test
-    public void valid() {
+    void valid() {
         ReplaceRouteDestinationsRequest.builder().routeId("test-route-destination-id").build();
     }
 }
diff --git a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v3/routes/UpdateRouteRequestTest.java b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v3/routes/UpdateRouteRequestTest.java
index e2c22fbfc88..10e0f1eb0a0 100644
--- a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v3/routes/UpdateRouteRequestTest.java
+++ b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v3/routes/UpdateRouteRequestTest.java
@@ -16,18 +16,24 @@
 
 package org.cloudfoundry.client.v3.routes;
 
+import static org.junit.jupiter.api.Assertions.assertThrows;
+
 import org.cloudfoundry.client.v3.Metadata;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
-public class UpdateRouteRequestTest {
+class UpdateRouteRequestTest {
 
-    @Test(expected = IllegalStateException.class)
-    public void noRouteId() {
-        UpdateRouteRequest.builder().build();
+    @Test
+    void noRouteId() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    UpdateRouteRequest.builder().build();
+                });
     }
 
     @Test
-    public void valid() {
+    void valid() {
         UpdateRouteRequest.builder()
                 .metadata(Metadata.builder().label("test-key", "test-value").build())
                 .routeId("test-route-id")
diff --git a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v3/servicebindings/CreateServiceBindingRequestTest.java b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v3/servicebindings/CreateServiceBindingRequestTest.java
index 8ca47a8bbea..4358afb9a6e 100644
--- a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v3/servicebindings/CreateServiceBindingRequestTest.java
+++ b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v3/servicebindings/CreateServiceBindingRequestTest.java
@@ -16,36 +16,54 @@
 
 package org.cloudfoundry.client.v3.servicebindings;
 
+import static org.junit.jupiter.api.Assertions.assertThrows;
+
 import org.cloudfoundry.client.v3.Relationship;
 import org.cloudfoundry.client.v3.ToOneRelationship;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
-public final class CreateServiceBindingRequestTest {
+final class CreateServiceBindingRequestTest {
 
-    @Test(expected = IllegalStateException.class)
-    public void noRelationships() {
-        CreateServiceBindingRequest.builder().type(ServiceBindingType.APPLICATION).build();
+    @Test
+    void noRelationships() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    CreateServiceBindingRequest.builder()
+                            .type(ServiceBindingType.APPLICATION)
+                            .build();
+                });
     }
 
-    @Test(expected = IllegalStateException.class)
-    public void noType() {
-        CreateServiceBindingRequest.builder()
-                .relationships(
-                        ServiceBindingRelationships.builder()
-                                .application(
-                                        ToOneRelationship.builder()
-                                                .data(Relationship.builder().id("test-id").build())
-                                                .build())
-                                .serviceInstance(
-                                        ToOneRelationship.builder()
-                                                .data(Relationship.builder().id("test-id").build())
-                                                .build())
-                                .build())
-                .build();
+    @Test
+    void noType() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    CreateServiceBindingRequest.builder()
+                            .relationships(
+                                    ServiceBindingRelationships.builder()
+                                            .application(
+                                                    ToOneRelationship.builder()
+                                                            .data(
+                                                                    Relationship.builder()
+                                                                            .id("test-id")
+                                                                            .build())
+                                                            .build())
+                                            .serviceInstance(
+                                                    ToOneRelationship.builder()
+                                                            .data(
+                                                                    Relationship.builder()
+                                                                            .id("test-id")
+                                                                            .build())
+                                                            .build())
+                                            .build())
+                            .build();
+                });
     }
 
     @Test
-    public void valid() {
+    void valid() {
         CreateServiceBindingRequest.builder()
                 .relationships(
                         ServiceBindingRelationships.builder()
diff --git a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v3/servicebindings/DeleteServiceBindingRequestTest.java b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v3/servicebindings/DeleteServiceBindingRequestTest.java
index 352017aa5d2..436c6c31252 100644
--- a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v3/servicebindings/DeleteServiceBindingRequestTest.java
+++ b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v3/servicebindings/DeleteServiceBindingRequestTest.java
@@ -16,17 +16,23 @@
 
 package org.cloudfoundry.client.v3.servicebindings;
 
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
-public final class DeleteServiceBindingRequestTest {
+import org.junit.jupiter.api.Test;
 
-    @Test(expected = IllegalStateException.class)
-    public void noServiceBindingId() {
-        DeleteServiceBindingRequest.builder().build();
+final class DeleteServiceBindingRequestTest {
+
+    @Test
+    void noServiceBindingId() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    DeleteServiceBindingRequest.builder().build();
+                });
     }
 
     @Test
-    public void valid() {
+    void valid() {
         DeleteServiceBindingRequest.builder().serviceBindingId("test-service-binding-id").build();
     }
 }
diff --git a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v3/servicebindings/GetServiceBindingRequestTest.java b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v3/servicebindings/GetServiceBindingRequestTest.java
index f93f853c850..7526ce4b3ac 100644
--- a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v3/servicebindings/GetServiceBindingRequestTest.java
+++ b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v3/servicebindings/GetServiceBindingRequestTest.java
@@ -16,17 +16,23 @@
 
 package org.cloudfoundry.client.v3.servicebindings;
 
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
-public final class GetServiceBindingRequestTest {
+import org.junit.jupiter.api.Test;
 
-    @Test(expected = IllegalStateException.class)
-    public void noServiceBindingId() {
-        GetServiceBindingRequest.builder().build();
+final class GetServiceBindingRequestTest {
+
+    @Test
+    void noServiceBindingId() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    GetServiceBindingRequest.builder().build();
+                });
     }
 
     @Test
-    public void valid() {
+    void valid() {
         GetServiceBindingRequest.builder().serviceBindingId("test-service-binding-id").build();
     }
 }
diff --git a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v3/servicebindings/ListServiceBindingsRequestTest.java b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v3/servicebindings/ListServiceBindingsRequestTest.java
index 471bc4c9610..e9d52e2c6e2 100644
--- a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v3/servicebindings/ListServiceBindingsRequestTest.java
+++ b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v3/servicebindings/ListServiceBindingsRequestTest.java
@@ -16,12 +16,12 @@
 
 package org.cloudfoundry.client.v3.servicebindings;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
-public final class ListServiceBindingsRequestTest {
+final class ListServiceBindingsRequestTest {
 
     @Test
-    public void valid() {
+    void valid() {
         ListServiceBindingsRequest.builder().build();
     }
 }
diff --git a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v3/servicebindings/RelationshipsTest.java b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v3/servicebindings/RelationshipsTest.java
index ec5223a9ece..8fbb5efc484 100644
--- a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v3/servicebindings/RelationshipsTest.java
+++ b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v3/servicebindings/RelationshipsTest.java
@@ -16,14 +16,16 @@
 
 package org.cloudfoundry.client.v3.servicebindings;
 
+import static org.junit.jupiter.api.Assertions.assertThrows;
+
 import org.cloudfoundry.client.v3.Relationship;
 import org.cloudfoundry.client.v3.ToOneRelationship;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
-public final class RelationshipsTest {
+final class RelationshipsTest {
 
     @Test
-    public void noApplication() {
+    void noApplication() {
         ServiceBindingRelationships.builder()
                 .serviceInstance(
                         ToOneRelationship.builder()
@@ -32,18 +34,22 @@ public void noApplication() {
                 .build();
     }
 
-    @Test(expected = IllegalStateException.class)
-    public void noServiceInstance() {
-        ServiceBindingRelationships.builder()
-                .application(
-                        ToOneRelationship.builder()
-                                .data(Relationship.builder().id("test-id").build())
-                                .build())
-                .build();
+    @Test
+    void noServiceInstance() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    ServiceBindingRelationships.builder()
+                            .application(
+                                    ToOneRelationship.builder()
+                                            .data(Relationship.builder().id("test-id").build())
+                                            .build())
+                            .build();
+                });
     }
 
     @Test
-    public void valid() {
+    void valid() {
         ServiceBindingRelationships.builder()
                 .application(
                         ToOneRelationship.builder()
diff --git a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v3/servicebrokers/CreateServiceBrokerRequestTest.java b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v3/servicebrokers/CreateServiceBrokerRequestTest.java
index 3e50c100982..f7c637cbaf5 100644
--- a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v3/servicebrokers/CreateServiceBrokerRequestTest.java
+++ b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v3/servicebrokers/CreateServiceBrokerRequestTest.java
@@ -1,11 +1,13 @@
 package org.cloudfoundry.client.v3.servicebrokers;
 
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
-public final class CreateServiceBrokerRequestTest {
+import org.junit.jupiter.api.Test;
+
+final class CreateServiceBrokerRequestTest {
 
     @Test
-    public void valid() {
+    void valid() {
         CreateServiceBrokerRequest.builder()
                 .authentication(
                         BasicAuthentication.builder()
@@ -17,35 +19,47 @@ public void valid() {
                 .build();
     }
 
-    @Test(expected = IllegalStateException.class)
-    public void noAuthentication() {
-        CreateServiceBrokerRequest.builder()
-                .name("test-service-broker")
-                .url("test-service-broker-url")
-                .build();
+    @Test
+    void noAuthentication() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    CreateServiceBrokerRequest.builder()
+                            .name("test-service-broker")
+                            .url("test-service-broker-url")
+                            .build();
+                });
     }
 
-    @Test(expected = IllegalStateException.class)
-    public void noName() {
-        CreateServiceBrokerRequest.builder()
-                .authentication(
-                        BasicAuthentication.builder()
-                                .username("test-username")
-                                .password("test-password")
-                                .build())
-                .url("test-service-broker-url")
-                .build();
+    @Test
+    void noName() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    CreateServiceBrokerRequest.builder()
+                            .authentication(
+                                    BasicAuthentication.builder()
+                                            .username("test-username")
+                                            .password("test-password")
+                                            .build())
+                            .url("test-service-broker-url")
+                            .build();
+                });
     }
 
-    @Test(expected = IllegalStateException.class)
-    public void noUrl() {
-        CreateServiceBrokerRequest.builder()
-                .authentication(
-                        BasicAuthentication.builder()
-                                .username("test-username")
-                                .password("test-password")
-                                .build())
-                .name("test-service-broker")
-                .build();
+    @Test
+    void noUrl() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    CreateServiceBrokerRequest.builder()
+                            .authentication(
+                                    BasicAuthentication.builder()
+                                            .username("test-username")
+                                            .password("test-password")
+                                            .build())
+                            .name("test-service-broker")
+                            .build();
+                });
     }
 }
diff --git a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v3/servicebrokers/DeleteServiceBrokerRequestTest.java b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v3/servicebrokers/DeleteServiceBrokerRequestTest.java
index 3375cc470b9..998a2528754 100644
--- a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v3/servicebrokers/DeleteServiceBrokerRequestTest.java
+++ b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v3/servicebrokers/DeleteServiceBrokerRequestTest.java
@@ -1,16 +1,22 @@
 package org.cloudfoundry.client.v3.servicebrokers;
 
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
-public final class DeleteServiceBrokerRequestTest {
+import org.junit.jupiter.api.Test;
+
+final class DeleteServiceBrokerRequestTest {
 
     @Test
-    public void valid() {
+    void valid() {
         DeleteServiceBrokerRequest.builder().serviceBrokerId("test-service-broker-id").build();
     }
 
-    @Test(expected = IllegalStateException.class)
-    public void noServiceBrokerId() {
-        DeleteServiceBrokerRequest.builder().build();
+    @Test
+    void noServiceBrokerId() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    DeleteServiceBrokerRequest.builder().build();
+                });
     }
 }
diff --git a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v3/servicebrokers/GetServiceBrokerRequestTest.java b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v3/servicebrokers/GetServiceBrokerRequestTest.java
index c19914cfdb6..3616c56a5c0 100644
--- a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v3/servicebrokers/GetServiceBrokerRequestTest.java
+++ b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v3/servicebrokers/GetServiceBrokerRequestTest.java
@@ -1,16 +1,22 @@
 package org.cloudfoundry.client.v3.servicebrokers;
 
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
-public final class GetServiceBrokerRequestTest {
+import org.junit.jupiter.api.Test;
+
+final class GetServiceBrokerRequestTest {
 
     @Test
-    public void valid() {
+    void valid() {
         GetServiceBrokerRequest.builder().serviceBrokerId("test-service-broker-id").build();
     }
 
-    @Test(expected = IllegalStateException.class)
-    public void noServiceBrokerId() {
-        GetServiceBrokerRequest.builder().build();
+    @Test
+    void noServiceBrokerId() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    GetServiceBrokerRequest.builder().build();
+                });
     }
 }
diff --git a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v3/servicebrokers/ListServiceBrokersRequestTest.java b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v3/servicebrokers/ListServiceBrokersRequestTest.java
index 24cf8efa022..36df59d6f05 100644
--- a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v3/servicebrokers/ListServiceBrokersRequestTest.java
+++ b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v3/servicebrokers/ListServiceBrokersRequestTest.java
@@ -1,11 +1,11 @@
 package org.cloudfoundry.client.v3.servicebrokers;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
-public final class ListServiceBrokersRequestTest {
+final class ListServiceBrokersRequestTest {
 
     @Test
-    public void valid() {
+    void valid() {
         ListServiceBrokersRequest.builder().build();
     }
 }
diff --git a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v3/servicebrokers/UpdateServiceBrokerRequestTest.java b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v3/servicebrokers/UpdateServiceBrokerRequestTest.java
index 91db63f9b65..372ccc27567 100644
--- a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v3/servicebrokers/UpdateServiceBrokerRequestTest.java
+++ b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v3/servicebrokers/UpdateServiceBrokerRequestTest.java
@@ -1,16 +1,22 @@
 package org.cloudfoundry.client.v3.servicebrokers;
 
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
-public final class UpdateServiceBrokerRequestTest {
+import org.junit.jupiter.api.Test;
+
+final class UpdateServiceBrokerRequestTest {
 
     @Test
-    public void valid() {
+    void valid() {
         UpdateServiceBrokerRequest.builder().serviceBrokerId("test-service-broker-id").build();
     }
 
-    @Test(expected = IllegalStateException.class)
-    public void noServiceBrokerId() {
-        UpdateServiceBrokerRequest.builder().build();
+    @Test
+    void noServiceBrokerId() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    UpdateServiceBrokerRequest.builder().build();
+                });
     }
 }
diff --git a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v3/serviceinstances/CreateServiceInstanceRequestTest.java b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v3/serviceinstances/CreateServiceInstanceRequestTest.java
index b57f15c8c69..e7d332cbe98 100644
--- a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v3/serviceinstances/CreateServiceInstanceRequestTest.java
+++ b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v3/serviceinstances/CreateServiceInstanceRequestTest.java
@@ -16,14 +16,16 @@
 
 package org.cloudfoundry.client.v3.serviceinstances;
 
+import static org.junit.jupiter.api.Assertions.assertThrows;
+
 import org.cloudfoundry.client.v3.Relationship;
 import org.cloudfoundry.client.v3.ToOneRelationship;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
-public class CreateServiceInstanceRequestTest {
+class CreateServiceInstanceRequestTest {
 
     @Test
-    public void validManagedServiceInstance() {
+    void validManagedServiceInstance() {
         CreateServiceInstanceRequest.builder()
                 .type(ServiceInstanceType.MANAGED)
                 .name("test-service-instance-name")
@@ -50,7 +52,7 @@ public void validManagedServiceInstance() {
     }
 
     @Test
-    public void validUserProvidedServiceInstance() {
+    void validUserProvidedServiceInstance() {
         CreateServiceInstanceRequest.builder()
                 .type(ServiceInstanceType.USER_PROVIDED)
                 .syslogDrainUrl("https://syslog.com")
@@ -60,29 +62,34 @@ public void validUserProvidedServiceInstance() {
                 .build();
     }
 
-    @Test(expected = IllegalStateException.class)
-    public void testWithMissingName() {
-        CreateServiceInstanceRequest.builder()
-                .type(ServiceInstanceType.MANAGED)
-                .relationships(
-                        ServiceInstanceRelationships.builder()
-                                .servicePlan(
-                                        ToOneRelationship.builder()
-                                                .data(
-                                                        Relationship.builder()
-                                                                .id("test-service-plan-id")
-                                                                .build())
-                                                .build())
-                                .space(
-                                        ToOneRelationship.builder()
-                                                .data(
-                                                        Relationship.builder()
-                                                                .id("test-space-id")
-                                                                .build())
-                                                .build())
-                                .build())
-                .tags("foo", "bar")
-                .parameter("key", "value")
-                .build();
+    @Test
+    void withMissingName() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    CreateServiceInstanceRequest.builder()
+                            .type(ServiceInstanceType.MANAGED)
+                            .relationships(
+                                    ServiceInstanceRelationships.builder()
+                                            .servicePlan(
+                                                    ToOneRelationship.builder()
+                                                            .data(
+                                                                    Relationship.builder()
+                                                                            .id(
+                                                                                    "test-service-plan-id")
+                                                                            .build())
+                                                            .build())
+                                            .space(
+                                                    ToOneRelationship.builder()
+                                                            .data(
+                                                                    Relationship.builder()
+                                                                            .id("test-space-id")
+                                                                            .build())
+                                                            .build())
+                                            .build())
+                            .tags("foo", "bar")
+                            .parameter("key", "value")
+                            .build();
+                });
     }
 }
diff --git a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v3/serviceinstances/GetManagedServiceParametersRequestTest.java b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v3/serviceinstances/GetManagedServiceParametersRequestTest.java
index d4add5e20e6..7af7090a464 100644
--- a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v3/serviceinstances/GetManagedServiceParametersRequestTest.java
+++ b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v3/serviceinstances/GetManagedServiceParametersRequestTest.java
@@ -1,11 +1,11 @@
 package org.cloudfoundry.client.v3.serviceinstances;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
-public class GetManagedServiceParametersRequestTest {
+class GetManagedServiceParametersRequestTest {
 
     @Test
-    public void valid() {
+    void valid() {
         GetManagedServiceParametersRequest.builder()
                 .serviceInstanceId("test-service-instance-id")
                 .build();
diff --git a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v3/serviceinstances/GetUserProvidedCredentialsRequestTest.java b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v3/serviceinstances/GetUserProvidedCredentialsRequestTest.java
index 4f2641ec672..93d1d7813ca 100644
--- a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v3/serviceinstances/GetUserProvidedCredentialsRequestTest.java
+++ b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v3/serviceinstances/GetUserProvidedCredentialsRequestTest.java
@@ -1,11 +1,11 @@
 package org.cloudfoundry.client.v3.serviceinstances;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
-public class GetUserProvidedCredentialsRequestTest {
+class GetUserProvidedCredentialsRequestTest {
 
     @Test
-    public void valid() {
+    void valid() {
         GetUserProvidedCredentialsRequest.builder()
                 .serviceInstanceId("test-service-instance-id")
                 .build();
diff --git a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v3/serviceinstances/ListServiceInstancesRequestTest.java b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v3/serviceinstances/ListServiceInstancesRequestTest.java
index 2acb47f94fc..a39b7434d68 100644
--- a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v3/serviceinstances/ListServiceInstancesRequestTest.java
+++ b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v3/serviceinstances/ListServiceInstancesRequestTest.java
@@ -16,12 +16,12 @@
 
 package org.cloudfoundry.client.v3.serviceinstances;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
-public class ListServiceInstancesRequestTest {
+class ListServiceInstancesRequestTest {
 
     @Test
-    public void valid() {
+    void valid() {
         ListServiceInstancesRequest.builder().build();
     }
 }
diff --git a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v3/serviceinstances/ListSharedSpacesRelationshipTest.java b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v3/serviceinstances/ListSharedSpacesRelationshipTest.java
index ff45b44154e..79bfdbc973b 100644
--- a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v3/serviceinstances/ListSharedSpacesRelationshipTest.java
+++ b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v3/serviceinstances/ListSharedSpacesRelationshipTest.java
@@ -16,17 +16,23 @@
 
 package org.cloudfoundry.client.v3.serviceinstances;
 
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
-public class ListSharedSpacesRelationshipTest {
+import org.junit.jupiter.api.Test;
 
-    @Test(expected = IllegalStateException.class)
-    public void noServiceInstanceId() {
-        ListSharedSpacesRelationshipRequest.builder().build();
+class ListSharedSpacesRelationshipTest {
+
+    @Test
+    void noServiceInstanceId() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    ListSharedSpacesRelationshipRequest.builder().build();
+                });
     }
 
     @Test
-    public void valid() {
+    void valid() {
         ListSharedSpacesRelationshipRequest.builder()
                 .serviceInstanceId("test-service-instance-id")
                 .build();
diff --git a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v3/serviceinstances/ShareServiceInstanceRequestTest.java b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v3/serviceinstances/ShareServiceInstanceRequestTest.java
index 07abed34b6a..f4b2aae344e 100644
--- a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v3/serviceinstances/ShareServiceInstanceRequestTest.java
+++ b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v3/serviceinstances/ShareServiceInstanceRequestTest.java
@@ -16,20 +16,26 @@
 
 package org.cloudfoundry.client.v3.serviceinstances;
 
+import static org.junit.jupiter.api.Assertions.assertThrows;
+
 import org.cloudfoundry.client.v3.Relationship;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
-public class ShareServiceInstanceRequestTest {
+class ShareServiceInstanceRequestTest {
 
-    @Test(expected = IllegalStateException.class)
-    public void noServiceInstanceId() {
-        ShareServiceInstanceRequest.builder()
-                .data(Relationship.builder().id("test-space-id").build())
-                .build();
+    @Test
+    void noServiceInstanceId() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    ShareServiceInstanceRequest.builder()
+                            .data(Relationship.builder().id("test-space-id").build())
+                            .build();
+                });
     }
 
     @Test
-    public void valid() {
+    void valid() {
         ShareServiceInstanceRequest.builder()
                 .serviceInstanceId("test-service-instance-id")
                 .data(Relationship.builder().id("test-space-id").build())
diff --git a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v3/serviceinstances/UnshareServiceInstanceRequestTest.java b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v3/serviceinstances/UnshareServiceInstanceRequestTest.java
index ee43d141d9a..bcc88bf2db0 100644
--- a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v3/serviceinstances/UnshareServiceInstanceRequestTest.java
+++ b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v3/serviceinstances/UnshareServiceInstanceRequestTest.java
@@ -16,24 +16,34 @@
 
 package org.cloudfoundry.client.v3.serviceinstances;
 
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
-public class UnshareServiceInstanceRequestTest {
+import org.junit.jupiter.api.Test;
 
-    @Test(expected = IllegalStateException.class)
-    public void noServiceInstanceId() {
-        UnshareServiceInstanceRequest.builder().spaceId("test-space-id").build();
+class UnshareServiceInstanceRequestTest {
+
+    @Test
+    void noServiceInstanceId() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    UnshareServiceInstanceRequest.builder().spaceId("test-space-id").build();
+                });
     }
 
-    @Test(expected = IllegalStateException.class)
-    public void noSpaceId() {
-        UnshareServiceInstanceRequest.builder()
-                .serviceInstanceId("test-service-instance-id")
-                .build();
+    @Test
+    void noSpaceId() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    UnshareServiceInstanceRequest.builder()
+                            .serviceInstanceId("test-service-instance-id")
+                            .build();
+                });
     }
 
     @Test
-    public void valid() {
+    void valid() {
         UnshareServiceInstanceRequest.builder()
                 .serviceInstanceId("test-service-instance-id")
                 .spaceId("test-space-id")
diff --git a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v3/serviceinstances/UpdateServiceInstanceRequestTest.java b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v3/serviceinstances/UpdateServiceInstanceRequestTest.java
index a2ec7463895..ba697de0200 100644
--- a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v3/serviceinstances/UpdateServiceInstanceRequestTest.java
+++ b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v3/serviceinstances/UpdateServiceInstanceRequestTest.java
@@ -16,27 +16,35 @@
 
 package org.cloudfoundry.client.v3.serviceinstances;
 
+import static org.junit.jupiter.api.Assertions.assertThrows;
+
 import org.cloudfoundry.client.v3.Metadata;
 import org.cloudfoundry.client.v3.Relationship;
 import org.cloudfoundry.client.v3.ToOneRelationship;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
-public class UpdateServiceInstanceRequestTest {
+class UpdateServiceInstanceRequestTest {
 
     @Test
-    public void testServiceInstanceIdOnly() {
+    void serviceInstanceIdOnly() {
         UpdateServiceInstanceRequest.builder()
                 .serviceInstanceId("test-service-instance-id")
                 .build();
     }
 
-    @Test(expected = IllegalStateException.class)
-    public void noServiceInstanceId() {
-        UpdateServiceInstanceRequest.builder().metadata(Metadata.builder().build()).build();
+    @Test
+    void noServiceInstanceId() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    UpdateServiceInstanceRequest.builder()
+                            .metadata(Metadata.builder().build())
+                            .build();
+                });
     }
 
     @Test
-    public void validManagedServiceInstance() {
+    void validManagedServiceInstance() {
         UpdateServiceInstanceRequest.builder()
                 .metadata(Metadata.builder().build())
                 .serviceInstanceId("test-service-instance-id")
diff --git a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v3/serviceofferings/DeleteServiceOfferingRequestTest.java b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v3/serviceofferings/DeleteServiceOfferingRequestTest.java
index b5b0b1395dc..7d37e2b29d0 100644
--- a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v3/serviceofferings/DeleteServiceOfferingRequestTest.java
+++ b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v3/serviceofferings/DeleteServiceOfferingRequestTest.java
@@ -16,17 +16,23 @@
 
 package org.cloudfoundry.client.v3.serviceofferings;
 
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
-public final class DeleteServiceOfferingRequestTest {
+import org.junit.jupiter.api.Test;
 
-    @Test(expected = IllegalStateException.class)
-    public void noServiceOfferingId() {
-        DeleteServiceOfferingRequest.builder().build();
+final class DeleteServiceOfferingRequestTest {
+
+    @Test
+    void noServiceOfferingId() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    DeleteServiceOfferingRequest.builder().build();
+                });
     }
 
     @Test
-    public void valid() {
+    void valid() {
         DeleteServiceOfferingRequest.builder().serviceOfferingId("test-id").build();
     }
 }
diff --git a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v3/serviceofferings/GetServiceOfferingRequestTest.java b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v3/serviceofferings/GetServiceOfferingRequestTest.java
index b75b98d6ad5..a1637502f0e 100644
--- a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v3/serviceofferings/GetServiceOfferingRequestTest.java
+++ b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v3/serviceofferings/GetServiceOfferingRequestTest.java
@@ -16,17 +16,23 @@
 
 package org.cloudfoundry.client.v3.serviceofferings;
 
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
-public final class GetServiceOfferingRequestTest {
+import org.junit.jupiter.api.Test;
 
-    @Test(expected = IllegalStateException.class)
-    public void noServiceOfferingId() {
-        GetServiceOfferingRequest.builder().build();
+final class GetServiceOfferingRequestTest {
+
+    @Test
+    void noServiceOfferingId() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    GetServiceOfferingRequest.builder().build();
+                });
     }
 
     @Test
-    public void valid() {
+    void valid() {
         GetServiceOfferingRequest.builder().serviceOfferingId("test-id").build();
     }
 }
diff --git a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v3/serviceofferings/ListServiceOfferingsRequestTest.java b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v3/serviceofferings/ListServiceOfferingsRequestTest.java
index 421f7b754ce..b3d79cde5d2 100644
--- a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v3/serviceofferings/ListServiceOfferingsRequestTest.java
+++ b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v3/serviceofferings/ListServiceOfferingsRequestTest.java
@@ -16,12 +16,12 @@
 
 package org.cloudfoundry.client.v3.serviceofferings;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
-public final class ListServiceOfferingsRequestTest {
+final class ListServiceOfferingsRequestTest {
 
     @Test
-    public void valid() {
+    void valid() {
         ListServiceOfferingsRequest.builder().build();
     }
 }
diff --git a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v3/serviceofferings/UpdateServiceOfferingRequestTest.java b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v3/serviceofferings/UpdateServiceOfferingRequestTest.java
index e561bc63da8..1b0320c2d78 100644
--- a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v3/serviceofferings/UpdateServiceOfferingRequestTest.java
+++ b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v3/serviceofferings/UpdateServiceOfferingRequestTest.java
@@ -16,17 +16,23 @@
 
 package org.cloudfoundry.client.v3.serviceofferings;
 
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
-public final class UpdateServiceOfferingRequestTest {
+import org.junit.jupiter.api.Test;
 
-    @Test(expected = IllegalStateException.class)
-    public void noServiceOfferingId() {
-        UpdateServiceOfferingRequest.builder().build();
+final class UpdateServiceOfferingRequestTest {
+
+    @Test
+    void noServiceOfferingId() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    UpdateServiceOfferingRequest.builder().build();
+                });
     }
 
     @Test
-    public void valid() {
+    void valid() {
         UpdateServiceOfferingRequest.builder().serviceOfferingId("test-id").build();
     }
 }
diff --git a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v3/serviceplans/DeleteServicePlanRequestTest.java b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v3/serviceplans/DeleteServicePlanRequestTest.java
index df8454be155..1a196a3acce 100644
--- a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v3/serviceplans/DeleteServicePlanRequestTest.java
+++ b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v3/serviceplans/DeleteServicePlanRequestTest.java
@@ -16,17 +16,23 @@
 
 package org.cloudfoundry.client.v3.serviceplans;
 
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
-public final class DeleteServicePlanRequestTest {
+import org.junit.jupiter.api.Test;
 
-    @Test(expected = IllegalStateException.class)
-    public void noServicePlanId() {
-        DeleteServicePlanRequest.builder().build();
+final class DeleteServicePlanRequestTest {
+
+    @Test
+    void noServicePlanId() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    DeleteServicePlanRequest.builder().build();
+                });
     }
 
     @Test
-    public void valid() {
+    void valid() {
         DeleteServicePlanRequest.builder().servicePlanId("test-id").build();
     }
 }
diff --git a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v3/serviceplans/GetServicePlanRequestTest.java b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v3/serviceplans/GetServicePlanRequestTest.java
index c6811e738ba..ec920f5c028 100644
--- a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v3/serviceplans/GetServicePlanRequestTest.java
+++ b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v3/serviceplans/GetServicePlanRequestTest.java
@@ -16,17 +16,23 @@
 
 package org.cloudfoundry.client.v3.serviceplans;
 
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
-public final class GetServicePlanRequestTest {
+import org.junit.jupiter.api.Test;
 
-    @Test(expected = IllegalStateException.class)
-    public void noServicePlanId() {
-        GetServicePlanRequest.builder().build();
+final class GetServicePlanRequestTest {
+
+    @Test
+    void noServicePlanId() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    GetServicePlanRequest.builder().build();
+                });
     }
 
     @Test
-    public void valid() {
+    void valid() {
         GetServicePlanRequest.builder().servicePlanId("test-service-plan-id").build();
     }
 }
diff --git a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v3/serviceplans/ListServicePlansRequestTest.java b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v3/serviceplans/ListServicePlansRequestTest.java
index feb119ad895..4f0c8a03739 100644
--- a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v3/serviceplans/ListServicePlansRequestTest.java
+++ b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v3/serviceplans/ListServicePlansRequestTest.java
@@ -16,12 +16,12 @@
 
 package org.cloudfoundry.client.v3.serviceplans;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
-public final class ListServicePlansRequestTest {
+final class ListServicePlansRequestTest {
 
     @Test
-    public void valid() {
+    void valid() {
         ListServicePlansRequest.builder().build();
     }
 }
diff --git a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v3/serviceplans/UpdateServicePlanRequestTest.java b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v3/serviceplans/UpdateServicePlanRequestTest.java
index 410b1e03dae..f7f611bda6e 100644
--- a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v3/serviceplans/UpdateServicePlanRequestTest.java
+++ b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v3/serviceplans/UpdateServicePlanRequestTest.java
@@ -16,17 +16,23 @@
 
 package org.cloudfoundry.client.v3.serviceplans;
 
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
-public final class UpdateServicePlanRequestTest {
+import org.junit.jupiter.api.Test;
 
-    @Test(expected = IllegalStateException.class)
-    public void noServicePlanId() {
-        UpdateServicePlanRequest.builder().build();
+final class UpdateServicePlanRequestTest {
+
+    @Test
+    void noServicePlanId() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    UpdateServicePlanRequest.builder().build();
+                });
     }
 
     @Test
-    public void valid() {
+    void valid() {
         UpdateServicePlanRequest.builder().servicePlanId("test-service-plan-id").build();
     }
 }
diff --git a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v3/serviceplans/UpdateServicePlanVisibilityTest.java b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v3/serviceplans/UpdateServicePlanVisibilityTest.java
index d44c84f4f78..a380eed2daa 100644
--- a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v3/serviceplans/UpdateServicePlanVisibilityTest.java
+++ b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v3/serviceplans/UpdateServicePlanVisibilityTest.java
@@ -16,12 +16,14 @@
 
 package org.cloudfoundry.client.v3.serviceplans;
 
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
-public class UpdateServicePlanVisibilityTest {
+import org.junit.jupiter.api.Test;
+
+class UpdateServicePlanVisibilityTest {
 
     @Test
-    public void valid() {
+    void valid() {
         UpdateServicePlanVisibilityRequest.builder()
                 .servicePlanId("test-service-plan-id")
                 .type(Visibility.ORGANIZATION)
@@ -33,15 +35,19 @@ public void valid() {
                 .build();
     }
 
-    @Test(expected = IllegalStateException.class)
-    public void invalid() {
-        UpdateServicePlanVisibilityRequest.builder()
-                .servicePlanId("test-service-plan-id")
-                .organization(
-                        Organization.builder()
-                                .name("test-organization")
-                                .guid("test-organization-id")
-                                .build())
-                .build();
+    @Test
+    void invalid() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    UpdateServicePlanVisibilityRequest.builder()
+                            .servicePlanId("test-service-plan-id")
+                            .organization(
+                                    Organization.builder()
+                                            .name("test-organization")
+                                            .guid("test-organization-id")
+                                            .build())
+                            .build();
+                });
     }
 }
diff --git a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v3/spaces/ApplyManifestRequestTest.java b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v3/spaces/ApplyManifestRequestTest.java
index 5831b6aa846..94806dd88fb 100644
--- a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v3/spaces/ApplyManifestRequestTest.java
+++ b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v3/spaces/ApplyManifestRequestTest.java
@@ -16,22 +16,32 @@
 
 package org.cloudfoundry.client.v3.spaces;
 
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
-public final class ApplyManifestRequestTest {
+import org.junit.jupiter.api.Test;
 
-    @Test(expected = IllegalStateException.class)
-    public void noSpaceId() {
-        ApplyManifestRequest.builder().manifest("test-manifest".getBytes()).build();
+final class ApplyManifestRequestTest {
+
+    @Test
+    void noSpaceId() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    ApplyManifestRequest.builder().manifest("test-manifest".getBytes()).build();
+                });
     }
 
-    @Test(expected = IllegalStateException.class)
-    public void noManifest() {
-        ApplyManifestRequest.builder().spaceId("test-space-id").build();
+    @Test
+    void noManifest() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    ApplyManifestRequest.builder().spaceId("test-space-id").build();
+                });
     }
 
     @Test
-    public void valid() {
+    void valid() {
         ApplyManifestRequest.builder()
                 .spaceId("test-space-id")
                 .manifest("test-manifest".getBytes())
diff --git a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v3/spaces/AssignSpaceIsolationSegmentRequestTest.java b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v3/spaces/AssignSpaceIsolationSegmentRequestTest.java
index a0951a31f81..f8624025cf4 100644
--- a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v3/spaces/AssignSpaceIsolationSegmentRequestTest.java
+++ b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v3/spaces/AssignSpaceIsolationSegmentRequestTest.java
@@ -16,20 +16,26 @@
 
 package org.cloudfoundry.client.v3.spaces;
 
+import static org.junit.jupiter.api.Assertions.assertThrows;
+
 import org.cloudfoundry.client.v3.Relationship;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
-public final class AssignSpaceIsolationSegmentRequestTest {
+final class AssignSpaceIsolationSegmentRequestTest {
 
-    @Test(expected = IllegalStateException.class)
-    public void noOrganizationId() {
-        AssignSpaceIsolationSegmentRequest.builder()
-                .data(Relationship.builder().id("test-isolation-segment-id").build())
-                .build();
+    @Test
+    void noOrganizationId() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    AssignSpaceIsolationSegmentRequest.builder()
+                            .data(Relationship.builder().id("test-isolation-segment-id").build())
+                            .build();
+                });
     }
 
     @Test
-    public void validData() {
+    void validData() {
         AssignSpaceIsolationSegmentRequest.builder()
                 .data(Relationship.builder().id("test-isolation-segment-id").build())
                 .spaceId("test-space-id")
@@ -37,7 +43,7 @@ public void validData() {
     }
 
     @Test
-    public void validNoData() {
+    void validNoData() {
         AssignSpaceIsolationSegmentRequest.builder().spaceId("test-space-id").build();
     }
 }
diff --git a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v3/spaces/CreateSpaceRequestTest.java b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v3/spaces/CreateSpaceRequestTest.java
index 7c112f3fc11..f6cd2ce9355 100644
--- a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v3/spaces/CreateSpaceRequestTest.java
+++ b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v3/spaces/CreateSpaceRequestTest.java
@@ -16,32 +16,45 @@
 
 package org.cloudfoundry.client.v3.spaces;
 
+import static org.junit.jupiter.api.Assertions.assertThrows;
+
 import org.cloudfoundry.client.v3.Relationship;
 import org.cloudfoundry.client.v3.ToOneRelationship;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
-public final class CreateSpaceRequestTest {
+final class CreateSpaceRequestTest {
 
-    @Test(expected = IllegalStateException.class)
-    public void noName() {
-        CreateSpaceRequest.builder()
-                .relationships(
-                        SpaceRelationships.builder()
-                                .organization(
-                                        ToOneRelationship.builder()
-                                                .data(Relationship.builder().id("test-id").build())
-                                                .build())
-                                .build())
-                .build();
+    @Test
+    void noName() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    CreateSpaceRequest.builder()
+                            .relationships(
+                                    SpaceRelationships.builder()
+                                            .organization(
+                                                    ToOneRelationship.builder()
+                                                            .data(
+                                                                    Relationship.builder()
+                                                                            .id("test-id")
+                                                                            .build())
+                                                            .build())
+                                            .build())
+                            .build();
+                });
     }
 
-    @Test(expected = IllegalStateException.class)
-    public void noRelationships() {
-        CreateSpaceRequest.builder().name("test-name").build();
+    @Test
+    void noRelationships() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    CreateSpaceRequest.builder().name("test-name").build();
+                });
     }
 
     @Test
-    public void valid() {
+    void valid() {
         CreateSpaceRequest.builder()
                 .name("test-name")
                 .relationships(
diff --git a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v3/spaces/DeleteSpaceRequestTest.java b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v3/spaces/DeleteSpaceRequestTest.java
index d981450245e..a07f80aea82 100644
--- a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v3/spaces/DeleteSpaceRequestTest.java
+++ b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v3/spaces/DeleteSpaceRequestTest.java
@@ -16,17 +16,23 @@
 
 package org.cloudfoundry.client.v3.spaces;
 
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
-public class DeleteSpaceRequestTest {
+import org.junit.jupiter.api.Test;
 
-    @Test(expected = IllegalStateException.class)
-    public void noSpaceId() {
-        DeleteSpaceRequest.builder().build();
+class DeleteSpaceRequestTest {
+
+    @Test
+    void noSpaceId() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    DeleteSpaceRequest.builder().build();
+                });
     }
 
     @Test
-    public void valid() {
+    void valid() {
         DeleteSpaceRequest.builder().spaceId("test-space-id").build();
     }
 }
diff --git a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v3/spaces/DeleteUnmappedRoutesRequestTest.java b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v3/spaces/DeleteUnmappedRoutesRequestTest.java
index 56fb8751f39..80914abd57b 100644
--- a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v3/spaces/DeleteUnmappedRoutesRequestTest.java
+++ b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v3/spaces/DeleteUnmappedRoutesRequestTest.java
@@ -16,17 +16,23 @@
 
 package org.cloudfoundry.client.v3.spaces;
 
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
-public class DeleteUnmappedRoutesRequestTest {
+import org.junit.jupiter.api.Test;
 
-    @Test(expected = IllegalStateException.class)
-    public void noSpaceId() {
-        DeleteUnmappedRoutesRequest.builder().build();
+class DeleteUnmappedRoutesRequestTest {
+
+    @Test
+    void noSpaceId() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    DeleteUnmappedRoutesRequest.builder().build();
+                });
     }
 
     @Test
-    public void valid() {
+    void valid() {
         DeleteUnmappedRoutesRequest.builder().spaceId("test-space-id").build();
     }
 }
diff --git a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v3/spaces/GetSpaceIsolationSegmentRequestTest.java b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v3/spaces/GetSpaceIsolationSegmentRequestTest.java
index bc7c5f43d31..f15481844e7 100644
--- a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v3/spaces/GetSpaceIsolationSegmentRequestTest.java
+++ b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v3/spaces/GetSpaceIsolationSegmentRequestTest.java
@@ -16,17 +16,23 @@
 
 package org.cloudfoundry.client.v3.spaces;
 
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
-public final class GetSpaceIsolationSegmentRequestTest {
+import org.junit.jupiter.api.Test;
 
-    @Test(expected = IllegalStateException.class)
-    public void noOrganizationId() {
-        GetSpaceIsolationSegmentRequest.builder().build();
+final class GetSpaceIsolationSegmentRequestTest {
+
+    @Test
+    void noOrganizationId() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    GetSpaceIsolationSegmentRequest.builder().build();
+                });
     }
 
     @Test
-    public void valid() {
+    void valid() {
         GetSpaceIsolationSegmentRequest.builder().spaceId("test-space-id").build();
     }
 }
diff --git a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v3/spaces/ListSpacesRequestTest.java b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v3/spaces/ListSpacesRequestTest.java
index d08cb9dd42b..b7a5ae1d618 100644
--- a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v3/spaces/ListSpacesRequestTest.java
+++ b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v3/spaces/ListSpacesRequestTest.java
@@ -16,12 +16,12 @@
 
 package org.cloudfoundry.client.v3.spaces;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
-public final class ListSpacesRequestTest {
+final class ListSpacesRequestTest {
 
     @Test
-    public void valid() {
+    void valid() {
         ListSpacesRequest.builder().build();
     }
 }
diff --git a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v3/stacks/CreateStackRequestTest.java b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v3/stacks/CreateStackRequestTest.java
index 00782a3d300..aaf0dec6a8a 100644
--- a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v3/stacks/CreateStackRequestTest.java
+++ b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v3/stacks/CreateStackRequestTest.java
@@ -16,49 +16,71 @@
 
 package org.cloudfoundry.client.v3.stacks;
 
+import static org.junit.jupiter.api.Assertions.assertThrows;
+
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 import org.cloudfoundry.client.v3.Metadata;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
-public class CreateStackRequestTest {
+class CreateStackRequestTest {
 
-    @Test(expected = IllegalStateException.class)
-    public void invalidNameLengthTest() {
-        String invalidName = Stream.generate(() -> "aaa").limit(251).collect(Collectors.joining());
+    @Test
+    void invalidNameLengthTest() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    String invalidName =
+                            Stream.generate(() -> "aaa").limit(251).collect(Collectors.joining());
 
-        CreateStackRequest.builder().name(invalidName).build();
+                    CreateStackRequest.builder().name(invalidName).build();
+                });
     }
 
-    @Test(expected = IllegalStateException.class)
-    public void invalidDescriptionLengthTest() {
-        String invalidDescription =
-                Stream.generate(() -> "aaa").limit(251).collect(Collectors.joining());
+    @Test
+    void invalidDescriptionLengthTest() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    String invalidDescription =
+                            Stream.generate(() -> "aaa").limit(251).collect(Collectors.joining());
 
-        CreateStackRequest.builder().name("valid name").description(invalidDescription).build();
+                    CreateStackRequest.builder()
+                            .name("valid name")
+                            .description(invalidDescription)
+                            .build();
+                });
     }
 
-    @Test(expected = IllegalStateException.class)
-    public void invalidNameAndDescriptionLengthTest() {
-        String invalidName = Stream.generate(() -> "aaa").limit(251).collect(Collectors.joining());
-        String invalidDescription =
-                Stream.generate(() -> "aaa").limit(251).collect(Collectors.joining());
+    @Test
+    void invalidNameAndDescriptionLengthTest() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    String invalidName =
+                            Stream.generate(() -> "aaa").limit(251).collect(Collectors.joining());
+                    String invalidDescription =
+                            Stream.generate(() -> "aaa").limit(251).collect(Collectors.joining());
 
-        CreateStackRequest.builder().name(invalidName).description(invalidDescription).build();
+                    CreateStackRequest.builder()
+                            .name(invalidName)
+                            .description(invalidDescription)
+                            .build();
+                });
     }
 
     @Test
-    public void validRequestTest() {
+    void validRequestTest() {
         CreateStackRequest.builder().name("valid name").build();
     }
 
     @Test
-    public void validRequestWithDescriptionTest() {
+    void validRequestWithDescriptionTest() {
         CreateStackRequest.builder().name("valid name").description("valid description").build();
     }
 
     @Test
-    public void validRequestWithMetadataTest() {
+    void validRequestWithMetadataTest() {
         CreateStackRequest.builder()
                 .name("valid name")
                 .metadata(Metadata.builder().label("label-key", "label-value").build())
@@ -66,7 +88,7 @@ public void validRequestWithMetadataTest() {
     }
 
     @Test
-    public void validRequestWithAllFieldsTest() {
+    void validRequestWithAllFieldsTest() {
         CreateStackRequest.builder()
                 .name("valid name")
                 .description("valid description")
diff --git a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v3/stacks/DeleteStackRequestTest.java b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v3/stacks/DeleteStackRequestTest.java
index 4ec51ffdc05..09c38bc64b0 100644
--- a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v3/stacks/DeleteStackRequestTest.java
+++ b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v3/stacks/DeleteStackRequestTest.java
@@ -16,17 +16,23 @@
 
 package org.cloudfoundry.client.v3.stacks;
 
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
-public class DeleteStackRequestTest {
+import org.junit.jupiter.api.Test;
 
-    @Test(expected = IllegalStateException.class)
-    public void noStackId() {
-        DeleteStackRequest.builder().build();
+class DeleteStackRequestTest {
+
+    @Test
+    void noStackId() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    DeleteStackRequest.builder().build();
+                });
     }
 
     @Test
-    public void valid() {
+    void valid() {
         DeleteStackRequest.builder().stackId("test-stack-id").build();
     }
 }
diff --git a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v3/stacks/GetStackRequestTest.java b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v3/stacks/GetStackRequestTest.java
index e8d179606e9..48d0b7f3d24 100644
--- a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v3/stacks/GetStackRequestTest.java
+++ b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v3/stacks/GetStackRequestTest.java
@@ -16,17 +16,23 @@
 
 package org.cloudfoundry.client.v3.stacks;
 
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
-public class GetStackRequestTest {
+import org.junit.jupiter.api.Test;
 
-    @Test(expected = IllegalStateException.class)
-    public void noStackId() {
-        GetStackRequest.builder().build();
+class GetStackRequestTest {
+
+    @Test
+    void noStackId() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    GetStackRequest.builder().build();
+                });
     }
 
     @Test
-    public void valid() {
+    void valid() {
         GetStackRequest.builder().stackId("test-stack-id").build();
     }
 }
diff --git a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v3/tasks/CancelTaskRequestTest.java b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v3/tasks/CancelTaskRequestTest.java
index e92905c65f8..ee97d7c7a0e 100644
--- a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v3/tasks/CancelTaskRequestTest.java
+++ b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v3/tasks/CancelTaskRequestTest.java
@@ -16,17 +16,23 @@
 
 package org.cloudfoundry.client.v3.tasks;
 
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
-public final class CancelTaskRequestTest {
+import org.junit.jupiter.api.Test;
 
-    @Test(expected = IllegalStateException.class)
-    public void noTaskId() {
-        CancelTaskRequest.builder().build();
+final class CancelTaskRequestTest {
+
+    @Test
+    void noTaskId() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    CancelTaskRequest.builder().build();
+                });
     }
 
     @Test
-    public void valid() {
+    void valid() {
         CancelTaskRequest.builder().taskId("test-task-id").build();
     }
 }
diff --git a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v3/tasks/CreateTaskRequestTest.java b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v3/tasks/CreateTaskRequestTest.java
index dd118d0a55b..20debb3ee4f 100644
--- a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v3/tasks/CreateTaskRequestTest.java
+++ b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v3/tasks/CreateTaskRequestTest.java
@@ -16,22 +16,32 @@
 
 package org.cloudfoundry.client.v3.tasks;
 
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
-public final class CreateTaskRequestTest {
+import org.junit.jupiter.api.Test;
 
-    @Test(expected = IllegalStateException.class)
-    public void noApplicationId() {
-        CreateTaskRequest.builder().command("test-command").build();
+final class CreateTaskRequestTest {
+
+    @Test
+    void noApplicationId() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    CreateTaskRequest.builder().command("test-command").build();
+                });
     }
 
-    @Test(expected = IllegalStateException.class)
-    public void noCommand() {
-        CreateTaskRequest.builder().applicationId("test-application-id").build();
+    @Test
+    void noCommand() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    CreateTaskRequest.builder().applicationId("test-application-id").build();
+                });
     }
 
     @Test
-    public void valid() {
+    void valid() {
         CreateTaskRequest.builder()
                 .applicationId("test-application-id")
                 .command("test-command")
diff --git a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v3/tasks/GetTaskRequestTest.java b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v3/tasks/GetTaskRequestTest.java
index cee85198a58..1b8b3b25b0c 100644
--- a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v3/tasks/GetTaskRequestTest.java
+++ b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v3/tasks/GetTaskRequestTest.java
@@ -16,17 +16,23 @@
 
 package org.cloudfoundry.client.v3.tasks;
 
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
-public final class GetTaskRequestTest {
+import org.junit.jupiter.api.Test;
 
-    @Test(expected = IllegalStateException.class)
-    public void noTaskId() {
-        GetTaskRequest.builder().build();
+final class GetTaskRequestTest {
+
+    @Test
+    void noTaskId() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    GetTaskRequest.builder().build();
+                });
     }
 
     @Test
-    public void valid() {
+    void valid() {
         GetTaskRequest.builder().taskId("test-task-id").build();
     }
 }
diff --git a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v3/tasks/ListTasksRequestTest.java b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v3/tasks/ListTasksRequestTest.java
index f3b421da061..ac38606634c 100644
--- a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v3/tasks/ListTasksRequestTest.java
+++ b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v3/tasks/ListTasksRequestTest.java
@@ -16,12 +16,12 @@
 
 package org.cloudfoundry.client.v3.tasks;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
-public final class ListTasksRequestTest {
+final class ListTasksRequestTest {
 
     @Test
-    public void valid() {
+    void valid() {
         ListTasksRequest.builder().build();
     }
 }
diff --git a/cloudfoundry-client/src/test/java/org/cloudfoundry/doppler/ContainerMetricTest.java b/cloudfoundry-client/src/test/java/org/cloudfoundry/doppler/ContainerMetricTest.java
index 7f11afe21e2..659649eaf46 100644
--- a/cloudfoundry-client/src/test/java/org/cloudfoundry/doppler/ContainerMetricTest.java
+++ b/cloudfoundry-client/src/test/java/org/cloudfoundry/doppler/ContainerMetricTest.java
@@ -16,12 +16,14 @@
 
 package org.cloudfoundry.doppler;
 
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
-public final class ContainerMetricTest {
+import org.junit.jupiter.api.Test;
+
+final class ContainerMetricTest {
 
     @Test
-    public void dropsonde() {
+    void dropsonde() {
         ContainerMetric.from(
                 new org.cloudfoundry.dropsonde.events.ContainerMetric.Builder()
                         .applicationId("test-application-id")
@@ -32,58 +34,78 @@ public void dropsonde() {
                         .build());
     }
 
-    @Test(expected = IllegalStateException.class)
-    public void noApplicationId() {
-        ContainerMetric.builder()
-                .cpuPercentage(0.0)
-                .diskBytes(0L)
-                .instanceIndex(0)
-                .memoryBytes(0L)
-                .build();
+    @Test
+    void noApplicationId() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    ContainerMetric.builder()
+                            .cpuPercentage(0.0)
+                            .diskBytes(0L)
+                            .instanceIndex(0)
+                            .memoryBytes(0L)
+                            .build();
+                });
     }
 
-    @Test(expected = IllegalStateException.class)
-    public void noCpuPercentage() {
-        ContainerMetric.builder()
-                .applicationId("test-application-id")
-                .diskBytes(0L)
-                .instanceIndex(0)
-                .memoryBytes(0L)
-                .build();
+    @Test
+    void noCpuPercentage() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    ContainerMetric.builder()
+                            .applicationId("test-application-id")
+                            .diskBytes(0L)
+                            .instanceIndex(0)
+                            .memoryBytes(0L)
+                            .build();
+                });
     }
 
-    @Test(expected = IllegalStateException.class)
-    public void noDiskBytes() {
-        ContainerMetric.builder()
-                .applicationId("test-application-id")
-                .cpuPercentage(0.0)
-                .instanceIndex(0)
-                .memoryBytes(0L)
-                .build();
+    @Test
+    void noDiskBytes() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    ContainerMetric.builder()
+                            .applicationId("test-application-id")
+                            .cpuPercentage(0.0)
+                            .instanceIndex(0)
+                            .memoryBytes(0L)
+                            .build();
+                });
     }
 
-    @Test(expected = IllegalStateException.class)
-    public void noInstanceIndex() {
-        ContainerMetric.builder()
-                .applicationId("test-application-id")
-                .cpuPercentage(0.0)
-                .diskBytes(0L)
-                .memoryBytes(0L)
-                .build();
+    @Test
+    void noInstanceIndex() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    ContainerMetric.builder()
+                            .applicationId("test-application-id")
+                            .cpuPercentage(0.0)
+                            .diskBytes(0L)
+                            .memoryBytes(0L)
+                            .build();
+                });
     }
 
-    @Test(expected = IllegalStateException.class)
-    public void noMemoryBytes() {
-        ContainerMetric.builder()
-                .applicationId("test-application-id")
-                .cpuPercentage(0.0)
-                .diskBytes(0L)
-                .instanceIndex(0)
-                .build();
+    @Test
+    void noMemoryBytes() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    ContainerMetric.builder()
+                            .applicationId("test-application-id")
+                            .cpuPercentage(0.0)
+                            .diskBytes(0L)
+                            .instanceIndex(0)
+                            .build();
+                });
     }
 
     @Test
-    public void valid() {
+    void valid() {
         ContainerMetric.builder()
                 .applicationId("test-application-id")
                 .cpuPercentage(0.0)
diff --git a/cloudfoundry-client/src/test/java/org/cloudfoundry/doppler/ContainerMetricsRequestTest.java b/cloudfoundry-client/src/test/java/org/cloudfoundry/doppler/ContainerMetricsRequestTest.java
index 97e77f0c587..6666ffbce8c 100644
--- a/cloudfoundry-client/src/test/java/org/cloudfoundry/doppler/ContainerMetricsRequestTest.java
+++ b/cloudfoundry-client/src/test/java/org/cloudfoundry/doppler/ContainerMetricsRequestTest.java
@@ -16,17 +16,23 @@
 
 package org.cloudfoundry.doppler;
 
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
-public final class ContainerMetricsRequestTest {
+import org.junit.jupiter.api.Test;
 
-    @Test(expected = IllegalStateException.class)
-    public void noApplicationId() {
-        ContainerMetricsRequest.builder().build();
+final class ContainerMetricsRequestTest {
+
+    @Test
+    void noApplicationId() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    ContainerMetricsRequest.builder().build();
+                });
     }
 
     @Test
-    public void valid() {
+    void valid() {
         ContainerMetricsRequest.builder().applicationId("test-application-id").build();
     }
 }
diff --git a/cloudfoundry-client/src/test/java/org/cloudfoundry/doppler/CounterEventTest.java b/cloudfoundry-client/src/test/java/org/cloudfoundry/doppler/CounterEventTest.java
index 56a3a3bfd04..90df2c25274 100644
--- a/cloudfoundry-client/src/test/java/org/cloudfoundry/doppler/CounterEventTest.java
+++ b/cloudfoundry-client/src/test/java/org/cloudfoundry/doppler/CounterEventTest.java
@@ -16,12 +16,14 @@
 
 package org.cloudfoundry.doppler;
 
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
-public final class CounterEventTest {
+import org.junit.jupiter.api.Test;
+
+final class CounterEventTest {
 
     @Test
-    public void dropsonde() {
+    void dropsonde() {
         CounterEvent.from(
                 new org.cloudfoundry.dropsonde.events.CounterEvent.Builder()
                         .delta(0L)
@@ -29,18 +31,26 @@ public void dropsonde() {
                         .build());
     }
 
-    @Test(expected = IllegalStateException.class)
-    public void noDelta() {
-        CounterEvent.builder().name("test-name").build();
+    @Test
+    void noDelta() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    CounterEvent.builder().name("test-name").build();
+                });
     }
 
-    @Test(expected = IllegalStateException.class)
-    public void noName() {
-        CounterEvent.builder().delta(0L).build();
+    @Test
+    void noName() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    CounterEvent.builder().delta(0L).build();
+                });
     }
 
     @Test
-    public void valid() {
+    void valid() {
         CounterEvent.builder().delta(0L).name("test-name").build();
     }
 }
diff --git a/cloudfoundry-client/src/test/java/org/cloudfoundry/doppler/ErrorTest.java b/cloudfoundry-client/src/test/java/org/cloudfoundry/doppler/ErrorTest.java
index ad8ebc40b25..1199da090bf 100644
--- a/cloudfoundry-client/src/test/java/org/cloudfoundry/doppler/ErrorTest.java
+++ b/cloudfoundry-client/src/test/java/org/cloudfoundry/doppler/ErrorTest.java
@@ -16,12 +16,14 @@
 
 package org.cloudfoundry.doppler;
 
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
-public final class ErrorTest {
+import org.junit.jupiter.api.Test;
+
+final class ErrorTest {
 
     @Test
-    public void dropsonde() {
+    void dropsonde() {
         Error.from(
                 new org.cloudfoundry.dropsonde.events.Error.Builder()
                         .code(0)
@@ -30,23 +32,35 @@ public void dropsonde() {
                         .build());
     }
 
-    @Test(expected = IllegalStateException.class)
-    public void noCode() {
-        Error.builder().message("test-message").source("test-source").build();
+    @Test
+    void noCode() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    Error.builder().message("test-message").source("test-source").build();
+                });
     }
 
-    @Test(expected = IllegalStateException.class)
-    public void noMessage() {
-        Error.builder().code(0).source("test-source").build();
+    @Test
+    void noMessage() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    Error.builder().code(0).source("test-source").build();
+                });
     }
 
-    @Test(expected = IllegalStateException.class)
-    public void noSource() {
-        Error.builder().code(0).message("test-message").build();
+    @Test
+    void noSource() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    Error.builder().code(0).message("test-message").build();
+                });
     }
 
     @Test
-    public void valid() {
+    void valid() {
         Error.builder().code(0).message("test-message").source("test-source").build();
     }
 }
diff --git a/cloudfoundry-client/src/test/java/org/cloudfoundry/doppler/FirehoseRequestTest.java b/cloudfoundry-client/src/test/java/org/cloudfoundry/doppler/FirehoseRequestTest.java
index c0dc63547f5..49f352488a2 100644
--- a/cloudfoundry-client/src/test/java/org/cloudfoundry/doppler/FirehoseRequestTest.java
+++ b/cloudfoundry-client/src/test/java/org/cloudfoundry/doppler/FirehoseRequestTest.java
@@ -16,17 +16,23 @@
 
 package org.cloudfoundry.doppler;
 
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
-public final class FirehoseRequestTest {
+import org.junit.jupiter.api.Test;
 
-    @Test(expected = IllegalStateException.class)
-    public void noSubscriptionId() {
-        FirehoseRequest.builder().build();
+final class FirehoseRequestTest {
+
+    @Test
+    void noSubscriptionId() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    FirehoseRequest.builder().build();
+                });
     }
 
     @Test
-    public void valid() {
+    void valid() {
         FirehoseRequest.builder().subscriptionId("test-subscription-id").build();
     }
 }
diff --git a/cloudfoundry-client/src/test/java/org/cloudfoundry/doppler/HttpStartStopTest.java b/cloudfoundry-client/src/test/java/org/cloudfoundry/doppler/HttpStartStopTest.java
index c43ce2e48cb..194cc621a97 100644
--- a/cloudfoundry-client/src/test/java/org/cloudfoundry/doppler/HttpStartStopTest.java
+++ b/cloudfoundry-client/src/test/java/org/cloudfoundry/doppler/HttpStartStopTest.java
@@ -16,13 +16,15 @@
 
 package org.cloudfoundry.doppler;
 
+import static org.junit.jupiter.api.Assertions.assertThrows;
+
 import java.util.UUID;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
-public final class HttpStartStopTest {
+final class HttpStartStopTest {
 
     @Test
-    public void dropsonde() {
+    void dropsonde() {
         HttpStartStop.from(
                 new org.cloudfoundry.dropsonde.events.HttpStartStop.Builder()
                         .contentLength(0L)
@@ -42,134 +44,170 @@ public void dropsonde() {
                         .build());
     }
 
-    @Test(expected = IllegalStateException.class)
-    public void noContentLength() {
-        HttpStartStop.builder()
-                .peerType(PeerType.CLIENT)
-                .remoteAddress("test-remote-address")
-                .requestId(UUID.randomUUID())
-                .startTimestamp(0L)
-                .statusCode(0)
-                .stopTimestamp(0L)
-                .uri("test-uri")
-                .userAgent("test-user-agent")
-                .build();
+    @Test
+    void noContentLength() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    HttpStartStop.builder()
+                            .peerType(PeerType.CLIENT)
+                            .remoteAddress("test-remote-address")
+                            .requestId(UUID.randomUUID())
+                            .startTimestamp(0L)
+                            .statusCode(0)
+                            .stopTimestamp(0L)
+                            .uri("test-uri")
+                            .userAgent("test-user-agent")
+                            .build();
+                });
     }
 
-    @Test(expected = IllegalStateException.class)
-    public void noPeerType() {
-        HttpStartStop.builder()
-                .contentLength(0L)
-                .remoteAddress("test-remote-address")
-                .requestId(UUID.randomUUID())
-                .startTimestamp(0L)
-                .statusCode(0)
-                .stopTimestamp(0L)
-                .uri("test-uri")
-                .userAgent("test-user-agent")
-                .build();
+    @Test
+    void noPeerType() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    HttpStartStop.builder()
+                            .contentLength(0L)
+                            .remoteAddress("test-remote-address")
+                            .requestId(UUID.randomUUID())
+                            .startTimestamp(0L)
+                            .statusCode(0)
+                            .stopTimestamp(0L)
+                            .uri("test-uri")
+                            .userAgent("test-user-agent")
+                            .build();
+                });
     }
 
-    @Test(expected = IllegalStateException.class)
-    public void noRemoteAddress() {
-        HttpStartStop.builder()
-                .contentLength(0L)
-                .peerType(PeerType.CLIENT)
-                .requestId(UUID.randomUUID())
-                .startTimestamp(0L)
-                .statusCode(0)
-                .stopTimestamp(0L)
-                .uri("test-uri")
-                .userAgent("test-user-agent")
-                .build();
+    @Test
+    void noRemoteAddress() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    HttpStartStop.builder()
+                            .contentLength(0L)
+                            .peerType(PeerType.CLIENT)
+                            .requestId(UUID.randomUUID())
+                            .startTimestamp(0L)
+                            .statusCode(0)
+                            .stopTimestamp(0L)
+                            .uri("test-uri")
+                            .userAgent("test-user-agent")
+                            .build();
+                });
     }
 
-    @Test(expected = IllegalStateException.class)
-    public void noRequestId() {
-        HttpStartStop.builder()
-                .contentLength(0L)
-                .peerType(PeerType.CLIENT)
-                .remoteAddress("test-remote-address")
-                .startTimestamp(0L)
-                .statusCode(0)
-                .stopTimestamp(0L)
-                .uri("test-uri")
-                .userAgent("test-user-agent")
-                .build();
+    @Test
+    void noRequestId() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    HttpStartStop.builder()
+                            .contentLength(0L)
+                            .peerType(PeerType.CLIENT)
+                            .remoteAddress("test-remote-address")
+                            .startTimestamp(0L)
+                            .statusCode(0)
+                            .stopTimestamp(0L)
+                            .uri("test-uri")
+                            .userAgent("test-user-agent")
+                            .build();
+                });
     }
 
-    @Test(expected = IllegalStateException.class)
-    public void noStartTimestamp() {
-        HttpStartStop.builder()
-                .contentLength(0L)
-                .peerType(PeerType.CLIENT)
-                .remoteAddress("test-remote-address")
-                .requestId(UUID.randomUUID())
-                .statusCode(0)
-                .stopTimestamp(0L)
-                .uri("test-uri")
-                .userAgent("test-user-agent")
-                .build();
+    @Test
+    void noStartTimestamp() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    HttpStartStop.builder()
+                            .contentLength(0L)
+                            .peerType(PeerType.CLIENT)
+                            .remoteAddress("test-remote-address")
+                            .requestId(UUID.randomUUID())
+                            .statusCode(0)
+                            .stopTimestamp(0L)
+                            .uri("test-uri")
+                            .userAgent("test-user-agent")
+                            .build();
+                });
     }
 
-    @Test(expected = IllegalStateException.class)
-    public void noStatusCode() {
-        HttpStartStop.builder()
-                .contentLength(0L)
-                .peerType(PeerType.CLIENT)
-                .remoteAddress("test-remote-address")
-                .requestId(UUID.randomUUID())
-                .startTimestamp(0L)
-                .stopTimestamp(0L)
-                .uri("test-uri")
-                .userAgent("test-user-agent")
-                .build();
+    @Test
+    void noStatusCode() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    HttpStartStop.builder()
+                            .contentLength(0L)
+                            .peerType(PeerType.CLIENT)
+                            .remoteAddress("test-remote-address")
+                            .requestId(UUID.randomUUID())
+                            .startTimestamp(0L)
+                            .stopTimestamp(0L)
+                            .uri("test-uri")
+                            .userAgent("test-user-agent")
+                            .build();
+                });
     }
 
-    @Test(expected = IllegalStateException.class)
-    public void noStopTimestamp() {
-        HttpStartStop.builder()
-                .contentLength(0L)
-                .peerType(PeerType.CLIENT)
-                .remoteAddress("test-remote-address")
-                .requestId(UUID.randomUUID())
-                .startTimestamp(0L)
-                .statusCode(0)
-                .uri("test-uri")
-                .userAgent("test-user-agent")
-                .build();
+    @Test
+    void noStopTimestamp() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    HttpStartStop.builder()
+                            .contentLength(0L)
+                            .peerType(PeerType.CLIENT)
+                            .remoteAddress("test-remote-address")
+                            .requestId(UUID.randomUUID())
+                            .startTimestamp(0L)
+                            .statusCode(0)
+                            .uri("test-uri")
+                            .userAgent("test-user-agent")
+                            .build();
+                });
     }
 
-    @Test(expected = IllegalStateException.class)
-    public void noUri() {
-        HttpStartStop.builder()
-                .contentLength(0L)
-                .peerType(PeerType.CLIENT)
-                .remoteAddress("test-remote-address")
-                .requestId(UUID.randomUUID())
-                .startTimestamp(0L)
-                .statusCode(0)
-                .stopTimestamp(0L)
-                .userAgent("test-user-agent")
-                .build();
+    @Test
+    void noUri() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    HttpStartStop.builder()
+                            .contentLength(0L)
+                            .peerType(PeerType.CLIENT)
+                            .remoteAddress("test-remote-address")
+                            .requestId(UUID.randomUUID())
+                            .startTimestamp(0L)
+                            .statusCode(0)
+                            .stopTimestamp(0L)
+                            .userAgent("test-user-agent")
+                            .build();
+                });
     }
 
-    @Test(expected = IllegalStateException.class)
-    public void noUserAgent() {
-        HttpStartStop.builder()
-                .contentLength(0L)
-                .peerType(PeerType.CLIENT)
-                .remoteAddress("test-remote-address")
-                .requestId(UUID.randomUUID())
-                .startTimestamp(0L)
-                .statusCode(0)
-                .stopTimestamp(0L)
-                .uri("test-uri")
-                .build();
+    @Test
+    void noUserAgent() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    HttpStartStop.builder()
+                            .contentLength(0L)
+                            .peerType(PeerType.CLIENT)
+                            .remoteAddress("test-remote-address")
+                            .requestId(UUID.randomUUID())
+                            .startTimestamp(0L)
+                            .statusCode(0)
+                            .stopTimestamp(0L)
+                            .uri("test-uri")
+                            .build();
+                });
     }
 
     @Test
-    public void valid() {
+    void valid() {
         HttpStartStop.builder()
                 .contentLength(0L)
                 .peerType(PeerType.CLIENT)
diff --git a/cloudfoundry-client/src/test/java/org/cloudfoundry/doppler/LogMessageTest.java b/cloudfoundry-client/src/test/java/org/cloudfoundry/doppler/LogMessageTest.java
index e43a666b47d..1049e242cd5 100644
--- a/cloudfoundry-client/src/test/java/org/cloudfoundry/doppler/LogMessageTest.java
+++ b/cloudfoundry-client/src/test/java/org/cloudfoundry/doppler/LogMessageTest.java
@@ -16,13 +16,15 @@
 
 package org.cloudfoundry.doppler;
 
+import static org.junit.jupiter.api.Assertions.assertThrows;
+
 import okio.ByteString;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
-public final class LogMessageTest {
+final class LogMessageTest {
 
     @Test
-    public void dropsonde() {
+    void dropsonde() {
         LogMessage.from(
                 new org.cloudfoundry.dropsonde.events.LogMessage.Builder()
                         .message(ByteString.encodeUtf8("test-message"))
@@ -31,23 +33,38 @@ public void dropsonde() {
                         .build());
     }
 
-    @Test(expected = IllegalStateException.class)
-    public void noMessage() {
-        LogMessage.builder().messageType(MessageType.ERR).timestamp(0L).build();
+    @Test
+    void noMessage() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    LogMessage.builder().messageType(MessageType.ERR).timestamp(0L).build();
+                });
     }
 
-    @Test(expected = IllegalStateException.class)
-    public void noMessageType() {
-        LogMessage.builder().message("test-message").timestamp(0L).build();
+    @Test
+    void noMessageType() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    LogMessage.builder().message("test-message").timestamp(0L).build();
+                });
     }
 
-    @Test(expected = IllegalStateException.class)
-    public void noTimestamp() {
-        LogMessage.builder().message("test-message").messageType(MessageType.ERR).build();
+    @Test
+    void noTimestamp() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    LogMessage.builder()
+                            .message("test-message")
+                            .messageType(MessageType.ERR)
+                            .build();
+                });
     }
 
     @Test
-    public void valid() {
+    void valid() {
         LogMessage.builder()
                 .message("test-message")
                 .messageType(MessageType.ERR)
diff --git a/cloudfoundry-client/src/test/java/org/cloudfoundry/doppler/RecentLogsRequestTest.java b/cloudfoundry-client/src/test/java/org/cloudfoundry/doppler/RecentLogsRequestTest.java
index c570a6ec20c..fa3f02c6c9d 100644
--- a/cloudfoundry-client/src/test/java/org/cloudfoundry/doppler/RecentLogsRequestTest.java
+++ b/cloudfoundry-client/src/test/java/org/cloudfoundry/doppler/RecentLogsRequestTest.java
@@ -16,17 +16,23 @@
 
 package org.cloudfoundry.doppler;
 
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
-public final class RecentLogsRequestTest {
+import org.junit.jupiter.api.Test;
 
-    @Test(expected = IllegalStateException.class)
-    public void noApplicationId() {
-        RecentLogsRequest.builder().build();
+final class RecentLogsRequestTest {
+
+    @Test
+    void noApplicationId() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    RecentLogsRequest.builder().build();
+                });
     }
 
     @Test
-    public void valid() {
+    void valid() {
         RecentLogsRequest.builder().applicationId("test-application-id").build();
     }
 }
diff --git a/cloudfoundry-client/src/test/java/org/cloudfoundry/doppler/StreamRequestTest.java b/cloudfoundry-client/src/test/java/org/cloudfoundry/doppler/StreamRequestTest.java
index 6597ca05ef6..625da4cba97 100644
--- a/cloudfoundry-client/src/test/java/org/cloudfoundry/doppler/StreamRequestTest.java
+++ b/cloudfoundry-client/src/test/java/org/cloudfoundry/doppler/StreamRequestTest.java
@@ -16,17 +16,23 @@
 
 package org.cloudfoundry.doppler;
 
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
-public final class StreamRequestTest {
+import org.junit.jupiter.api.Test;
 
-    @Test(expected = IllegalStateException.class)
-    public void noApplicationId() {
-        StreamRequest.builder().build();
+final class StreamRequestTest {
+
+    @Test
+    void noApplicationId() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    StreamRequest.builder().build();
+                });
     }
 
     @Test
-    public void valid() {
+    void valid() {
         StreamRequest.builder().applicationId("test-application-id").build();
     }
 }
diff --git a/cloudfoundry-client/src/test/java/org/cloudfoundry/doppler/UuidUtilsTest.java b/cloudfoundry-client/src/test/java/org/cloudfoundry/doppler/UuidUtilsTest.java
index 8c0fbf13d13..1d9bbca065e 100644
--- a/cloudfoundry-client/src/test/java/org/cloudfoundry/doppler/UuidUtilsTest.java
+++ b/cloudfoundry-client/src/test/java/org/cloudfoundry/doppler/UuidUtilsTest.java
@@ -16,21 +16,22 @@
 
 package org.cloudfoundry.doppler;
 
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
 import java.util.UUID;
-import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
-public final class UuidUtilsTest {
+final class UuidUtilsTest {
 
     @Test
-    public void from() {
+    void from() {
         org.cloudfoundry.dropsonde.events.UUID dropsondeUuid =
                 new org.cloudfoundry.dropsonde.events.UUID.Builder()
                         .high(0x79d4c3b2020e67a5L)
                         .low(0x7243cc580bc17af4L)
                         .build();
 
-        Assert.assertEquals(
+        assertEquals(
                 UUID.fromString("f47ac10b-58cc-4372-a567-0e02b2c3d479"),
                 UuidUtils.from(dropsondeUuid));
     }
diff --git a/cloudfoundry-client/src/test/java/org/cloudfoundry/doppler/ValueMetricTest.java b/cloudfoundry-client/src/test/java/org/cloudfoundry/doppler/ValueMetricTest.java
index cb383ed138b..204a9978933 100644
--- a/cloudfoundry-client/src/test/java/org/cloudfoundry/doppler/ValueMetricTest.java
+++ b/cloudfoundry-client/src/test/java/org/cloudfoundry/doppler/ValueMetricTest.java
@@ -16,12 +16,14 @@
 
 package org.cloudfoundry.doppler;
 
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
-public final class ValueMetricTest {
+import org.junit.jupiter.api.Test;
+
+final class ValueMetricTest {
 
     @Test
-    public void dropsonde() {
+    void dropsonde() {
         ValueMetric.from(
                 new org.cloudfoundry.dropsonde.events.ValueMetric.Builder()
                         .name("test-name")
@@ -30,23 +32,35 @@ public void dropsonde() {
                         .build());
     }
 
-    @Test(expected = IllegalStateException.class)
-    public void noName() {
-        ValueMetric.builder().unit("test-unit").value(0.0).build();
+    @Test
+    void noName() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    ValueMetric.builder().unit("test-unit").value(0.0).build();
+                });
     }
 
-    @Test(expected = IllegalStateException.class)
-    public void noUnit() {
-        ValueMetric.builder().name("test-name").value(0.0).build();
+    @Test
+    void noUnit() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    ValueMetric.builder().name("test-name").value(0.0).build();
+                });
     }
 
-    @Test(expected = IllegalStateException.class)
-    public void noValue() {
-        ValueMetric.builder().name("test-name").unit("test-unit").build();
+    @Test
+    void noValue() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    ValueMetric.builder().name("test-name").unit("test-unit").build();
+                });
     }
 
     @Test
-    public void valid() {
+    void valid() {
         ValueMetric.builder().name("test-name").unit("test-unit").value(0.0).build();
     }
 }
diff --git a/cloudfoundry-client/src/test/java/org/cloudfoundry/logcache/v1/CounterTest.java b/cloudfoundry-client/src/test/java/org/cloudfoundry/logcache/v1/CounterTest.java
index 5b91581afdd..507b268f3b3 100644
--- a/cloudfoundry-client/src/test/java/org/cloudfoundry/logcache/v1/CounterTest.java
+++ b/cloudfoundry-client/src/test/java/org/cloudfoundry/logcache/v1/CounterTest.java
@@ -16,12 +16,12 @@
 
 package org.cloudfoundry.logcache.v1;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
-public class CounterTest {
+class CounterTest {
 
     @Test
-    public void valid() {
+    void valid() {
         Counter.builder().build();
     }
 }
diff --git a/cloudfoundry-client/src/test/java/org/cloudfoundry/logcache/v1/EnvelopeBatchTest.java b/cloudfoundry-client/src/test/java/org/cloudfoundry/logcache/v1/EnvelopeBatchTest.java
index 1c21ccb0325..3758990383d 100644
--- a/cloudfoundry-client/src/test/java/org/cloudfoundry/logcache/v1/EnvelopeBatchTest.java
+++ b/cloudfoundry-client/src/test/java/org/cloudfoundry/logcache/v1/EnvelopeBatchTest.java
@@ -16,12 +16,12 @@
 
 package org.cloudfoundry.logcache.v1;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
-public class EnvelopeBatchTest {
+class EnvelopeBatchTest {
 
     @Test
-    public void valid() {
+    void valid() {
         EnvelopeBatch.builder().build();
     }
 }
diff --git a/cloudfoundry-client/src/test/java/org/cloudfoundry/logcache/v1/EnvelopeTest.java b/cloudfoundry-client/src/test/java/org/cloudfoundry/logcache/v1/EnvelopeTest.java
index b5a60a8343a..ac6dc93f6ed 100644
--- a/cloudfoundry-client/src/test/java/org/cloudfoundry/logcache/v1/EnvelopeTest.java
+++ b/cloudfoundry-client/src/test/java/org/cloudfoundry/logcache/v1/EnvelopeTest.java
@@ -16,12 +16,12 @@
 
 package org.cloudfoundry.logcache.v1;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
-public class EnvelopeTest {
+class EnvelopeTest {
 
     @Test
-    public void valid() {
+    void valid() {
         Envelope.builder().build();
     }
 }
diff --git a/cloudfoundry-client/src/test/java/org/cloudfoundry/logcache/v1/EventTest.java b/cloudfoundry-client/src/test/java/org/cloudfoundry/logcache/v1/EventTest.java
index 73e706ead2a..9f44751c808 100644
--- a/cloudfoundry-client/src/test/java/org/cloudfoundry/logcache/v1/EventTest.java
+++ b/cloudfoundry-client/src/test/java/org/cloudfoundry/logcache/v1/EventTest.java
@@ -16,12 +16,12 @@
 
 package org.cloudfoundry.logcache.v1;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
-public class EventTest {
+class EventTest {
 
     @Test
-    public void valid() {
+    void valid() {
         Event.builder().build();
     }
 }
diff --git a/cloudfoundry-client/src/test/java/org/cloudfoundry/logcache/v1/GaugeTest.java b/cloudfoundry-client/src/test/java/org/cloudfoundry/logcache/v1/GaugeTest.java
index 8797f59f2b9..b280e8bf0c6 100644
--- a/cloudfoundry-client/src/test/java/org/cloudfoundry/logcache/v1/GaugeTest.java
+++ b/cloudfoundry-client/src/test/java/org/cloudfoundry/logcache/v1/GaugeTest.java
@@ -16,12 +16,12 @@
 
 package org.cloudfoundry.logcache.v1;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
-public class GaugeTest {
+class GaugeTest {
 
     @Test
-    public void valid() {
+    void valid() {
         Gauge.builder().build();
     }
 }
diff --git a/cloudfoundry-client/src/test/java/org/cloudfoundry/logcache/v1/InfoRequestTest.java b/cloudfoundry-client/src/test/java/org/cloudfoundry/logcache/v1/InfoRequestTest.java
index 1d5f1aa5e4a..860b1deaa66 100644
--- a/cloudfoundry-client/src/test/java/org/cloudfoundry/logcache/v1/InfoRequestTest.java
+++ b/cloudfoundry-client/src/test/java/org/cloudfoundry/logcache/v1/InfoRequestTest.java
@@ -16,12 +16,12 @@
 
 package org.cloudfoundry.logcache.v1;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
-public class InfoRequestTest {
+class InfoRequestTest {
 
     @Test
-    public void valid() {
+    void valid() {
         InfoRequest.builder().build();
     }
 }
diff --git a/cloudfoundry-client/src/test/java/org/cloudfoundry/logcache/v1/InfoResponseTest.java b/cloudfoundry-client/src/test/java/org/cloudfoundry/logcache/v1/InfoResponseTest.java
index 2089b53e9ee..0196a23356c 100644
--- a/cloudfoundry-client/src/test/java/org/cloudfoundry/logcache/v1/InfoResponseTest.java
+++ b/cloudfoundry-client/src/test/java/org/cloudfoundry/logcache/v1/InfoResponseTest.java
@@ -16,12 +16,12 @@
 
 package org.cloudfoundry.logcache.v1;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
-public class InfoResponseTest {
+class InfoResponseTest {
 
     @Test
-    public void valid() {
+    void valid() {
         InfoResponse.builder().build();
     }
 }
diff --git a/cloudfoundry-client/src/test/java/org/cloudfoundry/logcache/v1/LogTest.java b/cloudfoundry-client/src/test/java/org/cloudfoundry/logcache/v1/LogTest.java
index fa3cc028b00..756f3fb9428 100644
--- a/cloudfoundry-client/src/test/java/org/cloudfoundry/logcache/v1/LogTest.java
+++ b/cloudfoundry-client/src/test/java/org/cloudfoundry/logcache/v1/LogTest.java
@@ -20,17 +20,17 @@
 
 import java.nio.charset.StandardCharsets;
 import java.util.Base64;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
-public class LogTest {
+class LogTest {
 
     @Test
-    public void valid() {
+    void valid() {
         Log.builder().build();
     }
 
     @Test
-    public void getPayloadAsText() {
+    void getPayloadAsText() {
         final String payload = "This is a test.";
         final String encodedPayload =
                 Base64.getEncoder().encodeToString(payload.getBytes(StandardCharsets.UTF_8));
diff --git a/cloudfoundry-client/src/test/java/org/cloudfoundry/logcache/v1/MetaResponseTest.java b/cloudfoundry-client/src/test/java/org/cloudfoundry/logcache/v1/MetaResponseTest.java
index 329f7f076fe..10259b3b23b 100644
--- a/cloudfoundry-client/src/test/java/org/cloudfoundry/logcache/v1/MetaResponseTest.java
+++ b/cloudfoundry-client/src/test/java/org/cloudfoundry/logcache/v1/MetaResponseTest.java
@@ -16,12 +16,12 @@
 
 package org.cloudfoundry.logcache.v1;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
-public class MetaResponseTest {
+class MetaResponseTest {
 
     @Test
-    public void valid() {
+    void valid() {
         MetaResponse.builder().build();
     }
 }
diff --git a/cloudfoundry-client/src/test/java/org/cloudfoundry/logcache/v1/MetadataTest.java b/cloudfoundry-client/src/test/java/org/cloudfoundry/logcache/v1/MetadataTest.java
index 4bdf2686285..0e1b5e39b7f 100644
--- a/cloudfoundry-client/src/test/java/org/cloudfoundry/logcache/v1/MetadataTest.java
+++ b/cloudfoundry-client/src/test/java/org/cloudfoundry/logcache/v1/MetadataTest.java
@@ -16,27 +16,41 @@
 
 package org.cloudfoundry.logcache.v1;
 
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
-public class MetadataTest {
+import org.junit.jupiter.api.Test;
 
-    @Test(expected = IllegalStateException.class)
-    public void missingCount() {
-        Metadata.builder().expired(1L).newestTimestamp(1L).oldestTimestamp(1L).build();
+class MetadataTest {
+
+    @Test
+    void missingCount() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    Metadata.builder().expired(1L).newestTimestamp(1L).oldestTimestamp(1L).build();
+                });
     }
 
-    @Test(expected = IllegalStateException.class)
-    public void missingNewestTimestamp() {
-        Metadata.builder().count(1L).expired(1L).oldestTimestamp(1L).build();
+    @Test
+    void missingNewestTimestamp() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    Metadata.builder().count(1L).expired(1L).oldestTimestamp(1L).build();
+                });
     }
 
-    @Test(expected = IllegalStateException.class)
-    public void missingOldestTimestamp() {
-        Metadata.builder().count(1L).expired(1L).newestTimestamp(1L).build();
+    @Test
+    void missingOldestTimestamp() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    Metadata.builder().count(1L).expired(1L).newestTimestamp(1L).build();
+                });
     }
 
     @Test
-    public void valid() {
+    void valid() {
         Metadata.builder().count(1L).expired(1L).newestTimestamp(1L).oldestTimestamp(1L).build();
     }
 }
diff --git a/cloudfoundry-client/src/test/java/org/cloudfoundry/logcache/v1/MetricTest.java b/cloudfoundry-client/src/test/java/org/cloudfoundry/logcache/v1/MetricTest.java
index 906009494c3..8fbeb6da1d9 100644
--- a/cloudfoundry-client/src/test/java/org/cloudfoundry/logcache/v1/MetricTest.java
+++ b/cloudfoundry-client/src/test/java/org/cloudfoundry/logcache/v1/MetricTest.java
@@ -16,12 +16,12 @@
 
 package org.cloudfoundry.logcache.v1;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
-public class MetricTest {
+class MetricTest {
 
     @Test
-    public void valid() {
+    void valid() {
         Metric.builder().build();
     }
 }
diff --git a/cloudfoundry-client/src/test/java/org/cloudfoundry/logcache/v1/ReadRequestTest.java b/cloudfoundry-client/src/test/java/org/cloudfoundry/logcache/v1/ReadRequestTest.java
index 18afa9692df..18d5f0e52eb 100644
--- a/cloudfoundry-client/src/test/java/org/cloudfoundry/logcache/v1/ReadRequestTest.java
+++ b/cloudfoundry-client/src/test/java/org/cloudfoundry/logcache/v1/ReadRequestTest.java
@@ -16,17 +16,23 @@
 
 package org.cloudfoundry.logcache.v1;
 
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
-public class ReadRequestTest {
+import org.junit.jupiter.api.Test;
 
-    @Test(expected = IllegalStateException.class)
-    public void noSourceId() {
-        ReadRequest.builder().build();
+class ReadRequestTest {
+
+    @Test
+    void noSourceId() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    ReadRequest.builder().build();
+                });
     }
 
     @Test
-    public void valid() {
+    void valid() {
         ReadRequest.builder().sourceId("test").build();
     }
 }
diff --git a/cloudfoundry-client/src/test/java/org/cloudfoundry/logcache/v1/ReadResponseTest.java b/cloudfoundry-client/src/test/java/org/cloudfoundry/logcache/v1/ReadResponseTest.java
index 917a0f9ae52..f593be0a6b6 100644
--- a/cloudfoundry-client/src/test/java/org/cloudfoundry/logcache/v1/ReadResponseTest.java
+++ b/cloudfoundry-client/src/test/java/org/cloudfoundry/logcache/v1/ReadResponseTest.java
@@ -18,17 +18,17 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
-public class ReadResponseTest {
+class ReadResponseTest {
 
     @Test
-    public void missingEnvelopes() {
+    void missingEnvelopes() {
         assertThat(ReadResponse.builder().build().getEnvelopes()).isNotNull();
     }
 
     @Test
-    public void valid() {
+    void valid() {
         ReadResponse.builder().envelopes(EnvelopeBatch.builder().build()).build();
     }
 }
diff --git a/cloudfoundry-client/src/test/java/org/cloudfoundry/logcache/v1/TimerTest.java b/cloudfoundry-client/src/test/java/org/cloudfoundry/logcache/v1/TimerTest.java
index bae270373d4..a6dc7773b28 100644
--- a/cloudfoundry-client/src/test/java/org/cloudfoundry/logcache/v1/TimerTest.java
+++ b/cloudfoundry-client/src/test/java/org/cloudfoundry/logcache/v1/TimerTest.java
@@ -16,12 +16,12 @@
 
 package org.cloudfoundry.logcache.v1;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
-public class TimerTest {
+class TimerTest {
 
     @Test
-    public void valid() {
+    void valid() {
         Timer.builder().build();
     }
 }
diff --git a/cloudfoundry-client/src/test/java/org/cloudfoundry/networking/v1/policies/CreatePoliciesRequestTest.java b/cloudfoundry-client/src/test/java/org/cloudfoundry/networking/v1/policies/CreatePoliciesRequestTest.java
index bb01fb62b4f..62571081a24 100644
--- a/cloudfoundry-client/src/test/java/org/cloudfoundry/networking/v1/policies/CreatePoliciesRequestTest.java
+++ b/cloudfoundry-client/src/test/java/org/cloudfoundry/networking/v1/policies/CreatePoliciesRequestTest.java
@@ -16,17 +16,23 @@
 
 package org.cloudfoundry.networking.v1.policies;
 
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
-public class CreatePoliciesRequestTest {
+import org.junit.jupiter.api.Test;
 
-    @Test(expected = IllegalStateException.class)
-    public void noPolicy() {
-        CreatePoliciesRequest.builder().build();
+class CreatePoliciesRequestTest {
+
+    @Test
+    void noPolicy() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    CreatePoliciesRequest.builder().build();
+                });
     }
 
     @Test
-    public void valid() {
+    void valid() {
         CreatePoliciesRequest.builder()
                 .policy(
                         Policy.builder()
diff --git a/cloudfoundry-client/src/test/java/org/cloudfoundry/networking/v1/policies/DeletePoliciesRequestTest.java b/cloudfoundry-client/src/test/java/org/cloudfoundry/networking/v1/policies/DeletePoliciesRequestTest.java
index a2e61c8def2..b2fdcdd5d3a 100644
--- a/cloudfoundry-client/src/test/java/org/cloudfoundry/networking/v1/policies/DeletePoliciesRequestTest.java
+++ b/cloudfoundry-client/src/test/java/org/cloudfoundry/networking/v1/policies/DeletePoliciesRequestTest.java
@@ -16,17 +16,23 @@
 
 package org.cloudfoundry.networking.v1.policies;
 
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
-public class DeletePoliciesRequestTest {
+import org.junit.jupiter.api.Test;
 
-    @Test(expected = IllegalStateException.class)
-    public void noPolicy() {
-        DeletePoliciesRequest.builder().build();
+class DeletePoliciesRequestTest {
+
+    @Test
+    void noPolicy() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    DeletePoliciesRequest.builder().build();
+                });
     }
 
     @Test
-    public void valid() {
+    void valid() {
         DeletePoliciesRequest.builder()
                 .policy(
                         Policy.builder()
diff --git a/cloudfoundry-client/src/test/java/org/cloudfoundry/networking/v1/policies/ListPoliciesRequestTest.java b/cloudfoundry-client/src/test/java/org/cloudfoundry/networking/v1/policies/ListPoliciesRequestTest.java
index 8f2b7ac4acc..694c7936714 100644
--- a/cloudfoundry-client/src/test/java/org/cloudfoundry/networking/v1/policies/ListPoliciesRequestTest.java
+++ b/cloudfoundry-client/src/test/java/org/cloudfoundry/networking/v1/policies/ListPoliciesRequestTest.java
@@ -16,12 +16,12 @@
 
 package org.cloudfoundry.networking.v1.policies;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
-public class ListPoliciesRequestTest {
+class ListPoliciesRequestTest {
 
     @Test
-    public void valid() {
+    void valid() {
         ListPoliciesRequest.builder().build();
     }
 }
diff --git a/cloudfoundry-client/src/test/java/org/cloudfoundry/networking/v1/tags/ListTagsRequestTest.java b/cloudfoundry-client/src/test/java/org/cloudfoundry/networking/v1/tags/ListTagsRequestTest.java
index 45d4d6dfdf0..fc090a6cb9d 100644
--- a/cloudfoundry-client/src/test/java/org/cloudfoundry/networking/v1/tags/ListTagsRequestTest.java
+++ b/cloudfoundry-client/src/test/java/org/cloudfoundry/networking/v1/tags/ListTagsRequestTest.java
@@ -16,12 +16,12 @@
 
 package org.cloudfoundry.networking.v1.tags;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
-public class ListTagsRequestTest {
+class ListTagsRequestTest {
 
     @Test
-    public void valid() {
+    void valid() {
         ListTagsRequest.builder().build();
     }
 }
diff --git a/cloudfoundry-client/src/test/java/org/cloudfoundry/routing/v1/routergroups/ListRouterGroupsRequestTest.java b/cloudfoundry-client/src/test/java/org/cloudfoundry/routing/v1/routergroups/ListRouterGroupsRequestTest.java
index 1ee271008fd..97a77ad6482 100644
--- a/cloudfoundry-client/src/test/java/org/cloudfoundry/routing/v1/routergroups/ListRouterGroupsRequestTest.java
+++ b/cloudfoundry-client/src/test/java/org/cloudfoundry/routing/v1/routergroups/ListRouterGroupsRequestTest.java
@@ -16,12 +16,12 @@
 
 package org.cloudfoundry.routing.v1.routergroups;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
-public class ListRouterGroupsRequestTest {
+class ListRouterGroupsRequestTest {
 
     @Test
-    public void valid() {
+    void valid() {
         ListRouterGroupsRequest.builder().build();
     }
 }
diff --git a/cloudfoundry-client/src/test/java/org/cloudfoundry/routing/v1/routergroups/UpdateRouterGroupRequestTest.java b/cloudfoundry-client/src/test/java/org/cloudfoundry/routing/v1/routergroups/UpdateRouterGroupRequestTest.java
index 03573300cd5..08063674d42 100644
--- a/cloudfoundry-client/src/test/java/org/cloudfoundry/routing/v1/routergroups/UpdateRouterGroupRequestTest.java
+++ b/cloudfoundry-client/src/test/java/org/cloudfoundry/routing/v1/routergroups/UpdateRouterGroupRequestTest.java
@@ -16,22 +16,34 @@
 
 package org.cloudfoundry.routing.v1.routergroups;
 
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
-public class UpdateRouterGroupRequestTest {
+import org.junit.jupiter.api.Test;
 
-    @Test(expected = IllegalStateException.class)
-    public void noId() {
-        UpdateRouterGroupRequest.builder().reservablePorts("999-9999").build();
+class UpdateRouterGroupRequestTest {
+
+    @Test
+    void noId() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    UpdateRouterGroupRequest.builder().reservablePorts("999-9999").build();
+                });
     }
 
-    @Test(expected = IllegalStateException.class)
-    public void noReservablePorts() {
-        UpdateRouterGroupRequest.builder().routerGroupId("test-router-group-id").build();
+    @Test
+    void noReservablePorts() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    UpdateRouterGroupRequest.builder()
+                            .routerGroupId("test-router-group-id")
+                            .build();
+                });
     }
 
     @Test
-    public void valid() {
+    void valid() {
         UpdateRouterGroupRequest.builder()
                 .reservablePorts("999-9999")
                 .routerGroupId("test-router-group-id")
diff --git a/cloudfoundry-client/src/test/java/org/cloudfoundry/routing/v1/tcproutes/CreateTcpRoutesRequestTest.java b/cloudfoundry-client/src/test/java/org/cloudfoundry/routing/v1/tcproutes/CreateTcpRoutesRequestTest.java
index 8d266d9911f..ab6331528db 100644
--- a/cloudfoundry-client/src/test/java/org/cloudfoundry/routing/v1/tcproutes/CreateTcpRoutesRequestTest.java
+++ b/cloudfoundry-client/src/test/java/org/cloudfoundry/routing/v1/tcproutes/CreateTcpRoutesRequestTest.java
@@ -16,77 +16,99 @@
 
 package org.cloudfoundry.routing.v1.tcproutes;
 
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
-public class CreateTcpRoutesRequestTest {
+import org.junit.jupiter.api.Test;
 
-    @Test(expected = IllegalStateException.class)
-    public void noBackendIp() {
-        CreateTcpRoutesRequest.builder()
-                .tcpRoute(
-                        TcpRouteConfiguration.builder()
-                                .backendPort(9999)
-                                .port(999)
-                                .routerGroupId("test-router-group-id")
-                                .ttl(99)
-                                .build())
-                .build();
+class CreateTcpRoutesRequestTest {
+
+    @Test
+    void noBackendIp() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    CreateTcpRoutesRequest.builder()
+                            .tcpRoute(
+                                    TcpRouteConfiguration.builder()
+                                            .backendPort(9999)
+                                            .port(999)
+                                            .routerGroupId("test-router-group-id")
+                                            .ttl(99)
+                                            .build())
+                            .build();
+                });
     }
 
-    @Test(expected = IllegalStateException.class)
-    public void noBackendPort() {
-        CreateTcpRoutesRequest.builder()
-                .tcpRoute(
-                        TcpRouteConfiguration.builder()
-                                .backendIp("test-backend-ip")
-                                .port(999)
-                                .routerGroupId("test-router-group-id")
-                                .ttl(99)
-                                .build())
-                .build();
+    @Test
+    void noBackendPort() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    CreateTcpRoutesRequest.builder()
+                            .tcpRoute(
+                                    TcpRouteConfiguration.builder()
+                                            .backendIp("test-backend-ip")
+                                            .port(999)
+                                            .routerGroupId("test-router-group-id")
+                                            .ttl(99)
+                                            .build())
+                            .build();
+                });
     }
 
-    @Test(expected = IllegalStateException.class)
-    public void noPort() {
-        CreateTcpRoutesRequest.builder()
-                .tcpRoute(
-                        TcpRouteConfiguration.builder()
-                                .backendIp("test-backend-ip")
-                                .backendPort(9999)
-                                .routerGroupId("test-router-group-id")
-                                .ttl(99)
-                                .build())
-                .build();
+    @Test
+    void noPort() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    CreateTcpRoutesRequest.builder()
+                            .tcpRoute(
+                                    TcpRouteConfiguration.builder()
+                                            .backendIp("test-backend-ip")
+                                            .backendPort(9999)
+                                            .routerGroupId("test-router-group-id")
+                                            .ttl(99)
+                                            .build())
+                            .build();
+                });
     }
 
-    @Test(expected = IllegalStateException.class)
-    public void noRouterGroupId() {
-        CreateTcpRoutesRequest.builder()
-                .tcpRoute(
-                        TcpRouteConfiguration.builder()
-                                .backendIp("test-backend-ip")
-                                .backendPort(9999)
-                                .port(999)
-                                .ttl(99)
-                                .build())
-                .build();
+    @Test
+    void noRouterGroupId() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    CreateTcpRoutesRequest.builder()
+                            .tcpRoute(
+                                    TcpRouteConfiguration.builder()
+                                            .backendIp("test-backend-ip")
+                                            .backendPort(9999)
+                                            .port(999)
+                                            .ttl(99)
+                                            .build())
+                            .build();
+                });
     }
 
-    @Test(expected = IllegalStateException.class)
-    public void noTtl() {
-        CreateTcpRoutesRequest.builder()
-                .tcpRoute(
-                        TcpRouteConfiguration.builder()
-                                .backendIp("test-backend-ip")
-                                .backendPort(9999)
-                                .port(999)
-                                .routerGroupId("test-router-group-id")
-                                .build())
-                .build();
+    @Test
+    void noTtl() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    CreateTcpRoutesRequest.builder()
+                            .tcpRoute(
+                                    TcpRouteConfiguration.builder()
+                                            .backendIp("test-backend-ip")
+                                            .backendPort(9999)
+                                            .port(999)
+                                            .routerGroupId("test-router-group-id")
+                                            .build())
+                            .build();
+                });
     }
 
     @Test
-    public void valid() {
+    void valid() {
         CreateTcpRoutesRequest.builder()
                 .tcpRoute(
                         TcpRouteConfiguration.builder()
diff --git a/cloudfoundry-client/src/test/java/org/cloudfoundry/routing/v1/tcproutes/DeleteTcpRoutesRequestTest.java b/cloudfoundry-client/src/test/java/org/cloudfoundry/routing/v1/tcproutes/DeleteTcpRoutesRequestTest.java
index 1c4c8755530..1fcae6c6b3d 100644
--- a/cloudfoundry-client/src/test/java/org/cloudfoundry/routing/v1/tcproutes/DeleteTcpRoutesRequestTest.java
+++ b/cloudfoundry-client/src/test/java/org/cloudfoundry/routing/v1/tcproutes/DeleteTcpRoutesRequestTest.java
@@ -16,60 +16,78 @@
 
 package org.cloudfoundry.routing.v1.tcproutes;
 
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
-public class DeleteTcpRoutesRequestTest {
+import org.junit.jupiter.api.Test;
 
-    @Test(expected = IllegalStateException.class)
-    public void noBackendIp() {
-        DeleteTcpRoutesRequest.builder()
-                .tcpRoute(
-                        TcpRouteDeletion.builder()
-                                .backendPort(9999)
-                                .port(999)
-                                .routerGroupId("test-router-group-id")
-                                .build())
-                .build();
+class DeleteTcpRoutesRequestTest {
+
+    @Test
+    void noBackendIp() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    DeleteTcpRoutesRequest.builder()
+                            .tcpRoute(
+                                    TcpRouteDeletion.builder()
+                                            .backendPort(9999)
+                                            .port(999)
+                                            .routerGroupId("test-router-group-id")
+                                            .build())
+                            .build();
+                });
     }
 
-    @Test(expected = IllegalStateException.class)
-    public void noBackendPort() {
-        DeleteTcpRoutesRequest.builder()
-                .tcpRoute(
-                        TcpRouteDeletion.builder()
-                                .backendIp("test-backend-ip")
-                                .port(999)
-                                .routerGroupId("test-router-group-id")
-                                .build())
-                .build();
+    @Test
+    void noBackendPort() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    DeleteTcpRoutesRequest.builder()
+                            .tcpRoute(
+                                    TcpRouteDeletion.builder()
+                                            .backendIp("test-backend-ip")
+                                            .port(999)
+                                            .routerGroupId("test-router-group-id")
+                                            .build())
+                            .build();
+                });
     }
 
-    @Test(expected = IllegalStateException.class)
-    public void noPort() {
-        DeleteTcpRoutesRequest.builder()
-                .tcpRoute(
-                        TcpRouteDeletion.builder()
-                                .backendIp("test-backend-ip")
-                                .backendPort(9999)
-                                .routerGroupId("test-router-group-id")
-                                .build())
-                .build();
+    @Test
+    void noPort() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    DeleteTcpRoutesRequest.builder()
+                            .tcpRoute(
+                                    TcpRouteDeletion.builder()
+                                            .backendIp("test-backend-ip")
+                                            .backendPort(9999)
+                                            .routerGroupId("test-router-group-id")
+                                            .build())
+                            .build();
+                });
     }
 
-    @Test(expected = IllegalStateException.class)
-    public void noRouterGroupId() {
-        DeleteTcpRoutesRequest.builder()
-                .tcpRoute(
-                        TcpRouteDeletion.builder()
-                                .backendIp("test-backend-ip")
-                                .backendPort(9999)
-                                .port(999)
-                                .build())
-                .build();
+    @Test
+    void noRouterGroupId() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    DeleteTcpRoutesRequest.builder()
+                            .tcpRoute(
+                                    TcpRouteDeletion.builder()
+                                            .backendIp("test-backend-ip")
+                                            .backendPort(9999)
+                                            .port(999)
+                                            .build())
+                            .build();
+                });
     }
 
     @Test
-    public void valid() {
+    void valid() {
         DeleteTcpRoutesRequest.builder()
                 .tcpRoute(
                         TcpRouteDeletion.builder()
diff --git a/cloudfoundry-client/src/test/java/org/cloudfoundry/routing/v1/tcproutes/ListTcpRoutesRequestTest.java b/cloudfoundry-client/src/test/java/org/cloudfoundry/routing/v1/tcproutes/ListTcpRoutesRequestTest.java
index 5233d74760d..cbe0d3bc3e3 100644
--- a/cloudfoundry-client/src/test/java/org/cloudfoundry/routing/v1/tcproutes/ListTcpRoutesRequestTest.java
+++ b/cloudfoundry-client/src/test/java/org/cloudfoundry/routing/v1/tcproutes/ListTcpRoutesRequestTest.java
@@ -16,12 +16,12 @@
 
 package org.cloudfoundry.routing.v1.tcproutes;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
-public class ListTcpRoutesRequestTest {
+class ListTcpRoutesRequestTest {
 
     @Test
-    public void valid() {
+    void valid() {
         ListTcpRoutesRequest.builder().build();
     }
 }
diff --git a/cloudfoundry-client/src/test/java/org/cloudfoundry/uaa/SortOrderTest.java b/cloudfoundry-client/src/test/java/org/cloudfoundry/uaa/SortOrderTest.java
index 75913c612d4..fe31082074d 100644
--- a/cloudfoundry-client/src/test/java/org/cloudfoundry/uaa/SortOrderTest.java
+++ b/cloudfoundry-client/src/test/java/org/cloudfoundry/uaa/SortOrderTest.java
@@ -20,12 +20,12 @@
 import static org.cloudfoundry.uaa.SortOrder.ASCENDING;
 import static org.cloudfoundry.uaa.SortOrder.DESCENDING;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
-public final class SortOrderTest {
+final class SortOrderTest {
 
     @Test
-    public void sortOrder() {
+    void sortOrder() {
         assertThat(ASCENDING.getValue()).isEqualTo("ascending");
         assertThat(DESCENDING.getValue()).isEqualTo("descending");
     }
diff --git a/cloudfoundry-client/src/test/java/org/cloudfoundry/uaa/UaaExceptionTest.java b/cloudfoundry-client/src/test/java/org/cloudfoundry/uaa/UaaExceptionTest.java
index 4413c34f551..b05d5a0e2dc 100644
--- a/cloudfoundry-client/src/test/java/org/cloudfoundry/uaa/UaaExceptionTest.java
+++ b/cloudfoundry-client/src/test/java/org/cloudfoundry/uaa/UaaExceptionTest.java
@@ -18,12 +18,12 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
-public final class UaaExceptionTest {
+final class UaaExceptionTest {
 
     @Test
-    public void test() {
+    void test() {
         assertThat(new UaaException(-1, "test-error", "test-error-description"))
                 .hasNoCause()
                 .hasMessage("test-error: test-error-description")
diff --git a/cloudfoundry-client/src/test/java/org/cloudfoundry/uaa/authorizations/AuthorizeByAuthorizationCodeGrantApiRequestTest.java b/cloudfoundry-client/src/test/java/org/cloudfoundry/uaa/authorizations/AuthorizeByAuthorizationCodeGrantApiRequestTest.java
index 6f95b2bbb9d..a099b93307b 100644
--- a/cloudfoundry-client/src/test/java/org/cloudfoundry/uaa/authorizations/AuthorizeByAuthorizationCodeGrantApiRequestTest.java
+++ b/cloudfoundry-client/src/test/java/org/cloudfoundry/uaa/authorizations/AuthorizeByAuthorizationCodeGrantApiRequestTest.java
@@ -16,20 +16,26 @@
 
 package org.cloudfoundry.uaa.authorizations;
 
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
-public final class AuthorizeByAuthorizationCodeGrantApiRequestTest {
+import org.junit.jupiter.api.Test;
 
-    @Test(expected = IllegalStateException.class)
-    public void noClientId() {
-        AuthorizeByAuthorizationCodeGrantApiRequest.builder()
-                .redirectUri("http://redirect.to/app")
-                .state("test-state")
-                .build();
+final class AuthorizeByAuthorizationCodeGrantApiRequestTest {
+
+    @Test
+    void noClientId() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    AuthorizeByAuthorizationCodeGrantApiRequest.builder()
+                            .redirectUri("http://redirect.to/app")
+                            .state("test-state")
+                            .build();
+                });
     }
 
     @Test
-    public void validMax() {
+    void validMax() {
         AuthorizeByAuthorizationCodeGrantApiRequest.builder()
                 .clientId("test-client-id")
                 .redirectUri("http://redirect.to/app")
@@ -38,7 +44,7 @@ public void validMax() {
     }
 
     @Test
-    public void validMin() {
+    void validMin() {
         AuthorizeByAuthorizationCodeGrantApiRequest.builder().clientId("test-client-id").build();
     }
 }
diff --git a/cloudfoundry-client/src/test/java/org/cloudfoundry/uaa/authorizations/AuthorizeByAuthorizationCodeGrantBrowserRequestTest.java b/cloudfoundry-client/src/test/java/org/cloudfoundry/uaa/authorizations/AuthorizeByAuthorizationCodeGrantBrowserRequestTest.java
index 9a299563cf4..4aa8c21793b 100644
--- a/cloudfoundry-client/src/test/java/org/cloudfoundry/uaa/authorizations/AuthorizeByAuthorizationCodeGrantBrowserRequestTest.java
+++ b/cloudfoundry-client/src/test/java/org/cloudfoundry/uaa/authorizations/AuthorizeByAuthorizationCodeGrantBrowserRequestTest.java
@@ -16,20 +16,26 @@
 
 package org.cloudfoundry.uaa.authorizations;
 
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
-public final class AuthorizeByAuthorizationCodeGrantBrowserRequestTest {
+import org.junit.jupiter.api.Test;
 
-    @Test(expected = IllegalStateException.class)
-    public void noClientId() {
-        AuthorizeByAuthorizationCodeGrantBrowserRequest.builder()
-                .redirectUri("http://redirect.to/app")
-                .scope("test-scope")
-                .build();
+final class AuthorizeByAuthorizationCodeGrantBrowserRequestTest {
+
+    @Test
+    void noClientId() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    AuthorizeByAuthorizationCodeGrantBrowserRequest.builder()
+                            .redirectUri("http://redirect.to/app")
+                            .scope("test-scope")
+                            .build();
+                });
     }
 
     @Test
-    public void validMax() {
+    void validMax() {
         AuthorizeByAuthorizationCodeGrantBrowserRequest.builder()
                 .clientId("test-client-id")
                 .redirectUri("http://redirect.to/app")
@@ -38,7 +44,7 @@ public void validMax() {
     }
 
     @Test
-    public void validMin() {
+    void validMin() {
         AuthorizeByAuthorizationCodeGrantBrowserRequest.builder()
                 .clientId("test-client-id")
                 .build();
diff --git a/cloudfoundry-client/src/test/java/org/cloudfoundry/uaa/authorizations/AuthorizeByAuthorizationCodeGrantHybridRequestTest.java b/cloudfoundry-client/src/test/java/org/cloudfoundry/uaa/authorizations/AuthorizeByAuthorizationCodeGrantHybridRequestTest.java
index 4500e940a7c..9eb1f7021d5 100644
--- a/cloudfoundry-client/src/test/java/org/cloudfoundry/uaa/authorizations/AuthorizeByAuthorizationCodeGrantHybridRequestTest.java
+++ b/cloudfoundry-client/src/test/java/org/cloudfoundry/uaa/authorizations/AuthorizeByAuthorizationCodeGrantHybridRequestTest.java
@@ -16,20 +16,26 @@
 
 package org.cloudfoundry.uaa.authorizations;
 
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
-public final class AuthorizeByAuthorizationCodeGrantHybridRequestTest {
+import org.junit.jupiter.api.Test;
 
-    @Test(expected = IllegalStateException.class)
-    public void noClientId() {
-        AuthorizeByAuthorizationCodeGrantHybridRequest.builder()
-                .redirectUri("http://redirect.to/app")
-                .scope("test-scope")
-                .build();
+final class AuthorizeByAuthorizationCodeGrantHybridRequestTest {
+
+    @Test
+    void noClientId() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    AuthorizeByAuthorizationCodeGrantHybridRequest.builder()
+                            .redirectUri("http://redirect.to/app")
+                            .scope("test-scope")
+                            .build();
+                });
     }
 
     @Test
-    public void validMax() {
+    void validMax() {
         AuthorizeByAuthorizationCodeGrantHybridRequest.builder()
                 .clientId("test-client-id")
                 .redirectUri("http://redirect.to/app")
@@ -38,7 +44,7 @@ public void validMax() {
     }
 
     @Test
-    public void validMin() {
+    void validMin() {
         AuthorizeByAuthorizationCodeGrantHybridRequest.builder().clientId("test-client-id").build();
     }
 }
diff --git a/cloudfoundry-client/src/test/java/org/cloudfoundry/uaa/authorizations/AuthorizeByImplicitGrantBrowserRequestTest.java b/cloudfoundry-client/src/test/java/org/cloudfoundry/uaa/authorizations/AuthorizeByImplicitGrantBrowserRequestTest.java
index dfa81501330..af9f338aeff 100644
--- a/cloudfoundry-client/src/test/java/org/cloudfoundry/uaa/authorizations/AuthorizeByImplicitGrantBrowserRequestTest.java
+++ b/cloudfoundry-client/src/test/java/org/cloudfoundry/uaa/authorizations/AuthorizeByImplicitGrantBrowserRequestTest.java
@@ -16,20 +16,26 @@
 
 package org.cloudfoundry.uaa.authorizations;
 
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
-public final class AuthorizeByImplicitGrantBrowserRequestTest {
+import org.junit.jupiter.api.Test;
 
-    @Test(expected = IllegalStateException.class)
-    public void noClientId() {
-        AuthorizeByImplicitGrantBrowserRequest.builder()
-                .redirectUri("http://redirect.to/app")
-                .scope("test-scope")
-                .build();
+final class AuthorizeByImplicitGrantBrowserRequestTest {
+
+    @Test
+    void noClientId() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    AuthorizeByImplicitGrantBrowserRequest.builder()
+                            .redirectUri("http://redirect.to/app")
+                            .scope("test-scope")
+                            .build();
+                });
     }
 
     @Test
-    public void validMax() {
+    void validMax() {
         AuthorizeByImplicitGrantBrowserRequest.builder()
                 .clientId("test-client-id")
                 .redirectUri("http://redirect.to/app")
@@ -38,7 +44,7 @@ public void validMax() {
     }
 
     @Test
-    public void validMin() {
+    void validMin() {
         AuthorizeByImplicitGrantBrowserRequest.builder().clientId("test-client-id").build();
     }
 }
diff --git a/cloudfoundry-client/src/test/java/org/cloudfoundry/uaa/authorizations/AuthorizeByOpenIdWithAuthorizationCodeGrantRequestTest.java b/cloudfoundry-client/src/test/java/org/cloudfoundry/uaa/authorizations/AuthorizeByOpenIdWithAuthorizationCodeGrantRequestTest.java
index 10f5348e291..8099169de38 100644
--- a/cloudfoundry-client/src/test/java/org/cloudfoundry/uaa/authorizations/AuthorizeByOpenIdWithAuthorizationCodeGrantRequestTest.java
+++ b/cloudfoundry-client/src/test/java/org/cloudfoundry/uaa/authorizations/AuthorizeByOpenIdWithAuthorizationCodeGrantRequestTest.java
@@ -16,20 +16,26 @@
 
 package org.cloudfoundry.uaa.authorizations;
 
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
-public final class AuthorizeByOpenIdWithAuthorizationCodeGrantRequestTest {
+import org.junit.jupiter.api.Test;
 
-    @Test(expected = IllegalStateException.class)
-    public void noClientId() {
-        AuthorizeByOpenIdWithAuthorizationCodeGrantRequest.builder()
-                .redirectUri("http://redirect.to/app")
-                .scope("test-scope")
-                .build();
+final class AuthorizeByOpenIdWithAuthorizationCodeGrantRequestTest {
+
+    @Test
+    void noClientId() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    AuthorizeByOpenIdWithAuthorizationCodeGrantRequest.builder()
+                            .redirectUri("http://redirect.to/app")
+                            .scope("test-scope")
+                            .build();
+                });
     }
 
     @Test
-    public void validMax() {
+    void validMax() {
         AuthorizeByOpenIdWithAuthorizationCodeGrantRequest.builder()
                 .clientId("test-client-id")
                 .redirectUri("http://redirect.to/app")
@@ -38,7 +44,7 @@ public void validMax() {
     }
 
     @Test
-    public void validMin() {
+    void validMin() {
         AuthorizeByOpenIdWithAuthorizationCodeGrantRequest.builder()
                 .clientId("test-client-id")
                 .build();
diff --git a/cloudfoundry-client/src/test/java/org/cloudfoundry/uaa/authorizations/AuthorizeByOpenIdWithIdTokenRequestTest.java b/cloudfoundry-client/src/test/java/org/cloudfoundry/uaa/authorizations/AuthorizeByOpenIdWithIdTokenRequestTest.java
index 37fc29916ee..05d4b95172a 100644
--- a/cloudfoundry-client/src/test/java/org/cloudfoundry/uaa/authorizations/AuthorizeByOpenIdWithIdTokenRequestTest.java
+++ b/cloudfoundry-client/src/test/java/org/cloudfoundry/uaa/authorizations/AuthorizeByOpenIdWithIdTokenRequestTest.java
@@ -16,20 +16,26 @@
 
 package org.cloudfoundry.uaa.authorizations;
 
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
-public final class AuthorizeByOpenIdWithIdTokenRequestTest {
+import org.junit.jupiter.api.Test;
 
-    @Test(expected = IllegalStateException.class)
-    public void noClientId() {
-        AuthorizeByOpenIdWithIdTokenRequest.builder()
-                .redirectUri("http://redirect.to/app")
-                .scope("test-scope")
-                .build();
+final class AuthorizeByOpenIdWithIdTokenRequestTest {
+
+    @Test
+    void noClientId() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    AuthorizeByOpenIdWithIdTokenRequest.builder()
+                            .redirectUri("http://redirect.to/app")
+                            .scope("test-scope")
+                            .build();
+                });
     }
 
     @Test
-    public void validMax() {
+    void validMax() {
         AuthorizeByOpenIdWithIdTokenRequest.builder()
                 .clientId("test-client-id")
                 .redirectUri("http://redirect.to/app")
@@ -38,7 +44,7 @@ public void validMax() {
     }
 
     @Test
-    public void validMin() {
+    void validMin() {
         AuthorizeByOpenIdWithIdTokenRequest.builder().clientId("test-client-id").build();
     }
 }
diff --git a/cloudfoundry-client/src/test/java/org/cloudfoundry/uaa/authorizations/AuthorizeByOpenIdWithImplicitGrantRequestTest.java b/cloudfoundry-client/src/test/java/org/cloudfoundry/uaa/authorizations/AuthorizeByOpenIdWithImplicitGrantRequestTest.java
index 3cbcab9e798..cd2e3d41c65 100644
--- a/cloudfoundry-client/src/test/java/org/cloudfoundry/uaa/authorizations/AuthorizeByOpenIdWithImplicitGrantRequestTest.java
+++ b/cloudfoundry-client/src/test/java/org/cloudfoundry/uaa/authorizations/AuthorizeByOpenIdWithImplicitGrantRequestTest.java
@@ -16,20 +16,26 @@
 
 package org.cloudfoundry.uaa.authorizations;
 
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
-public final class AuthorizeByOpenIdWithImplicitGrantRequestTest {
+import org.junit.jupiter.api.Test;
 
-    @Test(expected = IllegalStateException.class)
-    public void noClientId() {
-        AuthorizeByOpenIdWithImplicitGrantRequest.builder()
-                .redirectUri("http://redirect.to/app")
-                .scope("test-scope")
-                .build();
+final class AuthorizeByOpenIdWithImplicitGrantRequestTest {
+
+    @Test
+    void noClientId() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    AuthorizeByOpenIdWithImplicitGrantRequest.builder()
+                            .redirectUri("http://redirect.to/app")
+                            .scope("test-scope")
+                            .build();
+                });
     }
 
     @Test
-    public void validMax() {
+    void validMax() {
         AuthorizeByOpenIdWithImplicitGrantRequest.builder()
                 .clientId("test-client-id")
                 .redirectUri("http://redirect.to/app")
@@ -38,7 +44,7 @@ public void validMax() {
     }
 
     @Test
-    public void validMin() {
+    void validMin() {
         AuthorizeByOpenIdWithImplicitGrantRequest.builder().clientId("test-client-id").build();
     }
 }
diff --git a/cloudfoundry-client/src/test/java/org/cloudfoundry/uaa/authorizations/GetOpenIdProviderConfigurationRequestTest.java b/cloudfoundry-client/src/test/java/org/cloudfoundry/uaa/authorizations/GetOpenIdProviderConfigurationRequestTest.java
index cce44719f5f..b1ca3c0ce77 100644
--- a/cloudfoundry-client/src/test/java/org/cloudfoundry/uaa/authorizations/GetOpenIdProviderConfigurationRequestTest.java
+++ b/cloudfoundry-client/src/test/java/org/cloudfoundry/uaa/authorizations/GetOpenIdProviderConfigurationRequestTest.java
@@ -16,12 +16,12 @@
 
 package org.cloudfoundry.uaa.authorizations;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
-public final class GetOpenIdProviderConfigurationRequestTest {
+final class GetOpenIdProviderConfigurationRequestTest {
 
     @Test
-    public void valid() {
+    void valid() {
         GetOpenIdProviderConfigurationRequest.builder().build();
     }
 }
diff --git a/cloudfoundry-client/src/test/java/org/cloudfoundry/uaa/clients/BatchChangeSecretRequestTest.java b/cloudfoundry-client/src/test/java/org/cloudfoundry/uaa/clients/BatchChangeSecretRequestTest.java
index 0cf735fa532..86e987d2eb2 100644
--- a/cloudfoundry-client/src/test/java/org/cloudfoundry/uaa/clients/BatchChangeSecretRequestTest.java
+++ b/cloudfoundry-client/src/test/java/org/cloudfoundry/uaa/clients/BatchChangeSecretRequestTest.java
@@ -16,36 +16,54 @@
 
 package org.cloudfoundry.uaa.clients;
 
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
-public final class BatchChangeSecretRequestTest {
+import org.junit.jupiter.api.Test;
 
-    @Test(expected = IllegalStateException.class)
-    public void emptyChangeSecrets() {
-        BatchChangeSecretRequest.builder().changeSecrets().build();
+final class BatchChangeSecretRequestTest {
+
+    @Test
+    void emptyChangeSecrets() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    BatchChangeSecretRequest.builder().changeSecrets().build();
+                });
     }
 
-    @Test(expected = IllegalStateException.class)
-    public void noChangeSecrets() {
-        BatchChangeSecretRequest.builder().build();
+    @Test
+    void noChangeSecrets() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    BatchChangeSecretRequest.builder().build();
+                });
     }
 
-    @Test(expected = IllegalStateException.class)
-    public void noClientId() {
-        BatchChangeSecretRequest.builder()
-                .changeSecret(ChangeSecret.builder().secret("test-secret").build())
-                .build();
+    @Test
+    void noClientId() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    BatchChangeSecretRequest.builder()
+                            .changeSecret(ChangeSecret.builder().secret("test-secret").build())
+                            .build();
+                });
     }
 
-    @Test(expected = IllegalStateException.class)
-    public void noSecret() {
-        BatchChangeSecretRequest.builder()
-                .changeSecret(ChangeSecret.builder().clientId("test-client-id").build())
-                .build();
+    @Test
+    void noSecret() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    BatchChangeSecretRequest.builder()
+                            .changeSecret(ChangeSecret.builder().clientId("test-client-id").build())
+                            .build();
+                });
     }
 
     @Test
-    public void valid() {
+    void valid() {
         BatchChangeSecretRequest.builder()
                 .changeSecret(
                         ChangeSecret.builder()
diff --git a/cloudfoundry-client/src/test/java/org/cloudfoundry/uaa/clients/BatchCreateClientsRequestTest.java b/cloudfoundry-client/src/test/java/org/cloudfoundry/uaa/clients/BatchCreateClientsRequestTest.java
index 967f21b55a5..4fd51d5ee2c 100644
--- a/cloudfoundry-client/src/test/java/org/cloudfoundry/uaa/clients/BatchCreateClientsRequestTest.java
+++ b/cloudfoundry-client/src/test/java/org/cloudfoundry/uaa/clients/BatchCreateClientsRequestTest.java
@@ -17,23 +17,32 @@
 package org.cloudfoundry.uaa.clients;
 
 import static org.cloudfoundry.uaa.tokens.GrantType.CLIENT_CREDENTIALS;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
-public final class BatchCreateClientsRequestTest {
+final class BatchCreateClientsRequestTest {
 
-    @Test(expected = IllegalStateException.class)
-    public void emptyClient() {
-        BatchCreateClientsRequest.builder().clients().build();
+    @Test
+    void emptyClient() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    BatchCreateClientsRequest.builder().clients().build();
+                });
     }
 
-    @Test(expected = IllegalStateException.class)
-    public void noClient() {
-        BatchCreateClientsRequest.builder().build();
+    @Test
+    void noClient() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    BatchCreateClientsRequest.builder().build();
+                });
     }
 
     @Test
-    public void valid() {
+    void valid() {
         BatchCreateClientsRequest.builder()
                 .client(
                         CreateClient.builder()
diff --git a/cloudfoundry-client/src/test/java/org/cloudfoundry/uaa/clients/BatchDeleteClientsRequestTest.java b/cloudfoundry-client/src/test/java/org/cloudfoundry/uaa/clients/BatchDeleteClientsRequestTest.java
index 3fd6f29eeda..dd9669c82bd 100644
--- a/cloudfoundry-client/src/test/java/org/cloudfoundry/uaa/clients/BatchDeleteClientsRequestTest.java
+++ b/cloudfoundry-client/src/test/java/org/cloudfoundry/uaa/clients/BatchDeleteClientsRequestTest.java
@@ -16,22 +16,32 @@
 
 package org.cloudfoundry.uaa.clients;
 
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
-public final class BatchDeleteClientsRequestTest {
+import org.junit.jupiter.api.Test;
 
-    @Test(expected = IllegalStateException.class)
-    public void emptyClientIds() {
-        BatchDeleteClientsRequest.builder().clientIds().build();
+final class BatchDeleteClientsRequestTest {
+
+    @Test
+    void emptyClientIds() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    BatchDeleteClientsRequest.builder().clientIds().build();
+                });
     }
 
-    @Test(expected = IllegalStateException.class)
-    public void noClientIds() {
-        BatchDeleteClientsRequest.builder().build();
+    @Test
+    void noClientIds() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    BatchDeleteClientsRequest.builder().build();
+                });
     }
 
     @Test
-    public void valid() {
+    void valid() {
         BatchDeleteClientsRequest.builder().clientId("test-client-id").build();
     }
 }
diff --git a/cloudfoundry-client/src/test/java/org/cloudfoundry/uaa/clients/BatchUpdateClientsRequestTest.java b/cloudfoundry-client/src/test/java/org/cloudfoundry/uaa/clients/BatchUpdateClientsRequestTest.java
index 65a74e2051c..0b3a2ebc8b3 100644
--- a/cloudfoundry-client/src/test/java/org/cloudfoundry/uaa/clients/BatchUpdateClientsRequestTest.java
+++ b/cloudfoundry-client/src/test/java/org/cloudfoundry/uaa/clients/BatchUpdateClientsRequestTest.java
@@ -17,23 +17,32 @@
 package org.cloudfoundry.uaa.clients;
 
 import static org.cloudfoundry.uaa.tokens.GrantType.CLIENT_CREDENTIALS;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
-public final class BatchUpdateClientsRequestTest {
+final class BatchUpdateClientsRequestTest {
 
-    @Test(expected = IllegalStateException.class)
-    public void emptyClient() {
-        BatchUpdateClientsRequest.builder().clients().build();
+    @Test
+    void emptyClient() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    BatchUpdateClientsRequest.builder().clients().build();
+                });
     }
 
-    @Test(expected = IllegalStateException.class)
-    public void noClient() {
-        BatchUpdateClientsRequest.builder().build();
+    @Test
+    void noClient() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    BatchUpdateClientsRequest.builder().build();
+                });
     }
 
     @Test
-    public void valid() {
+    void valid() {
         BatchUpdateClientsRequest.builder()
                 .client(
                         UpdateClient.builder()
diff --git a/cloudfoundry-client/src/test/java/org/cloudfoundry/uaa/clients/ChangeSecretRequestTest.java b/cloudfoundry-client/src/test/java/org/cloudfoundry/uaa/clients/ChangeSecretRequestTest.java
index 5689b2b8555..856c22d0e35 100644
--- a/cloudfoundry-client/src/test/java/org/cloudfoundry/uaa/clients/ChangeSecretRequestTest.java
+++ b/cloudfoundry-client/src/test/java/org/cloudfoundry/uaa/clients/ChangeSecretRequestTest.java
@@ -16,22 +16,32 @@
 
 package org.cloudfoundry.uaa.clients;
 
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
-public final class ChangeSecretRequestTest {
+import org.junit.jupiter.api.Test;
 
-    @Test(expected = IllegalStateException.class)
-    public void noClientId() {
-        ChangeSecretRequest.builder().secret("test-secret").build();
+final class ChangeSecretRequestTest {
+
+    @Test
+    void noClientId() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    ChangeSecretRequest.builder().secret("test-secret").build();
+                });
     }
 
-    @Test(expected = IllegalStateException.class)
-    public void noSecret() {
-        ChangeSecretRequest.builder().clientId("test-client-id").build();
+    @Test
+    void noSecret() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    ChangeSecretRequest.builder().clientId("test-client-id").build();
+                });
     }
 
     @Test
-    public void valid() {
+    void valid() {
         ChangeSecretRequest.builder()
                 .clientId("test-client-id")
                 .oldSecret("test-old-secret")
diff --git a/cloudfoundry-client/src/test/java/org/cloudfoundry/uaa/clients/CreateClientRequestTest.java b/cloudfoundry-client/src/test/java/org/cloudfoundry/uaa/clients/CreateClientRequestTest.java
index bd4bfdc743b..32a79bfed23 100644
--- a/cloudfoundry-client/src/test/java/org/cloudfoundry/uaa/clients/CreateClientRequestTest.java
+++ b/cloudfoundry-client/src/test/java/org/cloudfoundry/uaa/clients/CreateClientRequestTest.java
@@ -17,23 +17,32 @@
 package org.cloudfoundry.uaa.clients;
 
 import static org.cloudfoundry.uaa.tokens.GrantType.CLIENT_CREDENTIALS;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
-public final class CreateClientRequestTest {
+final class CreateClientRequestTest {
 
-    @Test(expected = IllegalStateException.class)
-    public void noAuthorizedGrantType() {
-        CreateClientRequest.builder().clientId("test-client-id").build();
+    @Test
+    void noAuthorizedGrantType() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    CreateClientRequest.builder().clientId("test-client-id").build();
+                });
     }
 
-    @Test(expected = IllegalStateException.class)
-    public void noClientId() {
-        CreateClientRequest.builder().authorizedGrantType(CLIENT_CREDENTIALS).build();
+    @Test
+    void noClientId() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    CreateClientRequest.builder().authorizedGrantType(CLIENT_CREDENTIALS).build();
+                });
     }
 
     @Test
-    public void valid() {
+    void valid() {
         CreateClientRequest.builder()
                 .clientId("test-client-id")
                 .authorizedGrantType(CLIENT_CREDENTIALS)
diff --git a/cloudfoundry-client/src/test/java/org/cloudfoundry/uaa/clients/DeleteClientRequestTest.java b/cloudfoundry-client/src/test/java/org/cloudfoundry/uaa/clients/DeleteClientRequestTest.java
index 80d82666fbe..66cff72e393 100644
--- a/cloudfoundry-client/src/test/java/org/cloudfoundry/uaa/clients/DeleteClientRequestTest.java
+++ b/cloudfoundry-client/src/test/java/org/cloudfoundry/uaa/clients/DeleteClientRequestTest.java
@@ -16,17 +16,23 @@
 
 package org.cloudfoundry.uaa.clients;
 
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
-public final class DeleteClientRequestTest {
+import org.junit.jupiter.api.Test;
 
-    @Test(expected = IllegalStateException.class)
-    public void noId() {
-        DeleteClientRequest.builder().build();
+final class DeleteClientRequestTest {
+
+    @Test
+    void noId() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    DeleteClientRequest.builder().build();
+                });
     }
 
     @Test
-    public void valid() {
+    void valid() {
         DeleteClientRequest.builder().clientId("test-client-id").build();
     }
 }
diff --git a/cloudfoundry-client/src/test/java/org/cloudfoundry/uaa/clients/GetClientRequestTest.java b/cloudfoundry-client/src/test/java/org/cloudfoundry/uaa/clients/GetClientRequestTest.java
index bb0c2f3c953..9aec7dbbcad 100644
--- a/cloudfoundry-client/src/test/java/org/cloudfoundry/uaa/clients/GetClientRequestTest.java
+++ b/cloudfoundry-client/src/test/java/org/cloudfoundry/uaa/clients/GetClientRequestTest.java
@@ -16,17 +16,23 @@
 
 package org.cloudfoundry.uaa.clients;
 
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
-public final class GetClientRequestTest {
+import org.junit.jupiter.api.Test;
 
-    @Test(expected = IllegalStateException.class)
-    public void noId() {
-        GetClientRequest.builder().build();
+final class GetClientRequestTest {
+
+    @Test
+    void noId() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    GetClientRequest.builder().build();
+                });
     }
 
     @Test
-    public void valid() {
+    void valid() {
         GetClientRequest.builder().clientId("test-client-id").build();
     }
 }
diff --git a/cloudfoundry-client/src/test/java/org/cloudfoundry/uaa/clients/GetMetadataRequestTest.java b/cloudfoundry-client/src/test/java/org/cloudfoundry/uaa/clients/GetMetadataRequestTest.java
index c9f02244d61..94923f0374f 100644
--- a/cloudfoundry-client/src/test/java/org/cloudfoundry/uaa/clients/GetMetadataRequestTest.java
+++ b/cloudfoundry-client/src/test/java/org/cloudfoundry/uaa/clients/GetMetadataRequestTest.java
@@ -16,17 +16,23 @@
 
 package org.cloudfoundry.uaa.clients;
 
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
-public final class GetMetadataRequestTest {
+import org.junit.jupiter.api.Test;
 
-    @Test(expected = IllegalStateException.class)
-    public void noClientId() {
-        GetMetadataRequest.builder().build();
+final class GetMetadataRequestTest {
+
+    @Test
+    void noClientId() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    GetMetadataRequest.builder().build();
+                });
     }
 
     @Test
-    public void valid() {
+    void valid() {
         GetMetadataRequest.builder().clientId("test-client-id").build();
     }
 }
diff --git a/cloudfoundry-client/src/test/java/org/cloudfoundry/uaa/clients/ListClientsRequestTest.java b/cloudfoundry-client/src/test/java/org/cloudfoundry/uaa/clients/ListClientsRequestTest.java
index 7cf40ada3e4..0216011daf8 100644
--- a/cloudfoundry-client/src/test/java/org/cloudfoundry/uaa/clients/ListClientsRequestTest.java
+++ b/cloudfoundry-client/src/test/java/org/cloudfoundry/uaa/clients/ListClientsRequestTest.java
@@ -16,12 +16,12 @@
 
 package org.cloudfoundry.uaa.clients;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
-public final class ListClientsRequestTest {
+final class ListClientsRequestTest {
 
     @Test
-    public void valid() {
+    void valid() {
         ListClientsRequest.builder().build();
     }
 }
diff --git a/cloudfoundry-client/src/test/java/org/cloudfoundry/uaa/clients/ListMetadatasRequestTest.java b/cloudfoundry-client/src/test/java/org/cloudfoundry/uaa/clients/ListMetadatasRequestTest.java
index 9ec3161d8b6..55fe77835c0 100644
--- a/cloudfoundry-client/src/test/java/org/cloudfoundry/uaa/clients/ListMetadatasRequestTest.java
+++ b/cloudfoundry-client/src/test/java/org/cloudfoundry/uaa/clients/ListMetadatasRequestTest.java
@@ -16,12 +16,12 @@
 
 package org.cloudfoundry.uaa.clients;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
-public final class ListMetadatasRequestTest {
+final class ListMetadatasRequestTest {
 
     @Test
-    public void valid() {
+    void valid() {
         ListMetadatasRequest.builder().build();
     }
 }
diff --git a/cloudfoundry-client/src/test/java/org/cloudfoundry/uaa/clients/MixedActionsRequestTest.java b/cloudfoundry-client/src/test/java/org/cloudfoundry/uaa/clients/MixedActionsRequestTest.java
index 7384db57e23..af908bda02d 100644
--- a/cloudfoundry-client/src/test/java/org/cloudfoundry/uaa/clients/MixedActionsRequestTest.java
+++ b/cloudfoundry-client/src/test/java/org/cloudfoundry/uaa/clients/MixedActionsRequestTest.java
@@ -17,23 +17,32 @@
 package org.cloudfoundry.uaa.clients;
 
 import static org.cloudfoundry.uaa.tokens.GrantType.IMPLICIT;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
-public final class MixedActionsRequestTest {
+final class MixedActionsRequestTest {
 
-    @Test(expected = IllegalStateException.class)
-    public void emptyAction() {
-        MixedActionsRequest.builder().actions().build();
+    @Test
+    void emptyAction() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    MixedActionsRequest.builder().actions().build();
+                });
     }
 
-    @Test(expected = IllegalStateException.class)
-    public void noAction() {
-        MixedActionsRequest.builder().build();
+    @Test
+    void noAction() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    MixedActionsRequest.builder().build();
+                });
     }
 
     @Test
-    public void valid() {
+    void valid() {
         MixedActionsRequest.builder()
                 .action(
                         CreateClientAction.builder()
diff --git a/cloudfoundry-client/src/test/java/org/cloudfoundry/uaa/clients/UpdateClientRequestTest.java b/cloudfoundry-client/src/test/java/org/cloudfoundry/uaa/clients/UpdateClientRequestTest.java
index cd90d80536d..fb3ddf0e77c 100644
--- a/cloudfoundry-client/src/test/java/org/cloudfoundry/uaa/clients/UpdateClientRequestTest.java
+++ b/cloudfoundry-client/src/test/java/org/cloudfoundry/uaa/clients/UpdateClientRequestTest.java
@@ -17,23 +17,32 @@
 package org.cloudfoundry.uaa.clients;
 
 import static org.cloudfoundry.uaa.tokens.GrantType.CLIENT_CREDENTIALS;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
-public final class UpdateClientRequestTest {
+final class UpdateClientRequestTest {
 
-    @Test(expected = IllegalStateException.class)
-    public void noAuthorizedGrantType() {
-        UpdateClientRequest.builder().clientId("test-client-id").build();
+    @Test
+    void noAuthorizedGrantType() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    UpdateClientRequest.builder().clientId("test-client-id").build();
+                });
     }
 
-    @Test(expected = IllegalStateException.class)
-    public void noClientId() {
-        UpdateClientRequest.builder().authorizedGrantType(CLIENT_CREDENTIALS).build();
+    @Test
+    void noClientId() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    UpdateClientRequest.builder().authorizedGrantType(CLIENT_CREDENTIALS).build();
+                });
     }
 
     @Test
-    public void valid() {
+    void valid() {
         UpdateClientRequest.builder()
                 .authorizedGrantType(CLIENT_CREDENTIALS)
                 .clientId("test-client-id")
diff --git a/cloudfoundry-client/src/test/java/org/cloudfoundry/uaa/clients/UpdateMetadataRequestTest.java b/cloudfoundry-client/src/test/java/org/cloudfoundry/uaa/clients/UpdateMetadataRequestTest.java
index 83eace335c4..7b4015b17d3 100644
--- a/cloudfoundry-client/src/test/java/org/cloudfoundry/uaa/clients/UpdateMetadataRequestTest.java
+++ b/cloudfoundry-client/src/test/java/org/cloudfoundry/uaa/clients/UpdateMetadataRequestTest.java
@@ -16,12 +16,12 @@
 
 package org.cloudfoundry.uaa.clients;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
-public final class UpdateMetadataRequestTest {
+final class UpdateMetadataRequestTest {
 
     @Test
-    public void valid() {
+    void valid() {
         UpdateMetadataRequest.builder()
                 .appIcon("test-icon")
                 .appLaunchUrl("test-app-launch-url")
diff --git a/cloudfoundry-client/src/test/java/org/cloudfoundry/uaa/groups/AddMemberRequestTest.java b/cloudfoundry-client/src/test/java/org/cloudfoundry/uaa/groups/AddMemberRequestTest.java
index 5c1dc4db191..1eb7dd2e424 100644
--- a/cloudfoundry-client/src/test/java/org/cloudfoundry/uaa/groups/AddMemberRequestTest.java
+++ b/cloudfoundry-client/src/test/java/org/cloudfoundry/uaa/groups/AddMemberRequestTest.java
@@ -16,48 +16,66 @@
 
 package org.cloudfoundry.uaa.groups;
 
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
-public final class AddMemberRequestTest {
+import org.junit.jupiter.api.Test;
 
-    @Test(expected = IllegalStateException.class)
-    public void noGroupId() {
-        AddMemberRequest.builder()
-                .origin("test-origin")
-                .memberId("test-member-id")
-                .type(MemberType.USER)
-                .build();
+final class AddMemberRequestTest {
+
+    @Test
+    void noGroupId() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    AddMemberRequest.builder()
+                            .origin("test-origin")
+                            .memberId("test-member-id")
+                            .type(MemberType.USER)
+                            .build();
+                });
     }
 
-    @Test(expected = IllegalStateException.class)
-    public void noMemberId() {
-        AddMemberRequest.builder()
-                .groupId("test-group-id")
-                .origin("test-origin")
-                .type(MemberType.USER)
-                .build();
+    @Test
+    void noMemberId() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    AddMemberRequest.builder()
+                            .groupId("test-group-id")
+                            .origin("test-origin")
+                            .type(MemberType.USER)
+                            .build();
+                });
     }
 
-    @Test(expected = IllegalStateException.class)
-    public void noOrigin() {
-        AddMemberRequest.builder()
-                .groupId("test-group-id")
-                .memberId("test-member-id")
-                .type(MemberType.USER)
-                .build();
+    @Test
+    void noOrigin() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    AddMemberRequest.builder()
+                            .groupId("test-group-id")
+                            .memberId("test-member-id")
+                            .type(MemberType.USER)
+                            .build();
+                });
     }
 
-    @Test(expected = IllegalStateException.class)
-    public void noType() {
-        AddMemberRequest.builder()
-                .groupId("test-group-id")
-                .memberId("test-member-id")
-                .origin("test-origin")
-                .build();
+    @Test
+    void noType() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    AddMemberRequest.builder()
+                            .groupId("test-group-id")
+                            .memberId("test-member-id")
+                            .origin("test-origin")
+                            .build();
+                });
     }
 
     @Test
-    public void valid() {
+    void valid() {
         AddMemberRequest.builder()
                 .groupId("test-group-id")
                 .memberId("test-member-id")
diff --git a/cloudfoundry-client/src/test/java/org/cloudfoundry/uaa/groups/CheckMembershipRequestTest.java b/cloudfoundry-client/src/test/java/org/cloudfoundry/uaa/groups/CheckMembershipRequestTest.java
index 07301f57ded..39b4946e0eb 100644
--- a/cloudfoundry-client/src/test/java/org/cloudfoundry/uaa/groups/CheckMembershipRequestTest.java
+++ b/cloudfoundry-client/src/test/java/org/cloudfoundry/uaa/groups/CheckMembershipRequestTest.java
@@ -16,22 +16,32 @@
 
 package org.cloudfoundry.uaa.groups;
 
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
-public final class CheckMembershipRequestTest {
+import org.junit.jupiter.api.Test;
 
-    @Test(expected = IllegalStateException.class)
-    public void noGroupId() {
-        CheckMembershipRequest.builder().memberId("test-member-id").build();
+final class CheckMembershipRequestTest {
+
+    @Test
+    void noGroupId() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    CheckMembershipRequest.builder().memberId("test-member-id").build();
+                });
     }
 
-    @Test(expected = IllegalStateException.class)
-    public void noMemberId() {
-        CheckMembershipRequest.builder().groupId("test-group-id").build();
+    @Test
+    void noMemberId() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    CheckMembershipRequest.builder().groupId("test-group-id").build();
+                });
     }
 
     @Test
-    public void valid() {
+    void valid() {
         CheckMembershipRequest.builder()
                 .groupId("test-group-id")
                 .memberId("test-member-id")
diff --git a/cloudfoundry-client/src/test/java/org/cloudfoundry/uaa/groups/CreateGroupRequestTest.java b/cloudfoundry-client/src/test/java/org/cloudfoundry/uaa/groups/CreateGroupRequestTest.java
index f8f54037183..4c4abdd8ff1 100644
--- a/cloudfoundry-client/src/test/java/org/cloudfoundry/uaa/groups/CreateGroupRequestTest.java
+++ b/cloudfoundry-client/src/test/java/org/cloudfoundry/uaa/groups/CreateGroupRequestTest.java
@@ -16,17 +16,23 @@
 
 package org.cloudfoundry.uaa.groups;
 
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
-public final class CreateGroupRequestTest {
+import org.junit.jupiter.api.Test;
 
-    @Test(expected = IllegalStateException.class)
-    public void noDisplayName() {
-        CreateGroupRequest.builder().build();
+final class CreateGroupRequestTest {
+
+    @Test
+    void noDisplayName() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    CreateGroupRequest.builder().build();
+                });
     }
 
     @Test
-    public void valid() {
+    void valid() {
         CreateGroupRequest.builder().displayName("group-test").build();
     }
 }
diff --git a/cloudfoundry-client/src/test/java/org/cloudfoundry/uaa/groups/DeleteGroupRequestTest.java b/cloudfoundry-client/src/test/java/org/cloudfoundry/uaa/groups/DeleteGroupRequestTest.java
index 8fb76fc7190..24c918fa0ca 100644
--- a/cloudfoundry-client/src/test/java/org/cloudfoundry/uaa/groups/DeleteGroupRequestTest.java
+++ b/cloudfoundry-client/src/test/java/org/cloudfoundry/uaa/groups/DeleteGroupRequestTest.java
@@ -16,17 +16,23 @@
 
 package org.cloudfoundry.uaa.groups;
 
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
-public final class DeleteGroupRequestTest {
+import org.junit.jupiter.api.Test;
 
-    @Test(expected = IllegalStateException.class)
-    public void noId() {
-        DeleteGroupRequest.builder().build();
+final class DeleteGroupRequestTest {
+
+    @Test
+    void noId() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    DeleteGroupRequest.builder().build();
+                });
     }
 
     @Test
-    public void valid() {
+    void valid() {
         DeleteGroupRequest.builder().groupId("test-group-id").build();
     }
 }
diff --git a/cloudfoundry-client/src/test/java/org/cloudfoundry/uaa/groups/GetGroupRequestTest.java b/cloudfoundry-client/src/test/java/org/cloudfoundry/uaa/groups/GetGroupRequestTest.java
index 2dd0b47333e..acdbb4d32ae 100644
--- a/cloudfoundry-client/src/test/java/org/cloudfoundry/uaa/groups/GetGroupRequestTest.java
+++ b/cloudfoundry-client/src/test/java/org/cloudfoundry/uaa/groups/GetGroupRequestTest.java
@@ -16,17 +16,23 @@
 
 package org.cloudfoundry.uaa.groups;
 
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
-public final class GetGroupRequestTest {
+import org.junit.jupiter.api.Test;
 
-    @Test(expected = IllegalStateException.class)
-    public void noId() {
-        GetGroupRequest.builder().build();
+final class GetGroupRequestTest {
+
+    @Test
+    void noId() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    GetGroupRequest.builder().build();
+                });
     }
 
     @Test
-    public void valid() {
+    void valid() {
         GetGroupRequest.builder().groupId("test-group-id").build();
     }
 }
diff --git a/cloudfoundry-client/src/test/java/org/cloudfoundry/uaa/groups/ListExternalGroupMappingsRequestTest.java b/cloudfoundry-client/src/test/java/org/cloudfoundry/uaa/groups/ListExternalGroupMappingsRequestTest.java
index 01479437b47..a61fb8a4805 100644
--- a/cloudfoundry-client/src/test/java/org/cloudfoundry/uaa/groups/ListExternalGroupMappingsRequestTest.java
+++ b/cloudfoundry-client/src/test/java/org/cloudfoundry/uaa/groups/ListExternalGroupMappingsRequestTest.java
@@ -16,12 +16,12 @@
 
 package org.cloudfoundry.uaa.groups;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
-public final class ListExternalGroupMappingsRequestTest {
+final class ListExternalGroupMappingsRequestTest {
 
     @Test
-    public void valid() {
+    void valid() {
         ListExternalGroupMappingsRequest.builder().build();
     }
 }
diff --git a/cloudfoundry-client/src/test/java/org/cloudfoundry/uaa/groups/ListGroupsRequestTest.java b/cloudfoundry-client/src/test/java/org/cloudfoundry/uaa/groups/ListGroupsRequestTest.java
index 77b9c185e37..568435bfda4 100644
--- a/cloudfoundry-client/src/test/java/org/cloudfoundry/uaa/groups/ListGroupsRequestTest.java
+++ b/cloudfoundry-client/src/test/java/org/cloudfoundry/uaa/groups/ListGroupsRequestTest.java
@@ -16,12 +16,12 @@
 
 package org.cloudfoundry.uaa.groups;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
-public class ListGroupsRequestTest {
+class ListGroupsRequestTest {
 
     @Test
-    public void valid() {
+    void valid() {
         ListGroupsRequest.builder().build();
     }
 }
diff --git a/cloudfoundry-client/src/test/java/org/cloudfoundry/uaa/groups/ListMembersRequestTest.java b/cloudfoundry-client/src/test/java/org/cloudfoundry/uaa/groups/ListMembersRequestTest.java
index 51c30ead7b3..85a25d5a859 100644
--- a/cloudfoundry-client/src/test/java/org/cloudfoundry/uaa/groups/ListMembersRequestTest.java
+++ b/cloudfoundry-client/src/test/java/org/cloudfoundry/uaa/groups/ListMembersRequestTest.java
@@ -16,17 +16,23 @@
 
 package org.cloudfoundry.uaa.groups;
 
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
-public final class ListMembersRequestTest {
+import org.junit.jupiter.api.Test;
 
-    @Test(expected = IllegalStateException.class)
-    public void noId() {
-        ListMembersRequest.builder().build();
+final class ListMembersRequestTest {
+
+    @Test
+    void noId() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    ListMembersRequest.builder().build();
+                });
     }
 
     @Test
-    public void valid() {
+    void valid() {
         ListMembersRequest.builder().groupId("test-group-id").build();
     }
 }
diff --git a/cloudfoundry-client/src/test/java/org/cloudfoundry/uaa/groups/MapExternalGroupRequestTest.java b/cloudfoundry-client/src/test/java/org/cloudfoundry/uaa/groups/MapExternalGroupRequestTest.java
index 24b0efdf220..4801ed1ccb9 100644
--- a/cloudfoundry-client/src/test/java/org/cloudfoundry/uaa/groups/MapExternalGroupRequestTest.java
+++ b/cloudfoundry-client/src/test/java/org/cloudfoundry/uaa/groups/MapExternalGroupRequestTest.java
@@ -16,22 +16,32 @@
 
 package org.cloudfoundry.uaa.groups;
 
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
-public final class MapExternalGroupRequestTest {
+import org.junit.jupiter.api.Test;
 
-    @Test(expected = IllegalStateException.class)
-    public void noExternalGroup() {
-        MapExternalGroupRequest.builder().groupId("test-group-id").build();
+final class MapExternalGroupRequestTest {
+
+    @Test
+    void noExternalGroup() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    MapExternalGroupRequest.builder().groupId("test-group-id").build();
+                });
     }
 
-    @Test(expected = IllegalStateException.class)
-    public void noGroupId() {
-        MapExternalGroupRequest.builder().externalGroup("test-external-group").build();
+    @Test
+    void noGroupId() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    MapExternalGroupRequest.builder().externalGroup("test-external-group").build();
+                });
     }
 
     @Test
-    public void valid() {
+    void valid() {
         MapExternalGroupRequest.builder()
                 .groupId("test-group-id")
                 .externalGroup("test-external-group")
diff --git a/cloudfoundry-client/src/test/java/org/cloudfoundry/uaa/groups/RemoveMemberRequestTest.java b/cloudfoundry-client/src/test/java/org/cloudfoundry/uaa/groups/RemoveMemberRequestTest.java
index 79dc8f78b3e..9a9d22cd2c3 100644
--- a/cloudfoundry-client/src/test/java/org/cloudfoundry/uaa/groups/RemoveMemberRequestTest.java
+++ b/cloudfoundry-client/src/test/java/org/cloudfoundry/uaa/groups/RemoveMemberRequestTest.java
@@ -16,22 +16,32 @@
 
 package org.cloudfoundry.uaa.groups;
 
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
-public final class RemoveMemberRequestTest {
+import org.junit.jupiter.api.Test;
 
-    @Test(expected = IllegalStateException.class)
-    public void noGroupId() {
-        RemoveMemberRequest.builder().memberId("test-member-id").build();
+final class RemoveMemberRequestTest {
+
+    @Test
+    void noGroupId() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    RemoveMemberRequest.builder().memberId("test-member-id").build();
+                });
     }
 
-    @Test(expected = IllegalStateException.class)
-    public void noMemberId() {
-        RemoveMemberRequest.builder().groupId("test-group-id").build();
+    @Test
+    void noMemberId() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    RemoveMemberRequest.builder().groupId("test-group-id").build();
+                });
     }
 
     @Test
-    public void valid() {
+    void valid() {
         RemoveMemberRequest.builder().groupId("test-group-id").memberId("test-member-id").build();
     }
 }
diff --git a/cloudfoundry-client/src/test/java/org/cloudfoundry/uaa/groups/UnmapExternalGroupByGroupDisplayNameRequestTest.java b/cloudfoundry-client/src/test/java/org/cloudfoundry/uaa/groups/UnmapExternalGroupByGroupDisplayNameRequestTest.java
index bcdd4bcc470..6fe98536c98 100644
--- a/cloudfoundry-client/src/test/java/org/cloudfoundry/uaa/groups/UnmapExternalGroupByGroupDisplayNameRequestTest.java
+++ b/cloudfoundry-client/src/test/java/org/cloudfoundry/uaa/groups/UnmapExternalGroupByGroupDisplayNameRequestTest.java
@@ -16,36 +16,50 @@
 
 package org.cloudfoundry.uaa.groups;
 
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
-public final class UnmapExternalGroupByGroupDisplayNameRequestTest {
+import org.junit.jupiter.api.Test;
 
-    @Test(expected = IllegalStateException.class)
-    public void noExternalGroup() {
-        UnmapExternalGroupByGroupDisplayNameRequest.builder()
-                .groupDisplayName("test-group-display-name")
-                .origin("test-origin")
-                .build();
+final class UnmapExternalGroupByGroupDisplayNameRequestTest {
+
+    @Test
+    void noExternalGroup() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    UnmapExternalGroupByGroupDisplayNameRequest.builder()
+                            .groupDisplayName("test-group-display-name")
+                            .origin("test-origin")
+                            .build();
+                });
     }
 
-    @Test(expected = IllegalStateException.class)
-    public void noGroupDisplayName() {
-        UnmapExternalGroupByGroupDisplayNameRequest.builder()
-                .externalGroup("test-external-group")
-                .origin("test-origin")
-                .build();
+    @Test
+    void noGroupDisplayName() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    UnmapExternalGroupByGroupDisplayNameRequest.builder()
+                            .externalGroup("test-external-group")
+                            .origin("test-origin")
+                            .build();
+                });
     }
 
-    @Test(expected = IllegalStateException.class)
-    public void noOrigin() {
-        UnmapExternalGroupByGroupDisplayNameRequest.builder()
-                .groupDisplayName("test-group-display-name")
-                .externalGroup("test-external-group")
-                .build();
+    @Test
+    void noOrigin() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    UnmapExternalGroupByGroupDisplayNameRequest.builder()
+                            .groupDisplayName("test-group-display-name")
+                            .externalGroup("test-external-group")
+                            .build();
+                });
     }
 
     @Test
-    public void valid() {
+    void valid() {
         UnmapExternalGroupByGroupDisplayNameRequest.builder()
                 .groupDisplayName("test-group-display-name")
                 .externalGroup("test-external-group")
diff --git a/cloudfoundry-client/src/test/java/org/cloudfoundry/uaa/groups/UnmapExternalGroupByGroupIdRequestTest.java b/cloudfoundry-client/src/test/java/org/cloudfoundry/uaa/groups/UnmapExternalGroupByGroupIdRequestTest.java
index c6114818acc..56d2fa643b2 100644
--- a/cloudfoundry-client/src/test/java/org/cloudfoundry/uaa/groups/UnmapExternalGroupByGroupIdRequestTest.java
+++ b/cloudfoundry-client/src/test/java/org/cloudfoundry/uaa/groups/UnmapExternalGroupByGroupIdRequestTest.java
@@ -16,36 +16,50 @@
 
 package org.cloudfoundry.uaa.groups;
 
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
-public final class UnmapExternalGroupByGroupIdRequestTest {
+import org.junit.jupiter.api.Test;
 
-    @Test(expected = IllegalStateException.class)
-    public void noExternalGroup() {
-        UnmapExternalGroupByGroupIdRequest.builder()
-                .groupId("test-group-id")
-                .origin("test-origin")
-                .build();
+final class UnmapExternalGroupByGroupIdRequestTest {
+
+    @Test
+    void noExternalGroup() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    UnmapExternalGroupByGroupIdRequest.builder()
+                            .groupId("test-group-id")
+                            .origin("test-origin")
+                            .build();
+                });
     }
 
-    @Test(expected = IllegalStateException.class)
-    public void noGroupId() {
-        UnmapExternalGroupByGroupIdRequest.builder()
-                .externalGroup("test-external-group")
-                .origin("test-origin")
-                .build();
+    @Test
+    void noGroupId() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    UnmapExternalGroupByGroupIdRequest.builder()
+                            .externalGroup("test-external-group")
+                            .origin("test-origin")
+                            .build();
+                });
     }
 
-    @Test(expected = IllegalStateException.class)
-    public void noOrigin() {
-        UnmapExternalGroupByGroupIdRequest.builder()
-                .groupId("test-group-id")
-                .externalGroup("test-external-group")
-                .build();
+    @Test
+    void noOrigin() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    UnmapExternalGroupByGroupIdRequest.builder()
+                            .groupId("test-group-id")
+                            .externalGroup("test-external-group")
+                            .build();
+                });
     }
 
     @Test
-    public void valid() {
+    void valid() {
         UnmapExternalGroupByGroupIdRequest.builder()
                 .groupId("test-group-id")
                 .externalGroup("test-external-group")
diff --git a/cloudfoundry-client/src/test/java/org/cloudfoundry/uaa/groups/UpdateGroupRequestTest.java b/cloudfoundry-client/src/test/java/org/cloudfoundry/uaa/groups/UpdateGroupRequestTest.java
index 0f2d1ceafe1..f5adfe2228a 100644
--- a/cloudfoundry-client/src/test/java/org/cloudfoundry/uaa/groups/UpdateGroupRequestTest.java
+++ b/cloudfoundry-client/src/test/java/org/cloudfoundry/uaa/groups/UpdateGroupRequestTest.java
@@ -16,40 +16,58 @@
 
 package org.cloudfoundry.uaa.groups;
 
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
-public final class UpdateGroupRequestTest {
+import org.junit.jupiter.api.Test;
 
-    @Test(expected = IllegalStateException.class)
-    public void noDisplayName() {
-        UpdateGroupRequest.builder().groupId("test-group-id").version("*").build();
+final class UpdateGroupRequestTest {
+
+    @Test
+    void noDisplayName() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    UpdateGroupRequest.builder().groupId("test-group-id").version("*").build();
+                });
     }
 
-    @Test(expected = IllegalStateException.class)
-    public void noId() {
-        UpdateGroupRequest.builder()
-                .identityZoneId("test-identity-zone-id")
-                .displayName("group-test")
-                .version("*")
-                .build();
+    @Test
+    void noId() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    UpdateGroupRequest.builder()
+                            .identityZoneId("test-identity-zone-id")
+                            .displayName("group-test")
+                            .version("*")
+                            .build();
+                });
     }
 
-    @Test(expected = IllegalStateException.class)
-    public void noIdentityZoneId() {
-        UpdateGroupRequest.builder().displayName("group-test").version("*").build();
+    @Test
+    void noIdentityZoneId() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    UpdateGroupRequest.builder().displayName("group-test").version("*").build();
+                });
     }
 
-    @Test(expected = IllegalStateException.class)
-    public void noVersion() {
-        UpdateGroupRequest.builder()
-                .identityZoneId("test-identity-zone-id")
-                .displayName("group-test")
-                .groupId("test-group-id")
-                .build();
+    @Test
+    void noVersion() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    UpdateGroupRequest.builder()
+                            .identityZoneId("test-identity-zone-id")
+                            .displayName("group-test")
+                            .groupId("test-group-id")
+                            .build();
+                });
     }
 
     @Test
-    public void valid() {
+    void valid() {
         UpdateGroupRequest.builder()
                 .identityZoneId("test-identity-zone-id")
                 .displayName("group-test")
diff --git a/cloudfoundry-client/src/test/java/org/cloudfoundry/uaa/identityproviders/AttributeMappingsTest.java b/cloudfoundry-client/src/test/java/org/cloudfoundry/uaa/identityproviders/AttributeMappingsTest.java
index 87cf2ff4f22..89d1324b6b0 100644
--- a/cloudfoundry-client/src/test/java/org/cloudfoundry/uaa/identityproviders/AttributeMappingsTest.java
+++ b/cloudfoundry-client/src/test/java/org/cloudfoundry/uaa/identityproviders/AttributeMappingsTest.java
@@ -16,12 +16,12 @@
 
 package org.cloudfoundry.uaa.identityproviders;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
-public final class AttributeMappingsTest {
+final class AttributeMappingsTest {
 
     @Test
-    public void valid() {
+    void valid() {
         AttributeMappings.builder().build();
     }
 }
diff --git a/cloudfoundry-client/src/test/java/org/cloudfoundry/uaa/identityproviders/CreateIdentityProviderRequestTest.java b/cloudfoundry-client/src/test/java/org/cloudfoundry/uaa/identityproviders/CreateIdentityProviderRequestTest.java
index 0b4be8a32cf..144bc658733 100644
--- a/cloudfoundry-client/src/test/java/org/cloudfoundry/uaa/identityproviders/CreateIdentityProviderRequestTest.java
+++ b/cloudfoundry-client/src/test/java/org/cloudfoundry/uaa/identityproviders/CreateIdentityProviderRequestTest.java
@@ -16,51 +16,65 @@
 
 package org.cloudfoundry.uaa.identityproviders;
 
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
-public final class CreateIdentityProviderRequestTest {
+import org.junit.jupiter.api.Test;
 
-    @Test(expected = IllegalStateException.class)
-    public void noName() {
-        CreateIdentityProviderRequest.builder()
-                .configuration(
-                        SamlConfiguration.builder()
-                                .metaDataLocation("test-metadata-location")
-                                .build())
-                .identityZoneId("test-identity-zone-id")
-                .type(Type.SAML)
-                .originKey("test-origin-key")
-                .build();
+final class CreateIdentityProviderRequestTest {
+
+    @Test
+    void noName() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    CreateIdentityProviderRequest.builder()
+                            .configuration(
+                                    SamlConfiguration.builder()
+                                            .metaDataLocation("test-metadata-location")
+                                            .build())
+                            .identityZoneId("test-identity-zone-id")
+                            .type(Type.SAML)
+                            .originKey("test-origin-key")
+                            .build();
+                });
     }
 
-    @Test(expected = IllegalStateException.class)
-    public void noOriginKey() {
-        CreateIdentityProviderRequest.builder()
-                .configuration(
-                        SamlConfiguration.builder()
-                                .metaDataLocation("test-metadata-location")
-                                .build())
-                .identityZoneId("test-identity-zone-id")
-                .name("test-name")
-                .type(Type.SAML)
-                .build();
+    @Test
+    void noOriginKey() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    CreateIdentityProviderRequest.builder()
+                            .configuration(
+                                    SamlConfiguration.builder()
+                                            .metaDataLocation("test-metadata-location")
+                                            .build())
+                            .identityZoneId("test-identity-zone-id")
+                            .name("test-name")
+                            .type(Type.SAML)
+                            .build();
+                });
     }
 
-    @Test(expected = IllegalStateException.class)
-    public void noType() {
-        CreateIdentityProviderRequest.builder()
-                .configuration(
-                        SamlConfiguration.builder()
-                                .metaDataLocation("test-metadata-location")
-                                .build())
-                .identityZoneId("test-identity-zone-id")
-                .name("test-name")
-                .originKey("test-origin-key")
-                .build();
+    @Test
+    void noType() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    CreateIdentityProviderRequest.builder()
+                            .configuration(
+                                    SamlConfiguration.builder()
+                                            .metaDataLocation("test-metadata-location")
+                                            .build())
+                            .identityZoneId("test-identity-zone-id")
+                            .name("test-name")
+                            .originKey("test-origin-key")
+                            .build();
+                });
     }
 
     @Test
-    public void valid() {
+    void valid() {
         CreateIdentityProviderRequest.builder()
                 .configuration(
                         SamlConfiguration.builder()
diff --git a/cloudfoundry-client/src/test/java/org/cloudfoundry/uaa/identityproviders/DeleteIdentityProviderRequestTest.java b/cloudfoundry-client/src/test/java/org/cloudfoundry/uaa/identityproviders/DeleteIdentityProviderRequestTest.java
index fed1555a74b..348ccdded6e 100644
--- a/cloudfoundry-client/src/test/java/org/cloudfoundry/uaa/identityproviders/DeleteIdentityProviderRequestTest.java
+++ b/cloudfoundry-client/src/test/java/org/cloudfoundry/uaa/identityproviders/DeleteIdentityProviderRequestTest.java
@@ -16,17 +16,25 @@
 
 package org.cloudfoundry.uaa.identityproviders;
 
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
-public final class DeleteIdentityProviderRequestTest {
+import org.junit.jupiter.api.Test;
 
-    @Test(expected = IllegalStateException.class)
-    public void noIdentityProviderId() {
-        DeleteIdentityProviderRequest.builder().identityZoneId("test-identity-zone-id").build();
+final class DeleteIdentityProviderRequestTest {
+
+    @Test
+    void noIdentityProviderId() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    DeleteIdentityProviderRequest.builder()
+                            .identityZoneId("test-identity-zone-id")
+                            .build();
+                });
     }
 
     @Test
-    public void valid() {
+    void valid() {
         DeleteIdentityProviderRequest.builder()
                 .identityProviderId("test-identity-provider-id")
                 .identityZoneId("test-identity-zone-id")
diff --git a/cloudfoundry-client/src/test/java/org/cloudfoundry/uaa/identityproviders/GetIdentityProviderRequestTest.java b/cloudfoundry-client/src/test/java/org/cloudfoundry/uaa/identityproviders/GetIdentityProviderRequestTest.java
index ed7efe196fd..03e8e775dab 100644
--- a/cloudfoundry-client/src/test/java/org/cloudfoundry/uaa/identityproviders/GetIdentityProviderRequestTest.java
+++ b/cloudfoundry-client/src/test/java/org/cloudfoundry/uaa/identityproviders/GetIdentityProviderRequestTest.java
@@ -16,17 +16,25 @@
 
 package org.cloudfoundry.uaa.identityproviders;
 
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
-public final class GetIdentityProviderRequestTest {
+import org.junit.jupiter.api.Test;
 
-    @Test(expected = IllegalStateException.class)
-    public void noIdentityProviderId() {
-        GetIdentityProviderRequest.builder().identityZoneId("test-identity-zone-id").build();
+final class GetIdentityProviderRequestTest {
+
+    @Test
+    void noIdentityProviderId() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    GetIdentityProviderRequest.builder()
+                            .identityZoneId("test-identity-zone-id")
+                            .build();
+                });
     }
 
     @Test
-    public void valid() {
+    void valid() {
         GetIdentityProviderRequest.builder()
                 .identityProviderId("test-identity-provider-id")
                 .identityZoneId("test-identity-zone-id")
diff --git a/cloudfoundry-client/src/test/java/org/cloudfoundry/uaa/identityproviders/InternalConfigurationTest.java b/cloudfoundry-client/src/test/java/org/cloudfoundry/uaa/identityproviders/InternalConfigurationTest.java
index 8151fde366d..490c597d02c 100644
--- a/cloudfoundry-client/src/test/java/org/cloudfoundry/uaa/identityproviders/InternalConfigurationTest.java
+++ b/cloudfoundry-client/src/test/java/org/cloudfoundry/uaa/identityproviders/InternalConfigurationTest.java
@@ -16,12 +16,12 @@
 
 package org.cloudfoundry.uaa.identityproviders;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
-public final class InternalConfigurationTest {
+final class InternalConfigurationTest {
 
     @Test
-    public void valid() {
+    void valid() {
         InternalConfiguration.builder().build();
     }
 }
diff --git a/cloudfoundry-client/src/test/java/org/cloudfoundry/uaa/identityproviders/KeystoneConfigurationTest.java b/cloudfoundry-client/src/test/java/org/cloudfoundry/uaa/identityproviders/KeystoneConfigurationTest.java
index 21749b1d114..b1c3bc9f23b 100644
--- a/cloudfoundry-client/src/test/java/org/cloudfoundry/uaa/identityproviders/KeystoneConfigurationTest.java
+++ b/cloudfoundry-client/src/test/java/org/cloudfoundry/uaa/identityproviders/KeystoneConfigurationTest.java
@@ -16,12 +16,12 @@
 
 package org.cloudfoundry.uaa.identityproviders;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
-public final class KeystoneConfigurationTest {
+final class KeystoneConfigurationTest {
 
     @Test
-    public void valid() {
+    void valid() {
         KeystoneConfiguration.builder().build();
     }
 }
diff --git a/cloudfoundry-client/src/test/java/org/cloudfoundry/uaa/identityproviders/LdapConfigurationTest.java b/cloudfoundry-client/src/test/java/org/cloudfoundry/uaa/identityproviders/LdapConfigurationTest.java
index 06ef6598cfe..70325c9e75c 100644
--- a/cloudfoundry-client/src/test/java/org/cloudfoundry/uaa/identityproviders/LdapConfigurationTest.java
+++ b/cloudfoundry-client/src/test/java/org/cloudfoundry/uaa/identityproviders/LdapConfigurationTest.java
@@ -16,12 +16,12 @@
 
 package org.cloudfoundry.uaa.identityproviders;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
-public final class LdapConfigurationTest {
+final class LdapConfigurationTest {
 
     @Test
-    public void valid() {
+    void valid() {
         LdapConfiguration.builder().build();
     }
 }
diff --git a/cloudfoundry-client/src/test/java/org/cloudfoundry/uaa/identityproviders/ListIdentityProvidersRequestTest.java b/cloudfoundry-client/src/test/java/org/cloudfoundry/uaa/identityproviders/ListIdentityProvidersRequestTest.java
index c410b304b19..37f2be26984 100644
--- a/cloudfoundry-client/src/test/java/org/cloudfoundry/uaa/identityproviders/ListIdentityProvidersRequestTest.java
+++ b/cloudfoundry-client/src/test/java/org/cloudfoundry/uaa/identityproviders/ListIdentityProvidersRequestTest.java
@@ -16,12 +16,12 @@
 
 package org.cloudfoundry.uaa.identityproviders;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
-public final class ListIdentityProvidersRequestTest {
+final class ListIdentityProvidersRequestTest {
 
     @Test
-    public void valid() {
+    void valid() {
         ListIdentityProvidersRequest.builder().identityZoneId("text-identity-zone-id").build();
     }
 }
diff --git a/cloudfoundry-client/src/test/java/org/cloudfoundry/uaa/identityproviders/LockoutPolicyTest.java b/cloudfoundry-client/src/test/java/org/cloudfoundry/uaa/identityproviders/LockoutPolicyTest.java
index 17b3bf103d1..047282f2a10 100644
--- a/cloudfoundry-client/src/test/java/org/cloudfoundry/uaa/identityproviders/LockoutPolicyTest.java
+++ b/cloudfoundry-client/src/test/java/org/cloudfoundry/uaa/identityproviders/LockoutPolicyTest.java
@@ -16,27 +16,50 @@
 
 package org.cloudfoundry.uaa.identityproviders;
 
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
-public final class LockoutPolicyTest {
+import org.junit.jupiter.api.Test;
 
-    @Test(expected = IllegalStateException.class)
-    public void noLockAccountPeriodInSecond() {
-        LockoutPolicy.builder().lockoutPeriodInSecond(0).numberOfAllowedFailures(0).build();
+final class LockoutPolicyTest {
+
+    @Test
+    void noLockAccountPeriodInSecond() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    LockoutPolicy.builder()
+                            .lockoutPeriodInSecond(0)
+                            .numberOfAllowedFailures(0)
+                            .build();
+                });
     }
 
-    @Test(expected = IllegalStateException.class)
-    public void noLockoutPeriodInSecond() {
-        LockoutPolicy.builder().lockAccountPeriodInSecond(0).numberOfAllowedFailures(0).build();
+    @Test
+    void noLockoutPeriodInSecond() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    LockoutPolicy.builder()
+                            .lockAccountPeriodInSecond(0)
+                            .numberOfAllowedFailures(0)
+                            .build();
+                });
     }
 
-    @Test(expected = IllegalStateException.class)
-    public void noNumberOfAllowedFailures() {
-        LockoutPolicy.builder().lockAccountPeriodInSecond(0).lockoutPeriodInSecond(0).build();
+    @Test
+    void noNumberOfAllowedFailures() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    LockoutPolicy.builder()
+                            .lockAccountPeriodInSecond(0)
+                            .lockoutPeriodInSecond(0)
+                            .build();
+                });
     }
 
     @Test
-    public void valid() {
+    void valid() {
         LockoutPolicy.builder()
                 .lockAccountPeriodInSecond(0)
                 .lockoutPeriodInSecond(0)
diff --git a/cloudfoundry-client/src/test/java/org/cloudfoundry/uaa/identityproviders/OAuth2ConfigurationTest.java b/cloudfoundry-client/src/test/java/org/cloudfoundry/uaa/identityproviders/OAuth2ConfigurationTest.java
index 0527a25e592..36ca277a697 100644
--- a/cloudfoundry-client/src/test/java/org/cloudfoundry/uaa/identityproviders/OAuth2ConfigurationTest.java
+++ b/cloudfoundry-client/src/test/java/org/cloudfoundry/uaa/identityproviders/OAuth2ConfigurationTest.java
@@ -16,33 +16,50 @@
 
 package org.cloudfoundry.uaa.identityproviders;
 
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
-public final class OAuth2ConfigurationTest {
+import org.junit.jupiter.api.Test;
 
-    @Test(expected = IllegalStateException.class)
-    public void noAuthUrl() {
-        OAuth2Configuration.builder()
-                .tokenUrl("test-token-url")
-                .relyingPartyId("test-relying-party-id")
-                .build();
+final class OAuth2ConfigurationTest {
+
+    @Test
+    void noAuthUrl() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    OAuth2Configuration.builder()
+                            .tokenUrl("test-token-url")
+                            .relyingPartyId("test-relying-party-id")
+                            .build();
+                });
     }
 
-    @Test(expected = IllegalStateException.class)
-    public void noRelyingPartyId() {
-        OAuth2Configuration.builder().authUrl("test-auth-url").tokenUrl("test-token-url").build();
+    @Test
+    void noRelyingPartyId() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    OAuth2Configuration.builder()
+                            .authUrl("test-auth-url")
+                            .tokenUrl("test-token-url")
+                            .build();
+                });
     }
 
-    @Test(expected = IllegalStateException.class)
-    public void noTokenUrl() {
-        OAuth2Configuration.builder()
-                .authUrl("test-auth-url")
-                .relyingPartyId("test-relying-party-id")
-                .build();
+    @Test
+    void noTokenUrl() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    OAuth2Configuration.builder()
+                            .authUrl("test-auth-url")
+                            .relyingPartyId("test-relying-party-id")
+                            .build();
+                });
     }
 
     @Test
-    public void valid() {
+    void valid() {
         OAuth2Configuration.builder()
                 .authUrl("test-auth-url")
                 .tokenUrl("test-token-url")
diff --git a/cloudfoundry-client/src/test/java/org/cloudfoundry/uaa/identityproviders/OpenIdConnectConfigurationTest.java b/cloudfoundry-client/src/test/java/org/cloudfoundry/uaa/identityproviders/OpenIdConnectConfigurationTest.java
index 08c360a833e..d405ec64716 100644
--- a/cloudfoundry-client/src/test/java/org/cloudfoundry/uaa/identityproviders/OpenIdConnectConfigurationTest.java
+++ b/cloudfoundry-client/src/test/java/org/cloudfoundry/uaa/identityproviders/OpenIdConnectConfigurationTest.java
@@ -16,36 +16,50 @@
 
 package org.cloudfoundry.uaa.identityproviders;
 
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
-public final class OpenIdConnectConfigurationTest {
+import org.junit.jupiter.api.Test;
 
-    @Test(expected = IllegalStateException.class)
-    public void noAuthUrl() {
-        OpenIdConnectConfiguration.builder()
-                .tokenUrl("test-token-url")
-                .relyingPartyId("test-relying-party-id")
-                .build();
+final class OpenIdConnectConfigurationTest {
+
+    @Test
+    void noAuthUrl() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    OpenIdConnectConfiguration.builder()
+                            .tokenUrl("test-token-url")
+                            .relyingPartyId("test-relying-party-id")
+                            .build();
+                });
     }
 
-    @Test(expected = IllegalStateException.class)
-    public void noRelyingPartyId() {
-        OpenIdConnectConfiguration.builder()
-                .authUrl("test-auth-url")
-                .tokenUrl("test-token-url")
-                .build();
+    @Test
+    void noRelyingPartyId() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    OpenIdConnectConfiguration.builder()
+                            .authUrl("test-auth-url")
+                            .tokenUrl("test-token-url")
+                            .build();
+                });
     }
 
-    @Test(expected = IllegalStateException.class)
-    public void noTokenUrl() {
-        OpenIdConnectConfiguration.builder()
-                .authUrl("test-auth-url")
-                .relyingPartyId("test-relying-party-id")
-                .build();
+    @Test
+    void noTokenUrl() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    OpenIdConnectConfiguration.builder()
+                            .authUrl("test-auth-url")
+                            .relyingPartyId("test-relying-party-id")
+                            .build();
+                });
     }
 
     @Test
-    public void valid() {
+    void valid() {
         OpenIdConnectConfiguration.builder()
                 .authUrl("test-auth-url")
                 .tokenUrl("test-token-url")
diff --git a/cloudfoundry-client/src/test/java/org/cloudfoundry/uaa/identityproviders/PasswordPolicyTest.java b/cloudfoundry-client/src/test/java/org/cloudfoundry/uaa/identityproviders/PasswordPolicyTest.java
index 671f05e733d..2b70dd8cd52 100644
--- a/cloudfoundry-client/src/test/java/org/cloudfoundry/uaa/identityproviders/PasswordPolicyTest.java
+++ b/cloudfoundry-client/src/test/java/org/cloudfoundry/uaa/identityproviders/PasswordPolicyTest.java
@@ -16,96 +16,126 @@
 
 package org.cloudfoundry.uaa.identityproviders;
 
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
-public final class PasswordPolicyTest {
+import org.junit.jupiter.api.Test;
 
-    @Test(expected = IllegalStateException.class)
-    public void noMaximumLength() {
-        PasswordPolicy.builder()
-                .minimumDigit(0)
-                .minimumLength(0)
-                .minimumLowerCaseCharacter(0)
-                .minimumSpecialCharacter(0)
-                .minimumUpperCaseCharacter(0)
-                .passwordExpirationInMonth(0)
-                .build();
+final class PasswordPolicyTest {
+
+    @Test
+    void noMaximumLength() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    PasswordPolicy.builder()
+                            .minimumDigit(0)
+                            .minimumLength(0)
+                            .minimumLowerCaseCharacter(0)
+                            .minimumSpecialCharacter(0)
+                            .minimumUpperCaseCharacter(0)
+                            .passwordExpirationInMonth(0)
+                            .build();
+                });
     }
 
-    @Test(expected = IllegalStateException.class)
-    public void noMinimumDigit() {
-        PasswordPolicy.builder()
-                .maximumLength(0)
-                .minimumLength(0)
-                .minimumLowerCaseCharacter(0)
-                .minimumSpecialCharacter(0)
-                .minimumUpperCaseCharacter(0)
-                .passwordExpirationInMonth(0)
-                .build();
+    @Test
+    void noMinimumDigit() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    PasswordPolicy.builder()
+                            .maximumLength(0)
+                            .minimumLength(0)
+                            .minimumLowerCaseCharacter(0)
+                            .minimumSpecialCharacter(0)
+                            .minimumUpperCaseCharacter(0)
+                            .passwordExpirationInMonth(0)
+                            .build();
+                });
     }
 
-    @Test(expected = IllegalStateException.class)
-    public void noMinimumLength() {
-        PasswordPolicy.builder()
-                .maximumLength(0)
-                .minimumDigit(0)
-                .minimumLowerCaseCharacter(0)
-                .minimumSpecialCharacter(0)
-                .minimumUpperCaseCharacter(0)
-                .passwordExpirationInMonth(0)
-                .build();
+    @Test
+    void noMinimumLength() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    PasswordPolicy.builder()
+                            .maximumLength(0)
+                            .minimumDigit(0)
+                            .minimumLowerCaseCharacter(0)
+                            .minimumSpecialCharacter(0)
+                            .minimumUpperCaseCharacter(0)
+                            .passwordExpirationInMonth(0)
+                            .build();
+                });
     }
 
-    @Test(expected = IllegalStateException.class)
-    public void noMinimumLowerCaseCharacter() {
-        PasswordPolicy.builder()
-                .maximumLength(0)
-                .minimumDigit(0)
-                .minimumLength(0)
-                .minimumSpecialCharacter(0)
-                .minimumUpperCaseCharacter(0)
-                .passwordExpirationInMonth(0)
-                .build();
+    @Test
+    void noMinimumLowerCaseCharacter() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    PasswordPolicy.builder()
+                            .maximumLength(0)
+                            .minimumDigit(0)
+                            .minimumLength(0)
+                            .minimumSpecialCharacter(0)
+                            .minimumUpperCaseCharacter(0)
+                            .passwordExpirationInMonth(0)
+                            .build();
+                });
     }
 
-    @Test(expected = IllegalStateException.class)
-    public void noMinimumSpecialCharacter() {
-        PasswordPolicy.builder()
-                .maximumLength(0)
-                .minimumDigit(0)
-                .minimumLength(0)
-                .minimumLowerCaseCharacter(0)
-                .minimumUpperCaseCharacter(0)
-                .passwordExpirationInMonth(0)
-                .build();
+    @Test
+    void noMinimumSpecialCharacter() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    PasswordPolicy.builder()
+                            .maximumLength(0)
+                            .minimumDigit(0)
+                            .minimumLength(0)
+                            .minimumLowerCaseCharacter(0)
+                            .minimumUpperCaseCharacter(0)
+                            .passwordExpirationInMonth(0)
+                            .build();
+                });
     }
 
-    @Test(expected = IllegalStateException.class)
-    public void noMinimumUpperCaseCharacter() {
-        PasswordPolicy.builder()
-                .maximumLength(0)
-                .minimumDigit(0)
-                .minimumLength(0)
-                .minimumLowerCaseCharacter(0)
-                .minimumSpecialCharacter(0)
-                .passwordExpirationInMonth(0)
-                .build();
+    @Test
+    void noMinimumUpperCaseCharacter() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    PasswordPolicy.builder()
+                            .maximumLength(0)
+                            .minimumDigit(0)
+                            .minimumLength(0)
+                            .minimumLowerCaseCharacter(0)
+                            .minimumSpecialCharacter(0)
+                            .passwordExpirationInMonth(0)
+                            .build();
+                });
     }
 
-    @Test(expected = IllegalStateException.class)
-    public void noPasswordExpirationInMonth() {
-        PasswordPolicy.builder()
-                .maximumLength(0)
-                .minimumDigit(0)
-                .minimumLength(0)
-                .minimumLowerCaseCharacter(0)
-                .minimumSpecialCharacter(0)
-                .minimumUpperCaseCharacter(0)
-                .build();
+    @Test
+    void noPasswordExpirationInMonth() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    PasswordPolicy.builder()
+                            .maximumLength(0)
+                            .minimumDigit(0)
+                            .minimumLength(0)
+                            .minimumLowerCaseCharacter(0)
+                            .minimumSpecialCharacter(0)
+                            .minimumUpperCaseCharacter(0)
+                            .build();
+                });
     }
 
     @Test
-    public void valid() {
+    void valid() {
         PasswordPolicy.builder()
                 .maximumLength(0)
                 .minimumDigit(0)
diff --git a/cloudfoundry-client/src/test/java/org/cloudfoundry/uaa/identityproviders/SamlConfigurationTest.java b/cloudfoundry-client/src/test/java/org/cloudfoundry/uaa/identityproviders/SamlConfigurationTest.java
index 3b75b5442b1..5f38e778c59 100644
--- a/cloudfoundry-client/src/test/java/org/cloudfoundry/uaa/identityproviders/SamlConfigurationTest.java
+++ b/cloudfoundry-client/src/test/java/org/cloudfoundry/uaa/identityproviders/SamlConfigurationTest.java
@@ -16,17 +16,23 @@
 
 package org.cloudfoundry.uaa.identityproviders;
 
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
-public final class SamlConfigurationTest {
+import org.junit.jupiter.api.Test;
 
-    @Test(expected = IllegalStateException.class)
-    public void noMetadataLocation() {
-        SamlConfiguration.builder().build();
+final class SamlConfigurationTest {
+
+    @Test
+    void noMetadataLocation() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    SamlConfiguration.builder().build();
+                });
     }
 
     @Test
-    public void valid() {
+    void valid() {
         SamlConfiguration.builder().metaDataLocation("test-metadata-location").build();
     }
 }
diff --git a/cloudfoundry-client/src/test/java/org/cloudfoundry/uaa/identityproviders/UpdateIdentityProviderRequestTest.java b/cloudfoundry-client/src/test/java/org/cloudfoundry/uaa/identityproviders/UpdateIdentityProviderRequestTest.java
index 4acd6c5420f..e2a7cbd17a6 100644
--- a/cloudfoundry-client/src/test/java/org/cloudfoundry/uaa/identityproviders/UpdateIdentityProviderRequestTest.java
+++ b/cloudfoundry-client/src/test/java/org/cloudfoundry/uaa/identityproviders/UpdateIdentityProviderRequestTest.java
@@ -16,72 +16,94 @@
 
 package org.cloudfoundry.uaa.identityproviders;
 
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
-public final class UpdateIdentityProviderRequestTest {
+import org.junit.jupiter.api.Test;
 
-    @Test(expected = IllegalStateException.class)
-    public void noIdentityProviderId() {
-        UpdateIdentityProviderRequest.builder()
-                .configuration(InternalConfiguration.builder().build())
-                .identityZoneId("test-identity-zone-id")
-                .name("test-name")
-                .originKey("test-origin-key")
-                .type(Type.INTERNAL)
-                .version(0)
-                .build();
+final class UpdateIdentityProviderRequestTest {
+
+    @Test
+    void noIdentityProviderId() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    UpdateIdentityProviderRequest.builder()
+                            .configuration(InternalConfiguration.builder().build())
+                            .identityZoneId("test-identity-zone-id")
+                            .name("test-name")
+                            .originKey("test-origin-key")
+                            .type(Type.INTERNAL)
+                            .version(0)
+                            .build();
+                });
     }
 
-    @Test(expected = IllegalStateException.class)
-    public void noName() {
-        UpdateIdentityProviderRequest.builder()
-                .configuration(InternalConfiguration.builder().build())
-                .identityZoneId("test-identity-zone-id")
-                .identityProviderId("test-identity-provider-id")
-                .originKey("test-origin-key")
-                .type(Type.INTERNAL)
-                .version(0)
-                .build();
+    @Test
+    void noName() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    UpdateIdentityProviderRequest.builder()
+                            .configuration(InternalConfiguration.builder().build())
+                            .identityZoneId("test-identity-zone-id")
+                            .identityProviderId("test-identity-provider-id")
+                            .originKey("test-origin-key")
+                            .type(Type.INTERNAL)
+                            .version(0)
+                            .build();
+                });
     }
 
-    @Test(expected = IllegalStateException.class)
-    public void noOriginKey() {
-        UpdateIdentityProviderRequest.builder()
-                .configuration(InternalConfiguration.builder().build())
-                .identityZoneId("test-identity-zone-id")
-                .identityProviderId("test-identity-provider-id")
-                .name("test-name")
-                .type(Type.INTERNAL)
-                .version(0)
-                .build();
+    @Test
+    void noOriginKey() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    UpdateIdentityProviderRequest.builder()
+                            .configuration(InternalConfiguration.builder().build())
+                            .identityZoneId("test-identity-zone-id")
+                            .identityProviderId("test-identity-provider-id")
+                            .name("test-name")
+                            .type(Type.INTERNAL)
+                            .version(0)
+                            .build();
+                });
     }
 
-    @Test(expected = IllegalStateException.class)
-    public void noType() {
-        UpdateIdentityProviderRequest.builder()
-                .configuration(InternalConfiguration.builder().build())
-                .identityZoneId("test-identity-zone-id")
-                .identityProviderId("test-identity-provider-id")
-                .name("test-name")
-                .originKey("test-origin-key")
-                .version(0)
-                .build();
+    @Test
+    void noType() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    UpdateIdentityProviderRequest.builder()
+                            .configuration(InternalConfiguration.builder().build())
+                            .identityZoneId("test-identity-zone-id")
+                            .identityProviderId("test-identity-provider-id")
+                            .name("test-name")
+                            .originKey("test-origin-key")
+                            .version(0)
+                            .build();
+                });
     }
 
-    @Test(expected = IllegalStateException.class)
-    public void noVersion() {
-        UpdateIdentityProviderRequest.builder()
-                .configuration(InternalConfiguration.builder().build())
-                .identityZoneId("test-identity-zone-id")
-                .identityProviderId("test-identity-provider-id")
-                .name("test-name")
-                .originKey("test-origin-key")
-                .type(Type.INTERNAL)
-                .build();
+    @Test
+    void noVersion() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    UpdateIdentityProviderRequest.builder()
+                            .configuration(InternalConfiguration.builder().build())
+                            .identityZoneId("test-identity-zone-id")
+                            .identityProviderId("test-identity-provider-id")
+                            .name("test-name")
+                            .originKey("test-origin-key")
+                            .type(Type.INTERNAL)
+                            .build();
+                });
     }
 
     @Test
-    public void valid() {
+    void valid() {
         UpdateIdentityProviderRequest.builder()
                 .configuration(InternalConfiguration.builder().build())
                 .identityZoneId("test-identity-zone-id")
diff --git a/cloudfoundry-client/src/test/java/org/cloudfoundry/uaa/identityzones/CreateIdentityZoneRequestTest.java b/cloudfoundry-client/src/test/java/org/cloudfoundry/uaa/identityzones/CreateIdentityZoneRequestTest.java
index f56b1b8f429..4229a1abf5e 100644
--- a/cloudfoundry-client/src/test/java/org/cloudfoundry/uaa/identityzones/CreateIdentityZoneRequestTest.java
+++ b/cloudfoundry-client/src/test/java/org/cloudfoundry/uaa/identityzones/CreateIdentityZoneRequestTest.java
@@ -16,34 +16,44 @@
 
 package org.cloudfoundry.uaa.identityzones;
 
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
-public final class CreateIdentityZoneRequestTest {
+import org.junit.jupiter.api.Test;
 
-    @Test(expected = IllegalStateException.class)
-    public void noName() {
-        CreateIdentityZoneRequest.builder()
-                .configuration(IdentityZoneConfiguration.builder().build())
-                .description("test-description")
-                .identityZoneId("test-identity-zone-id")
-                .subdomain("test-sub-domain")
-                .version(1)
-                .build();
+final class CreateIdentityZoneRequestTest {
+
+    @Test
+    void noName() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    CreateIdentityZoneRequest.builder()
+                            .configuration(IdentityZoneConfiguration.builder().build())
+                            .description("test-description")
+                            .identityZoneId("test-identity-zone-id")
+                            .subdomain("test-sub-domain")
+                            .version(1)
+                            .build();
+                });
     }
 
-    @Test(expected = IllegalStateException.class)
-    public void noSubdomain() {
-        CreateIdentityZoneRequest.builder()
-                .configuration(IdentityZoneConfiguration.builder().build())
-                .description("test-description")
-                .identityZoneId("test-identity-zone-id")
-                .name("test-name")
-                .version(1)
-                .build();
+    @Test
+    void noSubdomain() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    CreateIdentityZoneRequest.builder()
+                            .configuration(IdentityZoneConfiguration.builder().build())
+                            .description("test-description")
+                            .identityZoneId("test-identity-zone-id")
+                            .name("test-name")
+                            .version(1)
+                            .build();
+                });
     }
 
     @Test
-    public void validMax() {
+    void validMax() {
         CreateIdentityZoneRequest.builder()
                 .configuration(IdentityZoneConfiguration.builder().build())
                 .description("test-description")
@@ -55,7 +65,7 @@ public void validMax() {
     }
 
     @Test
-    public void validMin() {
+    void validMin() {
         CreateIdentityZoneRequest.builder().name("test-name").subdomain("test-sub-domain").build();
     }
 }
diff --git a/cloudfoundry-client/src/test/java/org/cloudfoundry/uaa/identityzones/DeleteIdentityZoneRequestTest.java b/cloudfoundry-client/src/test/java/org/cloudfoundry/uaa/identityzones/DeleteIdentityZoneRequestTest.java
index 8108e501f94..bbc67172427 100644
--- a/cloudfoundry-client/src/test/java/org/cloudfoundry/uaa/identityzones/DeleteIdentityZoneRequestTest.java
+++ b/cloudfoundry-client/src/test/java/org/cloudfoundry/uaa/identityzones/DeleteIdentityZoneRequestTest.java
@@ -16,17 +16,23 @@
 
 package org.cloudfoundry.uaa.identityzones;
 
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
-public final class DeleteIdentityZoneRequestTest {
+import org.junit.jupiter.api.Test;
 
-    @Test(expected = IllegalStateException.class)
-    public void noId() {
-        DeleteIdentityZoneRequest.builder().build();
+final class DeleteIdentityZoneRequestTest {
+
+    @Test
+    void noId() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    DeleteIdentityZoneRequest.builder().build();
+                });
     }
 
     @Test
-    public void valid() {
+    void valid() {
         DeleteIdentityZoneRequest.builder().identityZoneId("test-identity-zone-id").build();
     }
 }
diff --git a/cloudfoundry-client/src/test/java/org/cloudfoundry/uaa/identityzones/GetIdentityZoneRequestTest.java b/cloudfoundry-client/src/test/java/org/cloudfoundry/uaa/identityzones/GetIdentityZoneRequestTest.java
index 7c295577ff0..c2009063b6b 100644
--- a/cloudfoundry-client/src/test/java/org/cloudfoundry/uaa/identityzones/GetIdentityZoneRequestTest.java
+++ b/cloudfoundry-client/src/test/java/org/cloudfoundry/uaa/identityzones/GetIdentityZoneRequestTest.java
@@ -16,17 +16,23 @@
 
 package org.cloudfoundry.uaa.identityzones;
 
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
-public final class GetIdentityZoneRequestTest {
+import org.junit.jupiter.api.Test;
 
-    @Test(expected = IllegalStateException.class)
-    public void noIdentityZoneId() {
-        GetIdentityZoneRequest.builder().build();
+final class GetIdentityZoneRequestTest {
+
+    @Test
+    void noIdentityZoneId() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    GetIdentityZoneRequest.builder().build();
+                });
     }
 
     @Test
-    public void valid() {
+    void valid() {
         GetIdentityZoneRequest.builder().identityZoneId("test-identity-zone-id").build();
     }
 }
diff --git a/cloudfoundry-client/src/test/java/org/cloudfoundry/uaa/identityzones/ListIdentityZonesRequestTest.java b/cloudfoundry-client/src/test/java/org/cloudfoundry/uaa/identityzones/ListIdentityZonesRequestTest.java
index 17e151ed04e..7c1b234d631 100644
--- a/cloudfoundry-client/src/test/java/org/cloudfoundry/uaa/identityzones/ListIdentityZonesRequestTest.java
+++ b/cloudfoundry-client/src/test/java/org/cloudfoundry/uaa/identityzones/ListIdentityZonesRequestTest.java
@@ -16,12 +16,12 @@
 
 package org.cloudfoundry.uaa.identityzones;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
-public final class ListIdentityZonesRequestTest {
+final class ListIdentityZonesRequestTest {
 
     @Test
-    public void valid() {
+    void valid() {
         ListIdentityZonesRequest.builder().build();
     }
 }
diff --git a/cloudfoundry-client/src/test/java/org/cloudfoundry/uaa/identityzones/UpdateIdentityZoneRequestTest.java b/cloudfoundry-client/src/test/java/org/cloudfoundry/uaa/identityzones/UpdateIdentityZoneRequestTest.java
index 135312ab5ff..05a021e93b3 100644
--- a/cloudfoundry-client/src/test/java/org/cloudfoundry/uaa/identityzones/UpdateIdentityZoneRequestTest.java
+++ b/cloudfoundry-client/src/test/java/org/cloudfoundry/uaa/identityzones/UpdateIdentityZoneRequestTest.java
@@ -16,45 +16,59 @@
 
 package org.cloudfoundry.uaa.identityzones;
 
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
-public class UpdateIdentityZoneRequestTest {
+import org.junit.jupiter.api.Test;
 
-    @Test(expected = IllegalStateException.class)
-    public void noIdentityZoneId() {
-        UpdateIdentityZoneRequest.builder()
-                .configuration(IdentityZoneConfiguration.builder().build())
-                .description("test-new-description")
-                .name("test-name")
-                .subdomain("test-sub-domain")
-                .version(1)
-                .build();
+class UpdateIdentityZoneRequestTest {
+
+    @Test
+    void noIdentityZoneId() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    UpdateIdentityZoneRequest.builder()
+                            .configuration(IdentityZoneConfiguration.builder().build())
+                            .description("test-new-description")
+                            .name("test-name")
+                            .subdomain("test-sub-domain")
+                            .version(1)
+                            .build();
+                });
     }
 
-    @Test(expected = IllegalStateException.class)
-    public void noName() {
-        UpdateIdentityZoneRequest.builder()
-                .configuration(IdentityZoneConfiguration.builder().build())
-                .description("test-new-description")
-                .identityZoneId("test-id")
-                .subdomain("test-sub-domain")
-                .version(1)
-                .build();
+    @Test
+    void noName() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    UpdateIdentityZoneRequest.builder()
+                            .configuration(IdentityZoneConfiguration.builder().build())
+                            .description("test-new-description")
+                            .identityZoneId("test-id")
+                            .subdomain("test-sub-domain")
+                            .version(1)
+                            .build();
+                });
     }
 
-    @Test(expected = IllegalStateException.class)
-    public void noSubdomain() {
-        UpdateIdentityZoneRequest.builder()
-                .configuration(IdentityZoneConfiguration.builder().build())
-                .description("test-new-description")
-                .identityZoneId("test-id")
-                .name("test-name")
-                .version(1)
-                .build();
+    @Test
+    void noSubdomain() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    UpdateIdentityZoneRequest.builder()
+                            .configuration(IdentityZoneConfiguration.builder().build())
+                            .description("test-new-description")
+                            .identityZoneId("test-id")
+                            .name("test-name")
+                            .version(1)
+                            .build();
+                });
     }
 
     @Test
-    public void validMax() {
+    void validMax() {
         UpdateIdentityZoneRequest.builder()
                 .configuration(IdentityZoneConfiguration.builder().build())
                 .description("test-new-description")
@@ -66,7 +80,7 @@ public void validMax() {
     }
 
     @Test
-    public void validMin() {
+    void validMin() {
         UpdateIdentityZoneRequest.builder()
                 .identityZoneId("test-id")
                 .name("test-name")
diff --git a/cloudfoundry-client/src/test/java/org/cloudfoundry/uaa/serverinformation/AutoLoginRequestTest.java b/cloudfoundry-client/src/test/java/org/cloudfoundry/uaa/serverinformation/AutoLoginRequestTest.java
index 6207a8fb6de..a8a7440b75a 100644
--- a/cloudfoundry-client/src/test/java/org/cloudfoundry/uaa/serverinformation/AutoLoginRequestTest.java
+++ b/cloudfoundry-client/src/test/java/org/cloudfoundry/uaa/serverinformation/AutoLoginRequestTest.java
@@ -16,22 +16,32 @@
 
 package org.cloudfoundry.uaa.serverinformation;
 
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
-public final class AutoLoginRequestTest {
+import org.junit.jupiter.api.Test;
 
-    @Test(expected = IllegalStateException.class)
-    public void noClientId() {
-        AutoLoginRequest.builder().code("test-code").build();
+final class AutoLoginRequestTest {
+
+    @Test
+    void noClientId() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    AutoLoginRequest.builder().code("test-code").build();
+                });
     }
 
-    @Test(expected = IllegalStateException.class)
-    public void noCode() {
-        AutoLoginRequest.builder().clientId("test-client-id").build();
+    @Test
+    void noCode() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    AutoLoginRequest.builder().clientId("test-client-id").build();
+                });
     }
 
     @Test
-    public void valid() {
+    void valid() {
         AutoLoginRequest.builder().clientId("test-client-id").code("test-code").build();
     }
 }
diff --git a/cloudfoundry-client/src/test/java/org/cloudfoundry/uaa/serverinformation/GetAutoLoginAuthenticationCodeRequestTest.java b/cloudfoundry-client/src/test/java/org/cloudfoundry/uaa/serverinformation/GetAutoLoginAuthenticationCodeRequestTest.java
index 173b510feb1..ab8c7de6d37 100644
--- a/cloudfoundry-client/src/test/java/org/cloudfoundry/uaa/serverinformation/GetAutoLoginAuthenticationCodeRequestTest.java
+++ b/cloudfoundry-client/src/test/java/org/cloudfoundry/uaa/serverinformation/GetAutoLoginAuthenticationCodeRequestTest.java
@@ -16,48 +16,66 @@
 
 package org.cloudfoundry.uaa.serverinformation;
 
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
-public final class GetAutoLoginAuthenticationCodeRequestTest {
+import org.junit.jupiter.api.Test;
 
-    @Test(expected = IllegalStateException.class)
-    public void noClientId() {
-        GetAutoLoginAuthenticationCodeRequest.builder()
-                .clientSecret("test-client-secret")
-                .password("test-password")
-                .username("test-username")
-                .build();
+final class GetAutoLoginAuthenticationCodeRequestTest {
+
+    @Test
+    void noClientId() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    GetAutoLoginAuthenticationCodeRequest.builder()
+                            .clientSecret("test-client-secret")
+                            .password("test-password")
+                            .username("test-username")
+                            .build();
+                });
     }
 
-    @Test(expected = IllegalStateException.class)
-    public void noClientSecret() {
-        GetAutoLoginAuthenticationCodeRequest.builder()
-                .clientId("test-client-id")
-                .password("test-password")
-                .username("test-username")
-                .build();
+    @Test
+    void noClientSecret() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    GetAutoLoginAuthenticationCodeRequest.builder()
+                            .clientId("test-client-id")
+                            .password("test-password")
+                            .username("test-username")
+                            .build();
+                });
     }
 
-    @Test(expected = IllegalStateException.class)
-    public void noPassword() {
-        GetAutoLoginAuthenticationCodeRequest.builder()
-                .clientId("test-client-id")
-                .clientSecret("test-client-secret")
-                .username("test-username")
-                .build();
+    @Test
+    void noPassword() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    GetAutoLoginAuthenticationCodeRequest.builder()
+                            .clientId("test-client-id")
+                            .clientSecret("test-client-secret")
+                            .username("test-username")
+                            .build();
+                });
     }
 
-    @Test(expected = IllegalStateException.class)
-    public void noUsername() {
-        GetAutoLoginAuthenticationCodeRequest.builder()
-                .clientId("test-client-id")
-                .clientSecret("test-client-secret")
-                .password("test-password")
-                .build();
+    @Test
+    void noUsername() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    GetAutoLoginAuthenticationCodeRequest.builder()
+                            .clientId("test-client-id")
+                            .clientSecret("test-client-secret")
+                            .password("test-password")
+                            .build();
+                });
     }
 
     @Test
-    public void valid() {
+    void valid() {
         GetAutoLoginAuthenticationCodeRequest.builder()
                 .clientId("test-client-id")
                 .clientSecret("test-client-secret")
diff --git a/cloudfoundry-client/src/test/java/org/cloudfoundry/uaa/serverinformation/GetInfoRequestTest.java b/cloudfoundry-client/src/test/java/org/cloudfoundry/uaa/serverinformation/GetInfoRequestTest.java
index 1b0e2f636e9..8c3a1776863 100644
--- a/cloudfoundry-client/src/test/java/org/cloudfoundry/uaa/serverinformation/GetInfoRequestTest.java
+++ b/cloudfoundry-client/src/test/java/org/cloudfoundry/uaa/serverinformation/GetInfoRequestTest.java
@@ -16,12 +16,12 @@
 
 package org.cloudfoundry.uaa.serverinformation;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
-public final class GetInfoRequestTest {
+final class GetInfoRequestTest {
 
     @Test
-    public void valid() {
+    void valid() {
         GetInfoRequest.builder().build();
     }
 }
diff --git a/cloudfoundry-client/src/test/java/org/cloudfoundry/uaa/tokens/CheckTokenRequestTest.java b/cloudfoundry-client/src/test/java/org/cloudfoundry/uaa/tokens/CheckTokenRequestTest.java
index fc69f16b705..77c80f31683 100644
--- a/cloudfoundry-client/src/test/java/org/cloudfoundry/uaa/tokens/CheckTokenRequestTest.java
+++ b/cloudfoundry-client/src/test/java/org/cloudfoundry/uaa/tokens/CheckTokenRequestTest.java
@@ -16,39 +16,53 @@
 
 package org.cloudfoundry.uaa.tokens;
 
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
-public final class CheckTokenRequestTest {
+import org.junit.jupiter.api.Test;
 
-    @Test(expected = IllegalStateException.class)
-    public void noClientId() {
-        CheckTokenRequest.builder()
-                .clientSecret("test-client-secret")
-                .token("test-token")
-                .scope("test-scope")
-                .build();
+final class CheckTokenRequestTest {
+
+    @Test
+    void noClientId() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    CheckTokenRequest.builder()
+                            .clientSecret("test-client-secret")
+                            .token("test-token")
+                            .scope("test-scope")
+                            .build();
+                });
     }
 
-    @Test(expected = IllegalStateException.class)
-    public void noClientSecret() {
-        CheckTokenRequest.builder()
-                .clientId("test-client-id")
-                .token("test-token")
-                .scope("test-scope")
-                .build();
+    @Test
+    void noClientSecret() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    CheckTokenRequest.builder()
+                            .clientId("test-client-id")
+                            .token("test-token")
+                            .scope("test-scope")
+                            .build();
+                });
     }
 
-    @Test(expected = IllegalStateException.class)
-    public void noToken() {
-        CheckTokenRequest.builder()
-                .clientId("test-client-id")
-                .clientSecret("test-client-secret")
-                .scope("test-scope")
-                .build();
+    @Test
+    void noToken() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    CheckTokenRequest.builder()
+                            .clientId("test-client-id")
+                            .clientSecret("test-client-secret")
+                            .scope("test-scope")
+                            .build();
+                });
     }
 
     @Test
-    public void validMax() {
+    void validMax() {
         CheckTokenRequest.builder()
                 .clientId("test-client-id")
                 .clientSecret("test-client-secret")
@@ -58,7 +72,7 @@ public void validMax() {
     }
 
     @Test
-    public void validMin() {
+    void validMin() {
         CheckTokenRequest.builder()
                 .clientId("test-client-id")
                 .clientSecret("test-client-secret")
diff --git a/cloudfoundry-client/src/test/java/org/cloudfoundry/uaa/tokens/GetTokenByAuthorizationCodeRequestTest.java b/cloudfoundry-client/src/test/java/org/cloudfoundry/uaa/tokens/GetTokenByAuthorizationCodeRequestTest.java
index 5f60c0c44d8..38f63c12948 100644
--- a/cloudfoundry-client/src/test/java/org/cloudfoundry/uaa/tokens/GetTokenByAuthorizationCodeRequestTest.java
+++ b/cloudfoundry-client/src/test/java/org/cloudfoundry/uaa/tokens/GetTokenByAuthorizationCodeRequestTest.java
@@ -16,36 +16,50 @@
 
 package org.cloudfoundry.uaa.tokens;
 
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
-public final class GetTokenByAuthorizationCodeRequestTest {
+import org.junit.jupiter.api.Test;
 
-    @Test(expected = IllegalStateException.class)
-    public void noAuthorizationCode() {
-        GetTokenByAuthorizationCodeRequest.builder()
-                .clientId("test-client-id")
-                .clientSecret("test-client-secret")
-                .build();
+final class GetTokenByAuthorizationCodeRequestTest {
+
+    @Test
+    void noAuthorizationCode() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    GetTokenByAuthorizationCodeRequest.builder()
+                            .clientId("test-client-id")
+                            .clientSecret("test-client-secret")
+                            .build();
+                });
     }
 
-    @Test(expected = IllegalStateException.class)
-    public void noClientId() {
-        GetTokenByAuthorizationCodeRequest.builder()
-                .authorizationCode("test-authorization-code")
-                .clientSecret("test-client-secret")
-                .build();
+    @Test
+    void noClientId() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    GetTokenByAuthorizationCodeRequest.builder()
+                            .authorizationCode("test-authorization-code")
+                            .clientSecret("test-client-secret")
+                            .build();
+                });
     }
 
-    @Test(expected = IllegalStateException.class)
-    public void noClientSecret() {
-        GetTokenByAuthorizationCodeRequest.builder()
-                .authorizationCode("test-authorization-code")
-                .clientId("test-client-id")
-                .build();
+    @Test
+    void noClientSecret() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    GetTokenByAuthorizationCodeRequest.builder()
+                            .authorizationCode("test-authorization-code")
+                            .clientId("test-client-id")
+                            .build();
+                });
     }
 
     @Test
-    public void valid() {
+    void valid() {
         GetTokenByAuthorizationCodeRequest.builder()
                 .authorizationCode("test-authorization-code")
                 .clientId("test-client-id")
diff --git a/cloudfoundry-client/src/test/java/org/cloudfoundry/uaa/tokens/GetTokenByClientCredentialsRequestTest.java b/cloudfoundry-client/src/test/java/org/cloudfoundry/uaa/tokens/GetTokenByClientCredentialsRequestTest.java
index 76117f41811..b9fd3e27e41 100644
--- a/cloudfoundry-client/src/test/java/org/cloudfoundry/uaa/tokens/GetTokenByClientCredentialsRequestTest.java
+++ b/cloudfoundry-client/src/test/java/org/cloudfoundry/uaa/tokens/GetTokenByClientCredentialsRequestTest.java
@@ -16,28 +16,38 @@
 
 package org.cloudfoundry.uaa.tokens;
 
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
-public final class GetTokenByClientCredentialsRequestTest {
+import org.junit.jupiter.api.Test;
 
-    @Test(expected = IllegalStateException.class)
-    public void noClientId() {
-        GetTokenByClientCredentialsRequest.builder()
-                .clientSecret("test-client-secret")
-                .tokenFormat(TokenFormat.OPAQUE)
-                .build();
+final class GetTokenByClientCredentialsRequestTest {
+
+    @Test
+    void noClientId() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    GetTokenByClientCredentialsRequest.builder()
+                            .clientSecret("test-client-secret")
+                            .tokenFormat(TokenFormat.OPAQUE)
+                            .build();
+                });
     }
 
-    @Test(expected = IllegalStateException.class)
-    public void noClientSecret() {
-        GetTokenByClientCredentialsRequest.builder()
-                .clientId("test-client-id")
-                .tokenFormat(TokenFormat.OPAQUE)
-                .build();
+    @Test
+    void noClientSecret() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    GetTokenByClientCredentialsRequest.builder()
+                            .clientId("test-client-id")
+                            .tokenFormat(TokenFormat.OPAQUE)
+                            .build();
+                });
     }
 
     @Test
-    public void validMax() {
+    void validMax() {
         GetTokenByClientCredentialsRequest.builder()
                 .clientId("test-client-id")
                 .clientSecret("test-client-secret")
@@ -46,7 +56,7 @@ public void validMax() {
     }
 
     @Test
-    public void validMin() {
+    void validMin() {
         GetTokenByClientCredentialsRequest.builder()
                 .clientId("test-client-id")
                 .clientSecret("test-client-secret")
diff --git a/cloudfoundry-client/src/test/java/org/cloudfoundry/uaa/tokens/GetTokenByOneTimePasscodeRequestTest.java b/cloudfoundry-client/src/test/java/org/cloudfoundry/uaa/tokens/GetTokenByOneTimePasscodeRequestTest.java
index d70ae5c55b7..e037320cc32 100644
--- a/cloudfoundry-client/src/test/java/org/cloudfoundry/uaa/tokens/GetTokenByOneTimePasscodeRequestTest.java
+++ b/cloudfoundry-client/src/test/java/org/cloudfoundry/uaa/tokens/GetTokenByOneTimePasscodeRequestTest.java
@@ -16,39 +16,53 @@
 
 package org.cloudfoundry.uaa.tokens;
 
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
-public final class GetTokenByOneTimePasscodeRequestTest {
+import org.junit.jupiter.api.Test;
 
-    @Test(expected = IllegalStateException.class)
-    public void noClientId() {
-        GetTokenByOneTimePasscodeRequest.builder()
-                .clientSecret("test-client-secret")
-                .passcode("test-passcode")
-                .tokenFormat(TokenFormat.OPAQUE)
-                .build();
+final class GetTokenByOneTimePasscodeRequestTest {
+
+    @Test
+    void noClientId() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    GetTokenByOneTimePasscodeRequest.builder()
+                            .clientSecret("test-client-secret")
+                            .passcode("test-passcode")
+                            .tokenFormat(TokenFormat.OPAQUE)
+                            .build();
+                });
     }
 
-    @Test(expected = IllegalStateException.class)
-    public void noClientSecret() {
-        GetTokenByOneTimePasscodeRequest.builder()
-                .clientId("test-client-id")
-                .passcode("test-passcode")
-                .tokenFormat(TokenFormat.OPAQUE)
-                .build();
+    @Test
+    void noClientSecret() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    GetTokenByOneTimePasscodeRequest.builder()
+                            .clientId("test-client-id")
+                            .passcode("test-passcode")
+                            .tokenFormat(TokenFormat.OPAQUE)
+                            .build();
+                });
     }
 
-    @Test(expected = IllegalStateException.class)
-    public void noPasscode() {
-        GetTokenByOneTimePasscodeRequest.builder()
-                .clientId("test-client-id")
-                .clientSecret("test-client-secret")
-                .tokenFormat(TokenFormat.OPAQUE)
-                .build();
+    @Test
+    void noPasscode() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    GetTokenByOneTimePasscodeRequest.builder()
+                            .clientId("test-client-id")
+                            .clientSecret("test-client-secret")
+                            .tokenFormat(TokenFormat.OPAQUE)
+                            .build();
+                });
     }
 
     @Test
-    public void validMax() {
+    void validMax() {
         GetTokenByOneTimePasscodeRequest.builder()
                 .clientId("test-client-id")
                 .clientSecret("test-client-secret")
@@ -58,7 +72,7 @@ public void validMax() {
     }
 
     @Test
-    public void validMin() {
+    void validMin() {
         GetTokenByOneTimePasscodeRequest.builder()
                 .clientId("test-client-id")
                 .clientSecret("test-client-secret")
diff --git a/cloudfoundry-client/src/test/java/org/cloudfoundry/uaa/tokens/GetTokenByOpenIdRequestTest.java b/cloudfoundry-client/src/test/java/org/cloudfoundry/uaa/tokens/GetTokenByOpenIdRequestTest.java
index 496be91f30a..64c4edffea8 100644
--- a/cloudfoundry-client/src/test/java/org/cloudfoundry/uaa/tokens/GetTokenByOpenIdRequestTest.java
+++ b/cloudfoundry-client/src/test/java/org/cloudfoundry/uaa/tokens/GetTokenByOpenIdRequestTest.java
@@ -16,42 +16,56 @@
 
 package org.cloudfoundry.uaa.tokens;
 
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
-public final class GetTokenByOpenIdRequestTest {
+import org.junit.jupiter.api.Test;
 
-    @Test(expected = IllegalStateException.class)
-    public void noAuthorizationCode() {
-        GetTokenByOpenIdRequest.builder()
-                .clientId("test-client-id")
-                .clientSecret("test-client-secret")
-                .redirectUri("test-redirect-uri")
-                .tokenFormat(TokenFormat.OPAQUE)
-                .build();
+final class GetTokenByOpenIdRequestTest {
+
+    @Test
+    void noAuthorizationCode() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    GetTokenByOpenIdRequest.builder()
+                            .clientId("test-client-id")
+                            .clientSecret("test-client-secret")
+                            .redirectUri("test-redirect-uri")
+                            .tokenFormat(TokenFormat.OPAQUE)
+                            .build();
+                });
     }
 
-    @Test(expected = IllegalStateException.class)
-    public void noClientId() {
-        GetTokenByOpenIdRequest.builder()
-                .authorizationCode("test-authorization-code")
-                .clientSecret("test-client-secret")
-                .redirectUri("test-redirect-uri")
-                .tokenFormat(TokenFormat.OPAQUE)
-                .build();
+    @Test
+    void noClientId() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    GetTokenByOpenIdRequest.builder()
+                            .authorizationCode("test-authorization-code")
+                            .clientSecret("test-client-secret")
+                            .redirectUri("test-redirect-uri")
+                            .tokenFormat(TokenFormat.OPAQUE)
+                            .build();
+                });
     }
 
-    @Test(expected = IllegalStateException.class)
-    public void noClientSecret() {
-        GetTokenByOpenIdRequest.builder()
-                .authorizationCode("test-authorization-code")
-                .clientId("test-client-id")
-                .redirectUri("test-redirect-uri")
-                .tokenFormat(TokenFormat.OPAQUE)
-                .build();
+    @Test
+    void noClientSecret() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    GetTokenByOpenIdRequest.builder()
+                            .authorizationCode("test-authorization-code")
+                            .clientId("test-client-id")
+                            .redirectUri("test-redirect-uri")
+                            .tokenFormat(TokenFormat.OPAQUE)
+                            .build();
+                });
     }
 
     @Test
-    public void validMax() {
+    void validMax() {
         GetTokenByOpenIdRequest.builder()
                 .authorizationCode("test-authorization-code")
                 .clientId("test-client-id")
@@ -62,7 +76,7 @@ public void validMax() {
     }
 
     @Test
-    public void validMin() {
+    void validMin() {
         GetTokenByOpenIdRequest.builder()
                 .authorizationCode("test-authorization-code")
                 .clientId("test-client-id")
diff --git a/cloudfoundry-client/src/test/java/org/cloudfoundry/uaa/tokens/GetTokenByPasswordRequestTest.java b/cloudfoundry-client/src/test/java/org/cloudfoundry/uaa/tokens/GetTokenByPasswordRequestTest.java
index c18c55de40d..69d47bc217a 100644
--- a/cloudfoundry-client/src/test/java/org/cloudfoundry/uaa/tokens/GetTokenByPasswordRequestTest.java
+++ b/cloudfoundry-client/src/test/java/org/cloudfoundry/uaa/tokens/GetTokenByPasswordRequestTest.java
@@ -16,48 +16,66 @@
 
 package org.cloudfoundry.uaa.tokens;
 
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
-public final class GetTokenByPasswordRequestTest {
+import org.junit.jupiter.api.Test;
 
-    @Test(expected = IllegalStateException.class)
-    public void noClientId() {
-        GetTokenByPasswordRequest.builder()
-                .clientSecret("test-client-secret")
-                .password("test-password")
-                .username("test-username")
-                .build();
+final class GetTokenByPasswordRequestTest {
+
+    @Test
+    void noClientId() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    GetTokenByPasswordRequest.builder()
+                            .clientSecret("test-client-secret")
+                            .password("test-password")
+                            .username("test-username")
+                            .build();
+                });
     }
 
-    @Test(expected = IllegalStateException.class)
-    public void noClientSecret() {
-        GetTokenByPasswordRequest.builder()
-                .clientId("test-client-id")
-                .password("test-password")
-                .username("test-username")
-                .build();
+    @Test
+    void noClientSecret() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    GetTokenByPasswordRequest.builder()
+                            .clientId("test-client-id")
+                            .password("test-password")
+                            .username("test-username")
+                            .build();
+                });
     }
 
-    @Test(expected = IllegalStateException.class)
-    public void noPassword() {
-        GetTokenByPasswordRequest.builder()
-                .clientId("test-client-id")
-                .clientSecret("test-client-secret")
-                .username("test-username")
-                .build();
+    @Test
+    void noPassword() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    GetTokenByPasswordRequest.builder()
+                            .clientId("test-client-id")
+                            .clientSecret("test-client-secret")
+                            .username("test-username")
+                            .build();
+                });
     }
 
-    @Test(expected = IllegalStateException.class)
-    public void noUsername() {
-        GetTokenByPasswordRequest.builder()
-                .clientId("test-client-id")
-                .clientSecret("test-client-secret")
-                .password("test-password")
-                .build();
+    @Test
+    void noUsername() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    GetTokenByPasswordRequest.builder()
+                            .clientId("test-client-id")
+                            .clientSecret("test-client-secret")
+                            .password("test-password")
+                            .build();
+                });
     }
 
     @Test
-    public void valid() {
+    void valid() {
         GetTokenByPasswordRequest.builder()
                 .clientId("test-client-id")
                 .clientSecret("test-client-secret")
diff --git a/cloudfoundry-client/src/test/java/org/cloudfoundry/uaa/tokens/GetTokenKeyRequestTest.java b/cloudfoundry-client/src/test/java/org/cloudfoundry/uaa/tokens/GetTokenKeyRequestTest.java
index 299da68ddc6..15eb6c6e63f 100644
--- a/cloudfoundry-client/src/test/java/org/cloudfoundry/uaa/tokens/GetTokenKeyRequestTest.java
+++ b/cloudfoundry-client/src/test/java/org/cloudfoundry/uaa/tokens/GetTokenKeyRequestTest.java
@@ -16,12 +16,12 @@
 
 package org.cloudfoundry.uaa.tokens;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
-public final class GetTokenKeyRequestTest {
+final class GetTokenKeyRequestTest {
 
     @Test
-    public void valid() {
+    void valid() {
         GetTokenKeyRequest.builder().build();
     }
 }
diff --git a/cloudfoundry-client/src/test/java/org/cloudfoundry/uaa/tokens/ListTokenKeysRequestTest.java b/cloudfoundry-client/src/test/java/org/cloudfoundry/uaa/tokens/ListTokenKeysRequestTest.java
index 83d7c3d8533..9277de41c90 100644
--- a/cloudfoundry-client/src/test/java/org/cloudfoundry/uaa/tokens/ListTokenKeysRequestTest.java
+++ b/cloudfoundry-client/src/test/java/org/cloudfoundry/uaa/tokens/ListTokenKeysRequestTest.java
@@ -16,12 +16,12 @@
 
 package org.cloudfoundry.uaa.tokens;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
-public final class ListTokenKeysRequestTest {
+final class ListTokenKeysRequestTest {
 
     @Test
-    public void valid() {
+    void valid() {
         ListTokenKeysRequest.builder().build();
     }
 }
diff --git a/cloudfoundry-client/src/test/java/org/cloudfoundry/uaa/tokens/RefreshTokenRequestTest.java b/cloudfoundry-client/src/test/java/org/cloudfoundry/uaa/tokens/RefreshTokenRequestTest.java
index ec8fc012bba..cc962b9f4e9 100644
--- a/cloudfoundry-client/src/test/java/org/cloudfoundry/uaa/tokens/RefreshTokenRequestTest.java
+++ b/cloudfoundry-client/src/test/java/org/cloudfoundry/uaa/tokens/RefreshTokenRequestTest.java
@@ -16,39 +16,53 @@
 
 package org.cloudfoundry.uaa.tokens;
 
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
-public final class RefreshTokenRequestTest {
+import org.junit.jupiter.api.Test;
 
-    @Test(expected = IllegalStateException.class)
-    public void noClientId() {
-        RefreshTokenRequest.builder()
-                .clientSecret("test-client-secret")
-                .refreshToken("test-refresh-token")
-                .tokenFormat(TokenFormat.OPAQUE)
-                .build();
+final class RefreshTokenRequestTest {
+
+    @Test
+    void noClientId() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    RefreshTokenRequest.builder()
+                            .clientSecret("test-client-secret")
+                            .refreshToken("test-refresh-token")
+                            .tokenFormat(TokenFormat.OPAQUE)
+                            .build();
+                });
     }
 
-    @Test(expected = IllegalStateException.class)
-    public void noClientSecret() {
-        RefreshTokenRequest.builder()
-                .clientId("test-client-id")
-                .refreshToken("test-refresh-token")
-                .tokenFormat(TokenFormat.OPAQUE)
-                .build();
+    @Test
+    void noClientSecret() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    RefreshTokenRequest.builder()
+                            .clientId("test-client-id")
+                            .refreshToken("test-refresh-token")
+                            .tokenFormat(TokenFormat.OPAQUE)
+                            .build();
+                });
     }
 
-    @Test(expected = IllegalStateException.class)
-    public void noRefreshToken() {
-        RefreshTokenRequest.builder()
-                .clientId("test-client-id")
-                .clientSecret("test-client-secret")
-                .tokenFormat(TokenFormat.OPAQUE)
-                .build();
+    @Test
+    void noRefreshToken() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    RefreshTokenRequest.builder()
+                            .clientId("test-client-id")
+                            .clientSecret("test-client-secret")
+                            .tokenFormat(TokenFormat.OPAQUE)
+                            .build();
+                });
     }
 
     @Test
-    public void validMax() {
+    void validMax() {
         RefreshTokenRequest.builder()
                 .clientId("test-client-id")
                 .clientSecret("test-client-secret")
@@ -58,7 +72,7 @@ public void validMax() {
     }
 
     @Test
-    public void validMin() {
+    void validMin() {
         RefreshTokenRequest.builder()
                 .clientId("test-client-id")
                 .clientSecret("test-client-secret")
diff --git a/cloudfoundry-client/src/test/java/org/cloudfoundry/uaa/users/ChangeUserPasswordRequestTest.java b/cloudfoundry-client/src/test/java/org/cloudfoundry/uaa/users/ChangeUserPasswordRequestTest.java
index c4b7a1c091a..2d56e68fe45 100644
--- a/cloudfoundry-client/src/test/java/org/cloudfoundry/uaa/users/ChangeUserPasswordRequestTest.java
+++ b/cloudfoundry-client/src/test/java/org/cloudfoundry/uaa/users/ChangeUserPasswordRequestTest.java
@@ -16,22 +16,32 @@
 
 package org.cloudfoundry.uaa.users;
 
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
-public final class ChangeUserPasswordRequestTest {
+import org.junit.jupiter.api.Test;
 
-    @Test(expected = IllegalStateException.class)
-    public void noPassword() {
-        ChangeUserPasswordRequest.builder().userId("test-user-id").build();
+final class ChangeUserPasswordRequestTest {
+
+    @Test
+    void noPassword() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    ChangeUserPasswordRequest.builder().userId("test-user-id").build();
+                });
     }
 
-    @Test(expected = IllegalStateException.class)
-    public void noUserId() {
-        ChangeUserPasswordRequest.builder().password("test-password").build();
+    @Test
+    void noUserId() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    ChangeUserPasswordRequest.builder().password("test-password").build();
+                });
     }
 
     @Test
-    public void valid() {
+    void valid() {
         ChangeUserPasswordRequest.builder()
                 .password("test-password")
                 .userId("test-user-id")
diff --git a/cloudfoundry-client/src/test/java/org/cloudfoundry/uaa/users/CreateUserRequestTest.java b/cloudfoundry-client/src/test/java/org/cloudfoundry/uaa/users/CreateUserRequestTest.java
index b0cbe14f471..7f22792e28a 100644
--- a/cloudfoundry-client/src/test/java/org/cloudfoundry/uaa/users/CreateUserRequestTest.java
+++ b/cloudfoundry-client/src/test/java/org/cloudfoundry/uaa/users/CreateUserRequestTest.java
@@ -16,33 +16,47 @@
 
 package org.cloudfoundry.uaa.users;
 
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
-public final class CreateUserRequestTest {
+import org.junit.jupiter.api.Test;
 
-    @Test(expected = IllegalStateException.class)
-    public void incompleteName() {
-        CreateUserRequest.builder()
-                .email(Email.builder().primary(true).value("test-email").build())
-                .name(Name.builder().familyName("test-family-name").build())
-                .userName("test-userName")
-                .build();
+final class CreateUserRequestTest {
+
+    @Test
+    void incompleteName() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    CreateUserRequest.builder()
+                            .email(Email.builder().primary(true).value("test-email").build())
+                            .name(Name.builder().familyName("test-family-name").build())
+                            .userName("test-userName")
+                            .build();
+                });
     }
 
-    @Test(expected = IllegalStateException.class)
-    public void noEmail() {
-        CreateUserRequest.builder().userName("test-userName").build();
+    @Test
+    void noEmail() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    CreateUserRequest.builder().userName("test-userName").build();
+                });
     }
 
-    @Test(expected = IllegalStateException.class)
-    public void noUserName() {
-        CreateUserRequest.builder()
-                .email(Email.builder().primary(true).value("test-email").build())
-                .build();
+    @Test
+    void noUserName() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    CreateUserRequest.builder()
+                            .email(Email.builder().primary(true).value("test-email").build())
+                            .build();
+                });
     }
 
     @Test
-    public void valid() {
+    void valid() {
         CreateUserRequest.builder()
                 .email(Email.builder().primary(true).value("test-email").build())
                 .userName("test-userName")
diff --git a/cloudfoundry-client/src/test/java/org/cloudfoundry/uaa/users/DeleteUserRequestTest.java b/cloudfoundry-client/src/test/java/org/cloudfoundry/uaa/users/DeleteUserRequestTest.java
index 7391c87c57e..a3306488c87 100644
--- a/cloudfoundry-client/src/test/java/org/cloudfoundry/uaa/users/DeleteUserRequestTest.java
+++ b/cloudfoundry-client/src/test/java/org/cloudfoundry/uaa/users/DeleteUserRequestTest.java
@@ -16,17 +16,23 @@
 
 package org.cloudfoundry.uaa.users;
 
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
-public final class DeleteUserRequestTest {
+import org.junit.jupiter.api.Test;
 
-    @Test(expected = IllegalStateException.class)
-    public void noUserId() {
-        DeleteUserRequest.builder().build();
+final class DeleteUserRequestTest {
+
+    @Test
+    void noUserId() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    DeleteUserRequest.builder().build();
+                });
     }
 
     @Test
-    public void valid() {
+    void valid() {
         DeleteUserRequest.builder().userId("test-user-id").build();
     }
 }
diff --git a/cloudfoundry-client/src/test/java/org/cloudfoundry/uaa/users/ExpirePasswordRequestTest.java b/cloudfoundry-client/src/test/java/org/cloudfoundry/uaa/users/ExpirePasswordRequestTest.java
index c327753601c..ade301fc0a8 100644
--- a/cloudfoundry-client/src/test/java/org/cloudfoundry/uaa/users/ExpirePasswordRequestTest.java
+++ b/cloudfoundry-client/src/test/java/org/cloudfoundry/uaa/users/ExpirePasswordRequestTest.java
@@ -16,22 +16,32 @@
 
 package org.cloudfoundry.uaa.users;
 
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
-public final class ExpirePasswordRequestTest {
+import org.junit.jupiter.api.Test;
 
-    @Test(expected = IllegalStateException.class)
-    public void noPasswordChangeRequired() {
-        ExpirePasswordRequest.builder().userId("test-user-id").build();
+final class ExpirePasswordRequestTest {
+
+    @Test
+    void noPasswordChangeRequired() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    ExpirePasswordRequest.builder().userId("test-user-id").build();
+                });
     }
 
-    @Test(expected = IllegalStateException.class)
-    public void noUserId() {
-        ExpirePasswordRequest.builder().passwordChangeRequired(true).build();
+    @Test
+    void noUserId() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    ExpirePasswordRequest.builder().passwordChangeRequired(true).build();
+                });
     }
 
     @Test
-    public void valid() {
+    void valid() {
         ExpirePasswordRequest.builder().passwordChangeRequired(true).userId("test-user-id").build();
     }
 }
diff --git a/cloudfoundry-client/src/test/java/org/cloudfoundry/uaa/users/GetUserVerificationLinkRequestTest.java b/cloudfoundry-client/src/test/java/org/cloudfoundry/uaa/users/GetUserVerificationLinkRequestTest.java
index bcf6d376b4b..caae97a3301 100644
--- a/cloudfoundry-client/src/test/java/org/cloudfoundry/uaa/users/GetUserVerificationLinkRequestTest.java
+++ b/cloudfoundry-client/src/test/java/org/cloudfoundry/uaa/users/GetUserVerificationLinkRequestTest.java
@@ -16,22 +16,34 @@
 
 package org.cloudfoundry.uaa.users;
 
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
-public final class GetUserVerificationLinkRequestTest {
+import org.junit.jupiter.api.Test;
 
-    @Test(expected = IllegalStateException.class)
-    public void noRedirectUri() {
-        GetUserVerificationLinkRequest.builder().userId("test-user-id").build();
+final class GetUserVerificationLinkRequestTest {
+
+    @Test
+    void noRedirectUri() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    GetUserVerificationLinkRequest.builder().userId("test-user-id").build();
+                });
     }
 
-    @Test(expected = IllegalStateException.class)
-    public void noUserId() {
-        GetUserVerificationLinkRequest.builder().redirectUri("test-redirect-uri").build();
+    @Test
+    void noUserId() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    GetUserVerificationLinkRequest.builder()
+                            .redirectUri("test-redirect-uri")
+                            .build();
+                });
     }
 
     @Test
-    public void valid() {
+    void valid() {
         GetUserVerificationLinkRequest.builder()
                 .userId("test-user-id")
                 .redirectUri("test-redirect-uri")
diff --git a/cloudfoundry-client/src/test/java/org/cloudfoundry/uaa/users/InviteUsersRequestTest.java b/cloudfoundry-client/src/test/java/org/cloudfoundry/uaa/users/InviteUsersRequestTest.java
index e567050eb4c..b39aa0a6a4c 100644
--- a/cloudfoundry-client/src/test/java/org/cloudfoundry/uaa/users/InviteUsersRequestTest.java
+++ b/cloudfoundry-client/src/test/java/org/cloudfoundry/uaa/users/InviteUsersRequestTest.java
@@ -16,25 +16,38 @@
 
 package org.cloudfoundry.uaa.users;
 
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
-public final class InviteUsersRequestTest {
+import org.junit.jupiter.api.Test;
 
-    @Test(expected = IllegalStateException.class)
-    public void noEmails() {
-        InviteUsersRequest.builder()
-                .clientId("test-client-id")
-                .redirectUri("test-redirect-uri")
-                .build();
+final class InviteUsersRequestTest {
+
+    @Test
+    void noEmails() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    InviteUsersRequest.builder()
+                            .clientId("test-client-id")
+                            .redirectUri("test-redirect-uri")
+                            .build();
+                });
     }
 
-    @Test(expected = IllegalStateException.class)
-    public void noRedirectId() {
-        InviteUsersRequest.builder().clientId("test-client-id").email("test-email").build();
+    @Test
+    void noRedirectId() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    InviteUsersRequest.builder()
+                            .clientId("test-client-id")
+                            .email("test-email")
+                            .build();
+                });
     }
 
     @Test
-    public void valid() {
+    void valid() {
         InviteUsersRequest.builder()
                 .clientId("test-client-id")
                 .email("test-email")
diff --git a/cloudfoundry-client/src/test/java/org/cloudfoundry/uaa/users/ListUsersRequestTest.java b/cloudfoundry-client/src/test/java/org/cloudfoundry/uaa/users/ListUsersRequestTest.java
index 2ad34287462..0a1c1481fdc 100644
--- a/cloudfoundry-client/src/test/java/org/cloudfoundry/uaa/users/ListUsersRequestTest.java
+++ b/cloudfoundry-client/src/test/java/org/cloudfoundry/uaa/users/ListUsersRequestTest.java
@@ -16,12 +16,12 @@
 
 package org.cloudfoundry.uaa.users;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
-public final class ListUsersRequestTest {
+final class ListUsersRequestTest {
 
     @Test
-    public void valid() {
+    void valid() {
         ListUsersRequest.builder().build();
     }
 }
diff --git a/cloudfoundry-client/src/test/java/org/cloudfoundry/uaa/users/LookupUserIdsRequestTest.java b/cloudfoundry-client/src/test/java/org/cloudfoundry/uaa/users/LookupUserIdsRequestTest.java
index ee9de28780e..aca3df20963 100644
--- a/cloudfoundry-client/src/test/java/org/cloudfoundry/uaa/users/LookupUserIdsRequestTest.java
+++ b/cloudfoundry-client/src/test/java/org/cloudfoundry/uaa/users/LookupUserIdsRequestTest.java
@@ -16,12 +16,12 @@
 
 package org.cloudfoundry.uaa.users;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
-public final class LookupUserIdsRequestTest {
+final class LookupUserIdsRequestTest {
 
     @Test
-    public void valid() {
+    void valid() {
         LookupUserIdsRequest.builder().build();
     }
 }
diff --git a/cloudfoundry-client/src/test/java/org/cloudfoundry/uaa/users/UpdateUserRequestTest.java b/cloudfoundry-client/src/test/java/org/cloudfoundry/uaa/users/UpdateUserRequestTest.java
index 0f6f31690bc..dac4c4e3dc7 100644
--- a/cloudfoundry-client/src/test/java/org/cloudfoundry/uaa/users/UpdateUserRequestTest.java
+++ b/cloudfoundry-client/src/test/java/org/cloudfoundry/uaa/users/UpdateUserRequestTest.java
@@ -16,68 +16,110 @@
 
 package org.cloudfoundry.uaa.users;
 
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
-public final class UpdateUserRequestTest {
+import org.junit.jupiter.api.Test;
 
-    @Test(expected = IllegalStateException.class)
-    public void incompleteName() {
-        UpdateUserRequest.builder()
-                .active(true)
-                .email(Email.builder().primary(true).value("john.doe@pivotal.io").build())
-                .id("user-id")
-                .version("*")
-                .name(Name.builder().givenName("John").build())
-                .userName("jdoe")
-                .build();
+final class UpdateUserRequestTest {
+
+    @Test
+    void incompleteName() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    UpdateUserRequest.builder()
+                            .active(true)
+                            .email(
+                                    Email.builder()
+                                            .primary(true)
+                                            .value("john.doe@pivotal.io")
+                                            .build())
+                            .id("user-id")
+                            .version("*")
+                            .name(Name.builder().givenName("John").build())
+                            .userName("jdoe")
+                            .build();
+                });
     }
 
-    @Test(expected = IllegalStateException.class)
-    public void noId() {
-        UpdateUserRequest.builder()
-                .active(true)
-                .email(Email.builder().primary(true).value("john.doe@pivotal.io").build())
-                .version("*")
-                .name(Name.builder().familyName("Doe").givenName("John").build())
-                .userName("jdoe")
-                .build();
+    @Test
+    void noId() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    UpdateUserRequest.builder()
+                            .active(true)
+                            .email(
+                                    Email.builder()
+                                            .primary(true)
+                                            .value("john.doe@pivotal.io")
+                                            .build())
+                            .version("*")
+                            .name(Name.builder().familyName("Doe").givenName("John").build())
+                            .userName("jdoe")
+                            .build();
+                });
     }
 
-    @Test(expected = IllegalStateException.class)
-    public void noName() {
-        UpdateUserRequest.builder()
-                .active(true)
-                .email(Email.builder().primary(true).value("john.doe@pivotal.io").build())
-                .id("user-id")
-                .version("*")
-                .userName("jdoe")
-                .build();
+    @Test
+    void noName() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    UpdateUserRequest.builder()
+                            .active(true)
+                            .email(
+                                    Email.builder()
+                                            .primary(true)
+                                            .value("john.doe@pivotal.io")
+                                            .build())
+                            .id("user-id")
+                            .version("*")
+                            .userName("jdoe")
+                            .build();
+                });
     }
 
-    @Test(expected = IllegalStateException.class)
-    public void noUsername() {
-        UpdateUserRequest.builder()
-                .active(true)
-                .email(Email.builder().primary(true).value("john.doe@pivotal.io").build())
-                .id("user-id")
-                .version("*")
-                .name(Name.builder().familyName("Doe").givenName("John").build())
-                .build();
+    @Test
+    void noUsername() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    UpdateUserRequest.builder()
+                            .active(true)
+                            .email(
+                                    Email.builder()
+                                            .primary(true)
+                                            .value("john.doe@pivotal.io")
+                                            .build())
+                            .id("user-id")
+                            .version("*")
+                            .name(Name.builder().familyName("Doe").givenName("John").build())
+                            .build();
+                });
     }
 
-    @Test(expected = IllegalStateException.class)
-    public void noVersion() {
-        UpdateUserRequest.builder()
-                .active(true)
-                .email(Email.builder().primary(true).value("john.doe@pivotal.io").build())
-                .id("user-id")
-                .name(Name.builder().familyName("Doe").givenName("John").build())
-                .userName("jdoe")
-                .build();
+    @Test
+    void noVersion() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    UpdateUserRequest.builder()
+                            .active(true)
+                            .email(
+                                    Email.builder()
+                                            .primary(true)
+                                            .value("john.doe@pivotal.io")
+                                            .build())
+                            .id("user-id")
+                            .name(Name.builder().familyName("Doe").givenName("John").build())
+                            .userName("jdoe")
+                            .build();
+                });
     }
 
     @Test
-    public void valid() {
+    void valid() {
         UpdateUserRequest.builder()
                 .active(true)
                 .email(Email.builder().primary(true).value("john.doe@pivotal.io").build())
diff --git a/cloudfoundry-client/src/test/java/org/cloudfoundry/uaa/users/UserInfoRequestTest.java b/cloudfoundry-client/src/test/java/org/cloudfoundry/uaa/users/UserInfoRequestTest.java
index 53b8e83c0e7..a2d7a4971f0 100644
--- a/cloudfoundry-client/src/test/java/org/cloudfoundry/uaa/users/UserInfoRequestTest.java
+++ b/cloudfoundry-client/src/test/java/org/cloudfoundry/uaa/users/UserInfoRequestTest.java
@@ -16,12 +16,12 @@
 
 package org.cloudfoundry.uaa.users;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
-public final class UserInfoRequestTest {
+final class UserInfoRequestTest {
 
     @Test
-    public void valid() {
+    void valid() {
         UserInfoRequest.builder().build();
     }
 }
diff --git a/cloudfoundry-client/src/test/java/org/cloudfoundry/uaa/users/VerifyUserRequestTest.java b/cloudfoundry-client/src/test/java/org/cloudfoundry/uaa/users/VerifyUserRequestTest.java
index 75a1f5bbe4b..de9d69692e5 100644
--- a/cloudfoundry-client/src/test/java/org/cloudfoundry/uaa/users/VerifyUserRequestTest.java
+++ b/cloudfoundry-client/src/test/java/org/cloudfoundry/uaa/users/VerifyUserRequestTest.java
@@ -16,17 +16,23 @@
 
 package org.cloudfoundry.uaa.users;
 
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
-public final class VerifyUserRequestTest {
+import org.junit.jupiter.api.Test;
 
-    @Test(expected = IllegalStateException.class)
-    public void noUserId() {
-        VerifyUserRequest.builder().build();
+final class VerifyUserRequestTest {
+
+    @Test
+    void noUserId() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    VerifyUserRequest.builder().build();
+                });
     }
 
     @Test
-    public void valid() {
+    void valid() {
         VerifyUserRequest.builder().userId("test-user-id").build();
     }
 }
diff --git a/cloudfoundry-operations/pom.xml b/cloudfoundry-operations/pom.xml
index ae53229fb51..50b1e16cb81 100644
--- a/cloudfoundry-operations/pom.xml
+++ b/cloudfoundry-operations/pom.xml
@@ -32,36 +32,43 @@
     <name>Cloud Foundry Java Operations</name>
     <packaging>jar</packaging>
 
-    <dependencies>
-        <dependency>
-            <groupId>com.fasterxml.jackson.core</groupId>
-            <artifactId>jackson-annotations</artifactId>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>com.fasterxml.jackson.core</groupId>
-            <artifactId>jackson-databind</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>io.projectreactor</groupId>
-            <artifactId>reactor-test</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <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>
-        <dependency>
-            <groupId>org.assertj</groupId>
-            <artifactId>assertj-core</artifactId>
-            <scope>test</scope>
-        </dependency>
+  <dependencies>
+    <dependency>
+      <groupId>com.fasterxml.jackson.core</groupId>
+      <artifactId>jackson-annotations</artifactId>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>com.fasterxml.jackson.core</groupId>
+      <artifactId>jackson-databind</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>io.projectreactor</groupId>
+      <artifactId>reactor-test</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework.boot</groupId>
+      <artifactId>spring-boot-starter-test</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.assertj</groupId>
+      <artifactId>assertj-core</artifactId>
+      <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.cloudfoundry</groupId>
             <artifactId>cloudfoundry-client</artifactId>
diff --git a/cloudfoundry-operations/src/test/java/org/cloudfoundry/operations/AbstractOperationsTest.java b/cloudfoundry-operations/src/test/java/org/cloudfoundry/operations/AbstractOperationsTest.java
index bdfd87e949e..c5afec5a219 100644
--- a/cloudfoundry-operations/src/test/java/org/cloudfoundry/operations/AbstractOperationsTest.java
+++ b/cloudfoundry-operations/src/test/java/org/cloudfoundry/operations/AbstractOperationsTest.java
@@ -53,7 +53,7 @@
 import org.cloudfoundry.uaa.UaaClient;
 import org.cloudfoundry.uaa.authorizations.Authorizations;
 import org.cloudfoundry.uaa.tokens.Tokens;
-import org.junit.Before;
+import org.junit.jupiter.api.BeforeEach;
 import reactor.core.publisher.Mono;
 
 public abstract class AbstractOperationsTest {
@@ -156,7 +156,7 @@ public abstract class AbstractOperationsTest {
 
     protected final Users users = mock(Users.class, RETURNS_SMART_NULLS);
 
-    @Before
+    @BeforeEach
     public final void mockClient() {
         when(this.cloudFoundryClient.applicationsV2()).thenReturn(this.applications);
         when(this.cloudFoundryClient.applicationsV3()).thenReturn(this.applicationsV3);
diff --git a/cloudfoundry-operations/src/test/java/org/cloudfoundry/operations/DefaultCloudFoundryOperationsTest.java b/cloudfoundry-operations/src/test/java/org/cloudfoundry/operations/DefaultCloudFoundryOperationsTest.java
index 580e2111c7e..fd1027e7f09 100644
--- a/cloudfoundry-operations/src/test/java/org/cloudfoundry/operations/DefaultCloudFoundryOperationsTest.java
+++ b/cloudfoundry-operations/src/test/java/org/cloudfoundry/operations/DefaultCloudFoundryOperationsTest.java
@@ -18,9 +18,9 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
-public final class DefaultCloudFoundryOperationsTest extends AbstractOperationsTest {
+final class DefaultCloudFoundryOperationsTest extends AbstractOperationsTest {
 
     private final DefaultCloudFoundryOperations operations =
             DefaultCloudFoundryOperations.builder()
@@ -32,72 +32,72 @@ public final class DefaultCloudFoundryOperationsTest extends AbstractOperationsT
                     .build();
 
     @Test
-    public void advanced() {
+    void advanced() {
         assertThat(this.operations.advanced()).isNotNull();
     }
 
     @Test
-    public void applications() {
+    void applications() {
         assertThat(this.operations.applications()).isNotNull();
     }
 
     @Test
-    public void buildpacks() {
+    void buildpacks() {
         assertThat(this.operations.buildpacks()).isNotNull();
     }
 
     @Test
-    public void domains() {
+    void domains() {
         assertThat(this.operations.domains()).isNotNull();
     }
 
     @Test
-    public void networkPolicies() {
+    void networkPolicies() {
         assertThat(this.operations.networkPolicies()).isNotNull();
     }
 
     @Test
-    public void organizationAdmin() {
+    void organizationAdmin() {
         assertThat(this.operations.organizationAdmin()).isNotNull();
     }
 
     @Test
-    public void organizations() {
+    void organizations() {
         assertThat(this.operations.organizations()).isNotNull();
     }
 
     @Test
-    public void routes() {
+    void routes() {
         assertThat(this.operations.routes()).isNotNull();
     }
 
     @Test
-    public void serviceAdmin() {
+    void serviceAdmin() {
         assertThat(this.operations.serviceAdmin()).isNotNull();
     }
 
     @Test
-    public void services() {
+    void services() {
         assertThat(this.operations.services()).isNotNull();
     }
 
     @Test
-    public void spaceAdmin() {
+    void spaceAdmin() {
         assertThat(this.operations.spaceAdmin()).isNotNull();
     }
 
     @Test
-    public void spaces() {
+    void spaces() {
         assertThat(this.operations.spaces()).isNotNull();
     }
 
     @Test
-    public void stacks() {
+    void stacks() {
         assertThat(this.operations.stacks()).isNotNull();
     }
 
     @Test
-    public void userAdmin() {
+    void userAdmin() {
         assertThat(this.operations.userAdmin()).isNotNull();
     }
 }
diff --git a/cloudfoundry-operations/src/test/java/org/cloudfoundry/operations/advanced/DefaultAdvancedTest.java b/cloudfoundry-operations/src/test/java/org/cloudfoundry/operations/advanced/DefaultAdvancedTest.java
index 9e4099a8378..916ec6f857d 100644
--- a/cloudfoundry-operations/src/test/java/org/cloudfoundry/operations/advanced/DefaultAdvancedTest.java
+++ b/cloudfoundry-operations/src/test/java/org/cloudfoundry/operations/advanced/DefaultAdvancedTest.java
@@ -22,16 +22,16 @@
 import org.cloudfoundry.operations.AbstractOperationsTest;
 import org.cloudfoundry.uaa.UaaClient;
 import org.cloudfoundry.uaa.authorizations.AuthorizeByAuthorizationCodeGrantApiRequest;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import reactor.core.publisher.Mono;
 import reactor.test.StepVerifier;
 
-public final class DefaultAdvancedTest extends AbstractOperationsTest {
+final class DefaultAdvancedTest extends AbstractOperationsTest {
 
     private final DefaultAdvanced advanced = new DefaultAdvanced(Mono.just(this.uaaClient));
 
     @Test
-    public void sshCode() {
+    void sshCode() {
         requestAuthorizeByAuthorizationCodeGrantApi(this.uaaClient);
 
         this.advanced
diff --git a/cloudfoundry-operations/src/test/java/org/cloudfoundry/operations/applications/ApplicationManifestTest.java b/cloudfoundry-operations/src/test/java/org/cloudfoundry/operations/applications/ApplicationManifestTest.java
index 5ce77924cd8..2c66a330d67 100644
--- a/cloudfoundry-operations/src/test/java/org/cloudfoundry/operations/applications/ApplicationManifestTest.java
+++ b/cloudfoundry-operations/src/test/java/org/cloudfoundry/operations/applications/ApplicationManifestTest.java
@@ -16,70 +16,96 @@
 
 package org.cloudfoundry.operations.applications;
 
+import static org.junit.jupiter.api.Assertions.assertThrows;
+
 import java.nio.file.Paths;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
-public final class ApplicationManifestTest {
+final class ApplicationManifestTest {
 
-    @Test(expected = IllegalStateException.class)
-    public void dockerAndBuildpack() {
-        ApplicationManifest.builder()
-                .name("test-name")
-                .buildpack("test-buildpack")
-                .docker(Docker.builder().image("test-docker-image").build())
-                .build();
+    @Test
+    void dockerAndBuildpack() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    ApplicationManifest.builder()
+                            .name("test-name")
+                            .buildpack("test-buildpack")
+                            .docker(Docker.builder().image("test-docker-image").build())
+                            .build();
+                });
     }
 
-    @Test(expected = IllegalStateException.class)
-    public void dockerAndPath() {
-        ApplicationManifest.builder()
-                .name("test-name")
-                .docker(Docker.builder().image("test-docker-image").build())
-                .path(Paths.get("test-application"))
-                .build();
+    @Test
+    void dockerAndPath() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    ApplicationManifest.builder()
+                            .name("test-name")
+                            .docker(Docker.builder().image("test-docker-image").build())
+                            .path(Paths.get("test-application"))
+                            .build();
+                });
     }
 
-    @Test(expected = IllegalStateException.class)
-    public void dockerCredentialsNoImage() {
-        ApplicationManifest.builder()
-                .name("test-name")
-                .docker(
-                        Docker.builder()
-                                .password("test-password")
-                                .username("test-username")
-                                .build())
-                .build();
+    @Test
+    void dockerCredentialsNoImage() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    ApplicationManifest.builder()
+                            .name("test-name")
+                            .docker(
+                                    Docker.builder()
+                                            .password("test-password")
+                                            .username("test-username")
+                                            .build())
+                            .build();
+                });
     }
 
-    @Test(expected = IllegalStateException.class)
-    public void routesAndDomains() {
-        ApplicationManifest.builder()
-                .name("test-name")
-                .route(Route.builder().route("test-route").build())
-                .domain("test-domain")
-                .build();
+    @Test
+    void routesAndDomains() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    ApplicationManifest.builder()
+                            .name("test-name")
+                            .route(Route.builder().route("test-route").build())
+                            .domain("test-domain")
+                            .build();
+                });
     }
 
-    @Test(expected = IllegalStateException.class)
-    public void routesAndHosts() {
-        ApplicationManifest.builder()
-                .name("test-name")
-                .route(Route.builder().route("test-route").build())
-                .host("test-host")
-                .build();
+    @Test
+    void routesAndHosts() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    ApplicationManifest.builder()
+                            .name("test-name")
+                            .route(Route.builder().route("test-route").build())
+                            .host("test-host")
+                            .build();
+                });
     }
 
-    @Test(expected = IllegalStateException.class)
-    public void routesAndNoHostName() {
-        ApplicationManifest.builder()
-                .name("test-name")
-                .route(Route.builder().route("test-route").build())
-                .noHostname(true)
-                .build();
+    @Test
+    void routesAndNoHostName() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    ApplicationManifest.builder()
+                            .name("test-name")
+                            .route(Route.builder().route("test-route").build())
+                            .noHostname(true)
+                            .build();
+                });
     }
 
     @Test
-    public void valid() {
+    void valid() {
         ApplicationManifest.builder().name("test-name").build();
     }
 }
diff --git a/cloudfoundry-operations/src/test/java/org/cloudfoundry/operations/applications/ApplicationManifestUtilsTest.java b/cloudfoundry-operations/src/test/java/org/cloudfoundry/operations/applications/ApplicationManifestUtilsTest.java
index bcccb8cba53..7ed8fbb9cef 100644
--- a/cloudfoundry-operations/src/test/java/org/cloudfoundry/operations/applications/ApplicationManifestUtilsTest.java
+++ b/cloudfoundry-operations/src/test/java/org/cloudfoundry/operations/applications/ApplicationManifestUtilsTest.java
@@ -20,7 +20,8 @@
 import static org.assertj.core.api.AssertionsForClassTypes.assertThatExceptionOfType;
 import static org.cloudfoundry.operations.applications.ApplicationHealthCheck.NONE;
 import static org.cloudfoundry.operations.applications.ApplicationHealthCheck.PORT;
-import static org.junit.Assume.assumeTrue;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assumptions.assumeTrue;
 
 import java.io.IOException;
 import java.nio.file.Files;
@@ -31,13 +32,13 @@
 import java.util.List;
 import java.util.NoSuchElementException;
 import org.apache.commons.lang3.SystemUtils;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.springframework.core.io.ClassPathResource;
 
-public final class ApplicationManifestUtilsTest {
+final class ApplicationManifestUtilsTest {
 
     @Test
-    public void anchorsAndReferences() throws IOException {
+    void anchorsAndReferences() throws IOException {
         List<ApplicationManifest> expected =
                 Collections.singletonList(
                         ApplicationManifest.builder()
@@ -53,7 +54,7 @@ public void anchorsAndReferences() throws IOException {
     }
 
     @Test
-    public void readCommon() throws IOException {
+    void readCommon() throws IOException {
         List<ApplicationManifest> expected =
                 Arrays.asList(
                         ApplicationManifest.builder()
@@ -113,7 +114,7 @@ public void readCommon() throws IOException {
     }
 
     @Test
-    public void readCommonAndInherit() throws IOException {
+    void readCommonAndInherit() throws IOException {
         List<ApplicationManifest> expected =
                 Arrays.asList(
                         ApplicationManifest.builder()
@@ -188,7 +189,7 @@ public void readCommonAndInherit() throws IOException {
     }
 
     @Test
-    public void readDocker() throws IOException {
+    void readDocker() throws IOException {
         List<ApplicationManifest> expected =
                 Collections.singletonList(
                         ApplicationManifest.builder()
@@ -212,7 +213,7 @@ public void readDocker() throws IOException {
     }
 
     @Test
-    public void readInherit() throws IOException {
+    void readInherit() throws IOException {
         List<ApplicationManifest> expected =
                 Arrays.asList(
                         ApplicationManifest.builder()
@@ -298,7 +299,7 @@ public void readInherit() throws IOException {
     }
 
     @Test
-    public void readInheritCommon() throws IOException {
+    void readInheritCommon() throws IOException {
         List<ApplicationManifest> expected =
                 Collections.singletonList(
                         ApplicationManifest.builder()
@@ -331,7 +332,7 @@ public void readInheritCommon() throws IOException {
     }
 
     @Test
-    public void readNoApplications() throws IOException {
+    void readNoApplications() throws IOException {
         List<ApplicationManifest> actual =
                 ApplicationManifestUtils.read(
                         new ClassPathResource("fixtures/manifest-hotel.yml").getFile().toPath());
@@ -339,20 +340,30 @@ public void readNoApplications() throws IOException {
         assertThat(actual).isEmpty();
     }
 
-    @Test(expected = IllegalStateException.class)
-    public void readNoName() throws IOException {
-        ApplicationManifestUtils.read(
-                new ClassPathResource("fixtures/manifest-foxtrot.yml").getFile().toPath());
+    @Test
+    void readNoName() throws IOException {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    ApplicationManifestUtils.read(
+                            new ClassPathResource("fixtures/manifest-foxtrot.yml")
+                                    .getFile()
+                                    .toPath());
+                });
     }
 
-    @Test(expected = IllegalStateException.class)
-    public void readNoRoute() throws IOException {
-        ApplicationManifestUtils.read(
-                new ClassPathResource("fixtures/manifest-golf.yml").getFile().toPath());
+    @Test
+    void readNoRoute() throws IOException {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    ApplicationManifestUtils.read(
+                            new ClassPathResource("fixtures/manifest-golf.yml").getFile().toPath());
+                });
     }
 
     @Test
-    public void relativePath() throws IOException {
+    void relativePath() throws IOException {
         Path root = new ClassPathResource("fixtures/manifest-november.yml").getFile().toPath();
 
         List<ApplicationManifest> expected =
@@ -368,7 +379,7 @@ public void relativePath() throws IOException {
     }
 
     @Test
-    public void testDiskQuotaAndMemoryParsing() throws Exception {
+    void diskQuotaAndMemoryParsing() throws Exception {
         List<ApplicationManifest> expected =
                 Arrays.asList(
                         ApplicationManifest.builder()
@@ -425,7 +436,7 @@ public void testDiskQuotaAndMemoryParsing() throws Exception {
     }
 
     @Test
-    public void readSingleBuildpack() throws IOException {
+    void readSingleBuildpack() throws IOException {
         List<ApplicationManifest> expected =
                 Collections.singletonList(
                         ApplicationManifest.builder()
@@ -441,7 +452,7 @@ public void readSingleBuildpack() throws IOException {
     }
 
     @Test
-    public void readWithVariableSubstitution() throws IOException {
+    void readWithVariableSubstitution() throws IOException {
         List<ApplicationManifest> expected =
                 Collections.singletonList(
                         ApplicationManifest.builder()
@@ -460,7 +471,7 @@ public void readWithVariableSubstitution() throws IOException {
     }
 
     @Test
-    public void readWithVariableSubstitution_throwExceptionOnMissing() throws IOException {
+    void readWithVariableSubstitution_throwExceptionOnMissing() throws IOException {
         assertThatExceptionOfType(NoSuchElementException.class)
                 .isThrownBy(
                         () -> {
@@ -476,7 +487,7 @@ public void readWithVariableSubstitution_throwExceptionOnMissing() throws IOExce
     }
 
     @Test
-    public void readWithVariableSubstitution_dontEvaluateRegex() throws IOException {
+    void readWithVariableSubstitution_dontEvaluateRegex() throws IOException {
         List<ApplicationManifest> expected =
                 Collections.singletonList(
                         ApplicationManifest.builder()
@@ -493,7 +504,7 @@ public void readWithVariableSubstitution_dontEvaluateRegex() throws IOException
     }
 
     @Test
-    public void readWithVariableSubstitution_avoidEndlessSubstitution() throws IOException {
+    void readWithVariableSubstitution_avoidEndlessSubstitution() throws IOException {
         List<ApplicationManifest> expected =
                 Collections.singletonList(
                         ApplicationManifest.builder()
@@ -510,7 +521,7 @@ public void readWithVariableSubstitution_avoidEndlessSubstitution() throws IOExc
     }
 
     @Test
-    public void readWithVariableSubstitution_dontAllowInjectionTest() throws IOException {
+    void readWithVariableSubstitution_dontAllowInjectionTest() throws IOException {
         List<ApplicationManifest> expected =
                 Collections.singletonList(
                         ApplicationManifest.builder()
@@ -527,7 +538,7 @@ public void readWithVariableSubstitution_dontAllowInjectionTest() throws IOExcep
     }
 
     @Test
-    public void readWithVariableSubstitution_addMultipleVariablesInOneField() throws IOException {
+    void readWithVariableSubstitution_addMultipleVariablesInOneField() throws IOException {
         List<ApplicationManifest> expected =
                 Collections.singletonList(
                         ApplicationManifest.builder()
@@ -544,7 +555,7 @@ public void readWithVariableSubstitution_addMultipleVariablesInOneField() throws
     }
 
     @Test
-    public void readWithVariableSubstitution_noSubstitutionAtAll() throws IOException {
+    void readWithVariableSubstitution_noSubstitutionAtAll() throws IOException {
         List<ApplicationManifest> expected =
                 Collections.singletonList(
                         ApplicationManifest.builder()
@@ -561,25 +572,25 @@ public void readWithVariableSubstitution_noSubstitutionAtAll() throws IOExceptio
     }
 
     @Test
-    public void unixRead() throws IOException {
+    void unixRead() throws IOException {
         assumeTrue(SystemUtils.IS_OS_UNIX);
         read("/alpha-path", "fixtures/manifest-alpha-unix.yml");
     }
 
     @Test
-    public void unixWrite() throws IOException {
+    void unixWrite() throws IOException {
         assumeTrue(SystemUtils.IS_OS_UNIX);
         write("/alpha-path", "fixtures/manifest-echo-unix.yml");
     }
 
     @Test
-    public void windowsRead() throws IOException {
+    void windowsRead() throws IOException {
         assumeTrue(SystemUtils.IS_OS_WINDOWS);
         read("c:\\alpha-path", "fixtures/manifest-alpha-windows.yml");
     }
 
     @Test
-    public void windowsWrite() throws IOException {
+    void windowsWrite() throws IOException {
         assumeTrue(SystemUtils.IS_OS_WINDOWS);
         write("c:\\alpha-path", "fixtures/manifest-echo-windows.yml");
     }
diff --git a/cloudfoundry-operations/src/test/java/org/cloudfoundry/operations/applications/ApplicationSshEnabledRequestTest.java b/cloudfoundry-operations/src/test/java/org/cloudfoundry/operations/applications/ApplicationSshEnabledRequestTest.java
index 80fbeaa03f8..077255e1380 100644
--- a/cloudfoundry-operations/src/test/java/org/cloudfoundry/operations/applications/ApplicationSshEnabledRequestTest.java
+++ b/cloudfoundry-operations/src/test/java/org/cloudfoundry/operations/applications/ApplicationSshEnabledRequestTest.java
@@ -16,17 +16,23 @@
 
 package org.cloudfoundry.operations.applications;
 
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
-public final class ApplicationSshEnabledRequestTest {
+import org.junit.jupiter.api.Test;
 
-    @Test(expected = IllegalStateException.class)
-    public void noName() {
-        ApplicationSshEnabledRequest.builder().build();
+final class ApplicationSshEnabledRequestTest {
+
+    @Test
+    void noName() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    ApplicationSshEnabledRequest.builder().build();
+                });
     }
 
     @Test
-    public void valid() {
+    void valid() {
         ApplicationSshEnabledRequest.builder().name("test-name").build();
     }
 }
diff --git a/cloudfoundry-operations/src/test/java/org/cloudfoundry/operations/applications/CopySourceApplicationRequestTest.java b/cloudfoundry-operations/src/test/java/org/cloudfoundry/operations/applications/CopySourceApplicationRequestTest.java
index 4f9657ed401..08186c384ac 100644
--- a/cloudfoundry-operations/src/test/java/org/cloudfoundry/operations/applications/CopySourceApplicationRequestTest.java
+++ b/cloudfoundry-operations/src/test/java/org/cloudfoundry/operations/applications/CopySourceApplicationRequestTest.java
@@ -16,31 +16,45 @@
 
 package org.cloudfoundry.operations.applications;
 
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
-public final class CopySourceApplicationRequestTest {
+import org.junit.jupiter.api.Test;
 
-    @Test(expected = IllegalStateException.class)
-    public void noName() {
-        CopySourceApplicationRequest.builder().targetName("test-target-name").build();
+final class CopySourceApplicationRequestTest {
+
+    @Test
+    void noName() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    CopySourceApplicationRequest.builder().targetName("test-target-name").build();
+                });
     }
 
-    @Test(expected = IllegalStateException.class)
-    public void noTargetName() {
-        CopySourceApplicationRequest.builder().name("test-name").build();
+    @Test
+    void noTargetName() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    CopySourceApplicationRequest.builder().name("test-name").build();
+                });
     }
 
-    @Test(expected = IllegalStateException.class)
-    public void organizationNoSpace() {
-        CopySourceApplicationRequest.builder()
-                .name("test-name")
-                .targetName("test-target-name")
-                .targetOrganization("test-target-organization")
-                .build();
+    @Test
+    void organizationNoSpace() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    CopySourceApplicationRequest.builder()
+                            .name("test-name")
+                            .targetName("test-target-name")
+                            .targetOrganization("test-target-organization")
+                            .build();
+                });
     }
 
     @Test
-    public void valid() {
+    void valid() {
         CopySourceApplicationRequest.builder()
                 .name("test-name")
                 .targetName("test-target-name")
diff --git a/cloudfoundry-operations/src/test/java/org/cloudfoundry/operations/applications/DefaultApplicationsTest.java b/cloudfoundry-operations/src/test/java/org/cloudfoundry/operations/applications/DefaultApplicationsTest.java
index 3efeff144dc..d8494294c13 100644
--- a/cloudfoundry-operations/src/test/java/org/cloudfoundry/operations/applications/DefaultApplicationsTest.java
+++ b/cloudfoundry-operations/src/test/java/org/cloudfoundry/operations/applications/DefaultApplicationsTest.java
@@ -144,14 +144,14 @@
 import org.cloudfoundry.util.DateUtils;
 import org.cloudfoundry.util.FluentMap;
 import org.cloudfoundry.util.ResourceMatchingUtils;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.springframework.core.io.ClassPathResource;
 import reactor.core.publisher.Flux;
 import reactor.core.publisher.Mono;
 import reactor.test.StepVerifier;
 import reactor.test.scheduler.VirtualTimeScheduler;
 
-public final class DefaultApplicationsTest extends AbstractOperationsTest {
+final class DefaultApplicationsTest extends AbstractOperationsTest {
 
     private RandomWords randomWords = mock(RandomWords.class, RETURNS_SMART_NULLS);
 
@@ -163,7 +163,7 @@ public final class DefaultApplicationsTest extends AbstractOperationsTest {
                     Mono.just(TEST_SPACE_ID));
 
     @Test
-    public void copySourceNoRestartOrgSpace() {
+    void copySourceNoRestartOrgSpace() {
         requestApplications(
                 this.cloudFoundryClient,
                 "test-application-name",
@@ -198,7 +198,7 @@ public void copySourceNoRestartOrgSpace() {
     }
 
     @Test
-    public void copySourceNoRestartSpace() {
+    void copySourceNoRestartSpace() {
         requestApplications(
                 this.cloudFoundryClient,
                 "test-application-name",
@@ -229,7 +229,7 @@ public void copySourceNoRestartSpace() {
     }
 
     @Test
-    public void copySourceOrganizationNotFound() {
+    void copySourceOrganizationNotFound() {
         requestApplications(
                 this.cloudFoundryClient,
                 "test-application-name",
@@ -257,7 +257,7 @@ public void copySourceOrganizationNotFound() {
     }
 
     @Test
-    public void copySourceRestart() {
+    void copySourceRestart() {
         requestApplications(
                 this.cloudFoundryClient,
                 "test-application-name",
@@ -290,7 +290,7 @@ public void copySourceRestart() {
     }
 
     @Test
-    public void copySourceSpaceNotFound() {
+    void copySourceSpaceNotFound() {
         requestApplications(
                 this.cloudFoundryClient,
                 "test-application-name",
@@ -317,7 +317,7 @@ public void copySourceSpaceNotFound() {
     }
 
     @Test
-    public void deleteAndDeleteRoutes() {
+    void deleteAndDeleteRoutes() {
         requestApplications(
                 this.cloudFoundryClient, "test-name", TEST_SPACE_ID, "test-metadata-id");
         requestApplicationSummary(this.cloudFoundryClient, "test-metadata-id");
@@ -339,7 +339,7 @@ public void deleteAndDeleteRoutes() {
     }
 
     @Test
-    public void deleteAndDeleteRoutesFailure() {
+    void deleteAndDeleteRoutesFailure() {
         requestApplications(
                 this.cloudFoundryClient, "test-name", TEST_SPACE_ID, "test-metadata-id");
         requestApplicationSummary(this.cloudFoundryClient, "test-metadata-id");
@@ -366,7 +366,7 @@ public void deleteAndDeleteRoutesFailure() {
     }
 
     @Test
-    public void deleteAndDoNotDeleteRoutes() {
+    void deleteAndDoNotDeleteRoutes() {
         requestApplications(
                 this.cloudFoundryClient, "test-name", TEST_SPACE_ID, "test-metadata-id");
         requestApplicationSummary(this.cloudFoundryClient, "test-metadata-id");
@@ -381,7 +381,7 @@ public void deleteAndDoNotDeleteRoutes() {
     }
 
     @Test
-    public void deleteWithBoundRoutes() {
+    void deleteWithBoundRoutes() {
         requestApplications(
                 this.cloudFoundryClient, "test-name", TEST_SPACE_ID, "test-metadata-id");
         requestApplicationSummary(this.cloudFoundryClient, "test-metadata-id");
@@ -405,7 +405,7 @@ public void deleteWithBoundRoutes() {
     }
 
     @Test
-    public void disableSsh() {
+    void disableSsh() {
         requestApplications(
                 this.cloudFoundryClient, "test-app-name", TEST_SPACE_ID, "test-metadata-id");
         requestUpdateApplicationSsh(this.cloudFoundryClient, "test-metadata-id", false);
@@ -418,7 +418,7 @@ public void disableSsh() {
     }
 
     @Test
-    public void disableSshAlreadyDisabled() {
+    void disableSshAlreadyDisabled() {
         requestApplicationsWithSsh(this.cloudFoundryClient, "test-app-name", TEST_SPACE_ID, false);
 
         this.applications
@@ -429,7 +429,7 @@ public void disableSshAlreadyDisabled() {
     }
 
     @Test
-    public void disableSshNoApp() {
+    void disableSshNoApp() {
         requestApplicationsEmpty(this.cloudFoundryClient, "test-app-name", TEST_SPACE_ID);
 
         this.applications
@@ -444,7 +444,7 @@ public void disableSshNoApp() {
     }
 
     @Test
-    public void enableSsh() {
+    void enableSsh() {
         requestApplications(
                 this.cloudFoundryClient, "test-app-name", TEST_SPACE_ID, "test-metadata-id");
         requestUpdateApplicationSsh(this.cloudFoundryClient, "test-application-id", true);
@@ -457,7 +457,7 @@ public void enableSsh() {
     }
 
     @Test
-    public void enableSshAlreadyEnabled() {
+    void enableSshAlreadyEnabled() {
         requestApplicationsWithSsh(this.cloudFoundryClient, "test-app-name", TEST_SPACE_ID, true);
 
         this.applications
@@ -468,7 +468,7 @@ public void enableSshAlreadyEnabled() {
     }
 
     @Test
-    public void enableSshNoApp() {
+    void enableSshNoApp() {
         requestApplicationsEmpty(this.cloudFoundryClient, "test-app-name", TEST_SPACE_ID);
 
         this.applications
@@ -483,7 +483,7 @@ public void enableSshNoApp() {
     }
 
     @Test
-    public void get() {
+    void get() {
         requestApplications(
                 this.cloudFoundryClient, "test-app", TEST_SPACE_ID, "test-application-id");
         requestApplicationStatistics(this.cloudFoundryClient, "test-application-id");
@@ -516,7 +516,7 @@ public void get() {
     }
 
     @Test
-    public void getApplicationManifest() {
+    void getApplicationManifest() {
         requestApplications(
                 this.cloudFoundryClient, "test-app", TEST_SPACE_ID, "test-application-id");
         requestApplicationSummary(this.cloudFoundryClient, "test-application-id");
@@ -552,7 +552,7 @@ public void getApplicationManifest() {
     }
 
     @Test
-    public void getApplicationManifestDocker() {
+    void getApplicationManifestDocker() {
         requestApplications(
                 this.cloudFoundryClient, "test-app", TEST_SPACE_ID, "test-application-id");
         requestApplicationSummaryDocker(this.cloudFoundryClient, "test-application-id");
@@ -593,7 +593,7 @@ public void getApplicationManifestDocker() {
     }
 
     @Test
-    public void getApplicationManifestNoRoutes() {
+    void getApplicationManifestNoRoutes() {
         requestApplications(
                 this.cloudFoundryClient, "test-app", TEST_SPACE_ID, "test-application-id");
         requestApplicationSummaryNoRoutes(this.cloudFoundryClient, "test-application-id");
@@ -625,7 +625,7 @@ public void getApplicationManifestNoRoutes() {
     }
 
     @Test
-    public void getApplicationManifestTcp() {
+    void getApplicationManifestTcp() {
         requestApplications(
                 this.cloudFoundryClient, "test-app", TEST_SPACE_ID, "test-application-id");
         requestApplicationSummaryTcp(this.cloudFoundryClient, "test-application-id");
@@ -661,7 +661,7 @@ public void getApplicationManifestTcp() {
     }
 
     @Test
-    public void getBuildpackError() {
+    void getBuildpackError() {
         requestApplications(
                 this.cloudFoundryClient, "test-app", TEST_SPACE_ID, "test-application-id");
         requestApplicationStatistics(this.cloudFoundryClient, "test-application-id");
@@ -688,7 +688,7 @@ public void getBuildpackError() {
     }
 
     @Test
-    public void getDetectedBuildpack() {
+    void getDetectedBuildpack() {
         requestApplications(
                 this.cloudFoundryClient, "test-app", TEST_SPACE_ID, "test-application-id");
         requestApplicationStatistics(this.cloudFoundryClient, "test-application-id");
@@ -721,7 +721,7 @@ public void getDetectedBuildpack() {
     }
 
     @Test
-    public void getEnvironments() {
+    void getEnvironments() {
         requestApplications(this.cloudFoundryClient, "test-app", TEST_SPACE_ID, "test-metadata-id");
         requestApplicationEnvironment(this.cloudFoundryClient, "test-metadata-id");
 
@@ -753,7 +753,7 @@ public void getEnvironments() {
     }
 
     @Test
-    public void getEnvironmentsNoApp() {
+    void getEnvironmentsNoApp() {
         requestApplicationsEmpty(this.cloudFoundryClient, "test-app", TEST_SPACE_ID);
 
         this.applications
@@ -769,7 +769,7 @@ public void getEnvironmentsNoApp() {
     }
 
     @Test
-    public void getEvents() {
+    void getEvents() {
         requestApplications(this.cloudFoundryClient, "test-app", TEST_SPACE_ID, "test-metadata-id");
         requestEvents(
                 this.cloudFoundryClient,
@@ -805,7 +805,7 @@ public void getEvents() {
     }
 
     @Test
-    public void getEventsBadTimeSparseMetadata() {
+    void getEventsBadTimeSparseMetadata() {
         requestApplications(this.cloudFoundryClient, "test-app", TEST_SPACE_ID, "test-metadata-id");
         requestEvents(
                 this.cloudFoundryClient,
@@ -838,7 +838,7 @@ public void getEventsBadTimeSparseMetadata() {
     }
 
     @Test
-    public void getEventsFoundZero() {
+    void getEventsFoundZero() {
         requestApplications(this.cloudFoundryClient, "test-app", TEST_SPACE_ID, "test-metadata-id");
         requestEvents(this.cloudFoundryClient, "test-metadata-id");
 
@@ -850,7 +850,7 @@ public void getEventsFoundZero() {
     }
 
     @Test
-    public void getEventsLimitZero() {
+    void getEventsLimitZero() {
         requestApplications(this.cloudFoundryClient, "test-app", TEST_SPACE_ID, "test-metadata-id");
         requestEvents(
                 this.cloudFoundryClient,
@@ -880,7 +880,7 @@ public void getEventsLimitZero() {
     }
 
     @Test
-    public void getEventsNoRequestMetadata() {
+    void getEventsNoRequestMetadata() {
         requestApplications(this.cloudFoundryClient, "test-app", TEST_SPACE_ID, "test-metadata-id");
         requestEvents(
                 this.cloudFoundryClient,
@@ -906,7 +906,7 @@ public void getEventsNoRequestMetadata() {
     }
 
     @Test
-    public void getEventsTwo() {
+    void getEventsTwo() {
         requestApplications(this.cloudFoundryClient, "test-app", TEST_SPACE_ID, "test-metadata-id");
         requestEvents(
                 this.cloudFoundryClient,
@@ -958,7 +958,7 @@ public void getEventsTwo() {
     }
 
     @Test
-    public void getHealthCheck() {
+    void getHealthCheck() {
         requestApplications(
                 this.cloudFoundryClient,
                 "test-application-name",
@@ -977,7 +977,7 @@ public void getHealthCheck() {
     }
 
     @Test
-    public void getInstancesError() {
+    void getInstancesError() {
         requestApplications(
                 this.cloudFoundryClient, "test-app", TEST_SPACE_ID, "test-application-id");
         requestApplicationStatistics(this.cloudFoundryClient, "test-application-id");
@@ -1004,7 +1004,7 @@ public void getInstancesError() {
     }
 
     @Test
-    public void getNoBuildpack() {
+    void getNoBuildpack() {
         requestApplications(
                 this.cloudFoundryClient, "test-app", TEST_SPACE_ID, "test-application-id");
         requestApplicationStatistics(this.cloudFoundryClient, "test-application-id");
@@ -1037,7 +1037,7 @@ public void getNoBuildpack() {
     }
 
     @Test
-    public void getStagingError() {
+    void getStagingError() {
         requestApplications(
                 this.cloudFoundryClient, "test-app", TEST_SPACE_ID, "test-application-id");
         requestApplicationStatistics(this.cloudFoundryClient, "test-application-id");
@@ -1064,7 +1064,7 @@ public void getStagingError() {
     }
 
     @Test
-    public void getStoppedError() {
+    void getStoppedError() {
         requestApplications(
                 this.cloudFoundryClient, "test-app", TEST_SPACE_ID, "test-application-id");
         requestApplicationStatisticsError(this.cloudFoundryClient, "test-application-id", 200003);
@@ -1097,7 +1097,7 @@ public void getStoppedError() {
     }
 
     @Test
-    public void getWithEmptyInstance() {
+    void getWithEmptyInstance() {
         requestApplications(
                 this.cloudFoundryClient, "test-app", TEST_SPACE_ID, "test-application-id");
         requestApplicationStatistics(this.cloudFoundryClient, "test-application-id");
@@ -1130,7 +1130,7 @@ public void getWithEmptyInstance() {
     }
 
     @Test
-    public void getWithEmptyInstanceStats() {
+    void getWithEmptyInstanceStats() {
         requestApplications(
                 this.cloudFoundryClient, "test-app", TEST_SPACE_ID, "test-application-id");
         requestApplicationEmptyStats(this.cloudFoundryClient, "test-application-id");
@@ -1163,7 +1163,7 @@ public void getWithEmptyInstanceStats() {
     }
 
     @Test
-    public void getWithNoInstances() {
+    void getWithNoInstances() {
         requestApplications(
                 this.cloudFoundryClient, "test-app", TEST_SPACE_ID, "test-application-id");
         requestApplicationStatistics(this.cloudFoundryClient, "test-application-id");
@@ -1190,7 +1190,7 @@ public void getWithNoInstances() {
     }
 
     @Test
-    public void getWithNullStats() {
+    void getWithNullStats() {
         requestApplications(
                 this.cloudFoundryClient, "test-app", TEST_SPACE_ID, "test-application-id");
         requestApplicationNullStats(this.cloudFoundryClient, "test-application-id");
@@ -1223,7 +1223,7 @@ public void getWithNullStats() {
     }
 
     @Test
-    public void getWithNullUsage() {
+    void getWithNullUsage() {
         requestApplications(
                 this.cloudFoundryClient, "test-app", TEST_SPACE_ID, "test-application-id");
         requestApplicationNullUsage(this.cloudFoundryClient, "test-application-id");
@@ -1258,7 +1258,7 @@ public void getWithNullUsage() {
     }
 
     @Test
-    public void list() {
+    void list() {
         requestSpaceSummary(this.cloudFoundryClient, TEST_SPACE_ID);
 
         this.applications
@@ -1275,7 +1275,7 @@ public void list() {
     }
 
     @Test
-    public void listTasks() {
+    void listTasks() {
         requestApplicationsV3(
                 this.cloudFoundryClient, "test-name", TEST_SPACE_ID, "test-metadata-id");
         requestListTasks(this.cloudFoundryClient, "test-metadata-id");
@@ -1296,7 +1296,7 @@ public void listTasks() {
     }
 
     @Test
-    public void logs() {
+    void logs() {
         requestApplications(
                 this.cloudFoundryClient,
                 "test-application-name",
@@ -1313,7 +1313,7 @@ public void logs() {
     }
 
     @Test
-    public void logsNoApp() {
+    void logsNoApp() {
         requestApplicationsEmpty(this.cloudFoundryClient, "test-application-name", TEST_SPACE_ID);
 
         this.applications
@@ -1329,7 +1329,7 @@ public void logsNoApp() {
     }
 
     @Test
-    public void logsRecent() {
+    void logsRecent() {
         requestApplications(
                 this.cloudFoundryClient,
                 "test-application-name",
@@ -1346,7 +1346,7 @@ public void logsRecent() {
     }
 
     @Test
-    public void logsRecentNotSet() {
+    void logsRecentNotSet() {
         requestApplications(
                 this.cloudFoundryClient,
                 "test-application-name",
@@ -1363,7 +1363,7 @@ public void logsRecentNotSet() {
     }
 
     @Test
-    public void pushDocker() {
+    void pushDocker() {
         requestSpace(this.cloudFoundryClient, TEST_SPACE_ID, TEST_ORGANIZATION_ID);
         requestApplicationsEmpty(this.cloudFoundryClient, "test-name", TEST_SPACE_ID);
         requestCreateDockerApplication(
@@ -1414,7 +1414,7 @@ public void pushDocker() {
     }
 
     @Test
-    public void pushDockerPrivateRepository() {
+    void pushDockerPrivateRepository() {
         requestSpace(this.cloudFoundryClient, TEST_SPACE_ID, TEST_ORGANIZATION_ID);
         requestApplicationsEmpty(this.cloudFoundryClient, "test-name", TEST_SPACE_ID);
         requestCreateDockerApplication(
@@ -1469,7 +1469,7 @@ public void pushDockerPrivateRepository() {
     }
 
     @Test
-    public void pushDomainNotFound() throws IOException {
+    void pushDomainNotFound() throws IOException {
         Path testApplication = new ClassPathResource("test-application.zip").getFile().toPath();
 
         requestApplicationsEmpty(this.cloudFoundryClient, "test-application-name", TEST_SPACE_ID);
@@ -1518,7 +1518,7 @@ public void pushDomainNotFound() throws IOException {
     }
 
     @Test
-    public void pushExistingApplication() throws IOException {
+    void pushExistingApplication() throws IOException {
         Path testApplication = new ClassPathResource("test-application.zip").getFile().toPath();
 
         requestSpace(this.cloudFoundryClient, TEST_SPACE_ID, TEST_ORGANIZATION_ID);
@@ -1584,7 +1584,7 @@ public void pushExistingApplication() throws IOException {
     }
 
     @Test
-    public void pushExistingApplicationWithEnvironmentVariables() throws IOException {
+    void pushExistingApplicationWithEnvironmentVariables() throws IOException {
         Path testApplication = new ClassPathResource("test-application.zip").getFile().toPath();
 
         requestSpace(this.cloudFoundryClient, TEST_SPACE_ID, TEST_ORGANIZATION_ID);
@@ -1661,7 +1661,7 @@ public void pushExistingApplicationWithEnvironmentVariables() throws IOException
     }
 
     @Test
-    public void pushExistingApplicationWithNullEnvironment() throws IOException {
+    void pushExistingApplicationWithNullEnvironment() throws IOException {
         Path testApplication = new ClassPathResource("test-application.zip").getFile().toPath();
 
         requestSpace(this.cloudFoundryClient, TEST_SPACE_ID, TEST_ORGANIZATION_ID);
@@ -1737,7 +1737,7 @@ public void pushExistingApplicationWithNullEnvironment() throws IOException {
     }
 
     @Test
-    public void pushExistingRouteWithHost() throws IOException {
+    void pushExistingRouteWithHost() throws IOException {
         Path testApplication = new ClassPathResource("test-application.zip").getFile().toPath();
 
         requestApplicationsEmpty(this.cloudFoundryClient, "test-name", TEST_SPACE_ID);
@@ -1800,7 +1800,7 @@ public void pushExistingRouteWithHost() throws IOException {
     }
 
     @Test
-    public void pushExistingRouteWithNoHost() throws IOException {
+    void pushExistingRouteWithNoHost() throws IOException {
         Path testApplication = new ClassPathResource("test-application.zip").getFile().toPath();
 
         requestApplicationsEmpty(this.cloudFoundryClient, "test-name", TEST_SPACE_ID);
@@ -1859,7 +1859,7 @@ public void pushExistingRouteWithNoHost() throws IOException {
     }
 
     @Test
-    public void pushInvalidStack() throws IOException {
+    void pushInvalidStack() throws IOException {
         Path testApplication = new ClassPathResource("test-application.zip").getFile().toPath();
 
         requestSpace(this.cloudFoundryClient, TEST_SPACE_ID, TEST_ORGANIZATION_ID);
@@ -1885,7 +1885,7 @@ public void pushInvalidStack() throws IOException {
     }
 
     @Test
-    public void pushMultipleRoutes() throws IOException {
+    void pushMultipleRoutes() throws IOException {
         Path testApplication = new ClassPathResource("test-application.zip").getFile().toPath();
 
         requestSpace(this.cloudFoundryClient, TEST_SPACE_ID, TEST_ORGANIZATION_ID);
@@ -1970,7 +1970,7 @@ public void pushMultipleRoutes() throws IOException {
     }
 
     @Test
-    public void pushNewApplication() throws IOException {
+    void pushNewApplication() throws IOException {
         Path testApplication = new ClassPathResource("test-application.zip").getFile().toPath();
 
         requestApplicationsEmpty(this.cloudFoundryClient, "test-name", TEST_SPACE_ID);
@@ -2039,7 +2039,7 @@ public void pushNewApplication() throws IOException {
     }
 
     @Test
-    public void pushNewApplicationWithEnvironmentVariables() throws IOException {
+    void pushNewApplicationWithEnvironmentVariables() throws IOException {
         Path testApplication = new ClassPathResource("test-application.zip").getFile().toPath();
 
         requestSpace(this.cloudFoundryClient, TEST_SPACE_ID, TEST_ORGANIZATION_ID);
@@ -2110,7 +2110,7 @@ public void pushNewApplicationWithEnvironmentVariables() throws IOException {
     }
 
     @Test
-    public void pushNewRouteWithHost() throws IOException {
+    void pushNewRouteWithHost() throws IOException {
         Path testApplication = new ClassPathResource("test-application.zip").getFile().toPath();
 
         requestApplicationsEmpty(this.cloudFoundryClient, "test-name", TEST_SPACE_ID);
@@ -2177,7 +2177,7 @@ public void pushNewRouteWithHost() throws IOException {
     }
 
     @Test
-    public void pushNewRouteWithNoHost() throws IOException {
+    void pushNewRouteWithNoHost() throws IOException {
         Path testApplication = new ClassPathResource("test-application.zip").getFile().toPath();
 
         requestApplicationsEmpty(this.cloudFoundryClient, "test-name", TEST_SPACE_ID);
@@ -2243,7 +2243,7 @@ public void pushNewRouteWithNoHost() throws IOException {
     }
 
     @Test
-    public void pushNoDomainNoneFound() throws IOException {
+    void pushNoDomainNoneFound() throws IOException {
         Path testApplication = new ClassPathResource("test-application.zip").getFile().toPath();
 
         requestApplicationsEmpty(this.cloudFoundryClient, "test-name", TEST_SPACE_ID);
@@ -2287,7 +2287,7 @@ public void pushNoDomainNoneFound() throws IOException {
     }
 
     @Test
-    public void pushNoDomainPrivate() throws IOException {
+    void pushNoDomainPrivate() throws IOException {
         Path testApplication = new ClassPathResource("test-application.zip").getFile().toPath();
 
         requestApplicationsEmpty(this.cloudFoundryClient, "test-name", TEST_SPACE_ID);
@@ -2332,7 +2332,7 @@ public void pushNoDomainPrivate() throws IOException {
     }
 
     @Test
-    public void pushNoDomainShared() throws IOException {
+    void pushNoDomainShared() throws IOException {
         Path testApplication = new ClassPathResource("test-application.zip").getFile().toPath();
 
         requestApplicationsEmpty(this.cloudFoundryClient, "test-name", TEST_SPACE_ID);
@@ -2392,7 +2392,7 @@ public void pushNoDomainShared() throws IOException {
     }
 
     @Test
-    public void pushNoHostnameFlag() throws IOException {
+    void pushNoHostnameFlag() throws IOException {
         Path testApplication = new ClassPathResource("test-application.zip").getFile().toPath();
 
         requestSpace(this.cloudFoundryClient, TEST_SPACE_ID, TEST_ORGANIZATION_ID);
@@ -2459,7 +2459,7 @@ public void pushNoHostnameFlag() throws IOException {
     }
 
     @Test
-    public void pushNoInstances() throws IOException {
+    void pushNoInstances() throws IOException {
         Path testApplication = new ClassPathResource("test-application.zip").getFile().toPath();
 
         requestApplicationsEmpty(this.cloudFoundryClient, "test-name", TEST_SPACE_ID);
@@ -2521,7 +2521,7 @@ public void pushNoInstances() throws IOException {
     }
 
     @Test
-    public void pushNoRoute() throws IOException {
+    void pushNoRoute() throws IOException {
         Path testApplication = new ClassPathResource("test-application.zip").getFile().toPath();
 
         requestApplicationsEmpty(this.cloudFoundryClient, "test-name", TEST_SPACE_ID);
@@ -2575,7 +2575,7 @@ public void pushNoRoute() throws IOException {
     }
 
     @Test
-    public void pushNoRouteFlag() throws IOException {
+    void pushNoRouteFlag() throws IOException {
         Path testApplication = new ClassPathResource("test-application.zip").getFile().toPath();
 
         requestSpace(this.cloudFoundryClient, TEST_SPACE_ID, TEST_ORGANIZATION_ID);
@@ -2634,7 +2634,7 @@ public void pushNoRouteFlag() throws IOException {
     }
 
     @Test
-    public void pushNoStart() throws IOException {
+    void pushNoStart() throws IOException {
         Path testApplication = new ClassPathResource("test-application.zip").getFile().toPath();
 
         requestApplicationsEmpty(this.cloudFoundryClient, "test-name", TEST_SPACE_ID);
@@ -2692,7 +2692,7 @@ public void pushNoStart() throws IOException {
     }
 
     @Test
-    public void pushPrivateDomain() throws IOException {
+    void pushPrivateDomain() throws IOException {
         Path testApplication = new ClassPathResource("test-application.zip").getFile().toPath();
 
         requestApplicationsEmpty(this.cloudFoundryClient, "test-name", TEST_SPACE_ID);
@@ -2757,7 +2757,7 @@ public void pushPrivateDomain() throws IOException {
     }
 
     @Test
-    public void pushRandomRoute() throws IOException {
+    void pushRandomRoute() throws IOException {
         Path testApplication = new ClassPathResource("test-application.zip").getFile().toPath();
 
         requestApplicationsEmpty(this.cloudFoundryClient, "test-application.name", TEST_SPACE_ID);
@@ -2829,7 +2829,7 @@ public void pushRandomRoute() throws IOException {
     }
 
     @Test
-    public void pushSharedDomain() throws IOException {
+    void pushSharedDomain() throws IOException {
         Path testApplication = new ClassPathResource("test-application.zip").getFile().toPath();
 
         requestApplicationsEmpty(this.cloudFoundryClient, "test-name", TEST_SPACE_ID);
@@ -2894,7 +2894,7 @@ public void pushSharedDomain() throws IOException {
     }
 
     @Test
-    public void pushStartFailsRunning() throws IOException {
+    void pushStartFailsRunning() throws IOException {
         Path testApplication = new ClassPathResource("test-application.zip").getFile().toPath();
 
         requestApplicationsEmpty(this.cloudFoundryClient, "test-name", TEST_SPACE_ID);
@@ -2963,7 +2963,7 @@ public void pushStartFailsRunning() throws IOException {
     }
 
     @Test
-    public void pushStartFailsStaging() throws IOException {
+    void pushStartFailsStaging() throws IOException {
         Path testApplication = new ClassPathResource("test-application.zip").getFile().toPath();
 
         requestApplicationsEmpty(this.cloudFoundryClient, "test-name", TEST_SPACE_ID);
@@ -3032,7 +3032,7 @@ public void pushStartFailsStaging() throws IOException {
     }
 
     @Test
-    public void pushTcpRandomRoute() throws IOException {
+    void pushTcpRandomRoute() throws IOException {
         Path testApplication = new ClassPathResource("test-application.zip").getFile().toPath();
 
         requestApplicationsEmpty(this.cloudFoundryClient, "test-name", TEST_SPACE_ID);
@@ -3095,7 +3095,7 @@ public void pushTcpRandomRoute() throws IOException {
     }
 
     @Test
-    public void pushTcpRoute() throws IOException {
+    void pushTcpRoute() throws IOException {
         Path testApplication = new ClassPathResource("test-application.zip").getFile().toPath();
 
         requestSpace(this.cloudFoundryClient, TEST_SPACE_ID, TEST_ORGANIZATION_ID);
@@ -3164,7 +3164,7 @@ public void pushTcpRoute() throws IOException {
     }
 
     @Test
-    public void pushUploadFails() throws IOException {
+    void pushUploadFails() throws IOException {
         Path testApplication = new ClassPathResource("test-application.zip").getFile().toPath();
 
         requestApplicationsEmpty(this.cloudFoundryClient, "test-name", TEST_SPACE_ID);
@@ -3231,7 +3231,7 @@ public void pushUploadFails() throws IOException {
     }
 
     @Test
-    public void rename() {
+    void rename() {
         requestApplications(
                 this.cloudFoundryClient, "test-app-name", TEST_SPACE_ID, "test-metadata-id");
         requestUpdateApplicationRename(
@@ -3249,7 +3249,7 @@ public void rename() {
     }
 
     @Test
-    public void renameNoApp() {
+    void renameNoApp() {
         requestApplicationsEmpty(this.cloudFoundryClient, "test-app-name", TEST_SPACE_ID);
 
         this.applications
@@ -3268,7 +3268,7 @@ public void renameNoApp() {
     }
 
     @Test
-    public void restage() {
+    void restage() {
         requestApplications(
                 this.cloudFoundryClient,
                 "test-application-name",
@@ -3290,7 +3290,7 @@ public void restage() {
     }
 
     @Test
-    public void restageInvalidApplication() {
+    void restageInvalidApplication() {
         requestApplicationsEmpty(this.cloudFoundryClient, "test-application-name", TEST_SPACE_ID);
 
         this.applications
@@ -3306,7 +3306,7 @@ public void restageInvalidApplication() {
     }
 
     @Test
-    public void restageStagingFailure() {
+    void restageStagingFailure() {
         requestApplications(
                 this.cloudFoundryClient,
                 "test-application-name",
@@ -3329,7 +3329,7 @@ public void restageStagingFailure() {
     }
 
     @Test
-    public void restageStartingFailurePartial() {
+    void restageStartingFailurePartial() {
         requestApplications(
                 this.cloudFoundryClient,
                 "test-application-name",
@@ -3351,7 +3351,7 @@ public void restageStartingFailurePartial() {
     }
 
     @Test
-    public void restageStartingFailureTotal() {
+    void restageStartingFailureTotal() {
         requestApplications(
                 this.cloudFoundryClient,
                 "test-application-name",
@@ -3379,7 +3379,7 @@ public void restageStartingFailureTotal() {
     }
 
     @Test
-    public void restageTimeout() {
+    void restageTimeout() {
         requestApplications(
                 this.cloudFoundryClient,
                 "test-application-name",
@@ -3406,7 +3406,7 @@ public void restageTimeout() {
     }
 
     @Test
-    public void restartFailurePartial() {
+    void restartFailurePartial() {
         requestApplicationsSpecificState(
                 this.cloudFoundryClient, "test-app-name", TEST_SPACE_ID, "STARTED");
         requestUpdateApplicationState(this.cloudFoundryClient, "test-application-id", "STOPPED");
@@ -3426,7 +3426,7 @@ public void restartFailurePartial() {
     }
 
     @Test
-    public void restartFailureTotal() {
+    void restartFailureTotal() {
         requestApplicationsSpecificState(
                 this.cloudFoundryClient, "test-app-name", TEST_SPACE_ID, "STARTED");
         requestUpdateApplicationState(this.cloudFoundryClient, "test-application-id", "STOPPED");
@@ -3451,7 +3451,7 @@ public void restartFailureTotal() {
     }
 
     @Test
-    public void restartInstance() {
+    void restartInstance() {
         requestApplications(
                 this.cloudFoundryClient,
                 "test-application-name",
@@ -3472,7 +3472,7 @@ public void restartInstance() {
     }
 
     @Test
-    public void restartNoApp() {
+    void restartNoApp() {
         requestApplicationsEmpty(
                 this.cloudFoundryClient, "test-non-existent-app-name", TEST_SPACE_ID);
 
@@ -3493,7 +3493,7 @@ public void restartNoApp() {
     }
 
     @Test
-    public void restartNotStartedAndNotStopped() {
+    void restartNotStartedAndNotStopped() {
         requestApplicationsSpecificState(
                 this.cloudFoundryClient, "test-app-name", TEST_SPACE_ID, "unknown-state");
         requestUpdateApplicationState(this.cloudFoundryClient, "test-application-id", "STOPPED");
@@ -3513,7 +3513,7 @@ public void restartNotStartedAndNotStopped() {
     }
 
     @Test
-    public void restartStarted() {
+    void restartStarted() {
         requestApplicationsSpecificState(
                 this.cloudFoundryClient, "test-app-name", TEST_SPACE_ID, "STARTED");
         requestUpdateApplicationState(this.cloudFoundryClient, "test-application-id", "STOPPED");
@@ -3533,7 +3533,7 @@ public void restartStarted() {
     }
 
     @Test
-    public void restartStopped() {
+    void restartStopped() {
         requestApplicationsSpecificState(
                 this.cloudFoundryClient, "test-app-name", TEST_SPACE_ID, "STOPPED");
         requestUpdateApplicationState(this.cloudFoundryClient, "test-application-id", "STARTED");
@@ -3552,7 +3552,7 @@ public void restartStopped() {
     }
 
     @Test
-    public void runTask() {
+    void runTask() {
         requestApplicationsV3(
                 this.cloudFoundryClient,
                 "test-application-name",
@@ -3580,7 +3580,7 @@ public void runTask() {
     }
 
     @Test
-    public void scaleDiskAndInstancesNotStarted() {
+    void scaleDiskAndInstancesNotStarted() {
         requestApplicationsSpecificState(
                 this.cloudFoundryClient, "test-app-name", TEST_SPACE_ID, "STOPPED");
         requestUpdateApplicationScale(
@@ -3599,7 +3599,7 @@ public void scaleDiskAndInstancesNotStarted() {
     }
 
     @Test
-    public void scaleDiskAndInstancesStarted() {
+    void scaleDiskAndInstancesStarted() {
         requestApplicationsSpecificState(
                 this.cloudFoundryClient, "test-app-name", TEST_SPACE_ID, "STARTED");
         requestUpdateApplicationScale(
@@ -3620,7 +3620,7 @@ public void scaleDiskAndInstancesStarted() {
     }
 
     @Test
-    public void scaleInstances() {
+    void scaleInstances() {
         requestApplications(
                 this.cloudFoundryClient, "test-app-name", TEST_SPACE_ID, "test-metadata-id");
         requestUpdateApplicationScale(this.cloudFoundryClient, "test-metadata-id", null, 2, null);
@@ -3633,7 +3633,7 @@ public void scaleInstances() {
     }
 
     @Test
-    public void scaleInstancesNoApp() {
+    void scaleInstancesNoApp() {
         requestApplicationsEmpty(this.cloudFoundryClient, "test-app-name", TEST_SPACE_ID);
 
         this.applications
@@ -3648,7 +3648,7 @@ public void scaleInstancesNoApp() {
     }
 
     @Test
-    public void scaleNoChange() {
+    void scaleNoChange() {
         requestApplications(
                 this.cloudFoundryClient, "test-app-name", TEST_SPACE_ID, "test-metadata-id");
 
@@ -3660,7 +3660,7 @@ public void scaleNoChange() {
     }
 
     @Test
-    public void setEnvironmentVariable() {
+    void setEnvironmentVariable() {
         requestApplications(
                 this.cloudFoundryClient,
                 "test-app",
@@ -3692,7 +3692,7 @@ public void setEnvironmentVariable() {
     }
 
     @Test
-    public void setEnvironmentVariableNoApp() {
+    void setEnvironmentVariableNoApp() {
         requestApplicationsEmpty(this.cloudFoundryClient, "test-app", TEST_SPACE_ID);
 
         this.applications
@@ -3712,7 +3712,7 @@ public void setEnvironmentVariableNoApp() {
     }
 
     @Test
-    public void setHealthCheck() {
+    void setHealthCheck() {
         requestApplications(
                 this.cloudFoundryClient,
                 "test-application-name",
@@ -3733,7 +3733,7 @@ public void setHealthCheck() {
     }
 
     @Test
-    public void sshEnabled() {
+    void sshEnabled() {
         requestApplications(
                 this.cloudFoundryClient, "test-app-name", TEST_SPACE_ID, "test-metadata-id");
 
@@ -3746,7 +3746,7 @@ public void sshEnabled() {
     }
 
     @Test
-    public void sshEnabledNoApp() {
+    void sshEnabledNoApp() {
         requestApplicationsEmpty(this.cloudFoundryClient, "test-app-name", TEST_SPACE_ID);
 
         this.applications
@@ -3761,7 +3761,7 @@ public void sshEnabledNoApp() {
     }
 
     @Test
-    public void startApplicationFailurePartial() {
+    void startApplicationFailurePartial() {
         requestApplicationsSpecificState(
                 this.cloudFoundryClient, "test-application-name", TEST_SPACE_ID, "STOPPED");
         requestUpdateApplicationState(this.cloudFoundryClient, "test-application-id", "STARTED");
@@ -3780,7 +3780,7 @@ public void startApplicationFailurePartial() {
     }
 
     @Test
-    public void startApplicationFailureTotal() {
+    void startApplicationFailureTotal() {
         requestApplicationsSpecificState(
                 this.cloudFoundryClient, "test-application-name", TEST_SPACE_ID, "STOPPED");
         requestUpdateApplicationState(this.cloudFoundryClient, "test-application-id", "STARTED");
@@ -3805,7 +3805,7 @@ public void startApplicationFailureTotal() {
     }
 
     @Test
-    public void startApplicationTimeout() {
+    void startApplicationTimeout() {
         requestApplicationsSpecificState(
                 this.cloudFoundryClient, "test-application-name", TEST_SPACE_ID, "STOPPED");
         requestUpdateApplicationState(this.cloudFoundryClient, "test-application-id", "STARTED");
@@ -3830,7 +3830,7 @@ public void startApplicationTimeout() {
     }
 
     @Test
-    public void startInvalidApplication() {
+    void startInvalidApplication() {
         requestApplicationsEmpty(this.cloudFoundryClient, "test-application-name", TEST_SPACE_ID);
 
         this.applications
@@ -3846,7 +3846,7 @@ public void startInvalidApplication() {
     }
 
     @Test
-    public void startStartedApplication() {
+    void startStartedApplication() {
         requestApplicationsSpecificState(
                 this.cloudFoundryClient, "test-application-name", TEST_SPACE_ID, "STARTED");
 
@@ -3858,7 +3858,7 @@ public void startStartedApplication() {
     }
 
     @Test
-    public void startStoppedApplication() {
+    void startStoppedApplication() {
         requestApplicationsSpecificState(
                 this.cloudFoundryClient, "test-application-name", TEST_SPACE_ID, "STOPPED");
         requestUpdateApplicationState(this.cloudFoundryClient, "test-application-id", "STARTED");
@@ -3877,7 +3877,7 @@ public void startStoppedApplication() {
     }
 
     @Test
-    public void stopInvalidApplication() {
+    void stopInvalidApplication() {
         requestApplicationsEmpty(this.cloudFoundryClient, "test-application-name", TEST_SPACE_ID);
 
         this.applications
@@ -3893,7 +3893,7 @@ public void stopInvalidApplication() {
     }
 
     @Test
-    public void stopStartedApplication() {
+    void stopStartedApplication() {
         requestApplicationsSpecificState(
                 this.cloudFoundryClient, "test-application-name", TEST_SPACE_ID, "STARTED");
         requestUpdateApplicationState(this.cloudFoundryClient, "test-application-id", "STOPPED");
@@ -3906,7 +3906,7 @@ public void stopStartedApplication() {
     }
 
     @Test
-    public void stopStoppedApplication() {
+    void stopStoppedApplication() {
         requestApplicationsSpecificState(
                 this.cloudFoundryClient, "test-application-name", TEST_SPACE_ID, "STOPPED");
 
@@ -3918,7 +3918,7 @@ public void stopStoppedApplication() {
     }
 
     @Test
-    public void terminateTask() {
+    void terminateTask() {
         requestApplicationsV3(
                 this.cloudFoundryClient,
                 "test-application-name",
@@ -3939,7 +3939,7 @@ public void terminateTask() {
     }
 
     @Test
-    public void terminateTaskNoTask() {
+    void terminateTaskNoTask() {
         requestApplicationsV3(
                 this.cloudFoundryClient,
                 "test-application-name",
@@ -3964,7 +3964,7 @@ public void terminateTaskNoTask() {
     }
 
     @Test
-    public void unsetEnvironmentVariable() {
+    void unsetEnvironmentVariable() {
         requestApplications(
                 this.cloudFoundryClient,
                 "test-app",
@@ -3995,7 +3995,7 @@ public void unsetEnvironmentVariable() {
     }
 
     @Test
-    public void unsetEnvironmentVariableNoApp() {
+    void unsetEnvironmentVariableNoApp() {
         requestApplicationsEmpty(this.cloudFoundryClient, "test-app", TEST_SPACE_ID);
 
         this.applications
diff --git a/cloudfoundry-operations/src/test/java/org/cloudfoundry/operations/applications/DeleteApplicationRequestTest.java b/cloudfoundry-operations/src/test/java/org/cloudfoundry/operations/applications/DeleteApplicationRequestTest.java
index 68b978c4bcb..0c0388ad747 100644
--- a/cloudfoundry-operations/src/test/java/org/cloudfoundry/operations/applications/DeleteApplicationRequestTest.java
+++ b/cloudfoundry-operations/src/test/java/org/cloudfoundry/operations/applications/DeleteApplicationRequestTest.java
@@ -16,17 +16,23 @@
 
 package org.cloudfoundry.operations.applications;
 
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
-public final class DeleteApplicationRequestTest {
+import org.junit.jupiter.api.Test;
 
-    @Test(expected = IllegalStateException.class)
-    public void noName() {
-        DeleteApplicationRequest.builder().build();
+final class DeleteApplicationRequestTest {
+
+    @Test
+    void noName() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    DeleteApplicationRequest.builder().build();
+                });
     }
 
     @Test
-    public void valid() {
+    void valid() {
         DeleteApplicationRequest.builder().name("test-name").deleteRoutes(true).build();
     }
 }
diff --git a/cloudfoundry-operations/src/test/java/org/cloudfoundry/operations/applications/DisableApplicationSshTest.java b/cloudfoundry-operations/src/test/java/org/cloudfoundry/operations/applications/DisableApplicationSshTest.java
index 86d85f55f84..111b44c9d46 100644
--- a/cloudfoundry-operations/src/test/java/org/cloudfoundry/operations/applications/DisableApplicationSshTest.java
+++ b/cloudfoundry-operations/src/test/java/org/cloudfoundry/operations/applications/DisableApplicationSshTest.java
@@ -16,17 +16,23 @@
 
 package org.cloudfoundry.operations.applications;
 
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
-public final class DisableApplicationSshTest {
+import org.junit.jupiter.api.Test;
 
-    @Test(expected = IllegalStateException.class)
-    public void noName() {
-        DisableApplicationSshRequest.builder().build();
+final class DisableApplicationSshTest {
+
+    @Test
+    void noName() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    DisableApplicationSshRequest.builder().build();
+                });
     }
 
     @Test
-    public void valid() {
+    void valid() {
         DisableApplicationSshRequest.builder().name("test-name").build();
     }
 }
diff --git a/cloudfoundry-operations/src/test/java/org/cloudfoundry/operations/applications/EnableApplicationSshRequestTest.java b/cloudfoundry-operations/src/test/java/org/cloudfoundry/operations/applications/EnableApplicationSshRequestTest.java
index b1b7c5cc25c..417ce79ab2b 100644
--- a/cloudfoundry-operations/src/test/java/org/cloudfoundry/operations/applications/EnableApplicationSshRequestTest.java
+++ b/cloudfoundry-operations/src/test/java/org/cloudfoundry/operations/applications/EnableApplicationSshRequestTest.java
@@ -16,17 +16,23 @@
 
 package org.cloudfoundry.operations.applications;
 
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
-public final class EnableApplicationSshRequestTest {
+import org.junit.jupiter.api.Test;
 
-    @Test(expected = IllegalStateException.class)
-    public void noName() {
-        EnableApplicationSshRequest.builder().build();
+final class EnableApplicationSshRequestTest {
+
+    @Test
+    void noName() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    EnableApplicationSshRequest.builder().build();
+                });
     }
 
     @Test
-    public void valid() {
+    void valid() {
         EnableApplicationSshRequest.builder().name("test-name").build();
     }
 }
diff --git a/cloudfoundry-operations/src/test/java/org/cloudfoundry/operations/applications/GetApplicationEnvironmentsRequestTest.java b/cloudfoundry-operations/src/test/java/org/cloudfoundry/operations/applications/GetApplicationEnvironmentsRequestTest.java
index a1a103a2870..c5155719589 100644
--- a/cloudfoundry-operations/src/test/java/org/cloudfoundry/operations/applications/GetApplicationEnvironmentsRequestTest.java
+++ b/cloudfoundry-operations/src/test/java/org/cloudfoundry/operations/applications/GetApplicationEnvironmentsRequestTest.java
@@ -16,17 +16,23 @@
 
 package org.cloudfoundry.operations.applications;
 
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
-public final class GetApplicationEnvironmentsRequestTest {
+import org.junit.jupiter.api.Test;
 
-    @Test(expected = IllegalStateException.class)
-    public void noName() {
-        GetApplicationEnvironmentsRequest.builder().build();
+final class GetApplicationEnvironmentsRequestTest {
+
+    @Test
+    void noName() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    GetApplicationEnvironmentsRequest.builder().build();
+                });
     }
 
     @Test
-    public void valid() {
+    void valid() {
         GetApplicationEnvironmentsRequest.builder().name("test-name").build();
     }
 }
diff --git a/cloudfoundry-operations/src/test/java/org/cloudfoundry/operations/applications/GetApplicationEventsRequestTest.java b/cloudfoundry-operations/src/test/java/org/cloudfoundry/operations/applications/GetApplicationEventsRequestTest.java
index 09b5d29008a..e22d9526c0c 100644
--- a/cloudfoundry-operations/src/test/java/org/cloudfoundry/operations/applications/GetApplicationEventsRequestTest.java
+++ b/cloudfoundry-operations/src/test/java/org/cloudfoundry/operations/applications/GetApplicationEventsRequestTest.java
@@ -16,17 +16,23 @@
 
 package org.cloudfoundry.operations.applications;
 
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
-public final class GetApplicationEventsRequestTest {
+import org.junit.jupiter.api.Test;
 
-    @Test(expected = IllegalStateException.class)
-    public void noName() {
-        GetApplicationEventsRequest.builder().build();
+final class GetApplicationEventsRequestTest {
+
+    @Test
+    void noName() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    GetApplicationEventsRequest.builder().build();
+                });
     }
 
     @Test
-    public void valid() {
+    void valid() {
         GetApplicationEventsRequest.builder().name("test-name").build();
     }
 }
diff --git a/cloudfoundry-operations/src/test/java/org/cloudfoundry/operations/applications/GetApplicationHealthCheckRequestTest.java b/cloudfoundry-operations/src/test/java/org/cloudfoundry/operations/applications/GetApplicationHealthCheckRequestTest.java
index a629d297e43..d66ba883720 100644
--- a/cloudfoundry-operations/src/test/java/org/cloudfoundry/operations/applications/GetApplicationHealthCheckRequestTest.java
+++ b/cloudfoundry-operations/src/test/java/org/cloudfoundry/operations/applications/GetApplicationHealthCheckRequestTest.java
@@ -16,17 +16,23 @@
 
 package org.cloudfoundry.operations.applications;
 
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
-public final class GetApplicationHealthCheckRequestTest {
+import org.junit.jupiter.api.Test;
 
-    @Test(expected = IllegalStateException.class)
-    public void noName() {
-        GetApplicationHealthCheckRequest.builder().build();
+final class GetApplicationHealthCheckRequestTest {
+
+    @Test
+    void noName() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    GetApplicationHealthCheckRequest.builder().build();
+                });
     }
 
     @Test
-    public void valid() {
+    void valid() {
         GetApplicationHealthCheckRequest.builder().name("test-name").build();
     }
 }
diff --git a/cloudfoundry-operations/src/test/java/org/cloudfoundry/operations/applications/GetApplicationManifestRequestTest.java b/cloudfoundry-operations/src/test/java/org/cloudfoundry/operations/applications/GetApplicationManifestRequestTest.java
index 886bfec5f8a..1ef360c62b5 100644
--- a/cloudfoundry-operations/src/test/java/org/cloudfoundry/operations/applications/GetApplicationManifestRequestTest.java
+++ b/cloudfoundry-operations/src/test/java/org/cloudfoundry/operations/applications/GetApplicationManifestRequestTest.java
@@ -16,17 +16,23 @@
 
 package org.cloudfoundry.operations.applications;
 
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
-public final class GetApplicationManifestRequestTest {
+import org.junit.jupiter.api.Test;
 
-    @Test(expected = IllegalStateException.class)
-    public void noName() {
-        GetApplicationManifestRequest.builder().build();
+final class GetApplicationManifestRequestTest {
+
+    @Test
+    void noName() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    GetApplicationManifestRequest.builder().build();
+                });
     }
 
     @Test
-    public void valid() {
+    void valid() {
         GetApplicationManifestRequest.builder().name("test-name").build();
     }
 }
diff --git a/cloudfoundry-operations/src/test/java/org/cloudfoundry/operations/applications/GetApplicationRequestTest.java b/cloudfoundry-operations/src/test/java/org/cloudfoundry/operations/applications/GetApplicationRequestTest.java
index 9148c4ef3f9..fb62dd6f7b0 100644
--- a/cloudfoundry-operations/src/test/java/org/cloudfoundry/operations/applications/GetApplicationRequestTest.java
+++ b/cloudfoundry-operations/src/test/java/org/cloudfoundry/operations/applications/GetApplicationRequestTest.java
@@ -16,17 +16,23 @@
 
 package org.cloudfoundry.operations.applications;
 
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
-public final class GetApplicationRequestTest {
+import org.junit.jupiter.api.Test;
 
-    @Test(expected = IllegalStateException.class)
-    public void noName() {
-        GetApplicationRequest.builder().build();
+final class GetApplicationRequestTest {
+
+    @Test
+    void noName() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    GetApplicationRequest.builder().build();
+                });
     }
 
     @Test
-    public void valid() {
+    void valid() {
         GetApplicationRequest.builder().name("test-name").build();
     }
 }
diff --git a/cloudfoundry-operations/src/test/java/org/cloudfoundry/operations/applications/ListApplicationTasksRequestTest.java b/cloudfoundry-operations/src/test/java/org/cloudfoundry/operations/applications/ListApplicationTasksRequestTest.java
index adcefd07681..66329d022e1 100644
--- a/cloudfoundry-operations/src/test/java/org/cloudfoundry/operations/applications/ListApplicationTasksRequestTest.java
+++ b/cloudfoundry-operations/src/test/java/org/cloudfoundry/operations/applications/ListApplicationTasksRequestTest.java
@@ -16,17 +16,23 @@
 
 package org.cloudfoundry.operations.applications;
 
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
-public final class ListApplicationTasksRequestTest {
+import org.junit.jupiter.api.Test;
 
-    @Test(expected = IllegalStateException.class)
-    public void noName() {
-        ListApplicationTasksRequest.builder().build();
+final class ListApplicationTasksRequestTest {
+
+    @Test
+    void noName() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    ListApplicationTasksRequest.builder().build();
+                });
     }
 
     @Test
-    public void valid() {
+    void valid() {
         ListApplicationTasksRequest.builder().name("test-name").build();
     }
 }
diff --git a/cloudfoundry-operations/src/test/java/org/cloudfoundry/operations/applications/LogsRequestTest.java b/cloudfoundry-operations/src/test/java/org/cloudfoundry/operations/applications/LogsRequestTest.java
index 7ca10707c7e..17fb92c9b2b 100644
--- a/cloudfoundry-operations/src/test/java/org/cloudfoundry/operations/applications/LogsRequestTest.java
+++ b/cloudfoundry-operations/src/test/java/org/cloudfoundry/operations/applications/LogsRequestTest.java
@@ -16,17 +16,23 @@
 
 package org.cloudfoundry.operations.applications;
 
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
-public final class LogsRequestTest {
+import org.junit.jupiter.api.Test;
 
-    @Test(expected = IllegalStateException.class)
-    public void noName() {
-        LogsRequest.builder().build();
+final class LogsRequestTest {
+
+    @Test
+    void noName() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    LogsRequest.builder().build();
+                });
     }
 
     @Test
-    public void valid() {
+    void valid() {
         LogsRequest.builder().name("test-name").build();
     }
 }
diff --git a/cloudfoundry-operations/src/test/java/org/cloudfoundry/operations/applications/ManifestV3ApplicationTest.java b/cloudfoundry-operations/src/test/java/org/cloudfoundry/operations/applications/ManifestV3ApplicationTest.java
index 7d48d8a3ea6..51bc31cb117 100644
--- a/cloudfoundry-operations/src/test/java/org/cloudfoundry/operations/applications/ManifestV3ApplicationTest.java
+++ b/cloudfoundry-operations/src/test/java/org/cloudfoundry/operations/applications/ManifestV3ApplicationTest.java
@@ -16,70 +16,96 @@
 
 package org.cloudfoundry.operations.applications;
 
+import static org.junit.jupiter.api.Assertions.assertThrows;
+
 import java.nio.file.Paths;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
-public class ManifestV3ApplicationTest {
+class ManifestV3ApplicationTest {
 
-    @Test(expected = IllegalStateException.class)
-    public void dockerAndBuildpack() {
-        ManifestV3Application.builder()
-                .name("test-name")
-                .buildpack("test-buildpack")
-                .docker(Docker.builder().image("test-docker-image").build())
-                .build();
+    @Test
+    void dockerAndBuildpack() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    ManifestV3Application.builder()
+                            .name("test-name")
+                            .buildpack("test-buildpack")
+                            .docker(Docker.builder().image("test-docker-image").build())
+                            .build();
+                });
     }
 
-    @Test(expected = IllegalStateException.class)
-    public void dockerAndPath() {
-        ManifestV3Application.builder()
-                .name("test-name")
-                .docker(Docker.builder().image("test-docker-image").build())
-                .path(Paths.get("test-application"))
-                .build();
+    @Test
+    void dockerAndPath() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    ManifestV3Application.builder()
+                            .name("test-name")
+                            .docker(Docker.builder().image("test-docker-image").build())
+                            .path(Paths.get("test-application"))
+                            .build();
+                });
     }
 
-    @Test(expected = IllegalStateException.class)
-    public void dockerCredentialsNoImage() {
-        ManifestV3Application.builder()
-                .name("test-name")
-                .docker(
-                        Docker.builder()
-                                .password("test-password")
-                                .username("test-username")
-                                .build())
-                .build();
+    @Test
+    void dockerCredentialsNoImage() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    ManifestV3Application.builder()
+                            .name("test-name")
+                            .docker(
+                                    Docker.builder()
+                                            .password("test-password")
+                                            .username("test-username")
+                                            .build())
+                            .build();
+                });
     }
 
-    @Test(expected = IllegalStateException.class)
-    public void routesAndDomains() {
-        ManifestV3Application.builder()
-                .name("test-name")
-                .route(Route.builder().route("test-route").build())
-                .domain("test-domain")
-                .build();
+    @Test
+    void routesAndDomains() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    ManifestV3Application.builder()
+                            .name("test-name")
+                            .route(Route.builder().route("test-route").build())
+                            .domain("test-domain")
+                            .build();
+                });
     }
 
-    @Test(expected = IllegalStateException.class)
-    public void routesAndHosts() {
-        ManifestV3Application.builder()
-                .name("test-name")
-                .route(Route.builder().route("test-route").build())
-                .host("test-host")
-                .build();
+    @Test
+    void routesAndHosts() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    ManifestV3Application.builder()
+                            .name("test-name")
+                            .route(Route.builder().route("test-route").build())
+                            .host("test-host")
+                            .build();
+                });
     }
 
-    @Test(expected = IllegalStateException.class)
-    public void routesAndNoHostName() {
-        ManifestV3Application.builder()
-                .name("test-name")
-                .route(Route.builder().route("test-route").build())
-                .noHostname(true)
-                .build();
+    @Test
+    void routesAndNoHostName() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    ManifestV3Application.builder()
+                            .name("test-name")
+                            .route(Route.builder().route("test-route").build())
+                            .noHostname(true)
+                            .build();
+                });
     }
 
     @Test
-    public void valid() {
+    void valid() {
         ManifestV3Application.builder().name("test-name").build();
     }
 }
diff --git a/cloudfoundry-operations/src/test/java/org/cloudfoundry/operations/applications/ManifestV3ProcessTest.java b/cloudfoundry-operations/src/test/java/org/cloudfoundry/operations/applications/ManifestV3ProcessTest.java
index 45b8bc01395..02763b2ddd7 100644
--- a/cloudfoundry-operations/src/test/java/org/cloudfoundry/operations/applications/ManifestV3ProcessTest.java
+++ b/cloudfoundry-operations/src/test/java/org/cloudfoundry/operations/applications/ManifestV3ProcessTest.java
@@ -16,16 +16,22 @@
 
 package org.cloudfoundry.operations.applications;
 
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
-public class ManifestV3ProcessTest {
-    @Test(expected = IllegalStateException.class)
-    public void noType() {
-        ManifestV3Process.builder().build();
+import org.junit.jupiter.api.Test;
+
+class ManifestV3ProcessTest {
+    @Test
+    void noType() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    ManifestV3Process.builder().build();
+                });
     }
 
     @Test
-    public void valid() {
+    void valid() {
         ManifestV3Process.builder().type("test-type").build();
     }
 }
diff --git a/cloudfoundry-operations/src/test/java/org/cloudfoundry/operations/applications/ManifestV3ServiceTest.java b/cloudfoundry-operations/src/test/java/org/cloudfoundry/operations/applications/ManifestV3ServiceTest.java
index e30980fb7df..284fcf8df4b 100644
--- a/cloudfoundry-operations/src/test/java/org/cloudfoundry/operations/applications/ManifestV3ServiceTest.java
+++ b/cloudfoundry-operations/src/test/java/org/cloudfoundry/operations/applications/ManifestV3ServiceTest.java
@@ -16,16 +16,22 @@
 
 package org.cloudfoundry.operations.applications;
 
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
-public class ManifestV3ServiceTest {
-    @Test(expected = IllegalStateException.class)
-    public void noName() {
-        ManifestV3Service.builder().build();
+import org.junit.jupiter.api.Test;
+
+class ManifestV3ServiceTest {
+    @Test
+    void noName() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    ManifestV3Service.builder().build();
+                });
     }
 
     @Test
-    public void valid() {
+    void valid() {
         ManifestV3Service.builder().name("test-service-name").build();
     }
 }
diff --git a/cloudfoundry-operations/src/test/java/org/cloudfoundry/operations/applications/ManifestV3SidecarTest.java b/cloudfoundry-operations/src/test/java/org/cloudfoundry/operations/applications/ManifestV3SidecarTest.java
index 04a7bca713d..6cd07c9783c 100644
--- a/cloudfoundry-operations/src/test/java/org/cloudfoundry/operations/applications/ManifestV3SidecarTest.java
+++ b/cloudfoundry-operations/src/test/java/org/cloudfoundry/operations/applications/ManifestV3SidecarTest.java
@@ -16,17 +16,23 @@
 
 package org.cloudfoundry.operations.applications;
 
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
-public class ManifestV3SidecarTest {
+import org.junit.jupiter.api.Test;
 
-    @Test(expected = IllegalStateException.class)
-    public void noName() {
-        ManifestV3Sidecar.builder().build();
+class ManifestV3SidecarTest {
+
+    @Test
+    void noName() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    ManifestV3Sidecar.builder().build();
+                });
     }
 
     @Test
-    public void valid() {
+    void valid() {
         ManifestV3Sidecar.builder().name("test-service-name").build();
     }
 }
diff --git a/cloudfoundry-operations/src/test/java/org/cloudfoundry/operations/applications/ManifestV3Test.java b/cloudfoundry-operations/src/test/java/org/cloudfoundry/operations/applications/ManifestV3Test.java
index 6d4ee60a5b9..498559c3c69 100644
--- a/cloudfoundry-operations/src/test/java/org/cloudfoundry/operations/applications/ManifestV3Test.java
+++ b/cloudfoundry-operations/src/test/java/org/cloudfoundry/operations/applications/ManifestV3Test.java
@@ -16,25 +16,35 @@
 
 package org.cloudfoundry.operations.applications;
 
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
-public class ManifestV3Test {
+import org.junit.jupiter.api.Test;
+
+class ManifestV3Test {
 
     private final ManifestV3Application testApplication =
             ManifestV3Application.builder().name("test-application-name").build();
 
-    @Test(expected = IllegalStateException.class)
-    public void illegalVersion() {
-        ManifestV3.builder().version(2).application(testApplication).build();
+    @Test
+    void illegalVersion() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    ManifestV3.builder().version(2).application(testApplication).build();
+                });
     }
 
-    @Test(expected = IllegalStateException.class)
-    public void noApplications() {
-        ManifestV3.builder().build();
+    @Test
+    void noApplications() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    ManifestV3.builder().build();
+                });
     }
 
     @Test
-    public void valid() {
+    void valid() {
         ManifestV3.builder().application(testApplication).build();
     }
 }
diff --git a/cloudfoundry-operations/src/test/java/org/cloudfoundry/operations/applications/PushApplicationRequestTest.java b/cloudfoundry-operations/src/test/java/org/cloudfoundry/operations/applications/PushApplicationRequestTest.java
index 2686f0784e9..d6a8d54c6ab 100644
--- a/cloudfoundry-operations/src/test/java/org/cloudfoundry/operations/applications/PushApplicationRequestTest.java
+++ b/cloudfoundry-operations/src/test/java/org/cloudfoundry/operations/applications/PushApplicationRequestTest.java
@@ -16,32 +16,46 @@
 
 package org.cloudfoundry.operations.applications;
 
+import static org.junit.jupiter.api.Assertions.assertThrows;
+
 import java.nio.file.Paths;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
-public final class PushApplicationRequestTest {
+final class PushApplicationRequestTest {
 
-    @Test(expected = IllegalStateException.class)
-    public void applicationAndDocker() {
-        PushApplicationRequest.builder()
-                .path(Paths.get("test-application"))
-                .dockerImage("test-docker")
-                .name("test-name")
-                .build();
+    @Test
+    void applicationAndDocker() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    PushApplicationRequest.builder()
+                            .path(Paths.get("test-application"))
+                            .dockerImage("test-docker")
+                            .name("test-name")
+                            .build();
+                });
     }
 
-    @Test(expected = IllegalStateException.class)
-    public void noApplicationOrDocker() {
-        PushApplicationRequest.builder().name("test-name").build();
+    @Test
+    void noApplicationOrDocker() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    PushApplicationRequest.builder().name("test-name").build();
+                });
     }
 
-    @Test(expected = IllegalStateException.class)
-    public void noName() {
-        PushApplicationRequest.builder().path(Paths.get("test-application")).build();
+    @Test
+    void noName() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    PushApplicationRequest.builder().path(Paths.get("test-application")).build();
+                });
     }
 
     @Test
-    public void validApplication() {
+    void validApplication() {
         PushApplicationRequest.builder()
                 .path(Paths.get("test-application"))
                 .name("test-name")
@@ -49,7 +63,7 @@ public void validApplication() {
     }
 
     @Test
-    public void validDocker() {
+    void validDocker() {
         PushApplicationRequest.builder().dockerImage("test-docker").name("test-name").build();
     }
 }
diff --git a/cloudfoundry-operations/src/test/java/org/cloudfoundry/operations/applications/PushManifestV3RequestTest.java b/cloudfoundry-operations/src/test/java/org/cloudfoundry/operations/applications/PushManifestV3RequestTest.java
index 6bf241fe45e..26a1f9f8635 100644
--- a/cloudfoundry-operations/src/test/java/org/cloudfoundry/operations/applications/PushManifestV3RequestTest.java
+++ b/cloudfoundry-operations/src/test/java/org/cloudfoundry/operations/applications/PushManifestV3RequestTest.java
@@ -16,17 +16,23 @@
 
 package org.cloudfoundry.operations.applications;
 
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
-public class PushManifestV3RequestTest {
+import org.junit.jupiter.api.Test;
 
-    @Test(expected = IllegalStateException.class)
-    public void noManifest() {
-        PushManifestV3Request.builder().build();
+class PushManifestV3RequestTest {
+
+    @Test
+    void noManifest() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    PushManifestV3Request.builder().build();
+                });
     }
 
     @Test
-    public void valid() {
+    void valid() {
         PushManifestV3Request.builder()
                 .manifest(
                         ManifestV3.builder()
diff --git a/cloudfoundry-operations/src/test/java/org/cloudfoundry/operations/applications/RestartApplicationInstanceRequestTest.java b/cloudfoundry-operations/src/test/java/org/cloudfoundry/operations/applications/RestartApplicationInstanceRequestTest.java
index f0eb01c9987..e878f7c7e89 100644
--- a/cloudfoundry-operations/src/test/java/org/cloudfoundry/operations/applications/RestartApplicationInstanceRequestTest.java
+++ b/cloudfoundry-operations/src/test/java/org/cloudfoundry/operations/applications/RestartApplicationInstanceRequestTest.java
@@ -16,22 +16,32 @@
 
 package org.cloudfoundry.operations.applications;
 
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
-public final class RestartApplicationInstanceRequestTest {
+import org.junit.jupiter.api.Test;
 
-    @Test(expected = IllegalStateException.class)
-    public void noInstanceIndex() {
-        RestartApplicationInstanceRequest.builder().name("test-name").build();
+final class RestartApplicationInstanceRequestTest {
+
+    @Test
+    void noInstanceIndex() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    RestartApplicationInstanceRequest.builder().name("test-name").build();
+                });
     }
 
-    @Test(expected = IllegalStateException.class)
-    public void noName() {
-        RestartApplicationInstanceRequest.builder().instanceIndex(0).build();
+    @Test
+    void noName() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    RestartApplicationInstanceRequest.builder().instanceIndex(0).build();
+                });
     }
 
     @Test
-    public void valid() {
+    void valid() {
         RestartApplicationInstanceRequest.builder().instanceIndex(0).name("test-name").build();
     }
 }
diff --git a/cloudfoundry-operations/src/test/java/org/cloudfoundry/operations/applications/RestartApplicationRequestTest.java b/cloudfoundry-operations/src/test/java/org/cloudfoundry/operations/applications/RestartApplicationRequestTest.java
index 197c81af6f5..99f99973ffb 100644
--- a/cloudfoundry-operations/src/test/java/org/cloudfoundry/operations/applications/RestartApplicationRequestTest.java
+++ b/cloudfoundry-operations/src/test/java/org/cloudfoundry/operations/applications/RestartApplicationRequestTest.java
@@ -16,17 +16,23 @@
 
 package org.cloudfoundry.operations.applications;
 
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
-public final class RestartApplicationRequestTest {
+import org.junit.jupiter.api.Test;
 
-    @Test(expected = IllegalStateException.class)
-    public void noName() {
-        RestartApplicationRequest.builder().build();
+final class RestartApplicationRequestTest {
+
+    @Test
+    void noName() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    RestartApplicationRequest.builder().build();
+                });
     }
 
     @Test
-    public void valid() {
+    void valid() {
         RestartApplicationRequest.builder().name("test-name").build();
     }
 }
diff --git a/cloudfoundry-operations/src/test/java/org/cloudfoundry/operations/applications/RouteUtilsTest.java b/cloudfoundry-operations/src/test/java/org/cloudfoundry/operations/applications/RouteUtilsTest.java
index 6156bdacda9..51d120c29de 100644
--- a/cloudfoundry-operations/src/test/java/org/cloudfoundry/operations/applications/RouteUtilsTest.java
+++ b/cloudfoundry-operations/src/test/java/org/cloudfoundry/operations/applications/RouteUtilsTest.java
@@ -17,18 +17,19 @@
 package org.cloudfoundry.operations.applications;
 
 import static org.assertj.core.api.Assertions.assertThat;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
 import java.time.Duration;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import reactor.test.StepVerifier;
 
-public class RouteUtilsTest {
+class RouteUtilsTest {
 
     @Test
-    public void complexHit() {
+    void complexHit() {
         List<DomainSummary> availableDomains = new ArrayList<>();
         availableDomains.add(DomainSummary.builder().id("1").name("test.com").build());
         availableDomains.add(DomainSummary.builder().id("2").name("test.test.com").build());
@@ -43,7 +44,7 @@ public void complexHit() {
     }
 
     @Test
-    public void complexPathHit() {
+    void complexPathHit() {
         List<DomainSummary> availableDomains = new ArrayList<>();
         availableDomains.add(DomainSummary.builder().id("1").name("test.com").build());
         availableDomains.add(DomainSummary.builder().id("2").name("test.test.com").build());
@@ -58,79 +59,99 @@ public void complexPathHit() {
                 .verify(Duration.ofSeconds(5));
     }
 
-    @Test(expected = IllegalArgumentException.class)
-    public void empty() {
-        List<DomainSummary> availableDomains = Collections.emptyList();
-
-        RouteUtils.decomposeRoute(availableDomains, "test.test.com", null)
-                .as(StepVerifier::create)
-                .consumeErrorWith(
-                        t ->
-                                assertThat(t)
-                                        .isInstanceOf(IllegalArgumentException.class)
-                                        .hasMessage(
-                                                "The route test.test.com did not match any existing"
-                                                        + " domains"))
-                .verify(Duration.ofSeconds(5));
+    @Test
+    void empty() {
+        assertThrows(
+                IllegalArgumentException.class,
+                () -> {
+                    List<DomainSummary> availableDomains = Collections.emptyList();
+
+                    RouteUtils.decomposeRoute(availableDomains, "test.test.com", null)
+                            .as(StepVerifier::create)
+                            .consumeErrorWith(
+                                    t ->
+                                            assertThat(t)
+                                                    .isInstanceOf(IllegalArgumentException.class)
+                                                    .hasMessage(
+                                                            "The route test.test.com did not match"
+                                                                    + " any existing domains"))
+                            .verify(Duration.ofSeconds(5));
+                });
     }
 
-    @Test(expected = IllegalArgumentException.class)
-    public void partialMatchMiss() {
-        List<DomainSummary> availableDomains = new ArrayList<>();
-        availableDomains.add(DomainSummary.builder().id("1").name("test.something.com").build());
-        availableDomains.add(DomainSummary.builder().id("2").name("something.com").build());
-        availableDomains.add(DomainSummary.builder().id("3").name("hing.com").build());
-
-        RouteUtils.decomposeRoute(availableDomains, "thing.com", null)
-                .as(StepVerifier::create)
-                .consumeErrorWith(
-                        t ->
-                                assertThat(t)
-                                        .isInstanceOf(IllegalArgumentException.class)
-                                        .hasMessage(
-                                                "The route thing.com did not match any existing"
-                                                        + " domains"))
-                .verify(Duration.ofSeconds(5));
+    @Test
+    void partialMatchMiss() {
+        assertThrows(
+                IllegalArgumentException.class,
+                () -> {
+                    List<DomainSummary> availableDomains = new ArrayList<>();
+                    availableDomains.add(
+                            DomainSummary.builder().id("1").name("test.something.com").build());
+                    availableDomains.add(
+                            DomainSummary.builder().id("2").name("something.com").build());
+                    availableDomains.add(DomainSummary.builder().id("3").name("hing.com").build());
+
+                    RouteUtils.decomposeRoute(availableDomains, "thing.com", null)
+                            .as(StepVerifier::create)
+                            .consumeErrorWith(
+                                    t ->
+                                            assertThat(t)
+                                                    .isInstanceOf(IllegalArgumentException.class)
+                                                    .hasMessage(
+                                                            "The route thing.com did not match any"
+                                                                    + " existing domains"))
+                            .verify(Duration.ofSeconds(5));
+                });
     }
 
-    @Test(expected = IllegalArgumentException.class)
-    public void partialMiss() {
-        List<DomainSummary> availableDomains = new ArrayList<>();
-        availableDomains.add(DomainSummary.builder().id("1").name("test.com").build());
-        availableDomains.add(DomainSummary.builder().id("2").name("test.test.com").build());
-
-        RouteUtils.decomposeRoute(availableDomains, "est.com", null)
-                .as(StepVerifier::create)
-                .consumeErrorWith(
-                        t ->
-                                assertThat(t)
-                                        .isInstanceOf(IllegalArgumentException.class)
-                                        .hasMessage(
-                                                "The route est.com did not match any existing"
-                                                        + " domains"))
-                .verify(Duration.ofSeconds(5));
+    @Test
+    void partialMiss() {
+        assertThrows(
+                IllegalArgumentException.class,
+                () -> {
+                    List<DomainSummary> availableDomains = new ArrayList<>();
+                    availableDomains.add(DomainSummary.builder().id("1").name("test.com").build());
+                    availableDomains.add(
+                            DomainSummary.builder().id("2").name("test.test.com").build());
+
+                    RouteUtils.decomposeRoute(availableDomains, "est.com", null)
+                            .as(StepVerifier::create)
+                            .consumeErrorWith(
+                                    t ->
+                                            assertThat(t)
+                                                    .isInstanceOf(IllegalArgumentException.class)
+                                                    .hasMessage(
+                                                            "The route est.com did not match any"
+                                                                    + " existing domains"))
+                            .verify(Duration.ofSeconds(5));
+                });
     }
 
-    @Test(expected = IllegalArgumentException.class)
-    public void pathMiss() {
-        List<DomainSummary> availableDomains = new ArrayList<>();
-        availableDomains.add(DomainSummary.builder().id("1").name("test.com").build());
-        availableDomains.add(DomainSummary.builder().id("2").name("test.test.com").build());
-
-        RouteUtils.decomposeRoute(availableDomains, "miss.com/path", null)
-                .as(StepVerifier::create)
-                .consumeErrorWith(
-                        t ->
-                                assertThat(t)
-                                        .isInstanceOf(IllegalArgumentException.class)
-                                        .hasMessage(
-                                                "The route miss.com/path did not match any existing"
-                                                        + " domains"))
-                .verify(Duration.ofSeconds(5));
+    @Test
+    void pathMiss() {
+        assertThrows(
+                IllegalArgumentException.class,
+                () -> {
+                    List<DomainSummary> availableDomains = new ArrayList<>();
+                    availableDomains.add(DomainSummary.builder().id("1").name("test.com").build());
+                    availableDomains.add(
+                            DomainSummary.builder().id("2").name("test.test.com").build());
+
+                    RouteUtils.decomposeRoute(availableDomains, "miss.com/path", null)
+                            .as(StepVerifier::create)
+                            .consumeErrorWith(
+                                    t ->
+                                            assertThat(t)
+                                                    .isInstanceOf(IllegalArgumentException.class)
+                                                    .hasMessage(
+                                                            "The route miss.com/path did not match"
+                                                                    + " any existing domains"))
+                            .verify(Duration.ofSeconds(5));
+                });
     }
 
     @Test
-    public void routeDecompositionPathHit() {
+    void routeDecompositionPathHit() {
         List<DomainSummary> availableDomains = new ArrayList<>();
         availableDomains.add(DomainSummary.builder().id("1").name("test.com").build());
         availableDomains.add(DomainSummary.builder().id("2").name("test.test.com").build());
@@ -146,7 +167,7 @@ public void routeDecompositionPathHit() {
     }
 
     @Test
-    public void simpleHit() {
+    void simpleHit() {
         List<DomainSummary> availableDomains = new ArrayList<>();
         availableDomains.add(DomainSummary.builder().id("1").name("test.com").build());
         availableDomains.add(DomainSummary.builder().id("2").name("test.test.com").build());
@@ -161,7 +182,7 @@ public void simpleHit() {
     }
 
     @Test
-    public void simpleHostHit() {
+    void simpleHostHit() {
         List<DomainSummary> availableDomains = new ArrayList<>();
         availableDomains.add(DomainSummary.builder().id("1").name("test.com").build());
         availableDomains.add(DomainSummary.builder().id("2").name("test.test.com").build());
@@ -177,7 +198,7 @@ public void simpleHostHit() {
     }
 
     @Test
-    public void simpleHostPathHit() {
+    void simpleHostPathHit() {
         List<DomainSummary> availableDomains = new ArrayList<>();
         availableDomains.add(DomainSummary.builder().id("1").name("test.com").build());
         availableDomains.add(DomainSummary.builder().id("2").name("test.test.com").build());
@@ -192,26 +213,31 @@ public void simpleHostPathHit() {
                 .verify(Duration.ofSeconds(5));
     }
 
-    @Test(expected = IllegalArgumentException.class)
-    public void simpleMiss() {
-        List<DomainSummary> availableDomains = new ArrayList<>();
-        availableDomains.add(DomainSummary.builder().id("1").name("test.com").build());
-        availableDomains.add(DomainSummary.builder().id("2").name("test.test.com").build());
-
-        RouteUtils.decomposeRoute(availableDomains, "miss.com", null)
-                .as(StepVerifier::create)
-                .consumeErrorWith(
-                        t ->
-                                assertThat(t)
-                                        .isInstanceOf(IllegalArgumentException.class)
-                                        .hasMessage(
-                                                "The route miss.com did not match any existing"
-                                                        + " domains"))
-                .verify(Duration.ofSeconds(5));
+    @Test
+    void simpleMiss() {
+        assertThrows(
+                IllegalArgumentException.class,
+                () -> {
+                    List<DomainSummary> availableDomains = new ArrayList<>();
+                    availableDomains.add(DomainSummary.builder().id("1").name("test.com").build());
+                    availableDomains.add(
+                            DomainSummary.builder().id("2").name("test.test.com").build());
+
+                    RouteUtils.decomposeRoute(availableDomains, "miss.com", null)
+                            .as(StepVerifier::create)
+                            .consumeErrorWith(
+                                    t ->
+                                            assertThat(t)
+                                                    .isInstanceOf(IllegalArgumentException.class)
+                                                    .hasMessage(
+                                                            "The route miss.com did not match any"
+                                                                    + " existing domains"))
+                            .verify(Duration.ofSeconds(5));
+                });
     }
 
     @Test
-    public void simplePathOverride() {
+    void simplePathOverride() {
         List<DomainSummary> availableDomains = new ArrayList<>();
         availableDomains.add(DomainSummary.builder().id("1").name("test.com").build());
         availableDomains.add(DomainSummary.builder().id("2").name("test.test.com").build());
diff --git a/cloudfoundry-operations/src/test/java/org/cloudfoundry/operations/applications/RunApplicationTaskRequestTest.java b/cloudfoundry-operations/src/test/java/org/cloudfoundry/operations/applications/RunApplicationTaskRequestTest.java
index dfa78b24c84..f736f3bbdd2 100644
--- a/cloudfoundry-operations/src/test/java/org/cloudfoundry/operations/applications/RunApplicationTaskRequestTest.java
+++ b/cloudfoundry-operations/src/test/java/org/cloudfoundry/operations/applications/RunApplicationTaskRequestTest.java
@@ -16,22 +16,34 @@
 
 package org.cloudfoundry.operations.applications;
 
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
-public final class RunApplicationTaskRequestTest {
+import org.junit.jupiter.api.Test;
 
-    @Test(expected = IllegalStateException.class)
-    public void noApplicationName() {
-        RunApplicationTaskRequest.builder().command("test-command").build();
+final class RunApplicationTaskRequestTest {
+
+    @Test
+    void noApplicationName() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    RunApplicationTaskRequest.builder().command("test-command").build();
+                });
     }
 
-    @Test(expected = IllegalStateException.class)
-    public void noCommand() {
-        RunApplicationTaskRequest.builder().applicationName("test-application-name").build();
+    @Test
+    void noCommand() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    RunApplicationTaskRequest.builder()
+                            .applicationName("test-application-name")
+                            .build();
+                });
     }
 
     @Test
-    public void valid() {
+    void valid() {
         RunApplicationTaskRequest.builder()
                 .applicationName("test-application-name")
                 .command("test-command")
diff --git a/cloudfoundry-operations/src/test/java/org/cloudfoundry/operations/applications/ScaleApplicationRequestTest.java b/cloudfoundry-operations/src/test/java/org/cloudfoundry/operations/applications/ScaleApplicationRequestTest.java
index 8222140e7fe..30237678a69 100644
--- a/cloudfoundry-operations/src/test/java/org/cloudfoundry/operations/applications/ScaleApplicationRequestTest.java
+++ b/cloudfoundry-operations/src/test/java/org/cloudfoundry/operations/applications/ScaleApplicationRequestTest.java
@@ -16,17 +16,23 @@
 
 package org.cloudfoundry.operations.applications;
 
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
-public final class ScaleApplicationRequestTest {
+import org.junit.jupiter.api.Test;
 
-    @Test(expected = IllegalStateException.class)
-    public void noName() {
-        ScaleApplicationRequest.builder().build();
+final class ScaleApplicationRequestTest {
+
+    @Test
+    void noName() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    ScaleApplicationRequest.builder().build();
+                });
     }
 
     @Test
-    public void valid() {
+    void valid() {
         ScaleApplicationRequest.builder().name("test-name").build();
     }
 }
diff --git a/cloudfoundry-operations/src/test/java/org/cloudfoundry/operations/applications/SetApplicationHealthCheckRequestTest.java b/cloudfoundry-operations/src/test/java/org/cloudfoundry/operations/applications/SetApplicationHealthCheckRequestTest.java
index e608b1f05a9..6f2c068d3cd 100644
--- a/cloudfoundry-operations/src/test/java/org/cloudfoundry/operations/applications/SetApplicationHealthCheckRequestTest.java
+++ b/cloudfoundry-operations/src/test/java/org/cloudfoundry/operations/applications/SetApplicationHealthCheckRequestTest.java
@@ -16,22 +16,34 @@
 
 package org.cloudfoundry.operations.applications;
 
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
-public final class SetApplicationHealthCheckRequestTest {
+import org.junit.jupiter.api.Test;
 
-    @Test(expected = IllegalStateException.class)
-    public void noName() {
-        SetApplicationHealthCheckRequest.builder().type(ApplicationHealthCheck.NONE).build();
+final class SetApplicationHealthCheckRequestTest {
+
+    @Test
+    void noName() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    SetApplicationHealthCheckRequest.builder()
+                            .type(ApplicationHealthCheck.NONE)
+                            .build();
+                });
     }
 
-    @Test(expected = IllegalStateException.class)
-    public void noType() {
-        SetApplicationHealthCheckRequest.builder().name("test-name").build();
+    @Test
+    void noType() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    SetApplicationHealthCheckRequest.builder().name("test-name").build();
+                });
     }
 
     @Test
-    public void valid() {
+    void valid() {
         SetApplicationHealthCheckRequest.builder()
                 .name("test-name")
                 .type(ApplicationHealthCheck.NONE)
diff --git a/cloudfoundry-operations/src/test/java/org/cloudfoundry/operations/applications/SetEnvironmentVariableApplicationRequestTest.java b/cloudfoundry-operations/src/test/java/org/cloudfoundry/operations/applications/SetEnvironmentVariableApplicationRequestTest.java
index 3b90e1e969a..9a7ccb466b5 100644
--- a/cloudfoundry-operations/src/test/java/org/cloudfoundry/operations/applications/SetEnvironmentVariableApplicationRequestTest.java
+++ b/cloudfoundry-operations/src/test/java/org/cloudfoundry/operations/applications/SetEnvironmentVariableApplicationRequestTest.java
@@ -16,36 +16,50 @@
 
 package org.cloudfoundry.operations.applications;
 
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
-public final class SetEnvironmentVariableApplicationRequestTest {
+import org.junit.jupiter.api.Test;
 
-    @Test(expected = IllegalStateException.class)
-    public void noName() {
-        SetEnvironmentVariableApplicationRequest.builder()
-                .variableName("test-variable-name")
-                .variableValue("test-variable-value")
-                .build();
+final class SetEnvironmentVariableApplicationRequestTest {
+
+    @Test
+    void noName() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    SetEnvironmentVariableApplicationRequest.builder()
+                            .variableName("test-variable-name")
+                            .variableValue("test-variable-value")
+                            .build();
+                });
     }
 
-    @Test(expected = IllegalStateException.class)
-    public void noVariableName() {
-        SetEnvironmentVariableApplicationRequest.builder()
-                .name("test-name")
-                .variableValue("test-variable-value")
-                .build();
+    @Test
+    void noVariableName() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    SetEnvironmentVariableApplicationRequest.builder()
+                            .name("test-name")
+                            .variableValue("test-variable-value")
+                            .build();
+                });
     }
 
-    @Test(expected = IllegalStateException.class)
-    public void noVariableValue() {
-        SetEnvironmentVariableApplicationRequest.builder()
-                .name("test-name")
-                .variableName("test-variable-name")
-                .build();
+    @Test
+    void noVariableValue() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    SetEnvironmentVariableApplicationRequest.builder()
+                            .name("test-name")
+                            .variableName("test-variable-name")
+                            .build();
+                });
     }
 
     @Test
-    public void valid() {
+    void valid() {
         SetEnvironmentVariableApplicationRequest.builder()
                 .name("test-name")
                 .variableName("test-variable-name")
diff --git a/cloudfoundry-operations/src/test/java/org/cloudfoundry/operations/applications/StartApplicationRequestTest.java b/cloudfoundry-operations/src/test/java/org/cloudfoundry/operations/applications/StartApplicationRequestTest.java
index 433130c28cc..3f339d27b3e 100644
--- a/cloudfoundry-operations/src/test/java/org/cloudfoundry/operations/applications/StartApplicationRequestTest.java
+++ b/cloudfoundry-operations/src/test/java/org/cloudfoundry/operations/applications/StartApplicationRequestTest.java
@@ -16,17 +16,23 @@
 
 package org.cloudfoundry.operations.applications;
 
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
-public final class StartApplicationRequestTest {
+import org.junit.jupiter.api.Test;
 
-    @Test(expected = IllegalStateException.class)
-    public void noName() {
-        StartApplicationRequest.builder().build();
+final class StartApplicationRequestTest {
+
+    @Test
+    void noName() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    StartApplicationRequest.builder().build();
+                });
     }
 
     @Test
-    public void valid() {
+    void valid() {
         StartApplicationRequest.builder().name("test-name").build();
     }
 }
diff --git a/cloudfoundry-operations/src/test/java/org/cloudfoundry/operations/applications/StopApplicationRequestTest.java b/cloudfoundry-operations/src/test/java/org/cloudfoundry/operations/applications/StopApplicationRequestTest.java
index 3382122b44f..326f66c309b 100644
--- a/cloudfoundry-operations/src/test/java/org/cloudfoundry/operations/applications/StopApplicationRequestTest.java
+++ b/cloudfoundry-operations/src/test/java/org/cloudfoundry/operations/applications/StopApplicationRequestTest.java
@@ -16,17 +16,23 @@
 
 package org.cloudfoundry.operations.applications;
 
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
-public final class StopApplicationRequestTest {
+import org.junit.jupiter.api.Test;
 
-    @Test(expected = IllegalStateException.class)
-    public void noName() {
-        StopApplicationRequest.builder().build();
+final class StopApplicationRequestTest {
+
+    @Test
+    void noName() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    StopApplicationRequest.builder().build();
+                });
     }
 
     @Test
-    public void valid() {
+    void valid() {
         StopApplicationRequest.builder().name("test-name").build();
     }
 }
diff --git a/cloudfoundry-operations/src/test/java/org/cloudfoundry/operations/applications/TerminateApplicationTaskRequestTest.java b/cloudfoundry-operations/src/test/java/org/cloudfoundry/operations/applications/TerminateApplicationTaskRequestTest.java
index 3aa4ccaf96f..bc6b14e2cf7 100644
--- a/cloudfoundry-operations/src/test/java/org/cloudfoundry/operations/applications/TerminateApplicationTaskRequestTest.java
+++ b/cloudfoundry-operations/src/test/java/org/cloudfoundry/operations/applications/TerminateApplicationTaskRequestTest.java
@@ -16,22 +16,34 @@
 
 package org.cloudfoundry.operations.applications;
 
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
-public final class TerminateApplicationTaskRequestTest {
+import org.junit.jupiter.api.Test;
 
-    @Test(expected = IllegalStateException.class)
-    public void noApplicationName() {
-        TerminateApplicationTaskRequest.builder().sequenceId(1).build();
+final class TerminateApplicationTaskRequestTest {
+
+    @Test
+    void noApplicationName() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    TerminateApplicationTaskRequest.builder().sequenceId(1).build();
+                });
     }
 
-    @Test(expected = IllegalStateException.class)
-    public void noSequenceId() {
-        TerminateApplicationTaskRequest.builder().applicationName("test-application-name").build();
+    @Test
+    void noSequenceId() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    TerminateApplicationTaskRequest.builder()
+                            .applicationName("test-application-name")
+                            .build();
+                });
     }
 
     @Test
-    public void valid() {
+    void valid() {
         TerminateApplicationTaskRequest.builder()
                 .applicationName("test-application-name")
                 .sequenceId(1)
diff --git a/cloudfoundry-operations/src/test/java/org/cloudfoundry/operations/applications/UnsetEnvironmentVariableApplicationRequestTest.java b/cloudfoundry-operations/src/test/java/org/cloudfoundry/operations/applications/UnsetEnvironmentVariableApplicationRequestTest.java
index 33f405ceb53..cb8ba57d349 100644
--- a/cloudfoundry-operations/src/test/java/org/cloudfoundry/operations/applications/UnsetEnvironmentVariableApplicationRequestTest.java
+++ b/cloudfoundry-operations/src/test/java/org/cloudfoundry/operations/applications/UnsetEnvironmentVariableApplicationRequestTest.java
@@ -16,24 +16,34 @@
 
 package org.cloudfoundry.operations.applications;
 
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
-public final class UnsetEnvironmentVariableApplicationRequestTest {
+import org.junit.jupiter.api.Test;
 
-    @Test(expected = IllegalStateException.class)
-    public void noName() {
-        UnsetEnvironmentVariableApplicationRequest.builder()
-                .variableName("test-variable-name")
-                .build();
+final class UnsetEnvironmentVariableApplicationRequestTest {
+
+    @Test
+    void noName() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    UnsetEnvironmentVariableApplicationRequest.builder()
+                            .variableName("test-variable-name")
+                            .build();
+                });
     }
 
-    @Test(expected = IllegalStateException.class)
-    public void noVariableName() {
-        UnsetEnvironmentVariableApplicationRequest.builder().name("test-name").build();
+    @Test
+    void noVariableName() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    UnsetEnvironmentVariableApplicationRequest.builder().name("test-name").build();
+                });
     }
 
     @Test
-    public void valid() {
+    void valid() {
         UnsetEnvironmentVariableApplicationRequest.builder()
                 .name("test-name")
                 .variableName("test-variable-name")
diff --git a/cloudfoundry-operations/src/test/java/org/cloudfoundry/operations/applications/WordListRandomWordsTest.java b/cloudfoundry-operations/src/test/java/org/cloudfoundry/operations/applications/WordListRandomWordsTest.java
index 64dba2c01c9..e0f05fa23ff 100644
--- a/cloudfoundry-operations/src/test/java/org/cloudfoundry/operations/applications/WordListRandomWordsTest.java
+++ b/cloudfoundry-operations/src/test/java/org/cloudfoundry/operations/applications/WordListRandomWordsTest.java
@@ -18,19 +18,19 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
-public final class WordListRandomWordsTest {
+final class WordListRandomWordsTest {
 
     private final WordListRandomWords randomWords = new WordListRandomWords();
 
     @Test
-    public void getAdjective() {
+    void getAdjective() {
         assertThat(this.randomWords.getAdjective()).isNotNull();
     }
 
     @Test
-    public void getNoun() {
+    void getNoun() {
         assertThat(this.randomWords.getNoun()).isNotNull();
     }
 }
diff --git a/cloudfoundry-operations/src/test/java/org/cloudfoundry/operations/buildpacks/CreateBuildpackRequestTest.java b/cloudfoundry-operations/src/test/java/org/cloudfoundry/operations/buildpacks/CreateBuildpackRequestTest.java
index 81fe1f2989f..e25aae7ec99 100644
--- a/cloudfoundry-operations/src/test/java/org/cloudfoundry/operations/buildpacks/CreateBuildpackRequestTest.java
+++ b/cloudfoundry-operations/src/test/java/org/cloudfoundry/operations/buildpacks/CreateBuildpackRequestTest.java
@@ -16,31 +16,48 @@
 
 package org.cloudfoundry.operations.buildpacks;
 
+import static org.junit.jupiter.api.Assertions.assertThrows;
+
 import java.nio.file.Paths;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
-public class CreateBuildpackRequestTest {
+class CreateBuildpackRequestTest {
 
-    @Test(expected = IllegalStateException.class)
-    public void noBuildpack() {
-        CreateBuildpackRequest.builder().name("test-name").position(0).build();
+    @Test
+    void noBuildpack() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    CreateBuildpackRequest.builder().name("test-name").position(0).build();
+                });
     }
 
-    @Test(expected = IllegalStateException.class)
-    public void noName() {
-        CreateBuildpackRequest.builder().buildpack(Paths.get("test-buildpack")).position(0).build();
+    @Test
+    void noName() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    CreateBuildpackRequest.builder()
+                            .buildpack(Paths.get("test-buildpack"))
+                            .position(0)
+                            .build();
+                });
     }
 
-    @Test(expected = IllegalStateException.class)
-    public void noPosition() {
-        CreateBuildpackRequest.builder()
-                .buildpack(Paths.get("test-buildpack"))
-                .name("test-name")
-                .build();
+    @Test
+    void noPosition() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    CreateBuildpackRequest.builder()
+                            .buildpack(Paths.get("test-buildpack"))
+                            .name("test-name")
+                            .build();
+                });
     }
 
     @Test
-    public void valid() {
+    void valid() {
         CreateBuildpackRequest.builder()
                 .buildpack(Paths.get("test-buildpack"))
                 .name("test-name")
diff --git a/cloudfoundry-operations/src/test/java/org/cloudfoundry/operations/buildpacks/DefaultBuildpacksTest.java b/cloudfoundry-operations/src/test/java/org/cloudfoundry/operations/buildpacks/DefaultBuildpacksTest.java
index 9ae3f05cadc..fdfca5272b9 100644
--- a/cloudfoundry-operations/src/test/java/org/cloudfoundry/operations/buildpacks/DefaultBuildpacksTest.java
+++ b/cloudfoundry-operations/src/test/java/org/cloudfoundry/operations/buildpacks/DefaultBuildpacksTest.java
@@ -40,18 +40,18 @@
 import org.cloudfoundry.client.v2.jobs.GetJobResponse;
 import org.cloudfoundry.client.v2.jobs.JobEntity;
 import org.cloudfoundry.operations.AbstractOperationsTest;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import reactor.core.publisher.Mono;
 import reactor.test.StepVerifier;
 import reactor.test.scheduler.VirtualTimeScheduler;
 
-public final class DefaultBuildpacksTest extends AbstractOperationsTest {
+final class DefaultBuildpacksTest extends AbstractOperationsTest {
 
     private final DefaultBuildpacks buildpacks =
             new DefaultBuildpacks(Mono.just(this.cloudFoundryClient));
 
     @Test
-    public void create() {
+    void create() {
         requestCreateBuildpack(this.cloudFoundryClient, "test-buildpack", 1, true);
         requestUploadBuildpack(
                 this.cloudFoundryClient,
@@ -73,7 +73,7 @@ public void create() {
     }
 
     @Test
-    public void delete() {
+    void delete() {
         requestListBuildpacks(this.cloudFoundryClient, "test-buildpack");
         requestDeleteBuildpack(this.cloudFoundryClient, "test-buildpack-id");
         requestJobSuccess(this.cloudFoundryClient, "test-job-id");
@@ -90,7 +90,7 @@ public void delete() {
     }
 
     @Test
-    public void list() {
+    void list() {
         requestBuildpacks(this.cloudFoundryClient);
 
         this.buildpacks
@@ -111,7 +111,7 @@ public void list() {
     }
 
     @Test
-    public void rename() {
+    void rename() {
         requestListBuildpacks(this.cloudFoundryClient, "test-buildpack");
         requestUpdateBuildpack(this.cloudFoundryClient, "test-buildpack-id", "test-buildpack-new");
 
@@ -127,7 +127,7 @@ public void rename() {
     }
 
     @Test
-    public void update() {
+    void update() {
         requestListBuildpacks(this.cloudFoundryClient, "test-buildpack");
         requestUpdateBuildpack(this.cloudFoundryClient, "test-buildpack-id", true, true, 5);
 
@@ -145,7 +145,7 @@ public void update() {
     }
 
     @Test
-    public void updateWithBits() {
+    void updateWithBits() {
         requestListBuildpacks(this.cloudFoundryClient, "test-buildpack");
         requestUpdateBuildpack(this.cloudFoundryClient, "test-buildpack-id", true, true, 5);
         requestUploadBuildpack(
diff --git a/cloudfoundry-operations/src/test/java/org/cloudfoundry/operations/buildpacks/DeleteBuildpackRequestTest.java b/cloudfoundry-operations/src/test/java/org/cloudfoundry/operations/buildpacks/DeleteBuildpackRequestTest.java
index af5c1626956..2bf4727d465 100644
--- a/cloudfoundry-operations/src/test/java/org/cloudfoundry/operations/buildpacks/DeleteBuildpackRequestTest.java
+++ b/cloudfoundry-operations/src/test/java/org/cloudfoundry/operations/buildpacks/DeleteBuildpackRequestTest.java
@@ -16,18 +16,24 @@
 
 package org.cloudfoundry.operations.buildpacks;
 
+import static org.junit.jupiter.api.Assertions.assertThrows;
+
 import java.time.Duration;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
-public class DeleteBuildpackRequestTest {
+class DeleteBuildpackRequestTest {
 
-    @Test(expected = IllegalStateException.class)
-    public void noName() {
-        DeleteBuildpackRequest.builder().build();
+    @Test
+    void noName() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    DeleteBuildpackRequest.builder().build();
+                });
     }
 
     @Test
-    public void valid() {
+    void valid() {
         DeleteBuildpackRequest.builder()
                 .name("test-buildpack-name")
                 .completionTimeout(Duration.ofSeconds(5))
diff --git a/cloudfoundry-operations/src/test/java/org/cloudfoundry/operations/buildpacks/RenameBuildpackRequestTest.java b/cloudfoundry-operations/src/test/java/org/cloudfoundry/operations/buildpacks/RenameBuildpackRequestTest.java
index 4d72154d69e..6845064c3a2 100644
--- a/cloudfoundry-operations/src/test/java/org/cloudfoundry/operations/buildpacks/RenameBuildpackRequestTest.java
+++ b/cloudfoundry-operations/src/test/java/org/cloudfoundry/operations/buildpacks/RenameBuildpackRequestTest.java
@@ -16,22 +16,32 @@
 
 package org.cloudfoundry.operations.buildpacks;
 
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
-public class RenameBuildpackRequestTest {
+import org.junit.jupiter.api.Test;
 
-    @Test(expected = IllegalStateException.class)
-    public void noName() {
-        RenameBuildpackRequest.builder().newName("test-buildpack-new-name").build();
+class RenameBuildpackRequestTest {
+
+    @Test
+    void noName() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    RenameBuildpackRequest.builder().newName("test-buildpack-new-name").build();
+                });
     }
 
-    @Test(expected = IllegalStateException.class)
-    public void noNewName() {
-        RenameBuildpackRequest.builder().name("test-buildpack-name").build();
+    @Test
+    void noNewName() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    RenameBuildpackRequest.builder().name("test-buildpack-name").build();
+                });
     }
 
     @Test
-    public void valid() {
+    void valid() {
         RenameBuildpackRequest.builder()
                 .name("test-buildpack-name")
                 .newName("test-buildpack-new-name")
diff --git a/cloudfoundry-operations/src/test/java/org/cloudfoundry/operations/buildpacks/UpdateBuildpackRequestTest.java b/cloudfoundry-operations/src/test/java/org/cloudfoundry/operations/buildpacks/UpdateBuildpackRequestTest.java
index 5b1d0a67097..005547fdbfc 100644
--- a/cloudfoundry-operations/src/test/java/org/cloudfoundry/operations/buildpacks/UpdateBuildpackRequestTest.java
+++ b/cloudfoundry-operations/src/test/java/org/cloudfoundry/operations/buildpacks/UpdateBuildpackRequestTest.java
@@ -16,18 +16,24 @@
 
 package org.cloudfoundry.operations.buildpacks;
 
+import static org.junit.jupiter.api.Assertions.assertThrows;
+
 import java.nio.file.Paths;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
-public class UpdateBuildpackRequestTest {
+class UpdateBuildpackRequestTest {
 
-    @Test(expected = IllegalStateException.class)
-    public void noName() {
-        UpdateBuildpackRequest.builder().build();
+    @Test
+    void noName() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    UpdateBuildpackRequest.builder().build();
+                });
     }
 
     @Test
-    public void valid() {
+    void valid() {
         UpdateBuildpackRequest.builder()
                 .buildpack(Paths.get("test-buildpack"))
                 .enable(false)
diff --git a/cloudfoundry-operations/src/test/java/org/cloudfoundry/operations/domains/CreateDomainRequestTest.java b/cloudfoundry-operations/src/test/java/org/cloudfoundry/operations/domains/CreateDomainRequestTest.java
index 189bca3bdf6..bb41e2a15da 100644
--- a/cloudfoundry-operations/src/test/java/org/cloudfoundry/operations/domains/CreateDomainRequestTest.java
+++ b/cloudfoundry-operations/src/test/java/org/cloudfoundry/operations/domains/CreateDomainRequestTest.java
@@ -16,22 +16,32 @@
 
 package org.cloudfoundry.operations.domains;
 
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
-public final class CreateDomainRequestTest {
+import org.junit.jupiter.api.Test;
 
-    @Test(expected = IllegalStateException.class)
-    public void noDomain() {
-        CreateDomainRequest.builder().organization("test-organization").build();
+final class CreateDomainRequestTest {
+
+    @Test
+    void noDomain() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    CreateDomainRequest.builder().organization("test-organization").build();
+                });
     }
 
-    @Test(expected = IllegalStateException.class)
-    public void noOrganization() {
-        CreateDomainRequest.builder().domain("test-domain").build();
+    @Test
+    void noOrganization() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    CreateDomainRequest.builder().domain("test-domain").build();
+                });
     }
 
     @Test
-    public void valid() {
+    void valid() {
         CreateDomainRequest.builder()
                 .domain("test-domain")
                 .organization("test-organization")
diff --git a/cloudfoundry-operations/src/test/java/org/cloudfoundry/operations/domains/CreateSharedDomainRequestTest.java b/cloudfoundry-operations/src/test/java/org/cloudfoundry/operations/domains/CreateSharedDomainRequestTest.java
index 1e06f7992c2..00b4816aea6 100644
--- a/cloudfoundry-operations/src/test/java/org/cloudfoundry/operations/domains/CreateSharedDomainRequestTest.java
+++ b/cloudfoundry-operations/src/test/java/org/cloudfoundry/operations/domains/CreateSharedDomainRequestTest.java
@@ -16,17 +16,23 @@
 
 package org.cloudfoundry.operations.domains;
 
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
-public final class CreateSharedDomainRequestTest {
+import org.junit.jupiter.api.Test;
 
-    @Test(expected = IllegalStateException.class)
-    public void noDomain() {
-        CreateSharedDomainRequest.builder().build();
+final class CreateSharedDomainRequestTest {
+
+    @Test
+    void noDomain() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    CreateSharedDomainRequest.builder().build();
+                });
     }
 
     @Test
-    public void valid() {
+    void valid() {
         CreateSharedDomainRequest.builder().domain("test-domain").build();
     }
 }
diff --git a/cloudfoundry-operations/src/test/java/org/cloudfoundry/operations/domains/DefaultDomainsTest.java b/cloudfoundry-operations/src/test/java/org/cloudfoundry/operations/domains/DefaultDomainsTest.java
index 3a98fac4958..15d97267ad1 100644
--- a/cloudfoundry-operations/src/test/java/org/cloudfoundry/operations/domains/DefaultDomainsTest.java
+++ b/cloudfoundry-operations/src/test/java/org/cloudfoundry/operations/domains/DefaultDomainsTest.java
@@ -42,17 +42,17 @@
 import org.cloudfoundry.routing.RoutingClient;
 import org.cloudfoundry.routing.v1.routergroups.ListRouterGroupsRequest;
 import org.cloudfoundry.routing.v1.routergroups.ListRouterGroupsResponse;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import reactor.core.publisher.Mono;
 import reactor.test.StepVerifier;
 
-public final class DefaultDomainsTest extends AbstractOperationsTest {
+final class DefaultDomainsTest extends AbstractOperationsTest {
 
     private final DefaultDomains domains =
             new DefaultDomains(Mono.just(this.cloudFoundryClient), Mono.just(this.routingClient));
 
     @Test
-    public void createDomain() {
+    void createDomain() {
         requestOrganizations(this.cloudFoundryClient, "test-organization");
         requestCreatePrivateDomain(this.cloudFoundryClient, "test-domain", "test-organization-id");
 
@@ -68,7 +68,7 @@ public void createDomain() {
     }
 
     @Test
-    public void createSharedDomain() {
+    void createSharedDomain() {
         requestCreateSharedDomain(this.cloudFoundryClient, "test-domain");
 
         this.domains
@@ -79,7 +79,7 @@ public void createSharedDomain() {
     }
 
     @Test
-    public void listDomains() {
+    void listDomains() {
         requestPrivateDomains(this.cloudFoundryClient);
         requestSharedDomains(this.cloudFoundryClient);
 
@@ -102,7 +102,7 @@ public void listDomains() {
     }
 
     @Test
-    public void listDomainsOnlyPrivate() {
+    void listDomainsOnlyPrivate() {
         requestPrivateDomains(this.cloudFoundryClient);
         requestSharedDomainsEmpty(this.cloudFoundryClient);
 
@@ -120,7 +120,7 @@ public void listDomainsOnlyPrivate() {
     }
 
     @Test
-    public void listDomainsOnlyShared() {
+    void listDomainsOnlyShared() {
         requestSharedDomains(this.cloudFoundryClient);
         requestPrivateDomainsEmpty(this.cloudFoundryClient);
 
@@ -138,7 +138,7 @@ public void listDomainsOnlyShared() {
     }
 
     @Test
-    public void listDomainsTcp() {
+    void listDomainsTcp() {
         requestPrivateDomains(this.cloudFoundryClient);
         requestSharedDomainsTcp(this.cloudFoundryClient);
 
@@ -162,7 +162,7 @@ public void listDomainsTcp() {
     }
 
     @Test
-    public void listRouterGroups() {
+    void listRouterGroups() {
         requestListRouterGroups(this.routingClient);
 
         this.domains
@@ -179,7 +179,7 @@ public void listRouterGroups() {
     }
 
     @Test
-    public void shareDomain() {
+    void shareDomain() {
         requestListPrivateDomains(this.cloudFoundryClient, "test-domain", "test-domain-id");
         requestOrganizations(this.cloudFoundryClient, "test-organization");
         requestAssociateOrganizationPrivateDomain(
@@ -197,7 +197,7 @@ public void shareDomain() {
     }
 
     @Test
-    public void shareDomainSharedDomain() {
+    void shareDomainSharedDomain() {
         requestListPrivateDomainsEmpty(this.cloudFoundryClient, "test-domain");
         requestOrganizations(this.cloudFoundryClient, "test-organization");
 
@@ -217,7 +217,7 @@ public void shareDomainSharedDomain() {
     }
 
     @Test
-    public void unshareDomain() {
+    void unshareDomain() {
         requestListPrivateDomains(this.cloudFoundryClient, "test-domain", "test-domain-id");
         requestOrganizations(this.cloudFoundryClient, "test-organization");
         requestRemoveOrganizationPrivateDomain(
diff --git a/cloudfoundry-operations/src/test/java/org/cloudfoundry/operations/domains/ShareDomainRequestTest.java b/cloudfoundry-operations/src/test/java/org/cloudfoundry/operations/domains/ShareDomainRequestTest.java
index fd2dee236af..ca27f273dd7 100644
--- a/cloudfoundry-operations/src/test/java/org/cloudfoundry/operations/domains/ShareDomainRequestTest.java
+++ b/cloudfoundry-operations/src/test/java/org/cloudfoundry/operations/domains/ShareDomainRequestTest.java
@@ -16,22 +16,32 @@
 
 package org.cloudfoundry.operations.domains;
 
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
-public final class ShareDomainRequestTest {
+import org.junit.jupiter.api.Test;
 
-    @Test(expected = IllegalStateException.class)
-    public void noDomain() {
-        ShareDomainRequest.builder().organization("test-organization").build();
+final class ShareDomainRequestTest {
+
+    @Test
+    void noDomain() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    ShareDomainRequest.builder().organization("test-organization").build();
+                });
     }
 
-    @Test(expected = IllegalStateException.class)
-    public void noOrganization() {
-        ShareDomainRequest.builder().domain("test-domain").build();
+    @Test
+    void noOrganization() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    ShareDomainRequest.builder().domain("test-domain").build();
+                });
     }
 
     @Test
-    public void valid() {
+    void valid() {
         ShareDomainRequest.builder()
                 .domain("test-domain")
                 .organization("test-organization")
diff --git a/cloudfoundry-operations/src/test/java/org/cloudfoundry/operations/domains/UnshareDomainRequestTest.java b/cloudfoundry-operations/src/test/java/org/cloudfoundry/operations/domains/UnshareDomainRequestTest.java
index b1282c6bc88..ebf6d220994 100644
--- a/cloudfoundry-operations/src/test/java/org/cloudfoundry/operations/domains/UnshareDomainRequestTest.java
+++ b/cloudfoundry-operations/src/test/java/org/cloudfoundry/operations/domains/UnshareDomainRequestTest.java
@@ -16,22 +16,32 @@
 
 package org.cloudfoundry.operations.domains;
 
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
-public final class UnshareDomainRequestTest {
+import org.junit.jupiter.api.Test;
 
-    @Test(expected = IllegalStateException.class)
-    public void noDomain() {
-        UnshareDomainRequest.builder().organization("test-organization").build();
+final class UnshareDomainRequestTest {
+
+    @Test
+    void noDomain() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    UnshareDomainRequest.builder().organization("test-organization").build();
+                });
     }
 
-    @Test(expected = IllegalStateException.class)
-    public void noOrganization() {
-        UnshareDomainRequest.builder().domain("test-domain").build();
+    @Test
+    void noOrganization() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    UnshareDomainRequest.builder().domain("test-domain").build();
+                });
     }
 
     @Test
-    public void valid() {
+    void valid() {
         UnshareDomainRequest.builder()
                 .domain("test-domain")
                 .organization("test-organization")
diff --git a/cloudfoundry-operations/src/test/java/org/cloudfoundry/operations/networkpolicies/AddNetworkPolicyRequestTest.java b/cloudfoundry-operations/src/test/java/org/cloudfoundry/operations/networkpolicies/AddNetworkPolicyRequestTest.java
index 64ee6e68a56..6b2f0d3936a 100644
--- a/cloudfoundry-operations/src/test/java/org/cloudfoundry/operations/networkpolicies/AddNetworkPolicyRequestTest.java
+++ b/cloudfoundry-operations/src/test/java/org/cloudfoundry/operations/networkpolicies/AddNetworkPolicyRequestTest.java
@@ -16,22 +16,32 @@
 
 package org.cloudfoundry.operations.networkpolicies;
 
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
-public final class AddNetworkPolicyRequestTest {
+import org.junit.jupiter.api.Test;
 
-    @Test(expected = IllegalStateException.class)
-    public void noDestination() {
-        AddNetworkPolicyRequest.builder().source("test-source").build();
+final class AddNetworkPolicyRequestTest {
+
+    @Test
+    void noDestination() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    AddNetworkPolicyRequest.builder().source("test-source").build();
+                });
     }
 
-    @Test(expected = IllegalStateException.class)
-    public void noSource() {
-        AddNetworkPolicyRequest.builder().destination("test-destination").build();
+    @Test
+    void noSource() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    AddNetworkPolicyRequest.builder().destination("test-destination").build();
+                });
     }
 
     @Test
-    public void valid() {
+    void valid() {
         AddNetworkPolicyRequest.builder()
                 .destination("test-destination")
                 .source("test-source")
diff --git a/cloudfoundry-operations/src/test/java/org/cloudfoundry/operations/networkpolicies/ListNetworkPoliciesRequestTest.java b/cloudfoundry-operations/src/test/java/org/cloudfoundry/operations/networkpolicies/ListNetworkPoliciesRequestTest.java
index d71dce03102..0e8f82caf2e 100644
--- a/cloudfoundry-operations/src/test/java/org/cloudfoundry/operations/networkpolicies/ListNetworkPoliciesRequestTest.java
+++ b/cloudfoundry-operations/src/test/java/org/cloudfoundry/operations/networkpolicies/ListNetworkPoliciesRequestTest.java
@@ -16,12 +16,12 @@
 
 package org.cloudfoundry.operations.networkpolicies;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
-public final class ListNetworkPoliciesRequestTest {
+final class ListNetworkPoliciesRequestTest {
 
     @Test
-    public void valid() {
+    void valid() {
         ListNetworkPoliciesRequest.builder().build();
     }
 }
diff --git a/cloudfoundry-operations/src/test/java/org/cloudfoundry/operations/networkpolicies/RemoveNetworkPolicyRequestTest.java b/cloudfoundry-operations/src/test/java/org/cloudfoundry/operations/networkpolicies/RemoveNetworkPolicyRequestTest.java
index 6ce3aa52a36..127826f0af0 100644
--- a/cloudfoundry-operations/src/test/java/org/cloudfoundry/operations/networkpolicies/RemoveNetworkPolicyRequestTest.java
+++ b/cloudfoundry-operations/src/test/java/org/cloudfoundry/operations/networkpolicies/RemoveNetworkPolicyRequestTest.java
@@ -16,48 +16,66 @@
 
 package org.cloudfoundry.operations.networkpolicies;
 
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
-public final class RemoveNetworkPolicyRequestTest {
+import org.junit.jupiter.api.Test;
 
-    @Test(expected = IllegalStateException.class)
-    public void noDestination() {
-        RemoveNetworkPolicyRequest.builder()
-                .protocol("test-protocol")
-                .startPort(1234)
-                .source("test-source")
-                .build();
+final class RemoveNetworkPolicyRequestTest {
+
+    @Test
+    void noDestination() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    RemoveNetworkPolicyRequest.builder()
+                            .protocol("test-protocol")
+                            .startPort(1234)
+                            .source("test-source")
+                            .build();
+                });
     }
 
-    @Test(expected = IllegalStateException.class)
-    public void noPort() {
-        RemoveNetworkPolicyRequest.builder()
-                .destination("test-destination")
-                .protocol("test-protocol")
-                .source("test-source")
-                .build();
+    @Test
+    void noPort() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    RemoveNetworkPolicyRequest.builder()
+                            .destination("test-destination")
+                            .protocol("test-protocol")
+                            .source("test-source")
+                            .build();
+                });
     }
 
-    @Test(expected = IllegalStateException.class)
-    public void noProtocol() {
-        RemoveNetworkPolicyRequest.builder()
-                .destination("test-destination")
-                .startPort(1234)
-                .source("test-source")
-                .build();
+    @Test
+    void noProtocol() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    RemoveNetworkPolicyRequest.builder()
+                            .destination("test-destination")
+                            .startPort(1234)
+                            .source("test-source")
+                            .build();
+                });
     }
 
-    @Test(expected = IllegalStateException.class)
-    public void noSource() {
-        RemoveNetworkPolicyRequest.builder()
-                .destination("test-destination")
-                .protocol("test-protocol")
-                .startPort(1234)
-                .build();
+    @Test
+    void noSource() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    RemoveNetworkPolicyRequest.builder()
+                            .destination("test-destination")
+                            .protocol("test-protocol")
+                            .startPort(1234)
+                            .build();
+                });
     }
 
     @Test
-    public void valid() {
+    void valid() {
         RemoveNetworkPolicyRequest.builder()
                 .destination("test-destination")
                 .protocol("test-protocol")
diff --git a/cloudfoundry-operations/src/test/java/org/cloudfoundry/operations/organizationadmin/CreateQuotaRequestTest.java b/cloudfoundry-operations/src/test/java/org/cloudfoundry/operations/organizationadmin/CreateQuotaRequestTest.java
index 4e1a77cd347..cbfbcb5dd03 100644
--- a/cloudfoundry-operations/src/test/java/org/cloudfoundry/operations/organizationadmin/CreateQuotaRequestTest.java
+++ b/cloudfoundry-operations/src/test/java/org/cloudfoundry/operations/organizationadmin/CreateQuotaRequestTest.java
@@ -16,17 +16,23 @@
 
 package org.cloudfoundry.operations.organizationadmin;
 
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
-public final class CreateQuotaRequestTest {
+import org.junit.jupiter.api.Test;
 
-    @Test(expected = IllegalStateException.class)
-    public void noName() {
-        CreateQuotaRequest.builder().build();
+final class CreateQuotaRequestTest {
+
+    @Test
+    void noName() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    CreateQuotaRequest.builder().build();
+                });
     }
 
     @Test
-    public void valid() {
+    void valid() {
         CreateQuotaRequest.builder().name("test-name").build();
     }
 }
diff --git a/cloudfoundry-operations/src/test/java/org/cloudfoundry/operations/organizationadmin/DefaultOrganizationAdminTest.java b/cloudfoundry-operations/src/test/java/org/cloudfoundry/operations/organizationadmin/DefaultOrganizationAdminTest.java
index 998a426d96a..35bc01d1b6c 100644
--- a/cloudfoundry-operations/src/test/java/org/cloudfoundry/operations/organizationadmin/DefaultOrganizationAdminTest.java
+++ b/cloudfoundry-operations/src/test/java/org/cloudfoundry/operations/organizationadmin/DefaultOrganizationAdminTest.java
@@ -38,17 +38,17 @@
 import org.cloudfoundry.client.v2.organizations.UpdateOrganizationRequest;
 import org.cloudfoundry.client.v2.organizations.UpdateOrganizationResponse;
 import org.cloudfoundry.operations.AbstractOperationsTest;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import reactor.core.publisher.Mono;
 import reactor.test.StepVerifier;
 
-public final class DefaultOrganizationAdminTest extends AbstractOperationsTest {
+final class DefaultOrganizationAdminTest extends AbstractOperationsTest {
 
     private final DefaultOrganizationAdmin organizationAdmin =
             new DefaultOrganizationAdmin(Mono.just(this.cloudFoundryClient));
 
     @Test
-    public void createQuota() {
+    void createQuota() {
         requestCreateOrganizationQuota(
                 this.cloudFoundryClient, 3, 4, "test-quota", true, 1, 2, "test-quota-id");
 
@@ -80,7 +80,7 @@ public void createQuota() {
     }
 
     @Test
-    public void createQuotaError() {
+    void createQuotaError() {
         requestCreateOrganizationQuotaError(this.cloudFoundryClient, "test-quota-error");
 
         this.organizationAdmin
@@ -97,7 +97,7 @@ public void createQuotaError() {
     }
 
     @Test
-    public void getQuota() {
+    void getQuota() {
         requestListOrganizationQuotas(this.cloudFoundryClient, "test-quota");
 
         this.organizationAdmin
@@ -120,7 +120,7 @@ public void getQuota() {
     }
 
     @Test
-    public void getQuotaNotFound() {
+    void getQuotaNotFound() {
         requestListOrganizationQuotasEmpty(this.cloudFoundryClient, "test-quota-not-found");
 
         this.organizationAdmin
@@ -135,7 +135,7 @@ public void getQuotaNotFound() {
     }
 
     @Test
-    public void listQuotas() {
+    void listQuotas() {
         requestListOrganizationQuotas(this.cloudFoundryClient);
 
         this.organizationAdmin
@@ -158,7 +158,7 @@ public void listQuotas() {
     }
 
     @Test
-    public void setQuota() {
+    void setQuota() {
         requestListOrganizationQuotas(this.cloudFoundryClient, "test-quota");
         requestListOrganizations(this.cloudFoundryClient, "test-organization");
         requestUpdateOrganization(this.cloudFoundryClient, "test-organization-id", "test-quota-id");
@@ -175,7 +175,7 @@ public void setQuota() {
     }
 
     @Test
-    public void setQuotaOrganizationNotFound() {
+    void setQuotaOrganizationNotFound() {
         requestListOrganizationQuotas(this.cloudFoundryClient, "test-quota");
         requestListOrganizationEmpty(this.cloudFoundryClient, "test-organization-not-found");
 
@@ -197,7 +197,7 @@ public void setQuotaOrganizationNotFound() {
     }
 
     @Test
-    public void setQuotaQuotaNotFound() {
+    void setQuotaQuotaNotFound() {
         requestListOrganizationQuotasEmpty(this.cloudFoundryClient, "test-quota-not-found");
         requestListOrganizations(this.cloudFoundryClient, "test-organization");
 
@@ -217,7 +217,7 @@ public void setQuotaQuotaNotFound() {
     }
 
     @Test
-    public void updateQuota() {
+    void updateQuota() {
         requestListOrganizationQuotas(this.cloudFoundryClient, "test-quota");
         requestUpdateOrganizationQuota(
                 this.cloudFoundryClient, "test-quota-id", 3, 4, "new-test-quota", true, 1, 2);
@@ -251,7 +251,7 @@ public void updateQuota() {
     }
 
     @Test
-    public void updateQuotaNotFound() {
+    void updateQuotaNotFound() {
         requestListOrganizationQuotasEmpty(this.cloudFoundryClient, "test-quota-not-found");
 
         this.organizationAdmin
diff --git a/cloudfoundry-operations/src/test/java/org/cloudfoundry/operations/organizationadmin/DeleteQuotaRequestTest.java b/cloudfoundry-operations/src/test/java/org/cloudfoundry/operations/organizationadmin/DeleteQuotaRequestTest.java
index 2fcd2d84b52..7dc0c4c158a 100644
--- a/cloudfoundry-operations/src/test/java/org/cloudfoundry/operations/organizationadmin/DeleteQuotaRequestTest.java
+++ b/cloudfoundry-operations/src/test/java/org/cloudfoundry/operations/organizationadmin/DeleteQuotaRequestTest.java
@@ -16,17 +16,23 @@
 
 package org.cloudfoundry.operations.organizationadmin;
 
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
-public final class DeleteQuotaRequestTest {
+import org.junit.jupiter.api.Test;
 
-    @Test(expected = IllegalStateException.class)
-    public void noName() {
-        DeleteQuotaRequest.builder().build();
+final class DeleteQuotaRequestTest {
+
+    @Test
+    void noName() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    DeleteQuotaRequest.builder().build();
+                });
     }
 
     @Test
-    public void valid() {
+    void valid() {
         DeleteQuotaRequest.builder().name("test-quota").build();
     }
 }
diff --git a/cloudfoundry-operations/src/test/java/org/cloudfoundry/operations/organizationadmin/GetQuotaRequestTest.java b/cloudfoundry-operations/src/test/java/org/cloudfoundry/operations/organizationadmin/GetQuotaRequestTest.java
index 9f7dbe8ca6a..c378096ba77 100644
--- a/cloudfoundry-operations/src/test/java/org/cloudfoundry/operations/organizationadmin/GetQuotaRequestTest.java
+++ b/cloudfoundry-operations/src/test/java/org/cloudfoundry/operations/organizationadmin/GetQuotaRequestTest.java
@@ -16,17 +16,23 @@
 
 package org.cloudfoundry.operations.organizationadmin;
 
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
-public final class GetQuotaRequestTest {
+import org.junit.jupiter.api.Test;
 
-    @Test(expected = IllegalStateException.class)
-    public void noName() {
-        GetQuotaRequest.builder().build();
+final class GetQuotaRequestTest {
+
+    @Test
+    void noName() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    GetQuotaRequest.builder().build();
+                });
     }
 
     @Test
-    public void valid() {
+    void valid() {
         GetQuotaRequest.builder().name("test-name").build();
     }
 }
diff --git a/cloudfoundry-operations/src/test/java/org/cloudfoundry/operations/organizationadmin/SetQuotaRequestTest.java b/cloudfoundry-operations/src/test/java/org/cloudfoundry/operations/organizationadmin/SetQuotaRequestTest.java
index 9920d9ab175..edfe700bd58 100644
--- a/cloudfoundry-operations/src/test/java/org/cloudfoundry/operations/organizationadmin/SetQuotaRequestTest.java
+++ b/cloudfoundry-operations/src/test/java/org/cloudfoundry/operations/organizationadmin/SetQuotaRequestTest.java
@@ -16,22 +16,32 @@
 
 package org.cloudfoundry.operations.organizationadmin;
 
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
-public final class SetQuotaRequestTest {
+import org.junit.jupiter.api.Test;
 
-    @Test(expected = IllegalStateException.class)
-    public void noOrganizationName() {
-        SetQuotaRequest.builder().quotaName("test-quota").build();
+final class SetQuotaRequestTest {
+
+    @Test
+    void noOrganizationName() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    SetQuotaRequest.builder().quotaName("test-quota").build();
+                });
     }
 
-    @Test(expected = IllegalStateException.class)
-    public void noQuotaName() {
-        SetQuotaRequest.builder().organizationName("test-organization").build();
+    @Test
+    void noQuotaName() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    SetQuotaRequest.builder().organizationName("test-organization").build();
+                });
     }
 
     @Test
-    public void valid() {
+    void valid() {
         SetQuotaRequest.builder()
                 .organizationName("test-organization")
                 .quotaName("test-quota")
diff --git a/cloudfoundry-operations/src/test/java/org/cloudfoundry/operations/organizationadmin/UpdateQuotaRequestTest.java b/cloudfoundry-operations/src/test/java/org/cloudfoundry/operations/organizationadmin/UpdateQuotaRequestTest.java
index 04967984e8f..2b97c8778dd 100644
--- a/cloudfoundry-operations/src/test/java/org/cloudfoundry/operations/organizationadmin/UpdateQuotaRequestTest.java
+++ b/cloudfoundry-operations/src/test/java/org/cloudfoundry/operations/organizationadmin/UpdateQuotaRequestTest.java
@@ -16,17 +16,23 @@
 
 package org.cloudfoundry.operations.organizationadmin;
 
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
-public final class UpdateQuotaRequestTest {
+import org.junit.jupiter.api.Test;
 
-    @Test(expected = IllegalStateException.class)
-    public void noName() {
-        UpdateQuotaRequest.builder().build();
+final class UpdateQuotaRequestTest {
+
+    @Test
+    void noName() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    UpdateQuotaRequest.builder().build();
+                });
     }
 
     @Test
-    public void valid() {
+    void valid() {
         UpdateQuotaRequest.builder().name("test-name").build();
     }
 }
diff --git a/cloudfoundry-operations/src/test/java/org/cloudfoundry/operations/organizations/CreateOrganizationRequestTest.java b/cloudfoundry-operations/src/test/java/org/cloudfoundry/operations/organizations/CreateOrganizationRequestTest.java
index eff807b4bfb..0bf6e1febec 100644
--- a/cloudfoundry-operations/src/test/java/org/cloudfoundry/operations/organizations/CreateOrganizationRequestTest.java
+++ b/cloudfoundry-operations/src/test/java/org/cloudfoundry/operations/organizations/CreateOrganizationRequestTest.java
@@ -16,17 +16,23 @@
 
 package org.cloudfoundry.operations.organizations;
 
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
-public final class CreateOrganizationRequestTest {
+import org.junit.jupiter.api.Test;
 
-    @Test(expected = IllegalStateException.class)
-    public void noOrganizationName() {
-        CreateOrganizationRequest.builder().build();
+final class CreateOrganizationRequestTest {
+
+    @Test
+    void noOrganizationName() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    CreateOrganizationRequest.builder().build();
+                });
     }
 
     @Test
-    public void valid() {
+    void valid() {
         CreateOrganizationRequest.builder().organizationName("test-organization").build();
     }
 }
diff --git a/cloudfoundry-operations/src/test/java/org/cloudfoundry/operations/organizations/DefaultOrganizationsTest.java b/cloudfoundry-operations/src/test/java/org/cloudfoundry/operations/organizations/DefaultOrganizationsTest.java
index dccd1251d59..3f967bf0884 100644
--- a/cloudfoundry-operations/src/test/java/org/cloudfoundry/operations/organizations/DefaultOrganizationsTest.java
+++ b/cloudfoundry-operations/src/test/java/org/cloudfoundry/operations/organizations/DefaultOrganizationsTest.java
@@ -67,18 +67,18 @@
 import org.cloudfoundry.client.v2.spaces.SpaceResource;
 import org.cloudfoundry.operations.AbstractOperationsTest;
 import org.cloudfoundry.operations.spaceadmin.SpaceQuota;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import reactor.core.publisher.Mono;
 import reactor.test.StepVerifier;
 import reactor.test.scheduler.VirtualTimeScheduler;
 
-public final class DefaultOrganizationsTest extends AbstractOperationsTest {
+final class DefaultOrganizationsTest extends AbstractOperationsTest {
 
     private final DefaultOrganizations organizations =
             new DefaultOrganizations(Mono.just(this.cloudFoundryClient), Mono.just(TEST_USERNAME));
 
     @Test
-    public void create() {
+    void create() {
         requestCreateOrganization(this.cloudFoundryClient, TEST_ORGANIZATION_NAME, null);
         requestGetFeatureFlagEnabled(this.cloudFoundryClient, "set_roles_by_username");
         requestAssociateOrganizationManagerByUsername(this.cloudFoundryClient, TEST_USERNAME);
@@ -95,7 +95,7 @@ public void create() {
     }
 
     @Test
-    public void createSetRolesByUsernameDisabled() {
+    void createSetRolesByUsernameDisabled() {
         requestCreateOrganization(this.cloudFoundryClient, TEST_ORGANIZATION_NAME, null);
         requestGetFeatureFlagDisabled(this.cloudFoundryClient, "set_roles_by_username");
 
@@ -110,7 +110,7 @@ public void createSetRolesByUsernameDisabled() {
     }
 
     @Test
-    public void createWithQuota() {
+    void createWithQuota() {
         requestOrganizationQuotaDefinitions(this.cloudFoundryClient, "test-quota-definition-name");
         requestCreateOrganization(
                 this.cloudFoundryClient,
@@ -132,7 +132,7 @@ public void createWithQuota() {
     }
 
     @Test
-    public void delete() {
+    void delete() {
         requestOrganizations(this.cloudFoundryClient, TEST_ORGANIZATION_NAME);
         requestDeleteOrganization(this.cloudFoundryClient, TEST_ORGANIZATION_ID);
         requestJobSuccess(this.cloudFoundryClient, "test-id");
@@ -149,7 +149,7 @@ public void delete() {
     }
 
     @Test
-    public void deleteFailure() {
+    void deleteFailure() {
         requestOrganizations(this.cloudFoundryClient, TEST_ORGANIZATION_NAME);
         requestDeleteOrganization(this.cloudFoundryClient, TEST_ORGANIZATION_ID);
         requestJobFailure(this.cloudFoundryClient, "test-id");
@@ -172,7 +172,7 @@ public void deleteFailure() {
     }
 
     @Test
-    public void info() {
+    void info() {
         requestOrganizations(this.cloudFoundryClient, TEST_ORGANIZATION_NAME);
         requestPrivateDomains(this.cloudFoundryClient, TEST_ORGANIZATION_ID);
         requestSharedDomains(this.cloudFoundryClient);
@@ -201,7 +201,7 @@ public void info() {
     }
 
     @Test
-    public void list() {
+    void list() {
         requestOrganizations(this.cloudFoundryClient);
 
         this.organizations
@@ -213,7 +213,7 @@ public void list() {
     }
 
     @Test
-    public void rename() {
+    void rename() {
         requestOrganizations(this.cloudFoundryClient, TEST_ORGANIZATION_NAME);
         requestUpdateOrganization(
                 this.cloudFoundryClient, TEST_ORGANIZATION_ID, "test-new-organization-name");
diff --git a/cloudfoundry-operations/src/test/java/org/cloudfoundry/operations/organizations/DeleteOrganizationRequestTest.java b/cloudfoundry-operations/src/test/java/org/cloudfoundry/operations/organizations/DeleteOrganizationRequestTest.java
index e09020d2251..ca34ec83f56 100644
--- a/cloudfoundry-operations/src/test/java/org/cloudfoundry/operations/organizations/DeleteOrganizationRequestTest.java
+++ b/cloudfoundry-operations/src/test/java/org/cloudfoundry/operations/organizations/DeleteOrganizationRequestTest.java
@@ -16,17 +16,23 @@
 
 package org.cloudfoundry.operations.organizations;
 
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
-public final class DeleteOrganizationRequestTest {
+import org.junit.jupiter.api.Test;
 
-    @Test(expected = IllegalStateException.class)
-    public void noName() {
-        DeleteOrganizationRequest.builder().build();
+final class DeleteOrganizationRequestTest {
+
+    @Test
+    void noName() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    DeleteOrganizationRequest.builder().build();
+                });
     }
 
     @Test
-    public void valid() {
+    void valid() {
         DeleteOrganizationRequest.builder().name("test-organization-name").build();
     }
 }
diff --git a/cloudfoundry-operations/src/test/java/org/cloudfoundry/operations/organizations/OrganizationSummaryDetailRequestTest.java b/cloudfoundry-operations/src/test/java/org/cloudfoundry/operations/organizations/OrganizationSummaryDetailRequestTest.java
index 043d4abaaea..98016108f55 100644
--- a/cloudfoundry-operations/src/test/java/org/cloudfoundry/operations/organizations/OrganizationSummaryDetailRequestTest.java
+++ b/cloudfoundry-operations/src/test/java/org/cloudfoundry/operations/organizations/OrganizationSummaryDetailRequestTest.java
@@ -16,17 +16,23 @@
 
 package org.cloudfoundry.operations.organizations;
 
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
-public final class OrganizationSummaryDetailRequestTest {
+import org.junit.jupiter.api.Test;
 
-    @Test(expected = IllegalStateException.class)
-    public void noName() {
-        OrganizationInfoRequest.builder().build();
+final class OrganizationSummaryDetailRequestTest {
+
+    @Test
+    void noName() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    OrganizationInfoRequest.builder().build();
+                });
     }
 
     @Test
-    public void valid() {
+    void valid() {
         OrganizationInfoRequest.builder().name("test-organization-name").build();
     }
 }
diff --git a/cloudfoundry-operations/src/test/java/org/cloudfoundry/operations/organizations/RenameOrganizationRequestTest.java b/cloudfoundry-operations/src/test/java/org/cloudfoundry/operations/organizations/RenameOrganizationRequestTest.java
index 0f4294d36bc..9b324f2bc3b 100644
--- a/cloudfoundry-operations/src/test/java/org/cloudfoundry/operations/organizations/RenameOrganizationRequestTest.java
+++ b/cloudfoundry-operations/src/test/java/org/cloudfoundry/operations/organizations/RenameOrganizationRequestTest.java
@@ -16,22 +16,32 @@
 
 package org.cloudfoundry.operations.organizations;
 
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
-public final class RenameOrganizationRequestTest {
+import org.junit.jupiter.api.Test;
 
-    @Test(expected = IllegalStateException.class)
-    public void noName() {
-        RenameOrganizationRequest.builder().newName("new-name").build();
+final class RenameOrganizationRequestTest {
+
+    @Test
+    void noName() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    RenameOrganizationRequest.builder().newName("new-name").build();
+                });
     }
 
     @Test
-    public void valid() {
+    void valid() {
         RenameOrganizationRequest.builder().name("test-name").newName("test-new-name").build();
     }
 
-    @Test(expected = IllegalStateException.class)
-    public void validNoNewName() {
-        RenameOrganizationRequest.builder().name("name").build();
+    @Test
+    void validNoNewName() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    RenameOrganizationRequest.builder().name("name").build();
+                });
     }
 }
diff --git a/cloudfoundry-operations/src/test/java/org/cloudfoundry/operations/routes/CheckRouteRequestTest.java b/cloudfoundry-operations/src/test/java/org/cloudfoundry/operations/routes/CheckRouteRequestTest.java
index 8e94dfa1ba4..7d5b9662409 100644
--- a/cloudfoundry-operations/src/test/java/org/cloudfoundry/operations/routes/CheckRouteRequestTest.java
+++ b/cloudfoundry-operations/src/test/java/org/cloudfoundry/operations/routes/CheckRouteRequestTest.java
@@ -16,17 +16,23 @@
 
 package org.cloudfoundry.operations.routes;
 
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
-public final class CheckRouteRequestTest {
+import org.junit.jupiter.api.Test;
 
-    @Test(expected = IllegalStateException.class)
-    public void noDomain() {
-        CheckRouteRequest.builder().build();
+final class CheckRouteRequestTest {
+
+    @Test
+    void noDomain() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    CheckRouteRequest.builder().build();
+                });
     }
 
     @Test
-    public void valid() {
+    void valid() {
         CheckRouteRequest.builder().domain("test-domain").build();
     }
 }
diff --git a/cloudfoundry-operations/src/test/java/org/cloudfoundry/operations/routes/CreateRouteRequestTest.java b/cloudfoundry-operations/src/test/java/org/cloudfoundry/operations/routes/CreateRouteRequestTest.java
index 928350ef6da..eb8ae2cf699 100644
--- a/cloudfoundry-operations/src/test/java/org/cloudfoundry/operations/routes/CreateRouteRequestTest.java
+++ b/cloudfoundry-operations/src/test/java/org/cloudfoundry/operations/routes/CreateRouteRequestTest.java
@@ -16,42 +16,63 @@
 
 package org.cloudfoundry.operations.routes;
 
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
-public final class CreateRouteRequestTest {
+import org.junit.jupiter.api.Test;
 
-    @Test(expected = IllegalStateException.class)
-    public void noDomain() {
-        CreateRouteRequest.builder().space("test-space").build();
+final class CreateRouteRequestTest {
+
+    @Test
+    void noDomain() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    CreateRouteRequest.builder().space("test-space").build();
+                });
     }
 
-    @Test(expected = IllegalStateException.class)
-    public void noSpace() {
-        CreateRouteRequest.builder().domain("test-domain").host("test-hostname").build();
+    @Test
+    void noSpace() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    CreateRouteRequest.builder()
+                            .domain("test-domain")
+                            .host("test-hostname")
+                            .build();
+                });
     }
 
-    @Test(expected = IllegalStateException.class)
-    public void portConflict() {
-        CreateRouteRequest.builder()
-                .domain("test-domain")
-                .port(123)
-                .randomPort(true)
-                .space("test-space")
-                .build();
+    @Test
+    void portConflict() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    CreateRouteRequest.builder()
+                            .domain("test-domain")
+                            .port(123)
+                            .randomPort(true)
+                            .space("test-space")
+                            .build();
+                });
     }
 
-    @Test(expected = IllegalStateException.class)
-    public void setupConflict() {
-        CreateRouteRequest.builder()
-                .domain("test-domain")
-                .host("test-hostname")
-                .port(123)
-                .space("test-space")
-                .build();
+    @Test
+    void setupConflict() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    CreateRouteRequest.builder()
+                            .domain("test-domain")
+                            .host("test-hostname")
+                            .port(123)
+                            .space("test-space")
+                            .build();
+                });
     }
 
     @Test
-    public void valid() {
+    void valid() {
         CreateRouteRequest.builder().domain("test-domain").space("test-space").build();
     }
 }
diff --git a/cloudfoundry-operations/src/test/java/org/cloudfoundry/operations/routes/DefaultRoutesTest.java b/cloudfoundry-operations/src/test/java/org/cloudfoundry/operations/routes/DefaultRoutesTest.java
index 3ebc769cb59..50fbdf5260c 100644
--- a/cloudfoundry-operations/src/test/java/org/cloudfoundry/operations/routes/DefaultRoutesTest.java
+++ b/cloudfoundry-operations/src/test/java/org/cloudfoundry/operations/routes/DefaultRoutesTest.java
@@ -65,12 +65,12 @@
 import org.cloudfoundry.client.v2.spaces.SpaceEntity;
 import org.cloudfoundry.client.v2.spaces.SpaceResource;
 import org.cloudfoundry.operations.AbstractOperationsTest;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import reactor.core.publisher.Mono;
 import reactor.test.StepVerifier;
 import reactor.test.scheduler.VirtualTimeScheduler;
 
-public final class DefaultRoutesTest extends AbstractOperationsTest {
+final class DefaultRoutesTest extends AbstractOperationsTest {
 
     private final DefaultRoutes routes =
             new DefaultRoutes(
@@ -79,7 +79,7 @@ public final class DefaultRoutesTest extends AbstractOperationsTest {
                     Mono.just(TEST_SPACE_ID));
 
     @Test
-    public void checkRouteInvalidDomain() {
+    void checkRouteInvalidDomain() {
         requestPrivateDomainsEmpty(this.cloudFoundryClient, TEST_ORGANIZATION_ID, "test-domain");
         requestSharedDomainsEmpty(this.cloudFoundryClient, "test-domain");
 
@@ -92,7 +92,7 @@ public void checkRouteInvalidDomain() {
     }
 
     @Test
-    public void checkRouteInvalidHost() {
+    void checkRouteInvalidHost() {
         requestPrivateDomains(this.cloudFoundryClient, TEST_ORGANIZATION_ID, "test-domain");
         requestRouteExistsFalse(
                 this.cloudFoundryClient,
@@ -114,7 +114,7 @@ public void checkRouteInvalidHost() {
     }
 
     @Test
-    public void checkRoutePrivateDomain() {
+    void checkRoutePrivateDomain() {
         requestPrivateDomains(this.cloudFoundryClient, TEST_ORGANIZATION_ID, "test-domain");
         requestRouteExistsTrue(
                 this.cloudFoundryClient,
@@ -136,7 +136,7 @@ public void checkRoutePrivateDomain() {
     }
 
     @Test
-    public void checkRouteSharedDomain() {
+    void checkRouteSharedDomain() {
         requestPrivateDomainsEmpty(this.cloudFoundryClient, TEST_ORGANIZATION_ID, "test-domain");
         requestSharedDomains(this.cloudFoundryClient, "test-domain");
         requestRouteExistsTrue(
@@ -159,7 +159,7 @@ public void checkRouteSharedDomain() {
     }
 
     @Test
-    public void createRouteAssignedPort() {
+    void createRouteAssignedPort() {
         requestSpaces(this.cloudFoundryClient, TEST_ORGANIZATION_ID, TEST_SPACE_NAME);
         requestPrivateDomainsEmpty(this.cloudFoundryClient, TEST_ORGANIZATION_ID, "test-domain");
         requestSharedDomains(this.cloudFoundryClient, "test-domain");
@@ -186,7 +186,7 @@ public void createRouteAssignedPort() {
     }
 
     @Test
-    public void createRouteInvalidDomain() {
+    void createRouteInvalidDomain() {
         requestSpaces(this.cloudFoundryClient, TEST_ORGANIZATION_ID, TEST_SPACE_NAME);
         requestPrivateDomainsEmpty(this.cloudFoundryClient, TEST_ORGANIZATION_ID, "test-domain");
         requestSharedDomainsEmpty(this.cloudFoundryClient, "test-domain");
@@ -208,7 +208,7 @@ public void createRouteInvalidDomain() {
     }
 
     @Test
-    public void createRouteInvalidSpace() {
+    void createRouteInvalidSpace() {
         requestSpacesEmpty(this.cloudFoundryClient, TEST_ORGANIZATION_ID, TEST_SPACE_NAME);
         requestPrivateDomains(this.cloudFoundryClient, TEST_ORGANIZATION_ID, "test-domain");
 
@@ -230,7 +230,7 @@ public void createRouteInvalidSpace() {
     }
 
     @Test
-    public void createRouteNoHost() {
+    void createRouteNoHost() {
         requestSpaces(this.cloudFoundryClient, TEST_ORGANIZATION_ID, TEST_SPACE_NAME);
         requestPrivateDomains(this.cloudFoundryClient, TEST_ORGANIZATION_ID, "test-domain");
         requestCreateRoute(
@@ -256,7 +256,7 @@ public void createRouteNoHost() {
     }
 
     @Test
-    public void createRouteNoPath() {
+    void createRouteNoPath() {
         requestSpaces(this.cloudFoundryClient, TEST_ORGANIZATION_ID, TEST_SPACE_NAME);
         requestPrivateDomains(this.cloudFoundryClient, TEST_ORGANIZATION_ID, "test-domain");
         requestCreateRoute(
@@ -282,7 +282,7 @@ public void createRouteNoPath() {
     }
 
     @Test
-    public void createRoutePrivateDomain() {
+    void createRoutePrivateDomain() {
         requestSpaces(this.cloudFoundryClient, TEST_ORGANIZATION_ID, TEST_SPACE_NAME);
         requestPrivateDomains(this.cloudFoundryClient, TEST_ORGANIZATION_ID, "test-domain");
         requestCreateRoute(
@@ -309,7 +309,7 @@ public void createRoutePrivateDomain() {
     }
 
     @Test
-    public void createRouteRandomPort() {
+    void createRouteRandomPort() {
         requestSpaces(this.cloudFoundryClient, TEST_ORGANIZATION_ID, TEST_SPACE_NAME);
         requestPrivateDomainsEmpty(this.cloudFoundryClient, TEST_ORGANIZATION_ID, "test-domain");
         requestSharedDomains(this.cloudFoundryClient, "test-domain");
@@ -336,7 +336,7 @@ public void createRouteRandomPort() {
     }
 
     @Test
-    public void deleteAssignedPort() {
+    void deleteAssignedPort() {
         requestPrivateDomainsEmpty(this.cloudFoundryClient, TEST_ORGANIZATION_ID, "test-domain");
         requestSharedDomains(this.cloudFoundryClient, "test-domain");
         requestRoutes(this.cloudFoundryClient, "test-shared-domain-metadata-id", null, null, 9999);
@@ -356,7 +356,7 @@ public void deleteAssignedPort() {
     }
 
     @Test
-    public void deleteFailure() {
+    void deleteFailure() {
         requestPrivateDomains(this.cloudFoundryClient, TEST_ORGANIZATION_ID, "test-domain");
         requestRoutes(
                 this.cloudFoundryClient,
@@ -387,7 +387,7 @@ public void deleteFailure() {
     }
 
     @Test
-    public void deleteInvalidDomain() {
+    void deleteInvalidDomain() {
         requestPrivateDomainsEmpty(this.cloudFoundryClient, TEST_ORGANIZATION_ID, "test-domain");
         requestSharedDomainsEmpty(this.cloudFoundryClient, "test-domain");
 
@@ -408,7 +408,7 @@ public void deleteInvalidDomain() {
     }
 
     @Test
-    public void deleteInvalidRoute() {
+    void deleteInvalidRoute() {
         requestPrivateDomains(this.cloudFoundryClient, TEST_ORGANIZATION_ID, "test-domain");
         requestRoutesEmpty(
                 this.cloudFoundryClient,
@@ -434,7 +434,7 @@ public void deleteInvalidRoute() {
     }
 
     @Test
-    public void deleteOrphanedRoutesAssociatedApplication() {
+    void deleteOrphanedRoutesAssociatedApplication() {
         requestSpaceRoutes(this.cloudFoundryClient, TEST_SPACE_ID);
         requestApplications(this.cloudFoundryClient, "test-route-id");
 
@@ -446,7 +446,7 @@ public void deleteOrphanedRoutesAssociatedApplication() {
     }
 
     @Test
-    public void deleteOrphanedRoutesAssociatedService() {
+    void deleteOrphanedRoutesAssociatedService() {
         requestSpaceRoutesService(this.cloudFoundryClient, TEST_SPACE_ID);
 
         this.routes
@@ -457,7 +457,7 @@ public void deleteOrphanedRoutesAssociatedService() {
     }
 
     @Test
-    public void deleteOrphanedRoutesNoAssociations() {
+    void deleteOrphanedRoutesNoAssociations() {
         requestSpaceRoutes(this.cloudFoundryClient, TEST_SPACE_ID);
         requestApplicationsEmpty(this.cloudFoundryClient, "test-route-id");
         requestDeleteRoute(this.cloudFoundryClient, "test-route-id");
@@ -473,7 +473,7 @@ public void deleteOrphanedRoutesNoAssociations() {
     }
 
     @Test
-    public void deleteOrphanedRoutesNoAssociationsFailure() {
+    void deleteOrphanedRoutesNoAssociationsFailure() {
         requestSpaceRoutes(this.cloudFoundryClient, TEST_SPACE_ID);
         requestApplicationsEmpty(this.cloudFoundryClient, "test-route-id");
         requestDeleteRoute(this.cloudFoundryClient, "test-route-id");
@@ -495,7 +495,7 @@ public void deleteOrphanedRoutesNoAssociationsFailure() {
     }
 
     @Test
-    public void deleteOrphanedRoutesNoRoutes() {
+    void deleteOrphanedRoutesNoRoutes() {
         requestSpaceRoutesEmpty(this.cloudFoundryClient, TEST_SPACE_ID);
 
         this.routes
@@ -506,7 +506,7 @@ public void deleteOrphanedRoutesNoRoutes() {
     }
 
     @Test
-    public void deletePrivateDomain() {
+    void deletePrivateDomain() {
         requestPrivateDomains(this.cloudFoundryClient, TEST_ORGANIZATION_ID, "test-domain");
         requestRoutes(
                 this.cloudFoundryClient,
@@ -531,7 +531,7 @@ public void deletePrivateDomain() {
     }
 
     @Test
-    public void deleteSharedDomain() {
+    void deleteSharedDomain() {
         requestPrivateDomainsEmpty(this.cloudFoundryClient, TEST_ORGANIZATION_ID, "test-domain");
         requestSharedDomains(this.cloudFoundryClient, "test-domain");
         requestRoutes(
@@ -557,7 +557,7 @@ public void deleteSharedDomain() {
     }
 
     @Test
-    public void listCurrentOrganizationNoSpace() {
+    void listCurrentOrganizationNoSpace() {
         requestOrganizationsRoutes(this.cloudFoundryClient, TEST_ORGANIZATION_ID);
         requestPrivateDomainsAll(this.cloudFoundryClient, TEST_ORGANIZATION_ID);
         requestSharedDomainsAll(this.cloudFoundryClient);
@@ -586,7 +586,7 @@ public void listCurrentOrganizationNoSpace() {
     }
 
     @Test
-    public void listCurrentOrganizationNoSpaceNoRoutes() {
+    void listCurrentOrganizationNoSpaceNoRoutes() {
         requestOrganizationsRoutesEmpty(this.cloudFoundryClient, TEST_ORGANIZATION_ID);
         requestPrivateDomainsAll(this.cloudFoundryClient, TEST_ORGANIZATION_ID);
         requestSharedDomainsAll(this.cloudFoundryClient);
@@ -601,7 +601,7 @@ public void listCurrentOrganizationNoSpaceNoRoutes() {
     }
 
     @Test
-    public void listCurrentSpace() {
+    void listCurrentSpace() {
         requestSpaceRoutes(this.cloudFoundryClient, TEST_SPACE_ID);
         requestPrivateDomainsAll(this.cloudFoundryClient, TEST_ORGANIZATION_ID);
         requestSharedDomainsAll(this.cloudFoundryClient);
@@ -625,7 +625,7 @@ public void listCurrentSpace() {
     }
 
     @Test
-    public void listCurrentSpaceNoPath() {
+    void listCurrentSpaceNoPath() {
         requestSpaceRoutesNoPath(this.cloudFoundryClient, TEST_SPACE_ID);
         requestPrivateDomainsAll(this.cloudFoundryClient, TEST_ORGANIZATION_ID);
         requestSharedDomainsAll(this.cloudFoundryClient);
@@ -648,7 +648,7 @@ public void listCurrentSpaceNoPath() {
     }
 
     @Test
-    public void mapRouteAssignedPort() {
+    void mapRouteAssignedPort() {
         requestApplications(this.cloudFoundryClient, "test-application-name", TEST_SPACE_ID);
         requestPrivateDomainsEmpty(this.cloudFoundryClient, TEST_ORGANIZATION_ID, "test-domain");
         requestSharedDomains(this.cloudFoundryClient, "test-domain");
@@ -678,7 +678,7 @@ public void mapRouteAssignedPort() {
     }
 
     @Test
-    public void mapRouteExists() {
+    void mapRouteExists() {
         requestApplications(this.cloudFoundryClient, "test-application-name", TEST_SPACE_ID);
         requestPrivateDomains(this.cloudFoundryClient, TEST_ORGANIZATION_ID, "test-domain");
         requestRoutes(
@@ -703,7 +703,7 @@ public void mapRouteExists() {
     }
 
     @Test
-    public void mapRouteInvalidApplicationName() {
+    void mapRouteInvalidApplicationName() {
         requestApplicationsEmpty(this.cloudFoundryClient, "test-application-name", TEST_SPACE_ID);
         requestPrivateDomains(this.cloudFoundryClient, TEST_ORGANIZATION_ID, "test-domain");
         requestRoutesEmpty(
@@ -740,7 +740,7 @@ public void mapRouteInvalidApplicationName() {
     }
 
     @Test
-    public void mapRouteInvalidDomain() {
+    void mapRouteInvalidDomain() {
         requestApplications(this.cloudFoundryClient, "test-application-name", TEST_SPACE_ID);
         requestPrivateDomainsEmpty(this.cloudFoundryClient, TEST_ORGANIZATION_ID, "test-domain");
         requestSharedDomainsEmpty(this.cloudFoundryClient, "test-domain");
@@ -763,7 +763,7 @@ public void mapRouteInvalidDomain() {
     }
 
     @Test
-    public void mapRouteNoHost() {
+    void mapRouteNoHost() {
         requestApplications(this.cloudFoundryClient, "test-application-name", TEST_SPACE_ID);
         requestPrivateDomains(this.cloudFoundryClient, TEST_ORGANIZATION_ID, "test-domain");
         requestRoutesEmpty(
@@ -795,7 +795,7 @@ public void mapRouteNoHost() {
     }
 
     @Test
-    public void mapRoutePath() {
+    void mapRoutePath() {
         requestApplications(this.cloudFoundryClient, "test-application-name", TEST_SPACE_ID);
         requestPrivateDomains(this.cloudFoundryClient, TEST_ORGANIZATION_ID, "test-domain");
         requestRoutesTwo(
@@ -819,7 +819,7 @@ public void mapRoutePath() {
     }
 
     @Test
-    public void mapRoutePrivateDomain() {
+    void mapRoutePrivateDomain() {
         requestApplications(this.cloudFoundryClient, "test-application-name", TEST_SPACE_ID);
         requestPrivateDomains(this.cloudFoundryClient, TEST_ORGANIZATION_ID, "test-domain");
         requestRoutesEmpty(
@@ -852,7 +852,7 @@ public void mapRoutePrivateDomain() {
     }
 
     @Test
-    public void mapRouteSharedDomain() {
+    void mapRouteSharedDomain() {
         requestApplications(this.cloudFoundryClient, "test-application-name", TEST_SPACE_ID);
         requestPrivateDomainsEmpty(this.cloudFoundryClient, TEST_ORGANIZATION_ID, "test-domain");
         requestSharedDomains(this.cloudFoundryClient, "test-domain");
@@ -886,7 +886,7 @@ public void mapRouteSharedDomain() {
     }
 
     @Test
-    public void unmapRouteAssignedPort() {
+    void unmapRouteAssignedPort() {
         requestApplications(this.cloudFoundryClient, "test-application-name", TEST_SPACE_ID);
         requestPrivateDomainsEmpty(this.cloudFoundryClient, TEST_ORGANIZATION_ID, "test-domain");
         requestSharedDomains(this.cloudFoundryClient, "test-domain");
@@ -907,7 +907,7 @@ public void unmapRouteAssignedPort() {
     }
 
     @Test
-    public void unmapRouteInvalidApplicationName() {
+    void unmapRouteInvalidApplicationName() {
         requestApplicationsEmpty(this.cloudFoundryClient, "test-application-name", TEST_SPACE_ID);
         requestPrivateDomains(this.cloudFoundryClient, TEST_ORGANIZATION_ID, "test-domain");
 
@@ -929,7 +929,7 @@ public void unmapRouteInvalidApplicationName() {
     }
 
     @Test
-    public void unmapRouteInvalidDomain() {
+    void unmapRouteInvalidDomain() {
         requestApplications(this.cloudFoundryClient, "test-application-name", TEST_SPACE_ID);
         requestPrivateDomainsEmpty(this.cloudFoundryClient, TEST_ORGANIZATION_ID, "test-domain");
         requestSharedDomainsEmpty(this.cloudFoundryClient, "test-domain");
@@ -951,7 +951,7 @@ public void unmapRouteInvalidDomain() {
     }
 
     @Test
-    public void unmapRouteInvalidRoute() {
+    void unmapRouteInvalidRoute() {
         requestApplications(this.cloudFoundryClient, "test-application-name", TEST_SPACE_ID);
         requestPrivateDomains(this.cloudFoundryClient, TEST_ORGANIZATION_ID, "test-domain");
         requestRoutesEmpty(
@@ -979,7 +979,7 @@ public void unmapRouteInvalidRoute() {
     }
 
     @Test
-    public void unmapRoutePrivateDomain() {
+    void unmapRoutePrivateDomain() {
         requestApplications(this.cloudFoundryClient, "test-application-name", TEST_SPACE_ID);
         requestPrivateDomains(this.cloudFoundryClient, TEST_ORGANIZATION_ID, "test-domain");
         requestRoutes(
@@ -1005,7 +1005,7 @@ public void unmapRoutePrivateDomain() {
     }
 
     @Test
-    public void unmapRouteSharedDomain() {
+    void unmapRouteSharedDomain() {
         requestApplications(this.cloudFoundryClient, "test-application-name", TEST_SPACE_ID);
         requestPrivateDomainsEmpty(this.cloudFoundryClient, TEST_ORGANIZATION_ID, "test-domain");
         requestSharedDomains(this.cloudFoundryClient, "test-domain");
diff --git a/cloudfoundry-operations/src/test/java/org/cloudfoundry/operations/routes/DeleteOrphanedRoutesRequestTest.java b/cloudfoundry-operations/src/test/java/org/cloudfoundry/operations/routes/DeleteOrphanedRoutesRequestTest.java
index 9149fb1f478..eb4e0d6c197 100644
--- a/cloudfoundry-operations/src/test/java/org/cloudfoundry/operations/routes/DeleteOrphanedRoutesRequestTest.java
+++ b/cloudfoundry-operations/src/test/java/org/cloudfoundry/operations/routes/DeleteOrphanedRoutesRequestTest.java
@@ -16,12 +16,12 @@
 
 package org.cloudfoundry.operations.routes;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
-public final class DeleteOrphanedRoutesRequestTest {
+final class DeleteOrphanedRoutesRequestTest {
 
     @Test
-    public void valid() {
+    void valid() {
         DeleteOrphanedRoutesRequest.builder().build();
     }
 }
diff --git a/cloudfoundry-operations/src/test/java/org/cloudfoundry/operations/routes/DeleteRouteRequestTest.java b/cloudfoundry-operations/src/test/java/org/cloudfoundry/operations/routes/DeleteRouteRequestTest.java
index c5c783cd425..56b916dd241 100644
--- a/cloudfoundry-operations/src/test/java/org/cloudfoundry/operations/routes/DeleteRouteRequestTest.java
+++ b/cloudfoundry-operations/src/test/java/org/cloudfoundry/operations/routes/DeleteRouteRequestTest.java
@@ -16,22 +16,36 @@
 
 package org.cloudfoundry.operations.routes;
 
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
-public final class DeleteRouteRequestTest {
+import org.junit.jupiter.api.Test;
 
-    @Test(expected = IllegalStateException.class)
-    public void noDomain() {
-        DeleteRouteRequest.builder().build();
+final class DeleteRouteRequestTest {
+
+    @Test
+    void noDomain() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    DeleteRouteRequest.builder().build();
+                });
     }
 
-    @Test(expected = IllegalStateException.class)
-    public void setupConflict() {
-        DeleteRouteRequest.builder().domain("test-domain").host("test-hostname").port(123).build();
+    @Test
+    void setupConflict() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    DeleteRouteRequest.builder()
+                            .domain("test-domain")
+                            .host("test-hostname")
+                            .port(123)
+                            .build();
+                });
     }
 
     @Test
-    public void valid() {
+    void valid() {
         DeleteRouteRequest.builder().domain("test-domain").build();
     }
 }
diff --git a/cloudfoundry-operations/src/test/java/org/cloudfoundry/operations/routes/ListRoutesRequestTest.java b/cloudfoundry-operations/src/test/java/org/cloudfoundry/operations/routes/ListRoutesRequestTest.java
index ae90da1011a..9f6c2bbdb89 100644
--- a/cloudfoundry-operations/src/test/java/org/cloudfoundry/operations/routes/ListRoutesRequestTest.java
+++ b/cloudfoundry-operations/src/test/java/org/cloudfoundry/operations/routes/ListRoutesRequestTest.java
@@ -16,12 +16,12 @@
 
 package org.cloudfoundry.operations.routes;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
-public final class ListRoutesRequestTest {
+final class ListRoutesRequestTest {
 
     @Test
-    public void valid() {
+    void valid() {
         ListRoutesRequest.builder().build();
     }
 }
diff --git a/cloudfoundry-operations/src/test/java/org/cloudfoundry/operations/routes/MapRouteRequestTest.java b/cloudfoundry-operations/src/test/java/org/cloudfoundry/operations/routes/MapRouteRequestTest.java
index 367709fdb0d..412693e81eb 100644
--- a/cloudfoundry-operations/src/test/java/org/cloudfoundry/operations/routes/MapRouteRequestTest.java
+++ b/cloudfoundry-operations/src/test/java/org/cloudfoundry/operations/routes/MapRouteRequestTest.java
@@ -16,36 +16,66 @@
 
 package org.cloudfoundry.operations.routes;
 
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
-public final class MapRouteRequestTest {
+import org.junit.jupiter.api.Test;
 
-    @Test(expected = IllegalStateException.class)
-    public void noApplicationName() {
-        MapRouteRequest.builder().domain("test-domain").host("test-host").path("test-path").build();
+final class MapRouteRequestTest {
+
+    @Test
+    void noApplicationName() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    MapRouteRequest.builder()
+                            .domain("test-domain")
+                            .host("test-host")
+                            .path("test-path")
+                            .build();
+                });
     }
 
-    @Test(expected = IllegalStateException.class)
-    public void noDomain() {
-        MapRouteRequest.builder()
-                .applicationName("test-applicationName")
-                .host("test-host")
-                .path("test-path")
-                .build();
+    @Test
+    void noDomain() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    MapRouteRequest.builder()
+                            .applicationName("test-applicationName")
+                            .host("test-host")
+                            .path("test-path")
+                            .build();
+                });
     }
 
-    @Test(expected = IllegalStateException.class)
-    public void portConflict() {
-        MapRouteRequest.builder().domain("test-domain").port(123).randomPort(true).build();
+    @Test
+    void portConflict() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    MapRouteRequest.builder()
+                            .domain("test-domain")
+                            .port(123)
+                            .randomPort(true)
+                            .build();
+                });
     }
 
-    @Test(expected = IllegalStateException.class)
-    public void setupConflict() {
-        MapRouteRequest.builder().domain("test-domain").host("test-hostname").port(123).build();
+    @Test
+    void setupConflict() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    MapRouteRequest.builder()
+                            .domain("test-domain")
+                            .host("test-hostname")
+                            .port(123)
+                            .build();
+                });
     }
 
     @Test
-    public void validMax() {
+    void validMax() {
         MapRouteRequest.builder()
                 .applicationName("test-applicationName")
                 .domain("test-domain")
@@ -55,7 +85,7 @@ public void validMax() {
     }
 
     @Test
-    public void validMin() {
+    void validMin() {
         MapRouteRequest.builder()
                 .applicationName("test-applicationName")
                 .domain("test-domain")
diff --git a/cloudfoundry-operations/src/test/java/org/cloudfoundry/operations/routes/UnmapRouteRequestTest.java b/cloudfoundry-operations/src/test/java/org/cloudfoundry/operations/routes/UnmapRouteRequestTest.java
index f2b9f9623f8..adc56cec79c 100644
--- a/cloudfoundry-operations/src/test/java/org/cloudfoundry/operations/routes/UnmapRouteRequestTest.java
+++ b/cloudfoundry-operations/src/test/java/org/cloudfoundry/operations/routes/UnmapRouteRequestTest.java
@@ -16,27 +16,45 @@
 
 package org.cloudfoundry.operations.routes;
 
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
-public final class UnmapRouteRequestTest {
+import org.junit.jupiter.api.Test;
 
-    @Test(expected = IllegalStateException.class)
-    public void noApplicationName() {
-        UnmapRouteRequest.builder().domain("test-domain").build();
+final class UnmapRouteRequestTest {
+
+    @Test
+    void noApplicationName() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    UnmapRouteRequest.builder().domain("test-domain").build();
+                });
     }
 
-    @Test(expected = IllegalStateException.class)
-    public void noDomain() {
-        UnmapRouteRequest.builder().applicationName("test-applicationName").build();
+    @Test
+    void noDomain() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    UnmapRouteRequest.builder().applicationName("test-applicationName").build();
+                });
     }
 
-    @Test(expected = IllegalStateException.class)
-    public void setupConflict() {
-        UnmapRouteRequest.builder().domain("test-domain").host("test-hostname").port(123).build();
+    @Test
+    void setupConflict() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    UnmapRouteRequest.builder()
+                            .domain("test-domain")
+                            .host("test-hostname")
+                            .port(123)
+                            .build();
+                });
     }
 
     @Test
-    public void valid() {
+    void valid() {
         UnmapRouteRequest.builder()
                 .applicationName("test-applicationName")
                 .domain("test-domain")
diff --git a/cloudfoundry-operations/src/test/java/org/cloudfoundry/operations/serviceadmin/CreateServiceBrokerRequestTest.java b/cloudfoundry-operations/src/test/java/org/cloudfoundry/operations/serviceadmin/CreateServiceBrokerRequestTest.java
index 06f29c0fa3f..ad872938034 100644
--- a/cloudfoundry-operations/src/test/java/org/cloudfoundry/operations/serviceadmin/CreateServiceBrokerRequestTest.java
+++ b/cloudfoundry-operations/src/test/java/org/cloudfoundry/operations/serviceadmin/CreateServiceBrokerRequestTest.java
@@ -16,48 +16,66 @@
 
 package org.cloudfoundry.operations.serviceadmin;
 
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
-public final class CreateServiceBrokerRequestTest {
+import org.junit.jupiter.api.Test;
 
-    @Test(expected = IllegalStateException.class)
-    public void noName() {
-        CreateServiceBrokerRequest.builder()
-                .url("test-broker-url")
-                .username("test-username")
-                .password("test-password")
-                .build();
+final class CreateServiceBrokerRequestTest {
+
+    @Test
+    void noName() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    CreateServiceBrokerRequest.builder()
+                            .url("test-broker-url")
+                            .username("test-username")
+                            .password("test-password")
+                            .build();
+                });
     }
 
-    @Test(expected = IllegalStateException.class)
-    public void noPassword() {
-        CreateServiceBrokerRequest.builder()
-                .name("test-broker")
-                .url("test-broker-url")
-                .username("test-username")
-                .build();
+    @Test
+    void noPassword() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    CreateServiceBrokerRequest.builder()
+                            .name("test-broker")
+                            .url("test-broker-url")
+                            .username("test-username")
+                            .build();
+                });
     }
 
-    @Test(expected = IllegalStateException.class)
-    public void noUrl() {
-        CreateServiceBrokerRequest.builder()
-                .name("test-broker")
-                .username("test-username")
-                .password("test-password")
-                .build();
+    @Test
+    void noUrl() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    CreateServiceBrokerRequest.builder()
+                            .name("test-broker")
+                            .username("test-username")
+                            .password("test-password")
+                            .build();
+                });
     }
 
-    @Test(expected = IllegalStateException.class)
-    public void noUsername() {
-        CreateServiceBrokerRequest.builder()
-                .name("test-broker")
-                .url("test-broker-url")
-                .password("test-password")
-                .build();
+    @Test
+    void noUsername() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    CreateServiceBrokerRequest.builder()
+                            .name("test-broker")
+                            .url("test-broker-url")
+                            .password("test-password")
+                            .build();
+                });
     }
 
     @Test
-    public void valid() {
+    void valid() {
         CreateServiceBrokerRequest.builder()
                 .name("test-broker")
                 .url("test-broker-url")
diff --git a/cloudfoundry-operations/src/test/java/org/cloudfoundry/operations/serviceadmin/DefaultServiceAdminTest.java b/cloudfoundry-operations/src/test/java/org/cloudfoundry/operations/serviceadmin/DefaultServiceAdminTest.java
index 7e0f02ac303..56d7e0303a2 100644
--- a/cloudfoundry-operations/src/test/java/org/cloudfoundry/operations/serviceadmin/DefaultServiceAdminTest.java
+++ b/cloudfoundry-operations/src/test/java/org/cloudfoundry/operations/serviceadmin/DefaultServiceAdminTest.java
@@ -52,17 +52,17 @@
 import org.cloudfoundry.client.v2.services.ServiceEntity;
 import org.cloudfoundry.client.v2.services.ServiceResource;
 import org.cloudfoundry.operations.AbstractOperationsTest;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import reactor.core.publisher.Mono;
 import reactor.test.StepVerifier;
 
-public final class DefaultServiceAdminTest extends AbstractOperationsTest {
+final class DefaultServiceAdminTest extends AbstractOperationsTest {
 
     private final DefaultServiceAdmin serviceAdmin =
             new DefaultServiceAdmin(Mono.just(this.cloudFoundryClient), Mono.just(TEST_SPACE_ID));
 
     @Test
-    public void createServiceBroker() {
+    void createServiceBroker() {
         requestCreateServiceBroker(
                 this.cloudFoundryClient,
                 "test-service-broker-name",
@@ -85,7 +85,7 @@ public void createServiceBroker() {
     }
 
     @Test
-    public void createServiceBrokerWithSpaceScope() {
+    void createServiceBrokerWithSpaceScope() {
         requestCreateServiceBroker(
                 this.cloudFoundryClient,
                 "test-service-broker-name",
@@ -109,7 +109,7 @@ public void createServiceBrokerWithSpaceScope() {
     }
 
     @Test
-    public void deleteServiceBroker() {
+    void deleteServiceBroker() {
         requestListServiceBrokers(this.cloudFoundryClient, "test-service-broker-name");
         requestDeleteServiceBroker(this.cloudFoundryClient, "test-service-broker-id");
 
@@ -124,7 +124,7 @@ public void deleteServiceBroker() {
     }
 
     @Test
-    public void deleteServiceBrokerNoServiceBroker() {
+    void deleteServiceBrokerNoServiceBroker() {
         requestListServiceBrokersEmpty(this.cloudFoundryClient, "test-service-broker-name");
         requestDeleteServiceBroker(this.cloudFoundryClient, "test-service-broker-id");
 
@@ -145,7 +145,7 @@ public void deleteServiceBrokerNoServiceBroker() {
     }
 
     @Test
-    public void disableServiceAccess() {
+    void disableServiceAccess() {
         requestListServicesWithName(this.cloudFoundryClient, "test-service-name");
         requestListServicePlans(this.cloudFoundryClient, "test-service-id");
         requestListServicePlanVisibilities(this.cloudFoundryClient, "test-service-plan-id");
@@ -164,7 +164,7 @@ public void disableServiceAccess() {
     }
 
     @Test
-    public void disableServiceAccessSpecifyAll() {
+    void disableServiceAccessSpecifyAll() {
         requestListServicesWithName(this.cloudFoundryClient, "test-service-name");
         requestListServicePlans(this.cloudFoundryClient, "test-service-id");
         requestListServicePlanVisibilities(
@@ -187,7 +187,7 @@ public void disableServiceAccessSpecifyAll() {
     }
 
     @Test
-    public void disableServiceAccessSpecifyOrganization() {
+    void disableServiceAccessSpecifyOrganization() {
         requestListServicesWithName(this.cloudFoundryClient, "test-service-name");
         requestListServicePlans(this.cloudFoundryClient, "test-service-id");
         requestListServicePlanVisibilities(
@@ -209,7 +209,7 @@ public void disableServiceAccessSpecifyOrganization() {
     }
 
     @Test
-    public void disableServiceAccessSpecifyServicePlan() {
+    void disableServiceAccessSpecifyServicePlan() {
         requestListServicesWithName(this.cloudFoundryClient, "test-service-name");
         requestListServicePlans(this.cloudFoundryClient, "test-service-id");
         requestListServicePlanVisibilities(this.cloudFoundryClient, "test-service-plan-id");
@@ -229,7 +229,7 @@ public void disableServiceAccessSpecifyServicePlan() {
     }
 
     @Test
-    public void enableServiceAccess() {
+    void enableServiceAccess() {
         requestListServicesWithName(this.cloudFoundryClient, "test-service-name");
         requestListServicePlans(this.cloudFoundryClient, "test-service-id");
         requestListServicePlanVisibilities(this.cloudFoundryClient, "test-service-plan-id");
@@ -247,7 +247,7 @@ public void enableServiceAccess() {
     }
 
     @Test
-    public void enableServiceAccessOrganizationNotFound() {
+    void enableServiceAccessOrganizationNotFound() {
         requestListServicesWithName(this.cloudFoundryClient, "test-service-name");
         requestListServicePlans(this.cloudFoundryClient, "test-service-id");
         requestListOrganizationsEmpty(this.cloudFoundryClient, "bogus-organization-name");
@@ -269,7 +269,7 @@ public void enableServiceAccessOrganizationNotFound() {
     }
 
     @Test
-    public void enableServiceAccessServiceNotFound() {
+    void enableServiceAccessServiceNotFound() {
         requestListServicesWithNameEmpty(this.cloudFoundryClient, "bogus-service-name");
 
         this.serviceAdmin
@@ -288,7 +288,7 @@ public void enableServiceAccessServiceNotFound() {
     }
 
     @Test
-    public void enableServiceAccessSpecifyAll() {
+    void enableServiceAccessSpecifyAll() {
         requestListServicesWithName(this.cloudFoundryClient, "test-service-name");
         requestListServicePlans(this.cloudFoundryClient, "test-service-id");
         requestListOrganizations(this.cloudFoundryClient, "test-organization-name");
@@ -308,7 +308,7 @@ public void enableServiceAccessSpecifyAll() {
     }
 
     @Test
-    public void enableServiceAccessSpecifyOrganization() {
+    void enableServiceAccessSpecifyOrganization() {
         requestListServicesWithName(this.cloudFoundryClient, "test-service-name");
         requestListServicePlans(this.cloudFoundryClient, "test-service-id");
         requestListServicePlanVisibilities(this.cloudFoundryClient, "test-service-plan-id");
@@ -328,7 +328,7 @@ public void enableServiceAccessSpecifyOrganization() {
     }
 
     @Test
-    public void enableServiceAccessSpecifyServicePlan() {
+    void enableServiceAccessSpecifyServicePlan() {
         requestListServicesWithName(this.cloudFoundryClient, "test-service-name");
         requestListServicePlans(this.cloudFoundryClient, "test-service-id");
         requestListServicePlanVisibilities(this.cloudFoundryClient, "test-service-plan-id");
@@ -347,7 +347,7 @@ public void enableServiceAccessSpecifyServicePlan() {
     }
 
     @Test
-    public void enableServiceAccessSpecifyServicePlanWithoutPublicVisibility() {
+    void enableServiceAccessSpecifyServicePlanWithoutPublicVisibility() {
         ServicePlanResource servicePlan1 =
                 buildServicePlan("test-service-plan-id-1", "test-service-plan-name-1");
         ServicePlanResource servicePlan2 =
@@ -373,7 +373,7 @@ public void enableServiceAccessSpecifyServicePlanWithoutPublicVisibility() {
     }
 
     @Test
-    public void listServiceAccessSettings() {
+    void listServiceAccessSettings() {
         requestListServiceBrokers(this.cloudFoundryClient);
         requestListServicePlanVisibilitiesEmpty(this.cloudFoundryClient);
         requestListServicesWithBroker(this.cloudFoundryClient, "test-service-broker-id");
@@ -395,7 +395,7 @@ public void listServiceAccessSettings() {
     }
 
     @Test
-    public void listServiceAccessSettingsNoBrokers() {
+    void listServiceAccessSettingsNoBrokers() {
         requestListServiceBrokersEmpty(this.cloudFoundryClient);
         requestListServicePlanVisibilitiesEmpty(this.cloudFoundryClient);
 
@@ -411,7 +411,7 @@ public void listServiceAccessSettingsNoBrokers() {
     }
 
     @Test
-    public void listServiceAccessSettingsSpecifyBroker() {
+    void listServiceAccessSettingsSpecifyBroker() {
         requestListServiceBrokers(this.cloudFoundryClient);
         requestListServicePlanVisibilitiesEmpty(this.cloudFoundryClient);
         requestListServicesWithBroker(this.cloudFoundryClient, "test-service-broker-id");
@@ -436,7 +436,7 @@ public void listServiceAccessSettingsSpecifyBroker() {
     }
 
     @Test
-    public void listServiceAccessSettingsSpecifyBrokerNotFound() {
+    void listServiceAccessSettingsSpecifyBrokerNotFound() {
         requestListServiceBrokers(this.cloudFoundryClient);
         requestListServicePlanVisibilitiesEmpty(this.cloudFoundryClient);
 
@@ -457,7 +457,7 @@ public void listServiceAccessSettingsSpecifyBrokerNotFound() {
     }
 
     @Test
-    public void listServiceAccessSettingsSpecifyOrganization() {
+    void listServiceAccessSettingsSpecifyOrganization() {
         requestListServiceBrokers(this.cloudFoundryClient);
         requestListServicePlanVisibilities(this.cloudFoundryClient);
         requestListOrganizations(this.cloudFoundryClient, "test-organization-name");
@@ -484,7 +484,7 @@ public void listServiceAccessSettingsSpecifyOrganization() {
     }
 
     @Test
-    public void listServiceAccessSettingsSpecifyOrganizationNotFound() {
+    void listServiceAccessSettingsSpecifyOrganizationNotFound() {
         requestListServiceBrokers(this.cloudFoundryClient);
         requestListServicePlanVisibilities(this.cloudFoundryClient);
         requestListOrganizationsEmpty(this.cloudFoundryClient, "bogus-organization-name");
@@ -505,7 +505,7 @@ public void listServiceAccessSettingsSpecifyOrganizationNotFound() {
     }
 
     @Test
-    public void listServiceAccessSettingsSpecifyService() {
+    void listServiceAccessSettingsSpecifyService() {
         requestListServicesWithName(this.cloudFoundryClient, "test-service-name");
         requestListServiceBrokers(this.cloudFoundryClient);
         requestListServicePlanVisibilitiesEmpty(this.cloudFoundryClient);
@@ -531,7 +531,7 @@ public void listServiceAccessSettingsSpecifyService() {
     }
 
     @Test
-    public void listServiceAccessSettingsSpecifyServiceNotFound() {
+    void listServiceAccessSettingsSpecifyServiceNotFound() {
         requestListServiceBrokers(this.cloudFoundryClient);
         requestListServicePlanVisibilitiesEmpty(this.cloudFoundryClient);
         requestListServicesWithNameEmpty(this.cloudFoundryClient, "bogus-service-name");
@@ -551,7 +551,7 @@ public void listServiceAccessSettingsSpecifyServiceNotFound() {
     }
 
     @Test
-    public void listServiceBrokers() {
+    void listServiceBrokers() {
         requestListServiceBrokers(this.cloudFoundryClient);
 
         this.serviceAdmin
@@ -568,7 +568,7 @@ public void listServiceBrokers() {
     }
 
     @Test
-    public void listServiceBrokersNoBrokers() {
+    void listServiceBrokersNoBrokers() {
         requestListServiceBrokersEmpty(this.cloudFoundryClient);
 
         this.serviceAdmin
@@ -579,7 +579,7 @@ public void listServiceBrokersNoBrokers() {
     }
 
     @Test
-    public void updateServiceBroker() {
+    void updateServiceBroker() {
         requestListServiceBrokers(this.cloudFoundryClient, "test-service-broker-name");
         requestUpdateServiceBroker(
                 this.cloudFoundryClient,
@@ -603,7 +603,7 @@ public void updateServiceBroker() {
     }
 
     @Test
-    public void updateServiceBrokerNoServiceBroker() {
+    void updateServiceBrokerNoServiceBroker() {
         requestListServiceBrokersEmpty(this.cloudFoundryClient, "test-service-broker-name");
         requestUpdateServiceBroker(
                 this.cloudFoundryClient,
diff --git a/cloudfoundry-operations/src/test/java/org/cloudfoundry/operations/serviceadmin/DeleteServiceBrokerRequestTest.java b/cloudfoundry-operations/src/test/java/org/cloudfoundry/operations/serviceadmin/DeleteServiceBrokerRequestTest.java
index 820265e1bab..a358757453e 100644
--- a/cloudfoundry-operations/src/test/java/org/cloudfoundry/operations/serviceadmin/DeleteServiceBrokerRequestTest.java
+++ b/cloudfoundry-operations/src/test/java/org/cloudfoundry/operations/serviceadmin/DeleteServiceBrokerRequestTest.java
@@ -16,17 +16,23 @@
 
 package org.cloudfoundry.operations.serviceadmin;
 
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
-public class DeleteServiceBrokerRequestTest {
+import org.junit.jupiter.api.Test;
 
-    @Test(expected = IllegalStateException.class)
-    public void noName() {
-        DeleteServiceBrokerRequest.builder().build();
+class DeleteServiceBrokerRequestTest {
+
+    @Test
+    void noName() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    DeleteServiceBrokerRequest.builder().build();
+                });
     }
 
     @Test
-    public void valid() {
+    void valid() {
         DeleteServiceBrokerRequest.builder().name("test-service-broker").build();
     }
 }
diff --git a/cloudfoundry-operations/src/test/java/org/cloudfoundry/operations/serviceadmin/DisableServiceAccessRequestTest.java b/cloudfoundry-operations/src/test/java/org/cloudfoundry/operations/serviceadmin/DisableServiceAccessRequestTest.java
index 9c62e37338b..c3b40d2b435 100644
--- a/cloudfoundry-operations/src/test/java/org/cloudfoundry/operations/serviceadmin/DisableServiceAccessRequestTest.java
+++ b/cloudfoundry-operations/src/test/java/org/cloudfoundry/operations/serviceadmin/DisableServiceAccessRequestTest.java
@@ -16,17 +16,23 @@
 
 package org.cloudfoundry.operations.serviceadmin;
 
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
-public final class DisableServiceAccessRequestTest {
+import org.junit.jupiter.api.Test;
 
-    @Test(expected = IllegalStateException.class)
-    public void noServiceName() {
-        DisableServiceAccessRequest.builder().build();
+final class DisableServiceAccessRequestTest {
+
+    @Test
+    void noServiceName() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    DisableServiceAccessRequest.builder().build();
+                });
     }
 
     @Test
-    public void valid() {
+    void valid() {
         DisableServiceAccessRequest.builder().serviceName("test-service-name").build();
     }
 }
diff --git a/cloudfoundry-operations/src/test/java/org/cloudfoundry/operations/serviceadmin/EnableServiceAccessRequestTest.java b/cloudfoundry-operations/src/test/java/org/cloudfoundry/operations/serviceadmin/EnableServiceAccessRequestTest.java
index c29258e7273..2cef62e1ed7 100644
--- a/cloudfoundry-operations/src/test/java/org/cloudfoundry/operations/serviceadmin/EnableServiceAccessRequestTest.java
+++ b/cloudfoundry-operations/src/test/java/org/cloudfoundry/operations/serviceadmin/EnableServiceAccessRequestTest.java
@@ -16,12 +16,12 @@
 
 package org.cloudfoundry.operations.serviceadmin;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
-public final class EnableServiceAccessRequestTest {
+final class EnableServiceAccessRequestTest {
 
     @Test
-    public void valid() {
+    void valid() {
         ListServiceAccessSettingsRequest.builder()
                 .brokerName("test-broker-name")
                 .organizationName("test-organization-name")
diff --git a/cloudfoundry-operations/src/test/java/org/cloudfoundry/operations/serviceadmin/ListServiceAccessSettingsRequestTest.java b/cloudfoundry-operations/src/test/java/org/cloudfoundry/operations/serviceadmin/ListServiceAccessSettingsRequestTest.java
index 1778fa53c60..c065457f76d 100644
--- a/cloudfoundry-operations/src/test/java/org/cloudfoundry/operations/serviceadmin/ListServiceAccessSettingsRequestTest.java
+++ b/cloudfoundry-operations/src/test/java/org/cloudfoundry/operations/serviceadmin/ListServiceAccessSettingsRequestTest.java
@@ -16,17 +16,23 @@
 
 package org.cloudfoundry.operations.serviceadmin;
 
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
-public final class ListServiceAccessSettingsRequestTest {
+import org.junit.jupiter.api.Test;
 
-    @Test(expected = IllegalStateException.class)
-    public void noServiceName() {
-        DisableServiceAccessRequest.builder().build();
+final class ListServiceAccessSettingsRequestTest {
+
+    @Test
+    void noServiceName() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    DisableServiceAccessRequest.builder().build();
+                });
     }
 
     @Test
-    public void valid() {
+    void valid() {
         DisableServiceAccessRequest.builder().serviceName("test-service-name").build();
     }
 }
diff --git a/cloudfoundry-operations/src/test/java/org/cloudfoundry/operations/serviceadmin/UpdateServiceBrokerRequestTest.java b/cloudfoundry-operations/src/test/java/org/cloudfoundry/operations/serviceadmin/UpdateServiceBrokerRequestTest.java
index e55c6acc293..b2fee7278c4 100644
--- a/cloudfoundry-operations/src/test/java/org/cloudfoundry/operations/serviceadmin/UpdateServiceBrokerRequestTest.java
+++ b/cloudfoundry-operations/src/test/java/org/cloudfoundry/operations/serviceadmin/UpdateServiceBrokerRequestTest.java
@@ -16,48 +16,66 @@
 
 package org.cloudfoundry.operations.serviceadmin;
 
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
-public class UpdateServiceBrokerRequestTest {
+import org.junit.jupiter.api.Test;
 
-    @Test(expected = IllegalStateException.class)
-    public void noName() {
-        UpdateServiceBrokerRequest.builder()
-                .url("test-broker-url")
-                .username("test-username")
-                .password("test-password")
-                .build();
+class UpdateServiceBrokerRequestTest {
+
+    @Test
+    void noName() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    UpdateServiceBrokerRequest.builder()
+                            .url("test-broker-url")
+                            .username("test-username")
+                            .password("test-password")
+                            .build();
+                });
     }
 
-    @Test(expected = IllegalStateException.class)
-    public void noPassword() {
-        UpdateServiceBrokerRequest.builder()
-                .name("test-broker")
-                .url("test-broker-url")
-                .username("test-username")
-                .build();
+    @Test
+    void noPassword() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    UpdateServiceBrokerRequest.builder()
+                            .name("test-broker")
+                            .url("test-broker-url")
+                            .username("test-username")
+                            .build();
+                });
     }
 
-    @Test(expected = IllegalStateException.class)
-    public void noUrl() {
-        UpdateServiceBrokerRequest.builder()
-                .name("test-broker")
-                .username("test-username")
-                .password("test-password")
-                .build();
+    @Test
+    void noUrl() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    UpdateServiceBrokerRequest.builder()
+                            .name("test-broker")
+                            .username("test-username")
+                            .password("test-password")
+                            .build();
+                });
     }
 
-    @Test(expected = IllegalStateException.class)
-    public void noUsername() {
-        UpdateServiceBrokerRequest.builder()
-                .name("test-broker")
-                .url("test-broker-url")
-                .password("test-password")
-                .build();
+    @Test
+    void noUsername() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    UpdateServiceBrokerRequest.builder()
+                            .name("test-broker")
+                            .url("test-broker-url")
+                            .password("test-password")
+                            .build();
+                });
     }
 
     @Test
-    public void valid() {
+    void valid() {
         UpdateServiceBrokerRequest.builder()
                 .name("test-broker")
                 .url("test-broker-url")
diff --git a/cloudfoundry-operations/src/test/java/org/cloudfoundry/operations/services/BindRouteServiceInstanceRequestTest.java b/cloudfoundry-operations/src/test/java/org/cloudfoundry/operations/services/BindRouteServiceInstanceRequestTest.java
index dad52104d14..8081cf7a43b 100644
--- a/cloudfoundry-operations/src/test/java/org/cloudfoundry/operations/services/BindRouteServiceInstanceRequestTest.java
+++ b/cloudfoundry-operations/src/test/java/org/cloudfoundry/operations/services/BindRouteServiceInstanceRequestTest.java
@@ -16,24 +16,36 @@
 
 package org.cloudfoundry.operations.services;
 
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
-public final class BindRouteServiceInstanceRequestTest {
+import org.junit.jupiter.api.Test;
 
-    @Test(expected = IllegalStateException.class)
-    public void noDomainName() {
-        BindRouteServiceInstanceRequest.builder()
-                .serviceInstanceName("test-service-instance-name")
-                .build();
+final class BindRouteServiceInstanceRequestTest {
+
+    @Test
+    void noDomainName() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    BindRouteServiceInstanceRequest.builder()
+                            .serviceInstanceName("test-service-instance-name")
+                            .build();
+                });
     }
 
-    @Test(expected = IllegalStateException.class)
-    public void noServiceInstanceName() {
-        BindRouteServiceInstanceRequest.builder().domainName("test-domain-name").build();
+    @Test
+    void noServiceInstanceName() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    BindRouteServiceInstanceRequest.builder()
+                            .domainName("test-domain-name")
+                            .build();
+                });
     }
 
     @Test
-    public void valid() {
+    void valid() {
         BindRouteServiceInstanceRequest.builder()
                 .domainName("test-domain-name")
                 .serviceInstanceName("test-service-instance-name")
diff --git a/cloudfoundry-operations/src/test/java/org/cloudfoundry/operations/services/BindServiceInstanceRequestTest.java b/cloudfoundry-operations/src/test/java/org/cloudfoundry/operations/services/BindServiceInstanceRequestTest.java
index 83ca455a445..511761fa675 100644
--- a/cloudfoundry-operations/src/test/java/org/cloudfoundry/operations/services/BindServiceInstanceRequestTest.java
+++ b/cloudfoundry-operations/src/test/java/org/cloudfoundry/operations/services/BindServiceInstanceRequestTest.java
@@ -16,24 +16,36 @@
 
 package org.cloudfoundry.operations.services;
 
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
-public final class BindServiceInstanceRequestTest {
+import org.junit.jupiter.api.Test;
 
-    @Test(expected = IllegalStateException.class)
-    public void noApplicationName() {
-        BindServiceInstanceRequest.builder()
-                .serviceInstanceName("test-service-instance-name")
-                .build();
+final class BindServiceInstanceRequestTest {
+
+    @Test
+    void noApplicationName() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    BindServiceInstanceRequest.builder()
+                            .serviceInstanceName("test-service-instance-name")
+                            .build();
+                });
     }
 
-    @Test(expected = IllegalStateException.class)
-    public void noServiceInstanceName() {
-        BindServiceInstanceRequest.builder().applicationName("test-application-name").build();
+    @Test
+    void noServiceInstanceName() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    BindServiceInstanceRequest.builder()
+                            .applicationName("test-application-name")
+                            .build();
+                });
     }
 
     @Test
-    public void valid() {
+    void valid() {
         BindServiceInstanceRequest.builder()
                 .applicationName("test-application-name")
                 .serviceInstanceName("test-service-instance-name")
diff --git a/cloudfoundry-operations/src/test/java/org/cloudfoundry/operations/services/CreateServiceInstanceRequestTest.java b/cloudfoundry-operations/src/test/java/org/cloudfoundry/operations/services/CreateServiceInstanceRequestTest.java
index ed309a394ea..b9d27f1b00d 100644
--- a/cloudfoundry-operations/src/test/java/org/cloudfoundry/operations/services/CreateServiceInstanceRequestTest.java
+++ b/cloudfoundry-operations/src/test/java/org/cloudfoundry/operations/services/CreateServiceInstanceRequestTest.java
@@ -16,36 +16,50 @@
 
 package org.cloudfoundry.operations.services;
 
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
-public final class CreateServiceInstanceRequestTest {
+import org.junit.jupiter.api.Test;
 
-    @Test(expected = IllegalStateException.class)
-    public void noPlan() {
-        CreateServiceInstanceRequest.builder()
-                .serviceName("test-service-name")
-                .serviceInstanceName("test-service-instance-name")
-                .build();
+final class CreateServiceInstanceRequestTest {
+
+    @Test
+    void noPlan() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    CreateServiceInstanceRequest.builder()
+                            .serviceName("test-service-name")
+                            .serviceInstanceName("test-service-instance-name")
+                            .build();
+                });
     }
 
-    @Test(expected = IllegalStateException.class)
-    public void noServiceInstanceName() {
-        CreateServiceInstanceRequest.builder()
-                .planName("test-plan-name")
-                .serviceName("test-service-name")
-                .build();
+    @Test
+    void noServiceInstanceName() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    CreateServiceInstanceRequest.builder()
+                            .planName("test-plan-name")
+                            .serviceName("test-service-name")
+                            .build();
+                });
     }
 
-    @Test(expected = IllegalStateException.class)
-    public void noServiceName() {
-        CreateServiceInstanceRequest.builder()
-                .planName("test-plan-name")
-                .serviceInstanceName("test-service-instance-name")
-                .build();
+    @Test
+    void noServiceName() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    CreateServiceInstanceRequest.builder()
+                            .planName("test-plan-name")
+                            .serviceInstanceName("test-service-instance-name")
+                            .build();
+                });
     }
 
     @Test
-    public void valid() {
+    void valid() {
         CreateServiceInstanceRequest.builder()
                 .planName("test-plan-name")
                 .serviceName("test-service-name")
diff --git a/cloudfoundry-operations/src/test/java/org/cloudfoundry/operations/services/CreateServiceKeyRequestTest.java b/cloudfoundry-operations/src/test/java/org/cloudfoundry/operations/services/CreateServiceKeyRequestTest.java
index 33fe39ca886..37d1feedbb6 100644
--- a/cloudfoundry-operations/src/test/java/org/cloudfoundry/operations/services/CreateServiceKeyRequestTest.java
+++ b/cloudfoundry-operations/src/test/java/org/cloudfoundry/operations/services/CreateServiceKeyRequestTest.java
@@ -16,22 +16,36 @@
 
 package org.cloudfoundry.operations.services;
 
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
-public final class CreateServiceKeyRequestTest {
+import org.junit.jupiter.api.Test;
 
-    @Test(expected = IllegalStateException.class)
-    public void noSerivceInstanceName() {
-        CreateServiceKeyRequest.builder().serviceKeyName("test-service-key-name").build();
+final class CreateServiceKeyRequestTest {
+
+    @Test
+    void noSerivceInstanceName() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    CreateServiceKeyRequest.builder()
+                            .serviceKeyName("test-service-key-name")
+                            .build();
+                });
     }
 
-    @Test(expected = IllegalStateException.class)
-    public void noServiceKeyName() {
-        CreateServiceKeyRequest.builder().serviceInstanceName("test-service-instance-name").build();
+    @Test
+    void noServiceKeyName() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    CreateServiceKeyRequest.builder()
+                            .serviceInstanceName("test-service-instance-name")
+                            .build();
+                });
     }
 
     @Test
-    public void valid() {
+    void valid() {
         CreateServiceKeyRequest.builder()
                 .serviceInstanceName("test-service-instance-name")
                 .serviceKeyName("test-service-key-name")
diff --git a/cloudfoundry-operations/src/test/java/org/cloudfoundry/operations/services/CreateUserProvidedServiceInstanceRequestTest.java b/cloudfoundry-operations/src/test/java/org/cloudfoundry/operations/services/CreateUserProvidedServiceInstanceRequestTest.java
index a248917c6cc..e2abc8fcf30 100644
--- a/cloudfoundry-operations/src/test/java/org/cloudfoundry/operations/services/CreateUserProvidedServiceInstanceRequestTest.java
+++ b/cloudfoundry-operations/src/test/java/org/cloudfoundry/operations/services/CreateUserProvidedServiceInstanceRequestTest.java
@@ -16,17 +16,23 @@
 
 package org.cloudfoundry.operations.services;
 
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
-public final class CreateUserProvidedServiceInstanceRequestTest {
+import org.junit.jupiter.api.Test;
 
-    @Test(expected = IllegalStateException.class)
-    public void noName() {
-        CreateUserProvidedServiceInstanceRequest.builder().build();
+final class CreateUserProvidedServiceInstanceRequestTest {
+
+    @Test
+    void noName() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    CreateUserProvidedServiceInstanceRequest.builder().build();
+                });
     }
 
     @Test
-    public void valid() {
+    void valid() {
         CreateUserProvidedServiceInstanceRequest.builder().name("test-name").build();
     }
 }
diff --git a/cloudfoundry-operations/src/test/java/org/cloudfoundry/operations/services/DefaultServicesTest.java b/cloudfoundry-operations/src/test/java/org/cloudfoundry/operations/services/DefaultServicesTest.java
index 022adec0dfa..a09f995757b 100644
--- a/cloudfoundry-operations/src/test/java/org/cloudfoundry/operations/services/DefaultServicesTest.java
+++ b/cloudfoundry-operations/src/test/java/org/cloudfoundry/operations/services/DefaultServicesTest.java
@@ -106,12 +106,12 @@
 import org.cloudfoundry.client.v2.userprovidedserviceinstances.UpdateUserProvidedServiceInstanceResponse;
 import org.cloudfoundry.client.v2.userprovidedserviceinstances.UserProvidedServiceInstanceEntity;
 import org.cloudfoundry.operations.AbstractOperationsTest;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import reactor.core.publisher.Mono;
 import reactor.test.StepVerifier;
 import reactor.test.scheduler.VirtualTimeScheduler;
 
-public final class DefaultServicesTest extends AbstractOperationsTest {
+final class DefaultServicesTest extends AbstractOperationsTest {
 
     private final DefaultServices services =
             new DefaultServices(
@@ -120,7 +120,7 @@ public final class DefaultServicesTest extends AbstractOperationsTest {
                     Mono.just(TEST_SPACE_ID));
 
     @Test
-    public void bindRouteServiceInstanceAlreadyBound() {
+    void bindRouteServiceInstanceAlreadyBound() {
         requestListOrganizationPrivateDomains(
                 this.cloudFoundryClient, "test-domain-name", TEST_ORGANIZATION_ID);
         requestListSpaceServiceInstancesUserProvided(
@@ -146,7 +146,7 @@ public void bindRouteServiceInstanceAlreadyBound() {
     }
 
     @Test
-    public void bindRouteServiceInstanceDomainNotFound() {
+    void bindRouteServiceInstanceDomainNotFound() {
         requestListOrganizationPrivateDomainsEmpty(
                 this.cloudFoundryClient, "test-domain-name", TEST_ORGANIZATION_ID);
         requestListSharedDomainsEmpty(this.cloudFoundryClient, "test-domain-name");
@@ -168,7 +168,7 @@ public void bindRouteServiceInstanceDomainNotFound() {
     }
 
     @Test
-    public void bindRouteServiceInstancePrivateDomain() {
+    void bindRouteServiceInstancePrivateDomain() {
         requestListOrganizationPrivateDomains(
                 this.cloudFoundryClient, "test-domain-name", TEST_ORGANIZATION_ID);
         requestListSpaceServiceInstancesUserProvided(
@@ -193,7 +193,7 @@ public void bindRouteServiceInstancePrivateDomain() {
     }
 
     @Test
-    public void bindRouteServiceInstancePrivateDomainWithHostAndPath() {
+    void bindRouteServiceInstancePrivateDomainWithHostAndPath() {
         requestListOrganizationPrivateDomains(
                 this.cloudFoundryClient, "test-domain-name", TEST_ORGANIZATION_ID);
         requestListSpaceServiceInstancesUserProvided(
@@ -221,7 +221,7 @@ public void bindRouteServiceInstancePrivateDomainWithHostAndPath() {
     }
 
     @Test
-    public void bindRouteServiceInstanceServiceInstanceNotFound() {
+    void bindRouteServiceInstanceServiceInstanceNotFound() {
         requestListOrganizationPrivateDomains(
                 this.cloudFoundryClient, "test-domain-name", TEST_ORGANIZATION_ID);
         requestListSpaceServiceInstancesEmpty(
@@ -247,7 +247,7 @@ public void bindRouteServiceInstanceServiceInstanceNotFound() {
     }
 
     @Test
-    public void bindRouteServiceInstanceSharedDomain() {
+    void bindRouteServiceInstanceSharedDomain() {
         requestListOrganizationPrivateDomainsEmpty(
                 this.cloudFoundryClient, "test-domain-name", TEST_ORGANIZATION_ID);
         requestListSharedDomains(this.cloudFoundryClient, "test-domain-name");
@@ -273,7 +273,7 @@ public void bindRouteServiceInstanceSharedDomain() {
     }
 
     @Test
-    public void bindServiceInstance() {
+    void bindServiceInstance() {
         requestApplications(this.cloudFoundryClient, "test-application-name", TEST_SPACE_ID);
         requestListSpaceServiceInstances(
                 this.cloudFoundryClient, "test-service-instance-name", TEST_SPACE_ID);
@@ -296,7 +296,7 @@ public void bindServiceInstance() {
     }
 
     @Test
-    public void bindServiceInstanceAlreadyBound() {
+    void bindServiceInstanceAlreadyBound() {
         requestApplications(this.cloudFoundryClient, "test-application-name", TEST_SPACE_ID);
         requestListSpaceServiceInstances(
                 this.cloudFoundryClient, "test-service-instance-name", TEST_SPACE_ID);
@@ -320,7 +320,7 @@ public void bindServiceInstanceAlreadyBound() {
     }
 
     @Test
-    public void bindServiceInstanceNoApplication() {
+    void bindServiceInstanceNoApplication() {
         requestApplicationsEmpty(this.cloudFoundryClient, "test-application-name", TEST_SPACE_ID);
         requestListSpaceServiceInstances(
                 this.cloudFoundryClient, "test-service-instance-name", TEST_SPACE_ID);
@@ -343,7 +343,7 @@ public void bindServiceInstanceNoApplication() {
     }
 
     @Test
-    public void bindServiceInstanceNoServiceInstance() {
+    void bindServiceInstanceNoServiceInstance() {
         requestApplications(this.cloudFoundryClient, "test-application-name", TEST_SPACE_ID);
         requestListSpaceServiceInstancesEmpty(
                 this.cloudFoundryClient, "test-service-instance-name", TEST_SPACE_ID);
@@ -367,7 +367,7 @@ public void bindServiceInstanceNoServiceInstance() {
     }
 
     @Test
-    public void createServiceInstance() {
+    void createServiceInstance() {
         requestListSpaceServices(this.cloudFoundryClient, TEST_SPACE_ID, "test-service");
         requestListSpaceServicePlans(
                 this.cloudFoundryClient, "test-service-id", "test-plan", "test-plan-id");
@@ -396,7 +396,7 @@ public void createServiceInstance() {
     }
 
     @Test
-    public void createServiceKey() {
+    void createServiceKey() {
         requestListSpaceServiceInstances(
                 this.cloudFoundryClient, "test-service-instance", TEST_SPACE_ID);
         requestCreateServiceKey(
@@ -418,7 +418,7 @@ public void createServiceKey() {
     }
 
     @Test
-    public void createServiceKeyNoServiceInstance() {
+    void createServiceKeyNoServiceInstance() {
         requestListSpaceServiceInstancesEmpty(
                 this.cloudFoundryClient, "test-service-instance-does-not-exist", TEST_SPACE_ID);
 
@@ -442,7 +442,7 @@ public void createServiceKeyNoServiceInstance() {
     }
 
     @Test
-    public void createUserProvidedServiceInstance() {
+    void createUserProvidedServiceInstance() {
         requestCreateUserProvidedServiceInstance(
                 this.cloudFoundryClient,
                 TEST_SPACE_ID,
@@ -468,7 +468,7 @@ public void createUserProvidedServiceInstance() {
     }
 
     @Test
-    public void deleteServiceInstance() {
+    void deleteServiceInstance() {
         requestListSpaceServiceInstances(
                 this.cloudFoundryClient, "test-service-instance-name", TEST_SPACE_ID);
         requestDeleteServiceInstance(this.cloudFoundryClient, "test-service-instance-id");
@@ -486,7 +486,7 @@ public void deleteServiceInstance() {
     }
 
     @Test
-    public void deleteServiceInstanceAcceptsIncomplete() {
+    void deleteServiceInstanceAcceptsIncomplete() {
         requestListSpaceServiceInstances(
                 this.cloudFoundryClient, "test-service-instance-name", TEST_SPACE_ID);
         requestDeleteServiceInstanceAcceptsIncomplete(
@@ -504,7 +504,7 @@ public void deleteServiceInstanceAcceptsIncomplete() {
     }
 
     @Test
-    public void deleteServiceInstanceNotFound() {
+    void deleteServiceInstanceNotFound() {
         requestListSpaceServiceInstancesEmpty(
                 this.cloudFoundryClient, "test-invalid-name", TEST_SPACE_ID);
 
@@ -523,7 +523,7 @@ public void deleteServiceInstanceNotFound() {
     }
 
     @Test
-    public void deleteServiceKey() {
+    void deleteServiceKey() {
         requestListSpaceServiceInstances(
                 this.cloudFoundryClient, "test-service-instance-name", TEST_SPACE_ID);
         requestListSpaceServiceInstanceServiceKeys(
@@ -546,7 +546,7 @@ public void deleteServiceKey() {
     }
 
     @Test
-    public void deleteServiceKeyNoServiceInstance() {
+    void deleteServiceKeyNoServiceInstance() {
         requestListSpaceServiceInstancesEmpty(
                 this.cloudFoundryClient, "test-service-instance", TEST_SPACE_ID);
 
@@ -568,7 +568,7 @@ public void deleteServiceKeyNoServiceInstance() {
     }
 
     @Test
-    public void deleteServiceKeyNoServiceKey() {
+    void deleteServiceKeyNoServiceKey() {
         requestListSpaceServiceInstances(
                 this.cloudFoundryClient, "test-service-instance-name", TEST_SPACE_ID);
         requestListSpaceServiceInstanceServiceKeysEmpty(
@@ -592,7 +592,7 @@ public void deleteServiceKeyNoServiceKey() {
     }
 
     @Test
-    public void deleteUserProvidedServiceInstance() {
+    void deleteUserProvidedServiceInstance() {
         requestListSpaceServiceInstancesUserProvided(
                 this.cloudFoundryClient, "test-service-instance-name", TEST_SPACE_ID);
         requestDeleteUserProvidedServiceInstance(
@@ -609,7 +609,7 @@ public void deleteUserProvidedServiceInstance() {
     }
 
     @Test
-    public void getServiceInstanceManaged() {
+    void getServiceInstanceManaged() {
         requestListSpaceServiceInstancesManaged(
                 this.cloudFoundryClient, "test-service-instance-name", TEST_SPACE_ID);
         requestGetServicePlan(
@@ -649,7 +649,7 @@ public void getServiceInstanceManaged() {
     }
 
     @Test
-    public void getServiceInstanceNoInstances() {
+    void getServiceInstanceNoInstances() {
         requestListSpaceServiceInstancesEmpty(
                 this.cloudFoundryClient, "test-invalid-name", TEST_SPACE_ID);
 
@@ -667,7 +667,7 @@ public void getServiceInstanceNoInstances() {
     }
 
     @Test
-    public void getServiceInstanceUserProvided() {
+    void getServiceInstanceUserProvided() {
         requestListSpaceServiceInstancesUserProvided(
                 this.cloudFoundryClient, "test-service-instance-name", TEST_SPACE_ID);
         requestListSpaceServiceBindings(
@@ -692,7 +692,7 @@ public void getServiceInstanceUserProvided() {
     }
 
     @Test
-    public void getServiceKey() {
+    void getServiceKey() {
         requestListSpaceServiceInstances(
                 this.cloudFoundryClient, "test-service-instance-name", TEST_SPACE_ID);
         requestListSpaceServiceInstanceServiceKeys(
@@ -720,7 +720,7 @@ public void getServiceKey() {
     }
 
     @Test
-    public void getServiceKeyNoKeys() {
+    void getServiceKeyNoKeys() {
         requestListSpaceServiceInstances(
                 this.cloudFoundryClient, "test-service-instance-name", TEST_SPACE_ID);
         requestListSpaceServiceInstanceServiceKeysEmpty(
@@ -744,7 +744,7 @@ public void getServiceKeyNoKeys() {
     }
 
     @Test
-    public void listInstancesManagedServices() {
+    void listInstancesManagedServices() {
         requestGetSpaceSummaryManagedServices(this.cloudFoundryClient, TEST_SPACE_ID);
 
         this.services
@@ -765,7 +765,7 @@ public void listInstancesManagedServices() {
     }
 
     @Test
-    public void listInstancesNoApplications() {
+    void listInstancesNoApplications() {
         requestGetSpaceSummaryManagedServicesNoApplications(this.cloudFoundryClient, TEST_SPACE_ID);
 
         this.services
@@ -785,7 +785,7 @@ public void listInstancesNoApplications() {
     }
 
     @Test
-    public void listInstancesNoInstances() {
+    void listInstancesNoInstances() {
         requestGetSpaceSummaryEmpty(this.cloudFoundryClient, TEST_SPACE_ID);
 
         this.services
@@ -796,7 +796,7 @@ public void listInstancesNoInstances() {
     }
 
     @Test
-    public void listInstancesOneApplication() {
+    void listInstancesOneApplication() {
         requestGetSpaceSummaryManagedServicesOneApplication(this.cloudFoundryClient, TEST_SPACE_ID);
 
         this.services
@@ -817,7 +817,7 @@ public void listInstancesOneApplication() {
     }
 
     @Test
-    public void listInstancesUserProvidedServices() {
+    void listInstancesUserProvidedServices() {
         requestGetSpaceSummaryUserProvidedServices(this.cloudFoundryClient, TEST_SPACE_ID);
 
         this.services
@@ -835,7 +835,7 @@ public void listInstancesUserProvidedServices() {
     }
 
     @Test
-    public void listServiceKeys() {
+    void listServiceKeys() {
         requestListSpaceServiceInstances(
                 this.cloudFoundryClient, "test-service-instance-name", TEST_SPACE_ID);
         requestListSpaceServiceInstanceServiceKeys(
@@ -858,7 +858,7 @@ public void listServiceKeys() {
     }
 
     @Test
-    public void listServiceKeysEmpty() {
+    void listServiceKeysEmpty() {
         requestListSpaceServiceInstances(
                 this.cloudFoundryClient, "test-service-instance-name", TEST_SPACE_ID);
         requestListSpaceServiceInstanceServiceKeysEmpty(
@@ -875,7 +875,7 @@ public void listServiceKeysEmpty() {
     }
 
     @Test
-    public void listServiceKeysNoServiceInstance() {
+    void listServiceKeysNoServiceInstance() {
         requestListSpaceServiceInstancesEmpty(
                 this.cloudFoundryClient, "test-service-instance-name", TEST_SPACE_ID);
 
@@ -896,7 +896,7 @@ public void listServiceKeysNoServiceInstance() {
     }
 
     @Test
-    public void listServiceOfferings() {
+    void listServiceOfferings() {
         requestListSpaceServicesTwo(
                 this.cloudFoundryClient, TEST_SPACE_ID, "test-service1", "test-service2");
         requestListSpaceServicePlans(
@@ -943,7 +943,7 @@ public void listServiceOfferings() {
     }
 
     @Test
-    public void listServiceOfferingsSingle() {
+    void listServiceOfferingsSingle() {
         requestListSpaceServices(this.cloudFoundryClient, TEST_SPACE_ID, "test-service");
         requestListSpaceServicePlans(
                 this.cloudFoundryClient,
@@ -973,7 +973,7 @@ public void listServiceOfferingsSingle() {
     }
 
     @Test
-    public void renameServiceInstance() {
+    void renameServiceInstance() {
         requestListSpaceServiceInstances(
                 this.cloudFoundryClient, "test-service-instance-name", TEST_SPACE_ID);
         requestRenameServiceInstance(
@@ -993,7 +993,7 @@ public void renameServiceInstance() {
     }
 
     @Test
-    public void unbindRoute() {
+    void unbindRoute() {
         requestListOrganizationPrivateDomains(
                 this.cloudFoundryClient, "test-domain-name", TEST_ORGANIZATION_ID);
         requestListRoutes(this.cloudFoundryClient, "test-private-domain-id");
@@ -1014,7 +1014,7 @@ public void unbindRoute() {
     }
 
     @Test
-    public void unbindRouteServiceInstanceRouteNotFound() {
+    void unbindRouteServiceInstanceRouteNotFound() {
         requestListOrganizationPrivateDomains(
                 this.cloudFoundryClient, "test-domain-name", TEST_ORGANIZATION_ID);
         requestListRoutesEmpty(this.cloudFoundryClient, "test-private-domain-id");
@@ -1037,7 +1037,7 @@ public void unbindRouteServiceInstanceRouteNotFound() {
     }
 
     @Test
-    public void unbindRouteServiceInstanceServiceInstanceNotFound() {
+    void unbindRouteServiceInstanceServiceInstanceNotFound() {
         requestListOrganizationPrivateDomains(
                 this.cloudFoundryClient, "test-domain-name", TEST_ORGANIZATION_ID);
         requestListRoutes(this.cloudFoundryClient, "test-private-domain-id");
@@ -1062,7 +1062,7 @@ public void unbindRouteServiceInstanceServiceInstanceNotFound() {
     }
 
     @Test
-    public void unbindServiceInstance() {
+    void unbindServiceInstance() {
         requestApplications(this.cloudFoundryClient, "test-application-name", TEST_SPACE_ID);
         requestListSpaceServiceInstances(
                 this.cloudFoundryClient, "test-service-instance-name", TEST_SPACE_ID);
@@ -1084,7 +1084,7 @@ public void unbindServiceInstance() {
     }
 
     @Test
-    public void unbindServiceInstanceFailure() {
+    void unbindServiceInstanceFailure() {
         requestApplications(this.cloudFoundryClient, "test-application-name", TEST_SPACE_ID);
         requestListSpaceServiceInstances(
                 this.cloudFoundryClient, "test-service-instance-name", TEST_SPACE_ID);
@@ -1112,7 +1112,7 @@ public void unbindServiceInstanceFailure() {
     }
 
     @Test
-    public void updateService() {
+    void updateService() {
         requestListSpaceServiceInstances(
                 this.cloudFoundryClient, "test-service", TEST_SPACE_ID, "test-service-plan-id");
         requestGetServicePlan(
@@ -1145,7 +1145,7 @@ public void updateService() {
     }
 
     @Test
-    public void updateServiceNewPlanDoesNotExist() {
+    void updateServiceNewPlanDoesNotExist() {
         requestListSpaceServiceInstances(
                 this.cloudFoundryClient, "test-service", TEST_SPACE_ID, "test-service-plan-id");
         requestGetServicePlan(
@@ -1178,7 +1178,7 @@ public void updateServiceNewPlanDoesNotExist() {
     }
 
     @Test
-    public void updateServiceNoParameters() {
+    void updateServiceNoParameters() {
         requestListSpaceServiceInstances(
                 this.cloudFoundryClient, "test-service", TEST_SPACE_ID, "test-service-plan-id");
         requestGetServicePlan(
@@ -1210,7 +1210,7 @@ public void updateServiceNoParameters() {
     }
 
     @Test
-    public void updateServiceNoPlan() {
+    void updateServiceNoPlan() {
         requestListSpaceServiceInstances(this.cloudFoundryClient, "test-service", TEST_SPACE_ID);
         requestUpdateServiceInstance(
                 this.cloudFoundryClient,
@@ -1233,7 +1233,7 @@ public void updateServiceNoPlan() {
     }
 
     @Test
-    public void updateServiceNoPlanExists() {
+    void updateServiceNoPlanExists() {
         requestListSpaceServiceInstances(
                 this.cloudFoundryClient, "test-service", TEST_SPACE_ID, null);
 
@@ -1256,7 +1256,7 @@ public void updateServiceNoPlanExists() {
     }
 
     @Test
-    public void updateServiceNoTags() {
+    void updateServiceNoTags() {
         requestListSpaceServiceInstances(
                 this.cloudFoundryClient, "test-service", TEST_SPACE_ID, "test-service-plan-id");
         requestGetServicePlan(
@@ -1288,7 +1288,7 @@ public void updateServiceNoTags() {
     }
 
     @Test
-    public void updateServiceNotPublic() {
+    void updateServiceNotPublic() {
         requestListSpaceServiceInstances(
                 this.cloudFoundryClient, "test-service", TEST_SPACE_ID, "test-plan-id");
         requestGetServicePlan(
@@ -1320,7 +1320,7 @@ public void updateServiceNotPublic() {
     }
 
     @Test
-    public void updateServiceNotVisible() {
+    void updateServiceNotVisible() {
         requestListSpaceServiceInstances(
                 this.cloudFoundryClient, "test-service", TEST_SPACE_ID, "test-plan-id");
         requestGetServicePlan(
@@ -1351,7 +1351,7 @@ public void updateServiceNotVisible() {
     }
 
     @Test
-    public void updateServicePlanNotUpdateable() {
+    void updateServicePlanNotUpdateable() {
         requestListSpaceServiceInstances(
                 this.cloudFoundryClient, "test-service", TEST_SPACE_ID, "test-service-plan-id");
         requestGetServicePlan(
@@ -1381,7 +1381,7 @@ public void updateServicePlanNotUpdateable() {
     }
 
     @Test
-    public void updateUserProvidedService() {
+    void updateUserProvidedService() {
         requestListSpaceServiceInstancesUserProvided(
                 this.cloudFoundryClient, "test-service", TEST_SPACE_ID);
         requestUpdateUserProvidedServiceInstance(
@@ -1405,7 +1405,7 @@ public void updateUserProvidedService() {
     }
 
     @Test
-    public void updateUserProvidedServiceNotUserProvided() {
+    void updateUserProvidedServiceNotUserProvided() {
         requestListSpaceServiceInstances(this.cloudFoundryClient, "test-service", TEST_SPACE_ID);
 
         this.services
diff --git a/cloudfoundry-operations/src/test/java/org/cloudfoundry/operations/services/DeleteServiceInstanceRequestTest.java b/cloudfoundry-operations/src/test/java/org/cloudfoundry/operations/services/DeleteServiceInstanceRequestTest.java
index 9045a70b6bc..f5b1b5222fc 100644
--- a/cloudfoundry-operations/src/test/java/org/cloudfoundry/operations/services/DeleteServiceInstanceRequestTest.java
+++ b/cloudfoundry-operations/src/test/java/org/cloudfoundry/operations/services/DeleteServiceInstanceRequestTest.java
@@ -16,17 +16,23 @@
 
 package org.cloudfoundry.operations.services;
 
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
-public final class DeleteServiceInstanceRequestTest {
+import org.junit.jupiter.api.Test;
 
-    @Test(expected = IllegalStateException.class)
-    public void noName() {
-        DeleteServiceInstanceRequest.builder().build();
+final class DeleteServiceInstanceRequestTest {
+
+    @Test
+    void noName() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    DeleteServiceInstanceRequest.builder().build();
+                });
     }
 
     @Test
-    public void valid() {
+    void valid() {
         DeleteServiceInstanceRequest.builder().name("test-service-name").build();
     }
 }
diff --git a/cloudfoundry-operations/src/test/java/org/cloudfoundry/operations/services/DeleteServiceKeyRequestTest.java b/cloudfoundry-operations/src/test/java/org/cloudfoundry/operations/services/DeleteServiceKeyRequestTest.java
index 3e4d3dadb9c..9302c4568d7 100644
--- a/cloudfoundry-operations/src/test/java/org/cloudfoundry/operations/services/DeleteServiceKeyRequestTest.java
+++ b/cloudfoundry-operations/src/test/java/org/cloudfoundry/operations/services/DeleteServiceKeyRequestTest.java
@@ -16,22 +16,36 @@
 
 package org.cloudfoundry.operations.services;
 
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
-public final class DeleteServiceKeyRequestTest {
+import org.junit.jupiter.api.Test;
 
-    @Test(expected = IllegalStateException.class)
-    public void noServiceInstanceName() {
-        DeleteServiceKeyRequest.builder().serviceKeyName("test-service-key-name").build();
+final class DeleteServiceKeyRequestTest {
+
+    @Test
+    void noServiceInstanceName() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    DeleteServiceKeyRequest.builder()
+                            .serviceKeyName("test-service-key-name")
+                            .build();
+                });
     }
 
-    @Test(expected = IllegalStateException.class)
-    public void noServiceKeyName() {
-        DeleteServiceKeyRequest.builder().serviceInstanceName("test-service-instance-name").build();
+    @Test
+    void noServiceKeyName() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    DeleteServiceKeyRequest.builder()
+                            .serviceInstanceName("test-service-instance-name")
+                            .build();
+                });
     }
 
     @Test
-    public void valid() {
+    void valid() {
         DeleteServiceKeyRequest.builder()
                 .serviceInstanceName("test-service-instance-name")
                 .serviceKeyName("test-service-key-name")
diff --git a/cloudfoundry-operations/src/test/java/org/cloudfoundry/operations/services/GetServiceInstanceRequestTest.java b/cloudfoundry-operations/src/test/java/org/cloudfoundry/operations/services/GetServiceInstanceRequestTest.java
index cfaf8e8a330..21ccc6ce667 100644
--- a/cloudfoundry-operations/src/test/java/org/cloudfoundry/operations/services/GetServiceInstanceRequestTest.java
+++ b/cloudfoundry-operations/src/test/java/org/cloudfoundry/operations/services/GetServiceInstanceRequestTest.java
@@ -16,17 +16,23 @@
 
 package org.cloudfoundry.operations.services;
 
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
-public final class GetServiceInstanceRequestTest {
+import org.junit.jupiter.api.Test;
 
-    @Test(expected = IllegalStateException.class)
-    public void noName() {
-        GetServiceInstanceRequest.builder().build();
+final class GetServiceInstanceRequestTest {
+
+    @Test
+    void noName() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    GetServiceInstanceRequest.builder().build();
+                });
     }
 
     @Test
-    public void valid() {
+    void valid() {
         GetServiceInstanceRequest.builder().name("test-service-name").build();
     }
 }
diff --git a/cloudfoundry-operations/src/test/java/org/cloudfoundry/operations/services/GetServiceKeyRequestTest.java b/cloudfoundry-operations/src/test/java/org/cloudfoundry/operations/services/GetServiceKeyRequestTest.java
index 6312ecd4216..9c08e084dac 100644
--- a/cloudfoundry-operations/src/test/java/org/cloudfoundry/operations/services/GetServiceKeyRequestTest.java
+++ b/cloudfoundry-operations/src/test/java/org/cloudfoundry/operations/services/GetServiceKeyRequestTest.java
@@ -16,22 +16,34 @@
 
 package org.cloudfoundry.operations.services;
 
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
-public final class GetServiceKeyRequestTest {
+import org.junit.jupiter.api.Test;
 
-    @Test(expected = IllegalStateException.class)
-    public void noServiceInstanceName() {
-        GetServiceKeyRequest.builder().serviceKeyName("test-service-key-name").build();
+final class GetServiceKeyRequestTest {
+
+    @Test
+    void noServiceInstanceName() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    GetServiceKeyRequest.builder().serviceKeyName("test-service-key-name").build();
+                });
     }
 
-    @Test(expected = IllegalStateException.class)
-    public void noServiceKeyName() {
-        GetServiceKeyRequest.builder().serviceInstanceName("test-service-instance-name").build();
+    @Test
+    void noServiceKeyName() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    GetServiceKeyRequest.builder()
+                            .serviceInstanceName("test-service-instance-name")
+                            .build();
+                });
     }
 
     @Test
-    public void valid() {
+    void valid() {
         GetServiceKeyRequest.builder()
                 .serviceKeyName("test-service-key-name")
                 .serviceInstanceName("test-service-instance-name")
diff --git a/cloudfoundry-operations/src/test/java/org/cloudfoundry/operations/services/ListServiceKeysRequestTest.java b/cloudfoundry-operations/src/test/java/org/cloudfoundry/operations/services/ListServiceKeysRequestTest.java
index 46751d28a82..dd20f491648 100644
--- a/cloudfoundry-operations/src/test/java/org/cloudfoundry/operations/services/ListServiceKeysRequestTest.java
+++ b/cloudfoundry-operations/src/test/java/org/cloudfoundry/operations/services/ListServiceKeysRequestTest.java
@@ -16,17 +16,23 @@
 
 package org.cloudfoundry.operations.services;
 
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
-public class ListServiceKeysRequestTest {
+import org.junit.jupiter.api.Test;
 
-    @Test(expected = IllegalStateException.class)
-    public void noServiceInstanceName() {
-        ListServiceKeysRequest.builder().build();
+class ListServiceKeysRequestTest {
+
+    @Test
+    void noServiceInstanceName() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    ListServiceKeysRequest.builder().build();
+                });
     }
 
     @Test
-    public void valid() {
+    void valid() {
         ListServiceKeysRequest.builder().serviceInstanceName("service-instance").build();
     }
 }
diff --git a/cloudfoundry-operations/src/test/java/org/cloudfoundry/operations/services/ListServiceOfferingsRequestTest.java b/cloudfoundry-operations/src/test/java/org/cloudfoundry/operations/services/ListServiceOfferingsRequestTest.java
index c45e3980169..f099acf4624 100644
--- a/cloudfoundry-operations/src/test/java/org/cloudfoundry/operations/services/ListServiceOfferingsRequestTest.java
+++ b/cloudfoundry-operations/src/test/java/org/cloudfoundry/operations/services/ListServiceOfferingsRequestTest.java
@@ -16,12 +16,12 @@
 
 package org.cloudfoundry.operations.services;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
-public final class ListServiceOfferingsRequestTest {
+final class ListServiceOfferingsRequestTest {
 
     @Test
-    public void valid() {
+    void valid() {
         ListServiceOfferingsRequest.builder().build();
     }
 }
diff --git a/cloudfoundry-operations/src/test/java/org/cloudfoundry/operations/services/RenameServiceInstanceRequestTest.java b/cloudfoundry-operations/src/test/java/org/cloudfoundry/operations/services/RenameServiceInstanceRequestTest.java
index 85d038cbfcd..6f1ffd5a8f9 100644
--- a/cloudfoundry-operations/src/test/java/org/cloudfoundry/operations/services/RenameServiceInstanceRequestTest.java
+++ b/cloudfoundry-operations/src/test/java/org/cloudfoundry/operations/services/RenameServiceInstanceRequestTest.java
@@ -16,22 +16,32 @@
 
 package org.cloudfoundry.operations.services;
 
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
-public final class RenameServiceInstanceRequestTest {
+import org.junit.jupiter.api.Test;
 
-    @Test(expected = IllegalStateException.class)
-    public void noName() {
-        RenameServiceInstanceRequest.builder().newName("test-service-new-name").build();
+final class RenameServiceInstanceRequestTest {
+
+    @Test
+    void noName() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    RenameServiceInstanceRequest.builder().newName("test-service-new-name").build();
+                });
     }
 
-    @Test(expected = IllegalStateException.class)
-    public void noNewName() {
-        RenameServiceInstanceRequest.builder().name("test-service-name").build();
+    @Test
+    void noNewName() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    RenameServiceInstanceRequest.builder().name("test-service-name").build();
+                });
     }
 
     @Test
-    public void valid() {
+    void valid() {
         RenameServiceInstanceRequest.builder()
                 .name("test-service-name")
                 .newName("test-service-new-name")
diff --git a/cloudfoundry-operations/src/test/java/org/cloudfoundry/operations/services/UnbindRouteServiceInstanceRequestTest.java b/cloudfoundry-operations/src/test/java/org/cloudfoundry/operations/services/UnbindRouteServiceInstanceRequestTest.java
index 4aad926959e..b97828a457f 100644
--- a/cloudfoundry-operations/src/test/java/org/cloudfoundry/operations/services/UnbindRouteServiceInstanceRequestTest.java
+++ b/cloudfoundry-operations/src/test/java/org/cloudfoundry/operations/services/UnbindRouteServiceInstanceRequestTest.java
@@ -16,24 +16,36 @@
 
 package org.cloudfoundry.operations.services;
 
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
-public final class UnbindRouteServiceInstanceRequestTest {
+import org.junit.jupiter.api.Test;
 
-    @Test(expected = IllegalStateException.class)
-    public void noDomainName() {
-        UnbindRouteServiceInstanceRequest.builder()
-                .serviceInstanceName("test-service-instance-name")
-                .build();
+final class UnbindRouteServiceInstanceRequestTest {
+
+    @Test
+    void noDomainName() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    UnbindRouteServiceInstanceRequest.builder()
+                            .serviceInstanceName("test-service-instance-name")
+                            .build();
+                });
     }
 
-    @Test(expected = IllegalStateException.class)
-    public void noServiceInstanceName() {
-        UnbindRouteServiceInstanceRequest.builder().domainName("test-domain-name").build();
+    @Test
+    void noServiceInstanceName() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    UnbindRouteServiceInstanceRequest.builder()
+                            .domainName("test-domain-name")
+                            .build();
+                });
     }
 
     @Test
-    public void valid() {
+    void valid() {
         UnbindRouteServiceInstanceRequest.builder()
                 .domainName("test-domain-name")
                 .serviceInstanceName("test-service-instance-name")
diff --git a/cloudfoundry-operations/src/test/java/org/cloudfoundry/operations/services/UnbindServiceInstanceRequestTest.java b/cloudfoundry-operations/src/test/java/org/cloudfoundry/operations/services/UnbindServiceInstanceRequestTest.java
index f4ef8d21d4d..5a264abeb4c 100644
--- a/cloudfoundry-operations/src/test/java/org/cloudfoundry/operations/services/UnbindServiceInstanceRequestTest.java
+++ b/cloudfoundry-operations/src/test/java/org/cloudfoundry/operations/services/UnbindServiceInstanceRequestTest.java
@@ -16,24 +16,36 @@
 
 package org.cloudfoundry.operations.services;
 
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
-public final class UnbindServiceInstanceRequestTest {
+import org.junit.jupiter.api.Test;
 
-    @Test(expected = IllegalStateException.class)
-    public void noApplicationName() {
-        UnbindServiceInstanceRequest.builder()
-                .serviceInstanceName("test-service-instance-name")
-                .build();
+final class UnbindServiceInstanceRequestTest {
+
+    @Test
+    void noApplicationName() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    UnbindServiceInstanceRequest.builder()
+                            .serviceInstanceName("test-service-instance-name")
+                            .build();
+                });
     }
 
-    @Test(expected = IllegalStateException.class)
-    public void noServiceInstanceName() {
-        UnbindServiceInstanceRequest.builder().applicationName("test-application-name").build();
+    @Test
+    void noServiceInstanceName() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    UnbindServiceInstanceRequest.builder()
+                            .applicationName("test-application-name")
+                            .build();
+                });
     }
 
     @Test
-    public void valid() {
+    void valid() {
         UnbindServiceInstanceRequest.builder()
                 .applicationName("test-application-name")
                 .serviceInstanceName("test-service-instance-name")
diff --git a/cloudfoundry-operations/src/test/java/org/cloudfoundry/operations/services/UpdateServiceInstanceRequestTest.java b/cloudfoundry-operations/src/test/java/org/cloudfoundry/operations/services/UpdateServiceInstanceRequestTest.java
index 37057acd12f..2071b58f573 100644
--- a/cloudfoundry-operations/src/test/java/org/cloudfoundry/operations/services/UpdateServiceInstanceRequestTest.java
+++ b/cloudfoundry-operations/src/test/java/org/cloudfoundry/operations/services/UpdateServiceInstanceRequestTest.java
@@ -16,17 +16,23 @@
 
 package org.cloudfoundry.operations.services;
 
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
-public final class UpdateServiceInstanceRequestTest {
+import org.junit.jupiter.api.Test;
 
-    @Test(expected = IllegalStateException.class)
-    public void noServiceInstanceName() {
-        CreateServiceInstanceRequest.builder().build();
+final class UpdateServiceInstanceRequestTest {
+
+    @Test
+    void noServiceInstanceName() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    CreateServiceInstanceRequest.builder().build();
+                });
     }
 
     @Test
-    public void valid() {
+    void valid() {
         UpdateServiceInstanceRequest.builder()
                 .serviceInstanceName("test-service-instance-name")
                 .build();
diff --git a/cloudfoundry-operations/src/test/java/org/cloudfoundry/operations/spaceadmin/DefaultSpaceAdminTest.java b/cloudfoundry-operations/src/test/java/org/cloudfoundry/operations/spaceadmin/DefaultSpaceAdminTest.java
index bb6abac09a6..41501276bf3 100644
--- a/cloudfoundry-operations/src/test/java/org/cloudfoundry/operations/spaceadmin/DefaultSpaceAdminTest.java
+++ b/cloudfoundry-operations/src/test/java/org/cloudfoundry/operations/spaceadmin/DefaultSpaceAdminTest.java
@@ -26,18 +26,18 @@
 import org.cloudfoundry.client.v2.organizations.ListOrganizationSpaceQuotaDefinitionsResponse;
 import org.cloudfoundry.client.v2.spacequotadefinitions.SpaceQuotaDefinitionResource;
 import org.cloudfoundry.operations.AbstractOperationsTest;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import reactor.core.publisher.Mono;
 import reactor.test.StepVerifier;
 
-public final class DefaultSpaceAdminTest extends AbstractOperationsTest {
+final class DefaultSpaceAdminTest extends AbstractOperationsTest {
 
     private final DefaultSpaceAdmin spaceAdmin =
             new DefaultSpaceAdmin(
                     Mono.just(this.cloudFoundryClient), Mono.just(TEST_ORGANIZATION_ID));
 
     @Test
-    public void get() {
+    void get() {
         requestSpaceQuotaDefinitions(this.cloudFoundryClient, TEST_ORGANIZATION_ID);
 
         this.spaceAdmin
@@ -52,7 +52,7 @@ public void get() {
     }
 
     @Test
-    public void getNotFound() {
+    void getNotFound() {
         requestSpaceQuotaDefinitionsEmpty(this.cloudFoundryClient, TEST_ORGANIZATION_ID);
 
         this.spaceAdmin
@@ -72,7 +72,7 @@ public void getNotFound() {
     }
 
     @Test
-    public void list() {
+    void list() {
         requestSpaceQuotaDefinitions(this.cloudFoundryClient, TEST_ORGANIZATION_ID);
 
         this.spaceAdmin
diff --git a/cloudfoundry-operations/src/test/java/org/cloudfoundry/operations/spaceadmin/GetSpaceQuotaRequestTest.java b/cloudfoundry-operations/src/test/java/org/cloudfoundry/operations/spaceadmin/GetSpaceQuotaRequestTest.java
index ce1c7f11855..20666ff1cfa 100644
--- a/cloudfoundry-operations/src/test/java/org/cloudfoundry/operations/spaceadmin/GetSpaceQuotaRequestTest.java
+++ b/cloudfoundry-operations/src/test/java/org/cloudfoundry/operations/spaceadmin/GetSpaceQuotaRequestTest.java
@@ -16,17 +16,23 @@
 
 package org.cloudfoundry.operations.spaceadmin;
 
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
-public final class GetSpaceQuotaRequestTest {
+import org.junit.jupiter.api.Test;
 
-    @Test(expected = IllegalStateException.class)
-    public void noName() {
-        GetSpaceQuotaRequest.builder().build();
+final class GetSpaceQuotaRequestTest {
+
+    @Test
+    void noName() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    GetSpaceQuotaRequest.builder().build();
+                });
     }
 
     @Test
-    public void valid() {
+    void valid() {
         GetSpaceQuotaRequest.builder().name("test-name").build();
     }
 }
diff --git a/cloudfoundry-operations/src/test/java/org/cloudfoundry/operations/spaces/AllowSpaceSshRequestTest.java b/cloudfoundry-operations/src/test/java/org/cloudfoundry/operations/spaces/AllowSpaceSshRequestTest.java
index d89b043347b..3e6d809cabf 100644
--- a/cloudfoundry-operations/src/test/java/org/cloudfoundry/operations/spaces/AllowSpaceSshRequestTest.java
+++ b/cloudfoundry-operations/src/test/java/org/cloudfoundry/operations/spaces/AllowSpaceSshRequestTest.java
@@ -16,17 +16,23 @@
 
 package org.cloudfoundry.operations.spaces;
 
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
-public final class AllowSpaceSshRequestTest {
+import org.junit.jupiter.api.Test;
 
-    @Test(expected = IllegalStateException.class)
-    public void noName() {
-        AllowSpaceSshRequest.builder().build();
+final class AllowSpaceSshRequestTest {
+
+    @Test
+    void noName() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    AllowSpaceSshRequest.builder().build();
+                });
     }
 
     @Test
-    public void valid() {
+    void valid() {
         AllowSpaceSshRequest.builder().name("test-name").build();
     }
 }
diff --git a/cloudfoundry-operations/src/test/java/org/cloudfoundry/operations/spaces/CreateSpaceRequestTest.java b/cloudfoundry-operations/src/test/java/org/cloudfoundry/operations/spaces/CreateSpaceRequestTest.java
index 1275c9d8fe1..e0a70bf048c 100644
--- a/cloudfoundry-operations/src/test/java/org/cloudfoundry/operations/spaces/CreateSpaceRequestTest.java
+++ b/cloudfoundry-operations/src/test/java/org/cloudfoundry/operations/spaces/CreateSpaceRequestTest.java
@@ -16,17 +16,23 @@
 
 package org.cloudfoundry.operations.spaces;
 
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
-public final class CreateSpaceRequestTest {
+import org.junit.jupiter.api.Test;
 
-    @Test(expected = IllegalStateException.class)
-    public void noName() {
-        CreateSpaceRequest.builder().build();
+final class CreateSpaceRequestTest {
+
+    @Test
+    void noName() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    CreateSpaceRequest.builder().build();
+                });
     }
 
     @Test
-    public void valid() {
+    void valid() {
         CreateSpaceRequest.builder().name("test-name").build();
     }
 }
diff --git a/cloudfoundry-operations/src/test/java/org/cloudfoundry/operations/spaces/DefaultSpacesTest.java b/cloudfoundry-operations/src/test/java/org/cloudfoundry/operations/spaces/DefaultSpacesTest.java
index 8b744926994..7a77417f0aa 100644
--- a/cloudfoundry-operations/src/test/java/org/cloudfoundry/operations/spaces/DefaultSpacesTest.java
+++ b/cloudfoundry-operations/src/test/java/org/cloudfoundry/operations/spaces/DefaultSpacesTest.java
@@ -81,12 +81,12 @@
 import org.cloudfoundry.client.v2.spaces.UpdateSpaceResponse;
 import org.cloudfoundry.operations.AbstractOperationsTest;
 import org.cloudfoundry.operations.spaceadmin.SpaceQuota;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import reactor.core.publisher.Mono;
 import reactor.test.StepVerifier;
 import reactor.test.scheduler.VirtualTimeScheduler;
 
-public final class DefaultSpacesTest extends AbstractOperationsTest {
+final class DefaultSpacesTest extends AbstractOperationsTest {
 
     private final DefaultSpaces spaces =
             new DefaultSpaces(
@@ -95,7 +95,7 @@ public final class DefaultSpacesTest extends AbstractOperationsTest {
                     Mono.just(TEST_USERNAME));
 
     @Test
-    public void allowSsh() {
+    void allowSsh() {
         requestOrganizationSpaces(
                 this.cloudFoundryClient,
                 TEST_ORGANIZATION_ID,
@@ -111,7 +111,7 @@ public void allowSsh() {
     }
 
     @Test
-    public void allowSshAlreadyAllowed() {
+    void allowSshAlreadyAllowed() {
         requestOrganizationSpacesWithSsh(
                 this.cloudFoundryClient, TEST_ORGANIZATION_ID, "test-space-name", true);
 
@@ -123,7 +123,7 @@ public void allowSshAlreadyAllowed() {
     }
 
     @Test
-    public void allowSshNoSpace() {
+    void allowSshNoSpace() {
         requestOrganizationSpacesEmpty(
                 this.cloudFoundryClient, TEST_ORGANIZATION_ID, "test-space-name");
 
@@ -139,7 +139,7 @@ public void allowSshNoSpace() {
     }
 
     @Test
-    public void createNoOrgNoQuota() {
+    void createNoOrgNoQuota() {
         requestCreateSpace(
                 this.cloudFoundryClient,
                 TEST_ORGANIZATION_ID,
@@ -161,7 +161,7 @@ public void createNoOrgNoQuota() {
     }
 
     @Test
-    public void createNoOrgQuota() {
+    void createNoOrgQuota() {
         requestOrganizationSpaceQuotas(
                 this.cloudFoundryClient,
                 TEST_ORGANIZATION_ID,
@@ -192,7 +192,7 @@ public void createNoOrgQuota() {
     }
 
     @Test
-    public void createNoOrgQuotaNotFound() {
+    void createNoOrgQuotaNotFound() {
         requestOrganizationSpaceQuotas(
                 this.cloudFoundryClient, TEST_ORGANIZATION_ID, "test-space-quota", null);
 
@@ -214,7 +214,7 @@ public void createNoOrgQuotaNotFound() {
     }
 
     @Test
-    public void createOrgNotFound() {
+    void createOrgNotFound() {
         requestOrganizations(this.cloudFoundryClient, "test-other-organization", null);
 
         this.spaces
@@ -236,7 +236,7 @@ public void createOrgNotFound() {
     }
 
     @Test
-    public void createOrgQuota() {
+    void createOrgQuota() {
         requestOrganizations(
                 this.cloudFoundryClient, "test-other-organization", "test-other-organization-id");
         requestOrganizationSpaceQuotas(
@@ -270,7 +270,7 @@ public void createOrgQuota() {
     }
 
     @Test
-    public void delete() {
+    void delete() {
         requestOrganizationSpaces(
                 this.cloudFoundryClient,
                 TEST_ORGANIZATION_ID,
@@ -291,7 +291,7 @@ public void delete() {
     }
 
     @Test
-    public void deleteFailure() {
+    void deleteFailure() {
         requestOrganizationSpaces(
                 this.cloudFoundryClient,
                 TEST_ORGANIZATION_ID,
@@ -318,7 +318,7 @@ public void deleteFailure() {
     }
 
     @Test
-    public void deleteInvalidSpace() {
+    void deleteInvalidSpace() {
         requestOrganizationSpacesEmpty(
                 this.cloudFoundryClient, TEST_ORGANIZATION_ID, "test-space-name");
 
@@ -334,7 +334,7 @@ public void deleteInvalidSpace() {
     }
 
     @Test
-    public void disallowSsh() {
+    void disallowSsh() {
         requestOrganizationSpaces(
                 this.cloudFoundryClient,
                 TEST_ORGANIZATION_ID,
@@ -350,7 +350,7 @@ public void disallowSsh() {
     }
 
     @Test
-    public void disallowSshAlreadyDisallowed() {
+    void disallowSshAlreadyDisallowed() {
         requestOrganizationSpacesWithSsh(
                 this.cloudFoundryClient, TEST_ORGANIZATION_ID, "test-space-name", false);
 
@@ -362,7 +362,7 @@ public void disallowSshAlreadyDisallowed() {
     }
 
     @Test
-    public void disallowSshNoSpace() {
+    void disallowSshNoSpace() {
         requestOrganizationSpacesEmpty(
                 this.cloudFoundryClient, TEST_ORGANIZATION_ID, "test-space-name");
 
@@ -378,7 +378,7 @@ public void disallowSshNoSpace() {
     }
 
     @Test
-    public void get() {
+    void get() {
         requestOrganization(this.cloudFoundryClient, "test-space-organizationId");
         requestOrganizationSpaces(
                 this.cloudFoundryClient,
@@ -426,7 +426,7 @@ public void get() {
     }
 
     @Test
-    public void getNoSecurityGroupRules() {
+    void getNoSecurityGroupRules() {
         requestOrganization(this.cloudFoundryClient, "test-space-organizationId");
         requestOrganizationSpaces(
                 this.cloudFoundryClient,
@@ -467,7 +467,7 @@ public void getNoSecurityGroupRules() {
     }
 
     @Test
-    public void getSpaceQuotaNull() {
+    void getSpaceQuotaNull() {
         requestOrganization(this.cloudFoundryClient, "test-space-organizationId");
         requestOrganizationSpaces(
                 this.cloudFoundryClient, TEST_ORGANIZATION_ID, TEST_SPACE_NAME, null);
@@ -503,7 +503,7 @@ public void getSpaceQuotaNull() {
     }
 
     @Test
-    public void list() {
+    void list() {
         requestSpaces(this.cloudFoundryClient, TEST_ORGANIZATION_ID);
 
         this.spaces
@@ -515,7 +515,7 @@ public void list() {
     }
 
     @Test
-    public void rename() {
+    void rename() {
         requestOrganizationSpaces(
                 this.cloudFoundryClient,
                 TEST_ORGANIZATION_ID,
@@ -535,7 +535,7 @@ public void rename() {
     }
 
     @Test
-    public void renameNoSpace() {
+    void renameNoSpace() {
         requestOrganizationSpacesEmpty(
                 this.cloudFoundryClient, TEST_ORGANIZATION_ID, "test-space-name");
 
@@ -555,7 +555,7 @@ public void renameNoSpace() {
     }
 
     @Test
-    public void sshAllowed() {
+    void sshAllowed() {
         requestOrganizationSpaces(
                 this.cloudFoundryClient,
                 TEST_ORGANIZATION_ID,
@@ -571,7 +571,7 @@ public void sshAllowed() {
     }
 
     @Test
-    public void sshAllowedNoSpace() {
+    void sshAllowedNoSpace() {
         requestOrganizationSpacesEmpty(
                 this.cloudFoundryClient, TEST_ORGANIZATION_ID, "test-space-name");
 
diff --git a/cloudfoundry-operations/src/test/java/org/cloudfoundry/operations/spaces/DeleteSpaceRequestTest.java b/cloudfoundry-operations/src/test/java/org/cloudfoundry/operations/spaces/DeleteSpaceRequestTest.java
index 46baedb65cc..9df963b2e2d 100644
--- a/cloudfoundry-operations/src/test/java/org/cloudfoundry/operations/spaces/DeleteSpaceRequestTest.java
+++ b/cloudfoundry-operations/src/test/java/org/cloudfoundry/operations/spaces/DeleteSpaceRequestTest.java
@@ -16,17 +16,23 @@
 
 package org.cloudfoundry.operations.spaces;
 
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
-public final class DeleteSpaceRequestTest {
+import org.junit.jupiter.api.Test;
 
-    @Test(expected = IllegalStateException.class)
-    public void noName() {
-        DeleteSpaceRequest.builder().build();
+final class DeleteSpaceRequestTest {
+
+    @Test
+    void noName() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    DeleteSpaceRequest.builder().build();
+                });
     }
 
     @Test
-    public void valid() {
+    void valid() {
         DeleteSpaceRequest.builder().name("test-name").build();
     }
 }
diff --git a/cloudfoundry-operations/src/test/java/org/cloudfoundry/operations/spaces/DisallowSpaceSshRequestTest.java b/cloudfoundry-operations/src/test/java/org/cloudfoundry/operations/spaces/DisallowSpaceSshRequestTest.java
index 86d067d0142..aeb1c06d86f 100644
--- a/cloudfoundry-operations/src/test/java/org/cloudfoundry/operations/spaces/DisallowSpaceSshRequestTest.java
+++ b/cloudfoundry-operations/src/test/java/org/cloudfoundry/operations/spaces/DisallowSpaceSshRequestTest.java
@@ -16,17 +16,23 @@
 
 package org.cloudfoundry.operations.spaces;
 
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
-public final class DisallowSpaceSshRequestTest {
+import org.junit.jupiter.api.Test;
 
-    @Test(expected = IllegalStateException.class)
-    public void noName() {
-        DisallowSpaceSshRequest.builder().build();
+final class DisallowSpaceSshRequestTest {
+
+    @Test
+    void noName() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    DisallowSpaceSshRequest.builder().build();
+                });
     }
 
     @Test
-    public void valid() {
+    void valid() {
         DisallowSpaceSshRequest.builder().name("test-name").build();
     }
 }
diff --git a/cloudfoundry-operations/src/test/java/org/cloudfoundry/operations/spaces/GetSpaceRequestTest.java b/cloudfoundry-operations/src/test/java/org/cloudfoundry/operations/spaces/GetSpaceRequestTest.java
index cdfa1baf256..7adfb43dc94 100644
--- a/cloudfoundry-operations/src/test/java/org/cloudfoundry/operations/spaces/GetSpaceRequestTest.java
+++ b/cloudfoundry-operations/src/test/java/org/cloudfoundry/operations/spaces/GetSpaceRequestTest.java
@@ -16,17 +16,23 @@
 
 package org.cloudfoundry.operations.spaces;
 
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
-public final class GetSpaceRequestTest {
+import org.junit.jupiter.api.Test;
 
-    @Test(expected = IllegalStateException.class)
-    public void noName() {
-        GetSpaceRequest.builder().build();
+final class GetSpaceRequestTest {
+
+    @Test
+    void noName() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    GetSpaceRequest.builder().build();
+                });
     }
 
     @Test
-    public void valid() {
+    void valid() {
         GetSpaceRequest.builder().name("test-name").build();
     }
 }
diff --git a/cloudfoundry-operations/src/test/java/org/cloudfoundry/operations/spaces/RenameSpaceRequestTest.java b/cloudfoundry-operations/src/test/java/org/cloudfoundry/operations/spaces/RenameSpaceRequestTest.java
index fbd850df764..b76a64d8859 100644
--- a/cloudfoundry-operations/src/test/java/org/cloudfoundry/operations/spaces/RenameSpaceRequestTest.java
+++ b/cloudfoundry-operations/src/test/java/org/cloudfoundry/operations/spaces/RenameSpaceRequestTest.java
@@ -16,22 +16,32 @@
 
 package org.cloudfoundry.operations.spaces;
 
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
-public final class RenameSpaceRequestTest {
+import org.junit.jupiter.api.Test;
 
-    @Test(expected = IllegalStateException.class)
-    public void noName() {
-        RenameSpaceRequest.builder().newName("new-name").build();
+final class RenameSpaceRequestTest {
+
+    @Test
+    void noName() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    RenameSpaceRequest.builder().newName("new-name").build();
+                });
     }
 
-    @Test(expected = IllegalStateException.class)
-    public void noNewName() {
-        RenameSpaceRequest.builder().name("name").build();
+    @Test
+    void noNewName() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    RenameSpaceRequest.builder().name("name").build();
+                });
     }
 
     @Test
-    public void valid() {
+    void valid() {
         RenameSpaceRequest.builder().name("test-name").newName("test-new-name").build();
     }
 }
diff --git a/cloudfoundry-operations/src/test/java/org/cloudfoundry/operations/spaces/SpaceSshAllowedRequestTest.java b/cloudfoundry-operations/src/test/java/org/cloudfoundry/operations/spaces/SpaceSshAllowedRequestTest.java
index 038e16052f9..ec960f63478 100644
--- a/cloudfoundry-operations/src/test/java/org/cloudfoundry/operations/spaces/SpaceSshAllowedRequestTest.java
+++ b/cloudfoundry-operations/src/test/java/org/cloudfoundry/operations/spaces/SpaceSshAllowedRequestTest.java
@@ -16,17 +16,23 @@
 
 package org.cloudfoundry.operations.spaces;
 
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
-public final class SpaceSshAllowedRequestTest {
+import org.junit.jupiter.api.Test;
 
-    @Test(expected = IllegalStateException.class)
-    public void noName() {
-        SpaceSshAllowedRequest.builder().build();
+final class SpaceSshAllowedRequestTest {
+
+    @Test
+    void noName() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    SpaceSshAllowedRequest.builder().build();
+                });
     }
 
     @Test
-    public void valid() {
+    void valid() {
         SpaceSshAllowedRequest.builder().name("test-name").build();
     }
 }
diff --git a/cloudfoundry-operations/src/test/java/org/cloudfoundry/operations/stacks/DefaultStacksTest.java b/cloudfoundry-operations/src/test/java/org/cloudfoundry/operations/stacks/DefaultStacksTest.java
index ee100b62256..d64f055eefc 100644
--- a/cloudfoundry-operations/src/test/java/org/cloudfoundry/operations/stacks/DefaultStacksTest.java
+++ b/cloudfoundry-operations/src/test/java/org/cloudfoundry/operations/stacks/DefaultStacksTest.java
@@ -25,16 +25,16 @@
 import org.cloudfoundry.client.v2.stacks.ListStacksResponse;
 import org.cloudfoundry.client.v2.stacks.StackResource;
 import org.cloudfoundry.operations.AbstractOperationsTest;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import reactor.core.publisher.Mono;
 import reactor.test.StepVerifier;
 
-public final class DefaultStacksTest extends AbstractOperationsTest {
+final class DefaultStacksTest extends AbstractOperationsTest {
 
     private final DefaultStacks stacks = new DefaultStacks(Mono.just(this.cloudFoundryClient));
 
     @Test
-    public void getStack() {
+    void getStack() {
         requestStacks(this.cloudFoundryClient, "test-stack-name");
 
         this.stacks
@@ -46,7 +46,7 @@ public void getStack() {
     }
 
     @Test
-    public void listStacks() {
+    void listStacks() {
         requestStacks(this.cloudFoundryClient);
 
         this.stacks
diff --git a/cloudfoundry-operations/src/test/java/org/cloudfoundry/operations/stacks/GetStackRequestTest.java b/cloudfoundry-operations/src/test/java/org/cloudfoundry/operations/stacks/GetStackRequestTest.java
index f86868c9a96..2d5ae0748fb 100644
--- a/cloudfoundry-operations/src/test/java/org/cloudfoundry/operations/stacks/GetStackRequestTest.java
+++ b/cloudfoundry-operations/src/test/java/org/cloudfoundry/operations/stacks/GetStackRequestTest.java
@@ -16,17 +16,23 @@
 
 package org.cloudfoundry.operations.stacks;
 
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
-public final class GetStackRequestTest {
+import org.junit.jupiter.api.Test;
 
-    @Test(expected = IllegalStateException.class)
-    public void noName() {
-        GetStackRequest.builder().build();
+final class GetStackRequestTest {
+
+    @Test
+    void noName() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    GetStackRequest.builder().build();
+                });
     }
 
     @Test
-    public void valid() {
+    void valid() {
         GetStackRequest.builder().name("test-stack-name").build();
     }
 }
diff --git a/cloudfoundry-operations/src/test/java/org/cloudfoundry/operations/useradmin/CreateUserRequestTest.java b/cloudfoundry-operations/src/test/java/org/cloudfoundry/operations/useradmin/CreateUserRequestTest.java
index 1e566844c6b..71afca339c0 100644
--- a/cloudfoundry-operations/src/test/java/org/cloudfoundry/operations/useradmin/CreateUserRequestTest.java
+++ b/cloudfoundry-operations/src/test/java/org/cloudfoundry/operations/useradmin/CreateUserRequestTest.java
@@ -16,31 +16,45 @@
 
 package org.cloudfoundry.operations.useradmin;
 
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
-public final class CreateUserRequestTest {
+import org.junit.jupiter.api.Test;
 
-    @Test(expected = IllegalStateException.class)
-    public void bothOriginAndPassword() {
-        CreateUserRequest.builder()
-                .origin("test-origin")
-                .password("test-password")
-                .username("test-username")
-                .build();
+final class CreateUserRequestTest {
+
+    @Test
+    void bothOriginAndPassword() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    CreateUserRequest.builder()
+                            .origin("test-origin")
+                            .password("test-password")
+                            .username("test-username")
+                            .build();
+                });
     }
 
-    @Test(expected = IllegalStateException.class)
-    public void noOriginOrPassword() {
-        CreateUserRequest.builder().username("test-username").build();
+    @Test
+    void noOriginOrPassword() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    CreateUserRequest.builder().username("test-username").build();
+                });
     }
 
-    @Test(expected = IllegalStateException.class)
-    public void noUsername() {
-        CreateUserRequest.builder().password("test-password").build();
+    @Test
+    void noUsername() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    CreateUserRequest.builder().password("test-password").build();
+                });
     }
 
     @Test
-    public void valid() {
+    void valid() {
         CreateUserRequest.builder().password("test-password").username("test-username").build();
     }
 }
diff --git a/cloudfoundry-operations/src/test/java/org/cloudfoundry/operations/useradmin/DefaultUserAdminTest.java b/cloudfoundry-operations/src/test/java/org/cloudfoundry/operations/useradmin/DefaultUserAdminTest.java
index 98cb303cb52..886c422a913 100644
--- a/cloudfoundry-operations/src/test/java/org/cloudfoundry/operations/useradmin/DefaultUserAdminTest.java
+++ b/cloudfoundry-operations/src/test/java/org/cloudfoundry/operations/useradmin/DefaultUserAdminTest.java
@@ -73,18 +73,18 @@
 import org.cloudfoundry.uaa.users.Meta;
 import org.cloudfoundry.uaa.users.Name;
 import org.cloudfoundry.uaa.users.User;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import reactor.core.publisher.Mono;
 import reactor.test.StepVerifier;
 import reactor.test.scheduler.VirtualTimeScheduler;
 
-public final class DefaultUserAdminTest extends AbstractOperationsTest {
+final class DefaultUserAdminTest extends AbstractOperationsTest {
 
     private final DefaultUserAdmin userAdmin =
             new DefaultUserAdmin(Mono.just(this.cloudFoundryClient), Mono.just(this.uaaClient));
 
     @Test
-    public void createUaaUserExists() {
+    void createUaaUserExists() {
         requestCreateUaaUserAlreadyExists(this.uaaClient);
         requestCreateUser(this.cloudFoundryClient);
 
@@ -100,7 +100,7 @@ public void createUaaUserExists() {
     }
 
     @Test
-    public void createWithPassword() {
+    void createWithPassword() {
         requestCreateUaaUser(this.uaaClient);
         requestCreateUser(this.cloudFoundryClient);
 
@@ -116,7 +116,7 @@ public void createWithPassword() {
     }
 
     @Test
-    public void delete() {
+    void delete() {
         requestListUser(this.uaaClient);
         requestDeleteUser(this.cloudFoundryClient);
         requestJobSuccess(this.cloudFoundryClient, "test-job-entity-id");
@@ -134,7 +134,7 @@ public void delete() {
     }
 
     @Test
-    public void deleteFailure() {
+    void deleteFailure() {
         requestListUser(this.uaaClient);
         requestDeleteUser(this.cloudFoundryClient);
         requestJobFailure(this.cloudFoundryClient, "test-job-entity-id");
@@ -158,7 +158,7 @@ public void deleteFailure() {
     }
 
     @Test
-    public void deleteNoCfUser() {
+    void deleteNoCfUser() {
         requestListUser(this.uaaClient);
         requestDeleteUserEmpty(this.cloudFoundryClient);
         requestDeleteUaaUser(this.uaaClient);
@@ -171,7 +171,7 @@ public void deleteNoCfUser() {
     }
 
     @Test
-    public void deleteNoUaaUser() {
+    void deleteNoUaaUser() {
         requestListUserEmpty(this.uaaClient);
 
         this.userAdmin
@@ -182,7 +182,7 @@ public void deleteNoUaaUser() {
     }
 
     @Test
-    public void listOrganizationUsersAllFound() {
+    void listOrganizationUsersAllFound() {
         requestOrganization(this.cloudFoundryClient);
         requestListOrganizationAuditors(this.cloudFoundryClient);
         requestListOrganizationBillingManagers(this.cloudFoundryClient);
@@ -205,7 +205,7 @@ public void listOrganizationUsersAllFound() {
     }
 
     @Test
-    public void listOrganizationUsersNoneFound() {
+    void listOrganizationUsersNoneFound() {
         requestOrganization(this.cloudFoundryClient);
         requestListOrganizationAuditorsEmpty(this.cloudFoundryClient);
         requestListOrganizationBillingManagersEmpty(this.cloudFoundryClient);
@@ -223,7 +223,7 @@ public void listOrganizationUsersNoneFound() {
     }
 
     @Test
-    public void listOrganizationUsersOrganizationNotFound() {
+    void listOrganizationUsersOrganizationNotFound() {
         requestOrganizationEmpty(this.cloudFoundryClient);
 
         this.userAdmin
@@ -237,7 +237,7 @@ public void listOrganizationUsersOrganizationNotFound() {
     }
 
     @Test
-    public void listSpaceUsersAllFound() {
+    void listSpaceUsersAllFound() {
         requestOrganization(this.cloudFoundryClient);
         requestSpace(this.cloudFoundryClient);
         requestListSpaceAuditors(this.cloudFoundryClient);
@@ -262,7 +262,7 @@ public void listSpaceUsersAllFound() {
     }
 
     @Test
-    public void listSpaceUsersNoneFound() {
+    void listSpaceUsersNoneFound() {
         requestOrganization(this.cloudFoundryClient);
         requestSpace(this.cloudFoundryClient);
         requestListSpaceAuditorsEmpty(this.cloudFoundryClient);
@@ -282,7 +282,7 @@ public void listSpaceUsersNoneFound() {
     }
 
     @Test
-    public void listSpaceUsersNullsFound() {
+    void listSpaceUsersNullsFound() {
         requestOrganization(this.cloudFoundryClient);
         requestSpace(this.cloudFoundryClient);
         requestListSpaceAuditorsNulls(this.cloudFoundryClient);
@@ -302,7 +302,7 @@ public void listSpaceUsersNullsFound() {
     }
 
     @Test
-    public void listSpaceUsersOrganizationNotFound() {
+    void listSpaceUsersOrganizationNotFound() {
         requestOrganizationEmpty(this.cloudFoundryClient);
 
         this.userAdmin
@@ -317,7 +317,7 @@ public void listSpaceUsersOrganizationNotFound() {
     }
 
     @Test
-    public void listSpaceUsersSpaceNotFound() {
+    void listSpaceUsersSpaceNotFound() {
         requestOrganization(this.cloudFoundryClient);
         requestSpaceEmpty(this.cloudFoundryClient);
 
@@ -333,7 +333,7 @@ public void listSpaceUsersSpaceNotFound() {
     }
 
     @Test
-    public void setOrganizationRole() {
+    void setOrganizationRole() {
         requestGetFeatureFlag(this.cloudFoundryClient, "set_roles_by_username", true);
         requestListOrganizations(this.cloudFoundryClient, "test-organization-name");
         requestAssociateOrganizationUserByUsername(
@@ -354,7 +354,7 @@ public void setOrganizationRole() {
     }
 
     @Test
-    public void setOrganizationRoleFeatureDisabled() {
+    void setOrganizationRoleFeatureDisabled() {
         requestGetFeatureFlag(this.cloudFoundryClient, "set_roles_by_username", false);
 
         this.userAdmin
@@ -370,7 +370,7 @@ public void setOrganizationRoleFeatureDisabled() {
     }
 
     @Test
-    public void setOrganizationRoleInvalidOrganization() {
+    void setOrganizationRoleInvalidOrganization() {
         requestGetFeatureFlag(this.cloudFoundryClient, "set_roles_by_username", true);
         requestListOrganizationsEmpty(this.cloudFoundryClient, "test-organization-name");
 
@@ -387,7 +387,7 @@ public void setOrganizationRoleInvalidOrganization() {
     }
 
     @Test
-    public void setSpaceRole() {
+    void setSpaceRole() {
         requestGetFeatureFlag(this.cloudFoundryClient, "set_roles_by_username", true);
         requestListOrganizations(this.cloudFoundryClient, "test-organization-name");
         requestListOrganizationSpaces(
@@ -411,7 +411,7 @@ public void setSpaceRole() {
     }
 
     @Test
-    public void setSpaceRoleFeatureDisabled() {
+    void setSpaceRoleFeatureDisabled() {
         requestGetFeatureFlag(this.cloudFoundryClient, "set_roles_by_username", false);
 
         this.userAdmin
@@ -428,7 +428,7 @@ public void setSpaceRoleFeatureDisabled() {
     }
 
     @Test
-    public void setSpaceRoleInvalidOrganization() {
+    void setSpaceRoleInvalidOrganization() {
         requestGetFeatureFlag(this.cloudFoundryClient, "set_roles_by_username", true);
         requestListOrganizationsEmpty(this.cloudFoundryClient, "test-organization-name");
 
@@ -446,7 +446,7 @@ public void setSpaceRoleInvalidOrganization() {
     }
 
     @Test
-    public void setSpaceRoleInvalidSpace() {
+    void setSpaceRoleInvalidSpace() {
         requestGetFeatureFlag(this.cloudFoundryClient, "set_roles_by_username", true);
         requestListOrganizations(this.cloudFoundryClient, "test-organization-name");
         requestListOrganizationSpacesEmpty(
@@ -466,7 +466,7 @@ public void setSpaceRoleInvalidSpace() {
     }
 
     @Test
-    public void unsetOrganizationRole() {
+    void unsetOrganizationRole() {
         requestGetFeatureFlag(this.cloudFoundryClient, "unset_roles_by_username", true);
         requestListOrganizations(this.cloudFoundryClient, "test-organization-name");
         requestRemoveOrganizationManagerByUsername(
@@ -485,7 +485,7 @@ public void unsetOrganizationRole() {
     }
 
     @Test
-    public void unsetOrganizationRoleFeatureDisabled() {
+    void unsetOrganizationRoleFeatureDisabled() {
         requestGetFeatureFlag(this.cloudFoundryClient, "unset_roles_by_username", false);
 
         this.userAdmin
@@ -501,7 +501,7 @@ public void unsetOrganizationRoleFeatureDisabled() {
     }
 
     @Test
-    public void unsetOrganizationRoleInvalidOrganization() {
+    void unsetOrganizationRoleInvalidOrganization() {
         requestGetFeatureFlag(this.cloudFoundryClient, "unset_roles_by_username", true);
         requestListOrganizationsEmpty(this.cloudFoundryClient, "test-organization-name");
 
@@ -518,7 +518,7 @@ public void unsetOrganizationRoleInvalidOrganization() {
     }
 
     @Test
-    public void unsetSpaceRole() {
+    void unsetSpaceRole() {
         requestGetFeatureFlag(this.cloudFoundryClient, "unset_roles_by_username", true);
         requestListOrganizations(this.cloudFoundryClient, "test-organization-name");
         requestListOrganizationSpaces(
@@ -540,7 +540,7 @@ public void unsetSpaceRole() {
     }
 
     @Test
-    public void unsetSpaceRoleFeatureDisabled() {
+    void unsetSpaceRoleFeatureDisabled() {
         requestGetFeatureFlag(this.cloudFoundryClient, "unset_roles_by_username", false);
 
         this.userAdmin
@@ -557,7 +557,7 @@ public void unsetSpaceRoleFeatureDisabled() {
     }
 
     @Test
-    public void unsetSpaceRoleInvalidOrganization() {
+    void unsetSpaceRoleInvalidOrganization() {
         requestGetFeatureFlag(this.cloudFoundryClient, "unset_roles_by_username", true);
         requestListOrganizationsEmpty(this.cloudFoundryClient, "test-organization-name");
 
@@ -575,7 +575,7 @@ public void unsetSpaceRoleInvalidOrganization() {
     }
 
     @Test
-    public void unsetSpaceRoleInvalidSpace() {
+    void unsetSpaceRoleInvalidSpace() {
         requestGetFeatureFlag(this.cloudFoundryClient, "unset_roles_by_username", true);
         requestListOrganizations(this.cloudFoundryClient, "test-organization-name");
         requestListOrganizationSpacesEmpty(
diff --git a/cloudfoundry-operations/src/test/java/org/cloudfoundry/operations/useradmin/DeleteUserRequestTest.java b/cloudfoundry-operations/src/test/java/org/cloudfoundry/operations/useradmin/DeleteUserRequestTest.java
index 096027e6111..f613bbb5d1d 100644
--- a/cloudfoundry-operations/src/test/java/org/cloudfoundry/operations/useradmin/DeleteUserRequestTest.java
+++ b/cloudfoundry-operations/src/test/java/org/cloudfoundry/operations/useradmin/DeleteUserRequestTest.java
@@ -16,17 +16,23 @@
 
 package org.cloudfoundry.operations.useradmin;
 
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
-public final class DeleteUserRequestTest {
+import org.junit.jupiter.api.Test;
 
-    @Test(expected = IllegalStateException.class)
-    public void noUsername() {
-        DeleteUserRequest.builder().build();
+final class DeleteUserRequestTest {
+
+    @Test
+    void noUsername() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    DeleteUserRequest.builder().build();
+                });
     }
 
     @Test
-    public void valid() {
+    void valid() {
         DeleteUserRequest.builder().username("test-username").build();
     }
 }
diff --git a/cloudfoundry-operations/src/test/java/org/cloudfoundry/operations/useradmin/ListOrganizationUsersRequestTest.java b/cloudfoundry-operations/src/test/java/org/cloudfoundry/operations/useradmin/ListOrganizationUsersRequestTest.java
index 9afdb649fff..fc69c06f88e 100644
--- a/cloudfoundry-operations/src/test/java/org/cloudfoundry/operations/useradmin/ListOrganizationUsersRequestTest.java
+++ b/cloudfoundry-operations/src/test/java/org/cloudfoundry/operations/useradmin/ListOrganizationUsersRequestTest.java
@@ -16,17 +16,23 @@
 
 package org.cloudfoundry.operations.useradmin;
 
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
-public final class ListOrganizationUsersRequestTest {
+import org.junit.jupiter.api.Test;
 
-    @Test(expected = IllegalStateException.class)
-    public void noOrganizationName() {
-        ListOrganizationUsersRequest.builder().build();
+final class ListOrganizationUsersRequestTest {
+
+    @Test
+    void noOrganizationName() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    ListOrganizationUsersRequest.builder().build();
+                });
     }
 
     @Test
-    public void valid() {
+    void valid() {
         ListOrganizationUsersRequest.builder().organizationName("test-organization").build();
     }
 }
diff --git a/cloudfoundry-operations/src/test/java/org/cloudfoundry/operations/useradmin/ListSpaceUsersRequestTest.java b/cloudfoundry-operations/src/test/java/org/cloudfoundry/operations/useradmin/ListSpaceUsersRequestTest.java
index 2e94140a069..45fc7a360ca 100644
--- a/cloudfoundry-operations/src/test/java/org/cloudfoundry/operations/useradmin/ListSpaceUsersRequestTest.java
+++ b/cloudfoundry-operations/src/test/java/org/cloudfoundry/operations/useradmin/ListSpaceUsersRequestTest.java
@@ -16,22 +16,32 @@
 
 package org.cloudfoundry.operations.useradmin;
 
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
-public final class ListSpaceUsersRequestTest {
+import org.junit.jupiter.api.Test;
 
-    @Test(expected = IllegalStateException.class)
-    public void noOrganizationName() {
-        ListSpaceUsersRequest.builder().spaceName("test-space").build();
+final class ListSpaceUsersRequestTest {
+
+    @Test
+    void noOrganizationName() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    ListSpaceUsersRequest.builder().spaceName("test-space").build();
+                });
     }
 
-    @Test(expected = IllegalStateException.class)
-    public void noSpaceName() {
-        ListSpaceUsersRequest.builder().organizationName("test-organization").build();
+    @Test
+    void noSpaceName() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    ListSpaceUsersRequest.builder().organizationName("test-organization").build();
+                });
     }
 
     @Test
-    public void valid() {
+    void valid() {
         ListSpaceUsersRequest.builder()
                 .organizationName("test-organization")
                 .spaceName("test-space")
diff --git a/cloudfoundry-operations/src/test/java/org/cloudfoundry/operations/useradmin/SetOrganizationRoleRequestTest.java b/cloudfoundry-operations/src/test/java/org/cloudfoundry/operations/useradmin/SetOrganizationRoleRequestTest.java
index d525405a851..c878a1f152a 100644
--- a/cloudfoundry-operations/src/test/java/org/cloudfoundry/operations/useradmin/SetOrganizationRoleRequestTest.java
+++ b/cloudfoundry-operations/src/test/java/org/cloudfoundry/operations/useradmin/SetOrganizationRoleRequestTest.java
@@ -16,36 +16,50 @@
 
 package org.cloudfoundry.operations.useradmin;
 
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
-public final class SetOrganizationRoleRequestTest {
+import org.junit.jupiter.api.Test;
 
-    @Test(expected = IllegalStateException.class)
-    public void noOrganizationName() {
-        SetOrganizationRoleRequest.builder()
-                .organizationRole(OrganizationRole.AUDITOR)
-                .username("test-username")
-                .build();
+final class SetOrganizationRoleRequestTest {
+
+    @Test
+    void noOrganizationName() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    SetOrganizationRoleRequest.builder()
+                            .organizationRole(OrganizationRole.AUDITOR)
+                            .username("test-username")
+                            .build();
+                });
     }
 
-    @Test(expected = IllegalStateException.class)
-    public void noOrganizationRole() {
-        SetOrganizationRoleRequest.builder()
-                .organizationName("test-organization")
-                .username("test-username")
-                .build();
+    @Test
+    void noOrganizationRole() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    SetOrganizationRoleRequest.builder()
+                            .organizationName("test-organization")
+                            .username("test-username")
+                            .build();
+                });
     }
 
-    @Test(expected = IllegalStateException.class)
-    public void noUsername() {
-        SetOrganizationRoleRequest.builder()
-                .organizationName("test-organization")
-                .organizationRole(OrganizationRole.BILLING_MANAGER)
-                .build();
+    @Test
+    void noUsername() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    SetOrganizationRoleRequest.builder()
+                            .organizationName("test-organization")
+                            .organizationRole(OrganizationRole.BILLING_MANAGER)
+                            .build();
+                });
     }
 
     @Test
-    public void valid() {
+    void valid() {
         SetOrganizationRoleRequest.builder()
                 .organizationName("test-organization")
                 .organizationRole(OrganizationRole.MANAGER)
diff --git a/cloudfoundry-operations/src/test/java/org/cloudfoundry/operations/useradmin/SetSpaceRoleRequestTest.java b/cloudfoundry-operations/src/test/java/org/cloudfoundry/operations/useradmin/SetSpaceRoleRequestTest.java
index 670abf1c5a8..4adda4416f6 100644
--- a/cloudfoundry-operations/src/test/java/org/cloudfoundry/operations/useradmin/SetSpaceRoleRequestTest.java
+++ b/cloudfoundry-operations/src/test/java/org/cloudfoundry/operations/useradmin/SetSpaceRoleRequestTest.java
@@ -16,48 +16,66 @@
 
 package org.cloudfoundry.operations.useradmin;
 
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
-public final class SetSpaceRoleRequestTest {
+import org.junit.jupiter.api.Test;
 
-    @Test(expected = IllegalStateException.class)
-    public void noOrganizationName() {
-        SetSpaceRoleRequest.builder()
-                .spaceName("test-space")
-                .spaceRole(SpaceRole.AUDITOR)
-                .username("test-username")
-                .build();
+final class SetSpaceRoleRequestTest {
+
+    @Test
+    void noOrganizationName() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    SetSpaceRoleRequest.builder()
+                            .spaceName("test-space")
+                            .spaceRole(SpaceRole.AUDITOR)
+                            .username("test-username")
+                            .build();
+                });
     }
 
-    @Test(expected = IllegalStateException.class)
-    public void noSpaceName() {
-        SetSpaceRoleRequest.builder()
-                .organizationName("test-organization")
-                .spaceRole(SpaceRole.MANAGER)
-                .username("test-username")
-                .build();
+    @Test
+    void noSpaceName() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    SetSpaceRoleRequest.builder()
+                            .organizationName("test-organization")
+                            .spaceRole(SpaceRole.MANAGER)
+                            .username("test-username")
+                            .build();
+                });
     }
 
-    @Test(expected = IllegalStateException.class)
-    public void noSpaceRole() {
-        SetSpaceRoleRequest.builder()
-                .organizationName("test-organization")
-                .spaceName("test-space")
-                .username("test-username")
-                .build();
+    @Test
+    void noSpaceRole() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    SetSpaceRoleRequest.builder()
+                            .organizationName("test-organization")
+                            .spaceName("test-space")
+                            .username("test-username")
+                            .build();
+                });
     }
 
-    @Test(expected = IllegalStateException.class)
-    public void noUsername() {
-        SetSpaceRoleRequest.builder()
-                .organizationName("test-organization")
-                .spaceName("test-space")
-                .spaceRole(SpaceRole.DEVELOPER)
-                .build();
+    @Test
+    void noUsername() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    SetSpaceRoleRequest.builder()
+                            .organizationName("test-organization")
+                            .spaceName("test-space")
+                            .spaceRole(SpaceRole.DEVELOPER)
+                            .build();
+                });
     }
 
     @Test
-    public void valid() {
+    void valid() {
         SetSpaceRoleRequest.builder()
                 .organizationName("test-organization")
                 .spaceName("test-space")
diff --git a/cloudfoundry-operations/src/test/java/org/cloudfoundry/operations/useradmin/UnsetOrganizationRoleRequestTest.java b/cloudfoundry-operations/src/test/java/org/cloudfoundry/operations/useradmin/UnsetOrganizationRoleRequestTest.java
index ce043bf2a00..63852ae9a3b 100644
--- a/cloudfoundry-operations/src/test/java/org/cloudfoundry/operations/useradmin/UnsetOrganizationRoleRequestTest.java
+++ b/cloudfoundry-operations/src/test/java/org/cloudfoundry/operations/useradmin/UnsetOrganizationRoleRequestTest.java
@@ -16,36 +16,50 @@
 
 package org.cloudfoundry.operations.useradmin;
 
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
-public final class UnsetOrganizationRoleRequestTest {
+import org.junit.jupiter.api.Test;
 
-    @Test(expected = IllegalStateException.class)
-    public void noOrganizationName() {
-        UnsetOrganizationRoleRequest.builder()
-                .organizationRole(OrganizationRole.AUDITOR)
-                .username("test-username")
-                .build();
+final class UnsetOrganizationRoleRequestTest {
+
+    @Test
+    void noOrganizationName() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    UnsetOrganizationRoleRequest.builder()
+                            .organizationRole(OrganizationRole.AUDITOR)
+                            .username("test-username")
+                            .build();
+                });
     }
 
-    @Test(expected = IllegalStateException.class)
-    public void noOrganizationRole() {
-        UnsetOrganizationRoleRequest.builder()
-                .organizationName("test-organization")
-                .username("test-username")
-                .build();
+    @Test
+    void noOrganizationRole() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    UnsetOrganizationRoleRequest.builder()
+                            .organizationName("test-organization")
+                            .username("test-username")
+                            .build();
+                });
     }
 
-    @Test(expected = IllegalStateException.class)
-    public void noUsername() {
-        UnsetOrganizationRoleRequest.builder()
-                .organizationName("test-organization")
-                .organizationRole(OrganizationRole.BILLING_MANAGER)
-                .build();
+    @Test
+    void noUsername() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    UnsetOrganizationRoleRequest.builder()
+                            .organizationName("test-organization")
+                            .organizationRole(OrganizationRole.BILLING_MANAGER)
+                            .build();
+                });
     }
 
     @Test
-    public void valid() {
+    void valid() {
         UnsetOrganizationRoleRequest.builder()
                 .organizationName("test-organization")
                 .organizationRole(OrganizationRole.MANAGER)
diff --git a/cloudfoundry-operations/src/test/java/org/cloudfoundry/operations/useradmin/UnsetSpaceRoleRequestTest.java b/cloudfoundry-operations/src/test/java/org/cloudfoundry/operations/useradmin/UnsetSpaceRoleRequestTest.java
index e6083f87caf..1faeec71b09 100644
--- a/cloudfoundry-operations/src/test/java/org/cloudfoundry/operations/useradmin/UnsetSpaceRoleRequestTest.java
+++ b/cloudfoundry-operations/src/test/java/org/cloudfoundry/operations/useradmin/UnsetSpaceRoleRequestTest.java
@@ -16,48 +16,66 @@
 
 package org.cloudfoundry.operations.useradmin;
 
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
-public final class UnsetSpaceRoleRequestTest {
+import org.junit.jupiter.api.Test;
 
-    @Test(expected = IllegalStateException.class)
-    public void noOrganizationName() {
-        UnsetSpaceRoleRequest.builder()
-                .spaceName("test-space")
-                .spaceRole(SpaceRole.AUDITOR)
-                .username("test-username")
-                .build();
+final class UnsetSpaceRoleRequestTest {
+
+    @Test
+    void noOrganizationName() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    UnsetSpaceRoleRequest.builder()
+                            .spaceName("test-space")
+                            .spaceRole(SpaceRole.AUDITOR)
+                            .username("test-username")
+                            .build();
+                });
     }
 
-    @Test(expected = IllegalStateException.class)
-    public void noSpaceName() {
-        UnsetSpaceRoleRequest.builder()
-                .organizationName("test-organization")
-                .spaceRole(SpaceRole.MANAGER)
-                .username("test-username")
-                .build();
+    @Test
+    void noSpaceName() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    UnsetSpaceRoleRequest.builder()
+                            .organizationName("test-organization")
+                            .spaceRole(SpaceRole.MANAGER)
+                            .username("test-username")
+                            .build();
+                });
     }
 
-    @Test(expected = IllegalStateException.class)
-    public void noSpaceRole() {
-        UnsetSpaceRoleRequest.builder()
-                .organizationName("test-organization")
-                .spaceName("test-space")
-                .username("test-username")
-                .build();
+    @Test
+    void noSpaceRole() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    UnsetSpaceRoleRequest.builder()
+                            .organizationName("test-organization")
+                            .spaceName("test-space")
+                            .username("test-username")
+                            .build();
+                });
     }
 
-    @Test(expected = IllegalStateException.class)
-    public void noUsername() {
-        UnsetSpaceRoleRequest.builder()
-                .organizationName("test-organization")
-                .spaceName("test-space")
-                .spaceRole(SpaceRole.DEVELOPER)
-                .build();
+    @Test
+    void noUsername() {
+        assertThrows(
+                IllegalStateException.class,
+                () -> {
+                    UnsetSpaceRoleRequest.builder()
+                            .organizationName("test-organization")
+                            .spaceName("test-space")
+                            .spaceRole(SpaceRole.DEVELOPER)
+                            .build();
+                });
     }
 
     @Test
-    public void valid() {
+    void valid() {
         UnsetSpaceRoleRequest.builder()
                 .organizationName("test-organization")
                 .spaceName("test-space")
diff --git a/cloudfoundry-util/pom.xml b/cloudfoundry-util/pom.xml
index ac627dad00a..e942dfcfbde 100644
--- a/cloudfoundry-util/pom.xml
+++ b/cloudfoundry-util/pom.xml
@@ -53,11 +53,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>
         <dependency>
             <groupId>org.apache.commons</groupId>
             <artifactId>commons-compress</artifactId>
diff --git a/cloudfoundry-util/src/test/java/org/cloudfoundry/util/DelayUtilsTest.java b/cloudfoundry-util/src/test/java/org/cloudfoundry/util/DelayUtilsTest.java
index c14c7eb732a..ec4ac01bb0d 100644
--- a/cloudfoundry-util/src/test/java/org/cloudfoundry/util/DelayUtilsTest.java
+++ b/cloudfoundry-util/src/test/java/org/cloudfoundry/util/DelayUtilsTest.java
@@ -17,18 +17,18 @@
 package org.cloudfoundry.util;
 
 import java.time.Duration;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.reactivestreams.Publisher;
 import reactor.core.publisher.Flux;
 import reactor.core.publisher.Mono;
 import reactor.test.StepVerifier;
 import reactor.test.scheduler.VirtualTimeScheduler;
 
-public final class DelayUtilsTest {
+final class DelayUtilsTest {
 
     @SuppressWarnings("unchecked")
     @Test
-    public void exponentialBackOff() {
+    void exponentialBackOff() {
         StepVerifier.withVirtualTime(
                         () ->
                                 (Publisher<Long>)
@@ -49,7 +49,7 @@ public void exponentialBackOff() {
 
     @SuppressWarnings("unchecked")
     @Test
-    public void exponentialBackOffMaximum() {
+    void exponentialBackOffMaximum() {
         StepVerifier.withVirtualTime(
                         () ->
                                 (Publisher<Long>)
@@ -69,7 +69,7 @@ public void exponentialBackOffMaximum() {
     }
 
     @Test
-    public void exponentialBackOffTimeout() {
+    void exponentialBackOffTimeout() {
         StepVerifier.create(
                         DelayUtils.exponentialBackOff(
                                         Duration.ofMillis(500),
@@ -82,7 +82,7 @@ public void exponentialBackOffTimeout() {
 
     @SuppressWarnings("unchecked")
     @Test
-    public void fixed() {
+    void fixed() {
         StepVerifier.withVirtualTime(
                         () ->
                                 (Publisher<Long>)
@@ -100,7 +100,7 @@ public void fixed() {
 
     @SuppressWarnings("unchecked")
     @Test
-    public void instant() {
+    void instant() {
         StepVerifier.withVirtualTime(
                         () -> (Publisher<Long>) DelayUtils.instant().apply(Flux.just(1L, 2L, 3L)))
                 .expectNext(0L)
diff --git a/cloudfoundry-util/src/test/java/org/cloudfoundry/util/PaginationUtilsTest.java b/cloudfoundry-util/src/test/java/org/cloudfoundry/util/PaginationUtilsTest.java
index 7de245bcb80..e3dfb3a5694 100644
--- a/cloudfoundry-util/src/test/java/org/cloudfoundry/util/PaginationUtilsTest.java
+++ b/cloudfoundry-util/src/test/java/org/cloudfoundry/util/PaginationUtilsTest.java
@@ -41,14 +41,14 @@
 import org.cloudfoundry.uaa.users.Name;
 import org.cloudfoundry.uaa.users.User;
 import org.cloudfoundry.uaa.users.Users;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import reactor.core.publisher.Mono;
 import reactor.test.StepVerifier;
 
-public final class PaginationUtilsTest {
+final class PaginationUtilsTest {
 
     @Test
-    public void requestClientV2Resources() {
+    void requestClientV2Resources() {
         Spaces spaces = mock(Spaces.class, RETURNS_SMART_NULLS);
 
         requestListSpaces(spaces, 1, 3);
@@ -64,7 +64,7 @@ public void requestClientV2Resources() {
     }
 
     @Test
-    public void requestClientV2ResourcesEmpty() {
+    void requestClientV2ResourcesEmpty() {
         Spaces spaces = mock(Spaces.class, RETURNS_SMART_NULLS);
 
         requestListSpacesEmpty(spaces);
@@ -77,7 +77,7 @@ public void requestClientV2ResourcesEmpty() {
     }
 
     @Test
-    public void requestClientV3Empty() {
+    void requestClientV3Empty() {
         Packages packages = mock(Packages.class, RETURNS_SMART_NULLS);
 
         requestListPackagesEmpty(packages);
@@ -90,7 +90,7 @@ public void requestClientV3Empty() {
     }
 
     @Test
-    public void requestClientV3Resources() {
+    void requestClientV3Resources() {
         Packages packages = mock(Packages.class, RETURNS_SMART_NULLS);
 
         requestListPackages(packages, 1, 3);
@@ -106,7 +106,7 @@ public void requestClientV3Resources() {
     }
 
     @Test
-    public void requestUaaResources() {
+    void requestUaaResources() {
         Users users = mock(Users.class, RETURNS_SMART_NULLS);
 
         requestListUsers(users, 1, 100, 250);
@@ -124,7 +124,7 @@ public void requestUaaResources() {
     }
 
     @Test
-    public void requestUaaResourcesEmpty() {
+    void requestUaaResourcesEmpty() {
         Users users = mock(Users.class, RETURNS_SMART_NULLS);
 
         requestListUsersEmpty(users, 1, 100);
diff --git a/cloudfoundry-util/src/test/java/org/cloudfoundry/util/tuple/TupleUtilsTest.java b/cloudfoundry-util/src/test/java/org/cloudfoundry/util/tuple/TupleUtilsTest.java
index 45e26fd1ba2..8b4dc074263 100644
--- a/cloudfoundry-util/src/test/java/org/cloudfoundry/util/tuple/TupleUtilsTest.java
+++ b/cloudfoundry-util/src/test/java/org/cloudfoundry/util/tuple/TupleUtilsTest.java
@@ -18,13 +18,13 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import reactor.util.function.Tuples;
 
-public final class TupleUtilsTest {
+final class TupleUtilsTest {
 
     @Test
-    public void consumer2() {
+    void consumer2() {
         TupleUtils.consumer(
                         (first, second) -> {
                             assertThat(first).isEqualTo(1);
@@ -34,7 +34,7 @@ public void consumer2() {
     }
 
     @Test
-    public void consumer3() {
+    void consumer3() {
         TupleUtils.consumer(
                         (first, second, third) -> {
                             assertThat(first).isEqualTo(1);
@@ -45,7 +45,7 @@ public void consumer3() {
     }
 
     @Test
-    public void consumer4() {
+    void consumer4() {
         TupleUtils.consumer(
                         (first, second, third, fourth) -> {
                             assertThat(first).isEqualTo(1);
@@ -57,7 +57,7 @@ public void consumer4() {
     }
 
     @Test
-    public void consumer5() {
+    void consumer5() {
         TupleUtils.consumer(
                         (first, second, third, fourth, fifth) -> {
                             assertThat(first).isEqualTo(1);
@@ -70,7 +70,7 @@ public void consumer5() {
     }
 
     @Test
-    public void consumer6() {
+    void consumer6() {
         TupleUtils.consumer(
                         (first, second, third, fourth, fifth, sixth) -> {
                             assertThat(first).isEqualTo(1);
@@ -84,7 +84,7 @@ public void consumer6() {
     }
 
     @Test
-    public void consumer7() {
+    void consumer7() {
         TupleUtils.consumer(
                         (first, second, third, fourth, fifth, sixth, seventh) -> {
                             assertThat(first).isEqualTo(1);
@@ -99,7 +99,7 @@ public void consumer7() {
     }
 
     @Test
-    public void consumer8() {
+    void consumer8() {
         TupleUtils.consumer(
                         (first, second, third, fourth, fifth, sixth, seventh, eighth) -> {
                             assertThat(first).isEqualTo(1);
@@ -115,7 +115,7 @@ public void consumer8() {
     }
 
     @Test
-    public void function2() {
+    void function2() {
         int result =
                 TupleUtils.function(
                                 (first, second) -> {
@@ -130,7 +130,7 @@ public void function2() {
     }
 
     @Test
-    public void function3() {
+    void function3() {
         int result =
                 TupleUtils.function(
                                 (first, second, third) -> {
@@ -146,7 +146,7 @@ public void function3() {
     }
 
     @Test
-    public void function4() {
+    void function4() {
         int result =
                 TupleUtils.function(
                                 (first, second, third, fourth) -> {
@@ -163,7 +163,7 @@ public void function4() {
     }
 
     @Test
-    public void function5() {
+    void function5() {
         int result =
                 TupleUtils.function(
                                 (first, second, third, fourth, fifth) -> {
@@ -181,7 +181,7 @@ public void function5() {
     }
 
     @Test
-    public void function6() {
+    void function6() {
         int result =
                 TupleUtils.function(
                                 (first, second, third, fourth, fifth, sixth) -> {
@@ -200,7 +200,7 @@ public void function6() {
     }
 
     @Test
-    public void function7() {
+    void function7() {
         int result =
                 TupleUtils.function(
                                 (first, second, third, fourth, fifth, sixth, seventh) -> {
@@ -220,7 +220,7 @@ public void function7() {
     }
 
     @Test
-    public void function8() {
+    void function8() {
         int result =
                 TupleUtils.function(
                                 (first, second, third, fourth, fifth, sixth, seventh, eighth) -> {
@@ -241,7 +241,7 @@ public void function8() {
     }
 
     @Test
-    public void predicate2() {
+    void predicate2() {
         boolean result =
                 TupleUtils.predicate(
                                 (first, second) -> {
@@ -256,7 +256,7 @@ public void predicate2() {
     }
 
     @Test
-    public void predicate3() {
+    void predicate3() {
         boolean result =
                 TupleUtils.predicate(
                                 (first, second, third) -> {
@@ -272,7 +272,7 @@ public void predicate3() {
     }
 
     @Test
-    public void predicate4() {
+    void predicate4() {
         boolean result =
                 TupleUtils.predicate(
                                 (first, second, third, fourth) -> {
@@ -289,7 +289,7 @@ public void predicate4() {
     }
 
     @Test
-    public void predicate5() {
+    void predicate5() {
         boolean result =
                 TupleUtils.predicate(
                                 (first, second, third, fourth, fifth) -> {
@@ -307,7 +307,7 @@ public void predicate5() {
     }
 
     @Test
-    public void predicate6() {
+    void predicate6() {
         boolean result =
                 TupleUtils.predicate(
                                 (first, second, third, fourth, fifth, sixth) -> {
@@ -326,7 +326,7 @@ public void predicate6() {
     }
 
     @Test
-    public void predicate7() {
+    void predicate7() {
         boolean result =
                 TupleUtils.predicate(
                                 (first, second, third, fourth, fifth, sixth, seventh) -> {
@@ -346,7 +346,7 @@ public void predicate7() {
     }
 
     @Test
-    public void predicate8() {
+    void predicate8() {
         boolean result =
                 TupleUtils.predicate(
                                 (first, second, third, fourth, fifth, sixth, seventh, eighth) -> {
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 ab1b229ab01..32e273c10e4 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,7 +69,6 @@
 import org.cloudfoundry.util.OperationUtils;
 import org.cloudfoundry.util.PaginationUtils;
 import org.cloudfoundry.util.ResourceUtils;
-import org.junit.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.core.io.ClassPathResource;
 import org.springframework.util.Assert;
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 6af1ce34529..444433cf9be 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,7 +20,6 @@
 import org.cloudfoundry.client.CloudFoundryClient;
 import org.cloudfoundry.client.v2.blobstores.DeleteBlobstoreBuildpackCachesRequest;
 import org.cloudfoundry.util.JobUtils;
-import org.junit.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 import reactor.test.StepVerifier;
 
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 cd7c650e248..947fa424e89 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,7 +30,6 @@
 import org.cloudfoundry.util.JobUtils;
 import org.cloudfoundry.util.PaginationUtils;
 import org.cloudfoundry.util.ResourceUtils;
-import org.junit.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.core.io.ClassPathResource;
 import reactor.core.publisher.Flux;
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 17a195ccfbd..90428642163 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,7 +45,6 @@
 import org.cloudfoundry.util.JobUtils;
 import org.cloudfoundry.util.PaginationUtils;
 import org.cloudfoundry.util.ResourceUtils;
-import org.junit.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 import reactor.core.publisher.Flux;
 import reactor.core.publisher.Mono;
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 f8d81f70b60..f3546825047 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,7 +22,6 @@
 import org.cloudfoundry.client.v2.events.GetEventRequest;
 import org.cloudfoundry.client.v2.events.ListEventsRequest;
 import org.cloudfoundry.util.ResourceUtils;
-import org.junit.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 import reactor.core.publisher.Flux;
 import reactor.core.publisher.Mono;
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 0c9d693197a..4d659103622 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,7 +22,6 @@
 import org.cloudfoundry.client.v2.featureflags.GetFeatureFlagRequest;
 import org.cloudfoundry.client.v2.featureflags.ListFeatureFlagsRequest;
 import org.cloudfoundry.client.v2.featureflags.SetFeatureFlagRequest;
-import org.junit.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 import reactor.core.publisher.Flux;
 import reactor.core.publisher.Mono;
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 d6998b88add..70b92b66157 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,7 +20,6 @@
 import org.cloudfoundry.AbstractIntegrationTest;
 import org.cloudfoundry.client.CloudFoundryClient;
 import org.cloudfoundry.client.v2.info.GetInfoRequest;
-import org.junit.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 import reactor.test.StepVerifier;
 
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 50c21b216d3..81df89392f4 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,7 +23,6 @@
 import org.cloudfoundry.client.v2.organizations.DeleteOrganizationRequest;
 import org.cloudfoundry.util.DelayUtils;
 import org.cloudfoundry.util.ResourceUtils;
-import org.junit.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 import reactor.core.publisher.Mono;
 import reactor.test.StepVerifier;
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 2d3828ee360..b9b1b0c1bf0 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,7 +29,6 @@
 import org.cloudfoundry.util.JobUtils;
 import org.cloudfoundry.util.PaginationUtils;
 import org.cloudfoundry.util.ResourceUtils;
-import org.junit.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 import reactor.core.publisher.Mono;
 import reactor.test.StepVerifier;
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 92f3fcff9cc..fa18fc1d85d 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,7 +87,6 @@
 import org.cloudfoundry.util.JobUtils;
 import org.cloudfoundry.util.PaginationUtils;
 import org.cloudfoundry.util.ResourceUtils;
-import org.junit.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 import reactor.core.publisher.Flux;
 import reactor.core.publisher.Mono;
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 052ac2622c5..d1fd29709d1 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,7 +44,6 @@
 import org.cloudfoundry.util.JobUtils;
 import org.cloudfoundry.util.PaginationUtils;
 import org.cloudfoundry.util.ResourceUtils;
-import org.junit.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 import reactor.core.publisher.Flux;
 import reactor.core.publisher.Mono;
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 5f8b8549cc2..d56a526afa2 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,7 +33,6 @@
 import org.cloudfoundry.util.JobUtils;
 import org.cloudfoundry.util.PaginationUtils;
 import org.cloudfoundry.util.ResourceUtils;
-import org.junit.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 import reactor.core.publisher.Mono;
 import reactor.test.StepVerifier;
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 2a2c63dae6f..7232e7aaab2 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,7 +41,6 @@
 import org.cloudfoundry.util.JobUtils;
 import org.cloudfoundry.util.PaginationUtils;
 import org.cloudfoundry.util.ResourceUtils;
-import org.junit.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 import reactor.core.publisher.Mono;
 import reactor.test.StepVerifier;
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 e9c1c0bcec4..a3256df3c40 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,7 +45,6 @@
 import org.cloudfoundry.util.JobUtils;
 import org.cloudfoundry.util.PaginationUtils;
 import org.cloudfoundry.util.ResourceUtils;
-import org.junit.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 import reactor.core.publisher.Flux;
 import reactor.core.publisher.Mono;
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 d928390e62f..f9a482729f7 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,7 +34,6 @@
 import org.cloudfoundry.util.JobUtils;
 import org.cloudfoundry.util.PaginationUtils;
 import org.cloudfoundry.util.ResourceUtils;
-import org.junit.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 import reactor.core.publisher.Flux;
 import reactor.core.publisher.Mono;
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 b902d9139b2..96e7fc3118d 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,7 +29,6 @@
 import org.cloudfoundry.client.v2.spaces.CreateSpaceResponse;
 import org.cloudfoundry.util.PaginationUtils;
 import org.cloudfoundry.util.ResourceUtils;
-import org.junit.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.core.io.ClassPathResource;
 import reactor.core.Exceptions;
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 4c3739f664c..021d6e1a038 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,7 +53,6 @@
 import org.cloudfoundry.util.LastOperationUtils;
 import org.cloudfoundry.util.PaginationUtils;
 import org.cloudfoundry.util.ResourceUtils;
-import org.junit.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 import reactor.core.publisher.Flux;
 import reactor.core.publisher.Mono;
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 0ac8b893db3..ae12918d5c9 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,7 +33,6 @@
 import org.cloudfoundry.client.v2.services.ServiceResource;
 import org.cloudfoundry.util.PaginationUtils;
 import org.cloudfoundry.util.ResourceUtils;
-import org.junit.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 import reactor.core.publisher.Flux;
 import reactor.core.publisher.Mono;
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 f46b0a8b1dc..88a2d31b1c2 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,7 +35,6 @@
 import org.cloudfoundry.util.JobUtils;
 import org.cloudfoundry.util.PaginationUtils;
 import org.cloudfoundry.util.ResourceUtils;
-import org.junit.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 import reactor.core.publisher.Flux;
 import reactor.core.publisher.Mono;
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 4369daace58..1c609290578 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,7 +42,6 @@
 import org.cloudfoundry.util.JobUtils;
 import org.cloudfoundry.util.PaginationUtils;
 import org.cloudfoundry.util.ResourceUtils;
-import org.junit.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 import reactor.core.publisher.Flux;
 import reactor.core.publisher.Mono;
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 54dc3521a6b..cdfd9f1f4b5 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,7 +31,6 @@
 import org.cloudfoundry.client.v2.serviceusageevents.ServiceUsageEventResource;
 import org.cloudfoundry.util.PaginationUtils;
 import org.cloudfoundry.util.ResourceUtils;
-import org.junit.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 import reactor.core.publisher.Flux;
 import reactor.core.publisher.Mono;
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 145cd0a9c66..1b0b4b9a8dd 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,7 +35,6 @@
 import org.cloudfoundry.util.JobUtils;
 import org.cloudfoundry.util.PaginationUtils;
 import org.cloudfoundry.util.ResourceUtils;
-import org.junit.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 import reactor.core.publisher.Flux;
 import reactor.core.publisher.Mono;
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 6cad4a136f5..94c484f9068 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,7 +29,6 @@
 import org.cloudfoundry.util.JobUtils;
 import org.cloudfoundry.util.PaginationUtils;
 import org.cloudfoundry.util.ResourceUtils;
-import org.junit.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 import reactor.core.publisher.Flux;
 import reactor.core.publisher.Mono;
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 b18f76a3d07..e66fccb24f3 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
@@ -38,7 +38,6 @@
 import org.cloudfoundry.util.PaginationUtils;
 import org.cloudfoundry.util.ResourceUtils;
 import org.junit.Ignore;
-import org.junit.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 import reactor.core.publisher.Flux;
 import reactor.core.publisher.Mono;
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 36024de5ed9..fe2cb72c408 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
@@ -99,7 +99,6 @@
 import org.cloudfoundry.util.PaginationUtils;
 import org.cloudfoundry.util.ResourceUtils;
 import org.junit.Ignore;
-import org.junit.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 import reactor.core.publisher.Flux;
 import reactor.core.publisher.Mono;
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 1da3ec5bd5f..cb86a6274e0 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,7 +28,6 @@
 import org.cloudfoundry.util.JobUtils;
 import org.cloudfoundry.util.PaginationUtils;
 import org.cloudfoundry.util.ResourceUtils;
-import org.junit.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 import reactor.core.publisher.Flux;
 import reactor.core.publisher.Mono;
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 938b74b7c4d..3561e835c1e 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,7 +41,6 @@
 import org.cloudfoundry.routing.RoutingClient;
 import org.cloudfoundry.util.PaginationUtils;
 import org.cloudfoundry.util.ResourceUtils;
-import org.junit.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 import reactor.core.publisher.Flux;
 import reactor.core.publisher.Mono;
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 8ce8147687b..7b97e0b6500 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,7 +70,6 @@
 import org.cloudfoundry.util.JobUtils;
 import org.cloudfoundry.util.PaginationUtils;
 import org.cloudfoundry.util.ResourceUtils;
-import org.junit.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 import reactor.core.publisher.Flux;
 import reactor.core.publisher.Mono;
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 1c384ec2567..868ec17ca12 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,7 +22,6 @@
 import org.cloudfoundry.client.CloudFoundryClient;
 import org.cloudfoundry.client.v3.admin.ClearBuildpackCacheRequest;
 import org.cloudfoundry.util.JobUtils;
-import org.junit.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 import reactor.test.StepVerifier;
 
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 12e6860df9a..40d937c0c70 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,7 +88,6 @@
 import org.cloudfoundry.util.DelayUtils;
 import org.cloudfoundry.util.JobUtils;
 import org.cloudfoundry.util.PaginationUtils;
-import org.junit.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.core.io.ClassPathResource;
 import reactor.core.publisher.Mono;
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 e65b845ca03..cb4246afbba 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,7 +30,6 @@
 import org.cloudfoundry.client.v3.spaces.CreateSpaceResponse;
 import org.cloudfoundry.client.v3.spaces.SpaceRelationships;
 import org.cloudfoundry.util.PaginationUtils;
-import org.junit.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 import reactor.core.publisher.Flux;
 import reactor.core.publisher.Mono;
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 a8a8be3ec4e..40c8628f50f 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,7 +29,6 @@
 import org.cloudfoundry.client.v3.buildpacks.UploadBuildpackRequest;
 import org.cloudfoundry.util.JobUtils;
 import org.cloudfoundry.util.PaginationUtils;
-import org.junit.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.core.io.ClassPathResource;
 import reactor.core.publisher.Flux;
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 f600afaf484..b37ab449272 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,7 +38,6 @@
 import org.cloudfoundry.operations.applications.GetApplicationRequest;
 import org.cloudfoundry.operations.applications.PushApplicationRequest;
 import org.cloudfoundry.util.PaginationUtils;
-import org.junit.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.core.io.ClassPathResource;
 import reactor.core.publisher.Flux;
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 650ad3ee114..654e3d1fb0c 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,7 +43,6 @@
 import org.cloudfoundry.client.v3.routes.RouteRelationships;
 import org.cloudfoundry.util.JobUtils;
 import org.cloudfoundry.util.PaginationUtils;
-import org.junit.Test;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
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 0588e9d3f7e..5d6970ef09d 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,7 +43,6 @@
 import org.cloudfoundry.client.v3.spaces.AssignSpaceIsolationSegmentResponse;
 import org.cloudfoundry.util.PaginationUtils;
 import org.cloudfoundry.util.ResourceUtils;
-import org.junit.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 import reactor.core.publisher.Flux;
 import reactor.core.publisher.Mono;
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 9956cdd1380..f5a2cdc3f30 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,7 +45,6 @@
 import org.cloudfoundry.client.v3.organizations.UpdateOrganizationRequest;
 import org.cloudfoundry.util.JobUtils;
 import org.cloudfoundry.util.PaginationUtils;
-import org.junit.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 import reactor.core.publisher.Flux;
 import reactor.core.publisher.Mono;
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 5f2173e8499..689c1fd8414 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
@@ -27,7 +27,6 @@
 import org.cloudfoundry.client.v3.packages.PackageType;
 import org.cloudfoundry.client.v3.packages.UploadPackageRequest;
 import org.junit.Ignore;
-import org.junit.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.core.io.ClassPathResource;
 import reactor.core.Exceptions;
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 3e2d1544a13..b6500c7d4b3 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,7 +41,6 @@
 import org.cloudfoundry.operations.applications.GetApplicationRequest;
 import org.cloudfoundry.operations.applications.PushApplicationRequest;
 import org.cloudfoundry.util.PaginationUtils;
-import org.junit.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.core.io.ClassPathResource;
 import reactor.core.publisher.Mono;
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 81140391d94..6f847e9b225 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
@@ -35,7 +35,6 @@
 import org.cloudfoundry.util.ExceptionUtils;
 import org.cloudfoundry.util.ResourceMatchingUtilsV3;
 import org.junit.Ignore;
-import org.junit.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.core.io.ClassPathResource;
 import reactor.core.Exceptions;
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 127fef2f4d8..a04ae0685e7 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,7 +31,6 @@
 import org.cloudfoundry.client.v3.roles.RoleResource;
 import org.cloudfoundry.util.JobUtils;
 import org.cloudfoundry.util.PaginationUtils;
-import org.junit.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 import reactor.core.publisher.Flux;
 import reactor.core.publisher.Mono;
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 1de8872f243..5f7545a1011 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,7 +48,6 @@
 import org.cloudfoundry.client.v3.spaces.CreateSpaceResponse;
 import org.cloudfoundry.client.v3.spaces.SpaceRelationships;
 import org.cloudfoundry.util.PaginationUtils;
-import org.junit.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 import reactor.core.publisher.Flux;
 import reactor.core.publisher.Mono;
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 da467c48897..96ee53685d6 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,7 +41,6 @@
 import org.cloudfoundry.client.v3.serviceplans.ServicePlan;
 import org.cloudfoundry.util.JobUtils;
 import org.cloudfoundry.util.PaginationUtils;
-import org.junit.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 import reactor.core.publisher.Flux;
 import reactor.core.publisher.Mono;
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 859e3d22b5f..2dcb88e463c 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,7 +34,6 @@
 import org.cloudfoundry.client.v3.spaces.SpaceRelationships;
 import org.cloudfoundry.util.JobUtils;
 import org.cloudfoundry.util.PaginationUtils;
-import org.junit.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.core.io.ClassPathResource;
 import reactor.core.Exceptions;
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 4a6da53251a..27ad2ffe1b2 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,7 +44,6 @@
 import org.cloudfoundry.client.v3.spaces.SpaceRelationships;
 import org.cloudfoundry.util.JobUtils;
 import org.cloudfoundry.util.PaginationUtils;
-import org.junit.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 import reactor.core.publisher.Flux;
 import reactor.core.publisher.Mono;
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 224ea6d9d67..6b6bba65663 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,7 +31,6 @@
 import org.cloudfoundry.client.v3.spaces.CreateSpaceResponse;
 import org.cloudfoundry.client.v3.spaces.SpaceRelationships;
 import org.cloudfoundry.util.PaginationUtils;
-import org.junit.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 import reactor.core.publisher.Flux;
 import reactor.core.publisher.Mono;
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 def69abfdbb..c8282157022 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,7 +33,6 @@
 import org.cloudfoundry.client.v3.spaces.CreateSpaceResponse;
 import org.cloudfoundry.client.v3.spaces.SpaceRelationships;
 import org.cloudfoundry.util.PaginationUtils;
-import org.junit.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 import reactor.core.publisher.Flux;
 import reactor.core.publisher.Mono;
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 0f8ab63d9a1..5693df0825c 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
@@ -48,7 +48,6 @@
 import org.cloudfoundry.util.JobUtils;
 import org.cloudfoundry.util.PaginationUtils;
 import org.junit.Ignore;
-import org.junit.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.core.io.ClassPathResource;
 import org.springframework.util.StreamUtils;
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 b4d2596ae72..287ecf0647a 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,7 +27,6 @@
 import org.cloudfoundry.client.v3.stacks.StackResource;
 import org.cloudfoundry.client.v3.stacks.Stack;
 import org.cloudfoundry.util.PaginationUtils;
-import org.junit.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 import reactor.core.publisher.Flux;
 import reactor.core.publisher.Mono;
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 241111f5901..db548472d48 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,7 +37,6 @@
 import org.cloudfoundry.operations.applications.ApplicationHealthCheck;
 import org.cloudfoundry.operations.applications.PushApplicationRequest;
 import org.cloudfoundry.util.PaginationUtils;
-import org.junit.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.core.io.ClassPathResource;
 import reactor.core.publisher.Flux;
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 1d638bef8c2..2d0cedf36c3 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,7 +20,6 @@
 import org.cloudfoundry.ApplicationUtils;
 import org.cloudfoundry.CloudFoundryVersion;
 import org.cloudfoundry.IfCloudFoundryVersion;
-import org.junit.Test;
 import org.springframework.beans.factory.InitializingBean;
 import org.springframework.beans.factory.annotation.Autowired;
 import reactor.core.publisher.Mono;
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 42d3742a3d8..fcefb58ceda 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,7 +32,6 @@
 import org.cloudfoundry.networking.v1.policies.Ports;
 import org.cloudfoundry.networking.v1.policies.Source;
 import org.cloudfoundry.util.ResourceUtils;
-import org.junit.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 import reactor.core.publisher.Mono;
 import reactor.test.StepVerifier;
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 cc5fcce4653..bfb95cf3263 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,7 +31,6 @@
 import org.cloudfoundry.networking.v1.tags.ListTagsRequest;
 import org.cloudfoundry.networking.v1.tags.ListTagsResponse;
 import org.cloudfoundry.util.ResourceUtils;
-import org.junit.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 import reactor.core.publisher.Mono;
 import reactor.test.StepVerifier;
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 27558f54f84..99d4b842ebc 100644
--- a/integration-test/src/test/java/org/cloudfoundry/operations/AdvancedTest.java
+++ b/integration-test/src/test/java/org/cloudfoundry/operations/AdvancedTest.java
@@ -17,7 +17,6 @@
 package org.cloudfoundry.operations;
 
 import org.cloudfoundry.AbstractIntegrationTest;
-import org.junit.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 import reactor.test.StepVerifier;
 
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 81bcb55afbc..62238e0c74b 100644
--- a/integration-test/src/test/java/org/cloudfoundry/operations/ApplicationsTest.java
+++ b/integration-test/src/test/java/org/cloudfoundry/operations/ApplicationsTest.java
@@ -68,7 +68,6 @@
 import org.cloudfoundry.operations.services.GetServiceInstanceRequest;
 import org.cloudfoundry.operations.services.ServiceInstance;
 import org.cloudfoundry.util.FluentMap;
-import org.junit.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.core.io.ClassPathResource;
 import reactor.core.publisher.Flux;
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 8c897549e67..869f00a9245 100644
--- a/integration-test/src/test/java/org/cloudfoundry/operations/BuildpacksTest.java
+++ b/integration-test/src/test/java/org/cloudfoundry/operations/BuildpacksTest.java
@@ -21,7 +21,6 @@
 import org.cloudfoundry.operations.buildpacks.CreateBuildpackRequest;
 import org.cloudfoundry.operations.buildpacks.DeleteBuildpackRequest;
 import org.cloudfoundry.operations.buildpacks.UpdateBuildpackRequest;
-import org.junit.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.core.io.ClassPathResource;
 import reactor.core.publisher.Mono;
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 4d23eca9555..f42129db405 100644
--- a/integration-test/src/test/java/org/cloudfoundry/operations/DomainsTest.java
+++ b/integration-test/src/test/java/org/cloudfoundry/operations/DomainsTest.java
@@ -24,7 +24,6 @@
 import org.cloudfoundry.operations.domains.ShareDomainRequest;
 import org.cloudfoundry.operations.domains.UnshareDomainRequest;
 import org.cloudfoundry.operations.organizations.CreateOrganizationRequest;
-import org.junit.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 import reactor.core.publisher.Flux;
 import reactor.core.publisher.Mono;
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 fc5ad4852ca..1ed827a1571 100644
--- a/integration-test/src/test/java/org/cloudfoundry/operations/NetworkPoliciesTest.java
+++ b/integration-test/src/test/java/org/cloudfoundry/operations/NetworkPoliciesTest.java
@@ -27,7 +27,6 @@
 import org.cloudfoundry.operations.networkpolicies.Policy;
 import org.cloudfoundry.operations.networkpolicies.RemoveNetworkPolicyRequest;
 import org.cloudfoundry.util.ResourceUtils;
-import org.junit.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 import reactor.core.publisher.Flux;
 import reactor.core.publisher.Mono;
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 154d18baaf4..ee5623b423f 100644
--- a/integration-test/src/test/java/org/cloudfoundry/operations/OrganizationAdminTest.java
+++ b/integration-test/src/test/java/org/cloudfoundry/operations/OrganizationAdminTest.java
@@ -25,7 +25,6 @@
 import org.cloudfoundry.operations.organizationadmin.UpdateQuotaRequest;
 import org.cloudfoundry.operations.organizations.CreateOrganizationRequest;
 import org.cloudfoundry.operations.organizations.OrganizationInfoRequest;
-import org.junit.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 import reactor.core.publisher.Mono;
 import reactor.test.StepVerifier;
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 00adc94d992..0ec28ddf50a 100644
--- a/integration-test/src/test/java/org/cloudfoundry/operations/OrganizationsTest.java
+++ b/integration-test/src/test/java/org/cloudfoundry/operations/OrganizationsTest.java
@@ -18,7 +18,6 @@
 
 import org.cloudfoundry.AbstractIntegrationTest;
 import org.cloudfoundry.operations.organizations.CreateOrganizationRequest;
-import org.junit.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 import reactor.core.publisher.Mono;
 import reactor.test.StepVerifier;
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 84fd20c18fc..e5a2c3757c9 100644
--- a/integration-test/src/test/java/org/cloudfoundry/operations/RoutesTest.java
+++ b/integration-test/src/test/java/org/cloudfoundry/operations/RoutesTest.java
@@ -31,7 +31,6 @@
 import org.cloudfoundry.operations.routes.UnmapRouteRequest;
 import org.cloudfoundry.operations.services.BindRouteServiceInstanceRequest;
 import org.cloudfoundry.operations.services.CreateUserProvidedServiceInstanceRequest;
-import org.junit.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.core.io.ClassPathResource;
 import reactor.core.publisher.Flux;
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 c84b1a6242a..3fb44a0eeba 100644
--- a/integration-test/src/test/java/org/cloudfoundry/operations/ServiceAdminTest.java
+++ b/integration-test/src/test/java/org/cloudfoundry/operations/ServiceAdminTest.java
@@ -27,7 +27,6 @@
 import org.cloudfoundry.operations.serviceadmin.ListServiceAccessSettingsRequest;
 import org.cloudfoundry.operations.serviceadmin.ServiceAccess;
 import org.cloudfoundry.util.ResourceUtils;
-import org.junit.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 import reactor.core.publisher.Flux;
 import reactor.core.publisher.Mono;
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 a15780145e4..b55a3bd469f 100644
--- a/integration-test/src/test/java/org/cloudfoundry/operations/ServicesTest.java
+++ b/integration-test/src/test/java/org/cloudfoundry/operations/ServicesTest.java
@@ -51,7 +51,6 @@
 import org.cloudfoundry.operations.services.UpdateServiceInstanceRequest;
 import org.cloudfoundry.operations.services.UpdateUserProvidedServiceInstanceRequest;
 import org.cloudfoundry.util.PaginationUtils;
-import org.junit.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.core.io.ClassPathResource;
 import reactor.core.publisher.Flux;
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 2ce72aea7dd..73418136a84 100644
--- a/integration-test/src/test/java/org/cloudfoundry/operations/SpacesTest.java
+++ b/integration-test/src/test/java/org/cloudfoundry/operations/SpacesTest.java
@@ -20,7 +20,6 @@
 import org.cloudfoundry.operations.spaces.CreateSpaceRequest;
 import org.cloudfoundry.operations.spaces.GetSpaceRequest;
 import org.cloudfoundry.operations.spaces.SpaceDetail;
-import org.junit.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 import reactor.test.StepVerifier;
 
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 761f82571ee..402017b47bc 100644
--- a/integration-test/src/test/java/org/cloudfoundry/operations/UserAdminTest.java
+++ b/integration-test/src/test/java/org/cloudfoundry/operations/UserAdminTest.java
@@ -38,7 +38,6 @@
 import org.cloudfoundry.operations.useradmin.UnsetSpaceRoleRequest;
 import org.cloudfoundry.util.PaginationUtils;
 import org.cloudfoundry.util.ResourceUtils;
-import org.junit.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 import reactor.core.publisher.Flux;
 import reactor.core.publisher.Mono;
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 f6ee202f308..b46b38612c5 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,7 +23,6 @@
 import org.cloudfoundry.routing.v1.routergroups.RouterGroup;
 import org.cloudfoundry.routing.v1.routergroups.UpdateRouterGroupRequest;
 import org.cloudfoundry.routing.v1.routergroups.UpdateRouterGroupResponse;
-import org.junit.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 import reactor.core.publisher.Mono;
 import reactor.test.StepVerifier;
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 04ffb3d2ec4..5438c70535f 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,7 +31,6 @@
 import org.cloudfoundry.routing.v1.tcproutes.TcpRoute;
 import org.cloudfoundry.routing.v1.tcproutes.TcpRouteConfiguration;
 import org.cloudfoundry.routing.v1.tcproutes.TcpRouteDeletion;
-import org.junit.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 import reactor.core.publisher.Flux;
 import reactor.core.publisher.Mono;
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 88697700c86..471391d133b 100644
--- a/integration-test/src/test/java/org/cloudfoundry/uaa/AuthorizationsTest.java
+++ b/integration-test/src/test/java/org/cloudfoundry/uaa/AuthorizationsTest.java
@@ -26,7 +26,6 @@
 import org.cloudfoundry.uaa.authorizations.AuthorizeByOpenIdWithImplicitGrantRequest;
 import org.cloudfoundry.uaa.authorizations.GetOpenIdProviderConfigurationRequest;
 import org.cloudfoundry.uaa.authorizations.GetOpenIdProviderConfigurationResponse;
-import org.junit.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 import reactor.test.StepVerifier;
 
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 35ac398404f..80e2489115b 100644
--- a/integration-test/src/test/java/org/cloudfoundry/uaa/ClientsTest.java
+++ b/integration-test/src/test/java/org/cloudfoundry/uaa/ClientsTest.java
@@ -51,7 +51,6 @@
 import org.cloudfoundry.uaa.clients.UpdateSecretAction;
 import org.cloudfoundry.uaa.clients.UpdateSecretClientAction;
 import org.cloudfoundry.util.PaginationUtils;
-import org.junit.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 import reactor.core.publisher.Flux;
 import reactor.core.publisher.Mono;
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 6e103bb25b3..6534aa199e9 100644
--- a/integration-test/src/test/java/org/cloudfoundry/uaa/GroupsTest.java
+++ b/integration-test/src/test/java/org/cloudfoundry/uaa/GroupsTest.java
@@ -47,7 +47,6 @@
 import org.cloudfoundry.uaa.users.Email;
 import org.cloudfoundry.uaa.users.Name;
 import org.cloudfoundry.util.PaginationUtils;
-import org.junit.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 import reactor.core.publisher.Flux;
 import reactor.core.publisher.Mono;
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 edad9de2576..2be3d6cac3a 100644
--- a/integration-test/src/test/java/org/cloudfoundry/uaa/IdentityProvidersTest.java
+++ b/integration-test/src/test/java/org/cloudfoundry/uaa/IdentityProvidersTest.java
@@ -33,7 +33,6 @@
 import org.cloudfoundry.uaa.identityproviders.UpdateIdentityProviderRequest;
 import org.cloudfoundry.uaa.identityzones.CreateIdentityZoneRequest;
 import org.cloudfoundry.uaa.identityzones.CreateIdentityZoneResponse;
-import org.junit.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 import reactor.core.publisher.Mono;
 import reactor.test.StepVerifier;
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 ff7302a9949..76a4f9d52f6 100644
--- a/integration-test/src/test/java/org/cloudfoundry/uaa/IdentityZonesTest.java
+++ b/integration-test/src/test/java/org/cloudfoundry/uaa/IdentityZonesTest.java
@@ -25,7 +25,6 @@
 import org.cloudfoundry.uaa.identityzones.ListIdentityZonesRequest;
 import org.cloudfoundry.uaa.identityzones.ListIdentityZonesResponse;
 import org.cloudfoundry.uaa.identityzones.UpdateIdentityZoneRequest;
-import org.junit.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 import reactor.core.publisher.Mono;
 import reactor.test.StepVerifier;
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 f79490619f6..b0f8b6e61dd 100644
--- a/integration-test/src/test/java/org/cloudfoundry/uaa/ServerInformationTest.java
+++ b/integration-test/src/test/java/org/cloudfoundry/uaa/ServerInformationTest.java
@@ -21,7 +21,6 @@
 import org.cloudfoundry.uaa.serverinformation.GetAutoLoginAuthenticationCodeRequest;
 import org.cloudfoundry.uaa.serverinformation.GetAutoLoginAuthenticationCodeResponse;
 import org.cloudfoundry.uaa.serverinformation.GetInfoRequest;
-import org.junit.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 import reactor.core.publisher.Mono;
 import reactor.test.StepVerifier;
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 fcf41458ad1..76fd5e1afd1 100644
--- a/integration-test/src/test/java/org/cloudfoundry/uaa/TokensTest.java
+++ b/integration-test/src/test/java/org/cloudfoundry/uaa/TokensTest.java
@@ -39,7 +39,6 @@
 import org.cloudfoundry.uaa.tokens.TokenFormat;
 import org.cloudfoundry.uaa.tokens.TokenKey;
 import org.junit.Ignore;
-import org.junit.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 import reactor.core.publisher.Flux;
 import reactor.core.publisher.Mono;
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 e7d4f5bb2a5..1eac301ac8c 100644
--- a/integration-test/src/test/java/org/cloudfoundry/uaa/UsersTest.java
+++ b/integration-test/src/test/java/org/cloudfoundry/uaa/UsersTest.java
@@ -43,7 +43,6 @@
 import org.cloudfoundry.uaa.users.UserInfoResponse;
 import org.cloudfoundry.uaa.users.VerifyUserRequest;
 import org.cloudfoundry.uaa.users.VerifyUserResponse;
-import org.junit.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 import reactor.core.publisher.Flux;
 import reactor.core.publisher.Mono;
diff --git a/pom.xml b/pom.xml
index d1052d7197f..e076ca6530e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -64,11 +64,11 @@
         <commons-lang3.version>3.13.0</commons-lang3.version>
         <evo-inflector.version>1.3</evo-inflector.version>
         <immutables.version>2.10.0</immutables.version>
-        <jackson.version>2.15.2</jackson.version>
+        <jackson.version>2.16.1</jackson.version>
         <java-semver.version>0.9.0</java-semver.version>
         <jjwt.version>0.11.5</jjwt.version>
-        <junit-jupiter.version>5.10.0</junit-jupiter.version>
-        <mockito.version>5.6.0</mockito.version>
+        <junit-jupiter.version>5.10.1</junit-jupiter.version>
+        <mockito.version>5.8.0</mockito.version>
         <snakeyaml.version>2.2</snakeyaml.version>
         <wire.version>3.7.1</wire.version>
         <wire.plugin.version>3.0.2</wire.plugin.version>
@@ -155,7 +155,7 @@
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-compiler-plugin</artifactId>
-                    <version>3.11.0</version>
+                    <version>3.12.1</version>
                     <configuration>
                         <compilerArgs>
                             <arg>-Xlint:all</arg>
@@ -181,7 +181,7 @@
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-javadoc-plugin</artifactId>
-                    <version>3.6.0</version>
+                    <version>3.6.3</version>
                     <configuration>
                         <links>
                             <link>https://projectreactor.io/docs/core/release/api/</link>
@@ -214,7 +214,7 @@
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-surefire-plugin</artifactId>
-                    <version>3.1.2</version>
+                    <version>3.2.3</version>
                     <configuration>
                         <runOrder>random</runOrder>
                     </configuration>
@@ -342,7 +342,7 @@
             </activation>
             <properties>
                 <java.version>17</java.version>
-                <dependencies.version>3.1.5</dependencies.version>
+                <dependencies.version>3.2.1</dependencies.version>
                 <wire.version>4.9.1</wire.version>
                 <wire.plugin.version>3.0.2</wire.plugin.version>
                 <wire.suffix>-jvm</wire.suffix>
@@ -353,7 +353,7 @@
                     <plugin>
                         <groupId>org.apache.maven.plugins</groupId>
                         <artifactId>maven-compiler-plugin</artifactId>
-                        <version>3.11.0</version>
+                        <version>3.12.1</version>
                         <!-- @see https://github.com/immutables/immutables/issues/1339#issuecomment-1016125673 -->
                         <configuration>
                             <fork>true</fork>
@@ -376,7 +376,7 @@
             </activation>
             <properties>
                 <java.version>21</java.version>
-                <dependencies.version>3.1.5</dependencies.version>
+                <dependencies.version>3.2.1</dependencies.version>
                 <wire.version>4.9.1</wire.version>
                 <wire.plugin.version>3.0.2</wire.plugin.version>
                 <wire.suffix>-jvm</wire.suffix>
@@ -387,7 +387,7 @@
                     <plugin>
                         <groupId>org.apache.maven.plugins</groupId>
                         <artifactId>maven-compiler-plugin</artifactId>
-                        <version>3.11.0</version>
+                        <version>3.12.1</version>
                         <!-- @see https://github.com/immutables/immutables/issues/1339#issuecomment-1016125673 -->
                         <configuration>
                             <fork>true</fork>