diff --git a/README.md b/README.md
index 6f6e77f4ae..2e974a59b7 100644
--- a/README.md
+++ b/README.md
@@ -298,6 +298,10 @@ Name | Description
 `TEST_PROXY_USERNAME` | _(Optional)_ The username for a proxy to route all requests through
 `TEST_SKIPSSLVALIDATION` | _(Optional)_ Whether to skip SSL validation when connecting to the Cloud Foundry instance.  Defaults to `false`.
 `UAA_API_REQUEST_LIMIT` | _(Optional)_ If your UAA server does rate limiting and returns 429 errors, set this variable to the smallest limit configured there. Whether your server limits UAA calls is shown in the log, together with the location of the configuration file on the server. Defaults to `0` (no limit).
+`SKIP_BROWSER_AUTH_TESTS` | _(Optional)_ Set to `true` to skip integration tests that require browser-based authentication (e.g., SSO tests). Useful when the Cloud Foundry instance does not support browser-based authentication or when running tests in a non-interactive environment. Defaults to `false`.
+`SKIP_METRIC_REGISTRAR_TESTS` | _(Optional)_ Set to `true` to skip integration tests that require the Metric Registrar service (e.g., MetricRegistrarTest). Useful when the Cloud Foundry instance does not have the Metric Registrar service available. Defaults to `false`.
+`SKIP_TCP_ROUTING_TESTS` | _(Optional)_ Set to `true` to skip TCP routing integration tests (TcpRoutesTest, RouterGroupsTest). Useful when the Cloud Foundry instance does not have TCP routing configured (i.e., no `routing_endpoint` in the info payload). Defaults to `false`.
+`SKIP_V2_TESTS` | _(Optional)_ Set to `true` to skip all V2 API integration tests. Useful when the Cloud Foundry V2 API is rate-limited or unavailable. When enabled, tests annotated with `@RequiresV2Api` will be skipped, including V3 tests that depend on V2 API calls (e.g., service broker creation). Defaults to `false`.
 
 If you do not have access to a CloudFoundry instance with admin access, you can run one locally using [bosh-deployment](https://github.com/cloudfoundry/bosh-deployment) & [cf-deployment](https://github.com/cloudfoundry/cf-deployment/) and Virtualbox.
 
diff --git a/integration-test/src/test/java/org/cloudfoundry/CloudFoundryCleaner.java b/integration-test/src/test/java/org/cloudfoundry/CloudFoundryCleaner.java
index 582e7cfbe5..c1aec4b3c5 100644
--- a/integration-test/src/test/java/org/cloudfoundry/CloudFoundryCleaner.java
+++ b/integration-test/src/test/java/org/cloudfoundry/CloudFoundryCleaner.java
@@ -76,6 +76,7 @@
 import org.cloudfoundry.client.v3.Metadata;
 import org.cloudfoundry.client.v3.Relationship;
 import org.cloudfoundry.client.v3.applications.Application;
+import org.cloudfoundry.client.v3.applications.ApplicationResource;
 import org.cloudfoundry.client.v3.applications.DeleteApplicationRequest;
 import org.cloudfoundry.client.v3.applications.ListApplicationsRequest;
 import org.cloudfoundry.client.v3.serviceinstances.ListSharedSpacesRelationshipRequest;
@@ -129,6 +130,12 @@ final class CloudFoundryCleaner implements InitializingBean, DisposableBean {
 
     private static final Logger LOGGER = LoggerFactory.getLogger("cloudfoundry-client.test");
 
+    private static final boolean RUN_V2_CLEANUP = isRunV2Tests();
+
+    private static boolean isRunV2Tests() {
+        return !"true".equalsIgnoreCase(System.getenv("SKIP_V2_TESTS"));
+    }
+
     private static final Map<String, Boolean> STANDARD_FEATURE_FLAGS =
             FluentMap.<String, Boolean>builder()
                     .entry("app_bits_upload", true)
@@ -186,6 +193,32 @@ public void destroy() {
     }
 
     void clean() {
+        if (!RUN_V2_CLEANUP) {
+            LOGGER.info("Skipping V2 API cleanup operations (SKIP_V2_TESTS=true)");
+            // Only run V3 and UAA cleanup operations
+            Flux.empty()
+                    .thenMany(
+                            Mono.when( // No prerequisites - V3/UAA only
+                                    cleanClients(this.uaaClient, this.nameFactory),
+                                    cleanGroups(this.uaaClient, this.nameFactory),
+                                    cleanIdentityProviders(this.uaaClient, this.nameFactory),
+                                    cleanIdentityZones(this.uaaClient, this.nameFactory),
+                                    cleanUsersV3(this.cloudFoundryClient, this.nameFactory)))
+                    .thenMany(
+                            Mono.when(
+                                    cleanApplicationsV3(
+                                            this.cloudFoundryClient,
+                                            this.nameFactory,
+                                            false), // runV2Calls = false (V3-only path)
+                                    cleanUsers(this.uaaClient, this.nameFactory)))
+                    .retryWhen(Retry.max(5).filter(SSLException.class::isInstance))
+                    .doOnSubscribe(s -> LOGGER.debug(">> CLEANUP (V3 only) <<"))
+                    .doOnComplete(() -> LOGGER.debug("<< CLEANUP (V3 only) >>"))
+                    .then()
+                    .block(Duration.ofMinutes(30));
+            return;
+        }
+
         Flux.empty()
                 .thenMany(
                         Mono.when( // Before Routes
@@ -218,7 +251,8 @@ void clean() {
                         Mono.when(
                                 cleanApplicationsV3(
                                         this.cloudFoundryClient,
-                                        this.nameFactory), // After Routes, cannot run with
+                                        this.nameFactory,
+                                        true), // After Routes, cannot run with
                                 // other cleanApps
                                 cleanUsers(this.uaaClient, this.nameFactory) // After CF Users
                                 ))
@@ -241,32 +275,43 @@ void clean() {
     }
 
     private static Flux<Void> cleanApplicationsV3(
-            CloudFoundryClient cloudFoundryClient, NameFactory nameFactory) {
-        return PaginationUtils.requestClientV3Resources(
-                        page ->
-                                cloudFoundryClient
-                                        .applicationsV3()
-                                        .list(ListApplicationsRequest.builder().page(page).build()))
-                .filter(application -> nameFactory.isApplicationName(application.getName()))
-                .delayUntil(
-                        application ->
-                                removeApplicationServiceBindings(cloudFoundryClient, application))
-                .flatMap(
-                        application ->
-                                cloudFoundryClient
-                                        .applicationsV3()
-                                        .delete(
-                                                DeleteApplicationRequest.builder()
-                                                        .applicationId(application.getId())
-                                                        .build())
-                                        .then()
-                                        .doOnError(
-                                                t ->
-                                                        LOGGER.error(
-                                                                "Unable to delete V3 application"
-                                                                        + " {}",
-                                                                application.getName(),
-                                                                t)));
+            CloudFoundryClient cloudFoundryClient, NameFactory nameFactory, boolean runV2Calls) {
+        Flux<ApplicationResource> apps =
+                PaginationUtils.requestClientV3Resources(
+                                page ->
+                                        cloudFoundryClient
+                                                .applicationsV3()
+                                                .list(
+                                                        ListApplicationsRequest.builder()
+                                                                .page(page)
+                                                                .build()))
+                        .filter(
+                                application ->
+                                        nameFactory.isApplicationName(application.getName()));
+
+        if (runV2Calls) {
+            apps =
+                    apps.delayUntil(
+                            application ->
+                                    removeApplicationServiceBindings(
+                                            cloudFoundryClient, application));
+        }
+
+        return apps.flatMap(
+                application ->
+                        cloudFoundryClient
+                                .applicationsV3()
+                                .delete(
+                                        DeleteApplicationRequest.builder()
+                                                .applicationId(application.getId())
+                                                .build())
+                                .then()
+                                .doOnError(
+                                        t ->
+                                                LOGGER.error(
+                                                        "Unable to delete V3 application" + " {}",
+                                                        application.getName(),
+                                                        t)));
     }
 
     private static Flux<Void> cleanBuildpacks(
diff --git a/integration-test/src/test/java/org/cloudfoundry/IntegrationTestConfiguration.java b/integration-test/src/test/java/org/cloudfoundry/IntegrationTestConfiguration.java
index 36c30c3578..d4daae376b 100644
--- a/integration-test/src/test/java/org/cloudfoundry/IntegrationTestConfiguration.java
+++ b/integration-test/src/test/java/org/cloudfoundry/IntegrationTestConfiguration.java
@@ -85,6 +85,7 @@
 import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.DependsOn;
@@ -350,6 +351,7 @@ RandomNameFactory nameFactory() {
 
     @Bean(initMethod = "block")
     @DependsOn("cloudFoundryCleaner")
+    @ConditionalOnProperty(name = "SKIP_V2_TESTS", havingValue = "false", matchIfMissing = true)
     Mono<String> metricRegistrarServiceInstance(
             CloudFoundryClient cloudFoundryClient, Mono<String> spaceId, NameFactory nameFactory) {
         return spaceId.flatMap(
@@ -377,6 +379,7 @@ NetworkingClient networkingClient(
 
     @Bean(initMethod = "block")
     @DependsOn("cloudFoundryCleaner")
+    @ConditionalOnProperty(name = "SKIP_V2_TESTS", havingValue = "false", matchIfMissing = true)
     Mono<String> organizationId(
             CloudFoundryClient cloudFoundryClient,
             String organizationName,
@@ -516,6 +519,7 @@ String serviceName(NameFactory nameFactory) {
 
     @Bean(initMethod = "block")
     @DependsOn("cloudFoundryCleaner")
+    @ConditionalOnProperty(name = "SKIP_V2_TESTS", havingValue = "false", matchIfMissing = true)
     Mono<String> spaceId(
             CloudFoundryClient cloudFoundryClient, Mono<String> organizationId, String spaceName) {
         return organizationId
@@ -542,6 +546,7 @@ String spaceName(NameFactory nameFactory) {
 
     @Bean(initMethod = "block")
     @DependsOn("cloudFoundryCleaner")
+    @ConditionalOnProperty(name = "SKIP_V2_TESTS", havingValue = "false", matchIfMissing = true)
     Mono<String> stackId(CloudFoundryClient cloudFoundryClient, Mono<String> stackName) {
         return stackName
                 .flux()
@@ -570,6 +575,7 @@ Mono<String> stackId(CloudFoundryClient cloudFoundryClient, Mono<String> stackNa
      */
     @Bean(initMethod = "block")
     @DependsOn("cloudFoundryCleaner")
+    @ConditionalOnProperty(name = "SKIP_V2_TESTS", havingValue = "false", matchIfMissing = true)
     Mono<String> stackName(CloudFoundryClient cloudFoundryClient) {
         return PaginationUtils.requestClientV2Resources(
                         page ->
@@ -587,6 +593,7 @@ Mono<String> stackName(CloudFoundryClient cloudFoundryClient) {
     @Lazy
     @Bean(initMethod = "block")
     @DependsOn("cloudFoundryCleaner")
+    @ConditionalOnProperty(name = "SKIP_V2_TESTS", havingValue = "false", matchIfMissing = true)
     Mono<ApplicationUtils.ApplicationMetadata> testLogCacheApp(
             CloudFoundryClient cloudFoundryClient,
             Mono<String> spaceId,
@@ -623,6 +630,7 @@ String testLogCacheAppName(NameFactory nameFactory) {
 
     @Lazy
     @Bean
+    @ConditionalOnProperty(name = "SKIP_V2_TESTS", havingValue = "false", matchIfMissing = true)
     TestLogCacheEndpoints testLogCacheEndpoints(
             ConnectionContext connectionContext,
             TokenProvider tokenProvider,
diff --git a/integration-test/src/test/java/org/cloudfoundry/RequiresBrowserAuth.java b/integration-test/src/test/java/org/cloudfoundry/RequiresBrowserAuth.java
new file mode 100644
index 0000000000..d675dd6324
--- /dev/null
+++ b/integration-test/src/test/java/org/cloudfoundry/RequiresBrowserAuth.java
@@ -0,0 +1,74 @@
+/*
+ * Copyright 2026 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.cloudfoundry;
+
+import java.lang.annotation.Documented;
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Inherited;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+import org.junit.jupiter.api.extension.ConditionEvaluationResult;
+import org.junit.jupiter.api.extension.ExecutionCondition;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.api.extension.ExtensionContext;
+
+/**
+ * Annotation to mark tests that require browser-based authentication (e.g., OAuth
+ * authorization code grants, implicit grants). Tests annotated with this will be skipped
+ * if the environment variable {@code SKIP_BROWSER_AUTH_TESTS} is set to "true".
+ *
+ * <p>Usage:
+ * <pre>
+ * &#64;RequiresBrowserAuth
+ * public class MyAuthTest extends AbstractIntegrationTest {
+ *     // ...
+ * }
+ * </pre>
+ *
+ * <p>To skip browser auth tests, set the environment variable:
+ * <pre>
+ * export SKIP_BROWSER_AUTH_TESTS=true
+ * </pre>
+ */
+@Target({ElementType.METHOD, ElementType.TYPE})
+@Retention(RetentionPolicy.RUNTIME)
+@Documented
+@Inherited
+@ExtendWith(RequiresBrowserAuth.BrowserAuthCondition.class)
+public @interface RequiresBrowserAuth {
+
+    /**
+     * JUnit 5 ExecutionCondition that checks if Browser Auth tests should be skipped.
+     */
+    class BrowserAuthCondition implements ExecutionCondition {
+
+        private static final String SKIP_BROWSER_AUTH_ENV = "SKIP_BROWSER_AUTH_TESTS";
+
+        @Override
+        public ConditionEvaluationResult evaluateExecutionCondition(ExtensionContext context) {
+            if ("true".equalsIgnoreCase(System.getenv(SKIP_BROWSER_AUTH_ENV))) {
+                return ConditionEvaluationResult.disabled(
+                        "Tests requiring Browser Authentication are disabled via "
+                                + SKIP_BROWSER_AUTH_ENV
+                                + " environment variable");
+            }
+
+            return ConditionEvaluationResult.enabled("Browser authentication tests are enabled");
+        }
+    }
+}
diff --git a/integration-test/src/test/java/org/cloudfoundry/RequiresMetricRegistrar.java b/integration-test/src/test/java/org/cloudfoundry/RequiresMetricRegistrar.java
new file mode 100644
index 0000000000..c70d21dfe2
--- /dev/null
+++ b/integration-test/src/test/java/org/cloudfoundry/RequiresMetricRegistrar.java
@@ -0,0 +1,74 @@
+/*
+ * Copyright 2026 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.cloudfoundry;
+
+import java.lang.annotation.Documented;
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Inherited;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+import org.junit.jupiter.api.extension.ConditionEvaluationResult;
+import org.junit.jupiter.api.extension.ExecutionCondition;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.api.extension.ExtensionContext;
+
+/**
+ * Annotation to mark tests that require the Metric Registrar service to be available.
+ * Tests annotated with this will be skipped if the environment variable
+ * {@code SKIP_METRIC_REGISTRAR_TESTS} is set to "true".
+ *
+ * <p>Usage:
+ * <pre>
+ * &#64;RequiresMetricRegistrar
+ * public class MetricTest extends AbstractIntegrationTest {
+ *     // ...
+ * }
+ * </pre>
+ *
+ * <p>To skip metric registrar tests, set the environment variable:
+ * <pre>
+ * export SKIP_METRIC_REGISTRAR_TESTS=true
+ * </pre>
+ */
+@Target({ElementType.METHOD, ElementType.TYPE})
+@Retention(RetentionPolicy.RUNTIME)
+@Documented
+@Inherited
+@ExtendWith(RequiresMetricRegistrar.RegistrarCondition.class)
+public @interface RequiresMetricRegistrar {
+
+    /**
+     * JUnit 5 ExecutionCondition that checks if Metric Registrar tests should be skipped.
+     */
+    class RegistrarCondition implements ExecutionCondition {
+
+        private static final String SKIP_REGISTRAR_ENV = "SKIP_METRIC_REGISTRAR_TESTS";
+
+        @Override
+        public ConditionEvaluationResult evaluateExecutionCondition(ExtensionContext context) {
+            if ("true".equalsIgnoreCase(System.getenv(SKIP_REGISTRAR_ENV))) {
+                return ConditionEvaluationResult.disabled(
+                        "Tests requiring Metric Registrar Service are disabled via "
+                                + SKIP_REGISTRAR_ENV
+                                + " environment variable.");
+            }
+
+            return ConditionEvaluationResult.enabled("Metric Registrar tests are enabled");
+        }
+    }
+}
diff --git a/integration-test/src/test/java/org/cloudfoundry/RequiresTcpRouting.java b/integration-test/src/test/java/org/cloudfoundry/RequiresTcpRouting.java
new file mode 100644
index 0000000000..0ee45aee62
--- /dev/null
+++ b/integration-test/src/test/java/org/cloudfoundry/RequiresTcpRouting.java
@@ -0,0 +1,77 @@
+/*
+ * Copyright 2026 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.cloudfoundry;
+
+import java.lang.annotation.Documented;
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Inherited;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+import org.junit.jupiter.api.extension.ConditionEvaluationResult;
+import org.junit.jupiter.api.extension.ExecutionCondition;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.api.extension.ExtensionContext;
+
+/**
+ * Annotation to mark tests that require TCP routing to be configured.
+ *
+ * <p>Tests annotated with this (or test classes containing this annotation)
+ * will be skipped if the {@code SKIP_TCP_ROUTING_TESTS} environment variable
+ * is set to "true".
+ *
+ * <p>Use this when your Cloud Foundry instance does not have TCP routing
+ * configured (i.e., when the info payload does not contain a 'routing_endpoint' key).
+ *
+ * <p>Example usage:
+ * <pre>
+ * &#64;RequiresTcpRouting
+ * public class TcpRoutesTest extends AbstractIntegrationTest {
+ *     // tests that require TCP routing
+ * }
+ * </pre>
+ */
+@Target({ElementType.METHOD, ElementType.TYPE})
+@Retention(RetentionPolicy.RUNTIME)
+@Documented
+@Inherited
+@ExtendWith(RequiresTcpRouting.SkipTcpRoutingCondition.class)
+public @interface RequiresTcpRouting {
+
+    /**
+     * JUnit 5 ExecutionCondition that checks if tcp routing tests should be skipped.
+     */
+    class SkipTcpRoutingCondition implements ExecutionCondition {
+
+        private static final String ENV_VAR = "SKIP_TCP_ROUTING_TESTS";
+
+        @Override
+        public ConditionEvaluationResult evaluateExecutionCondition(ExtensionContext context) {
+            String envValue = System.getenv(ENV_VAR);
+
+            if ("true".equalsIgnoreCase(envValue)) {
+                return ConditionEvaluationResult.disabled(
+                        "TCP routing tests are disabled via "
+                                + ENV_VAR
+                                + " environment variable"
+                                + ". TCP routing may not be configured on the target CF instance.");
+            }
+
+            return ConditionEvaluationResult.enabled("TCP routing tests are enabled");
+        }
+    }
+}
diff --git a/integration-test/src/test/java/org/cloudfoundry/RequiresV2Api.java b/integration-test/src/test/java/org/cloudfoundry/RequiresV2Api.java
new file mode 100644
index 0000000000..acde38fb6b
--- /dev/null
+++ b/integration-test/src/test/java/org/cloudfoundry/RequiresV2Api.java
@@ -0,0 +1,72 @@
+/*
+ * Copyright 2026 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.cloudfoundry;
+
+import java.lang.annotation.Documented;
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Inherited;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+import org.junit.jupiter.api.extension.ConditionEvaluationResult;
+import org.junit.jupiter.api.extension.ExecutionCondition;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.api.extension.ExtensionContext;
+
+/**
+ * Annotation to mark tests that require the V2 API. Tests annotated with this
+ * will be skipped if the environment variable {@code SKIP_V2_TESTS} is set to "true".
+ *
+ * <p>Usage:
+ * <pre>
+ * &#64;RequiresV2Api
+ * public class MyV2Test extends AbstractIntegrationTest {
+ *     // ...
+ * }
+ * </pre>
+ *
+ * <p>To skip V2 tests, set the environment variable:
+ * <pre>
+ * export SKIP_V2_TESTS=true
+ * </pre>
+ */
+@Target({ElementType.METHOD, ElementType.TYPE})
+@Retention(RetentionPolicy.RUNTIME)
+@Documented
+@Inherited
+@ExtendWith(RequiresV2Api.V2ApiCondition.class)
+public @interface RequiresV2Api {
+
+    /**
+     * JUnit 5 ExecutionCondition that checks if V2 tests should be skipped.
+     */
+    class V2ApiCondition implements ExecutionCondition {
+
+        private static final String SKIP_V2_TESTS_ENV = "SKIP_V2_TESTS";
+
+        @Override
+        public ConditionEvaluationResult evaluateExecutionCondition(ExtensionContext context) {
+            if ("true".equalsIgnoreCase(System.getenv(SKIP_V2_TESTS_ENV))) {
+                return ConditionEvaluationResult.disabled(
+                        "V2 API tests are disabled via "
+                                + SKIP_V2_TESTS_ENV
+                                + " environment variable");
+            }
+            return ConditionEvaluationResult.enabled("V2 API tests are enabled");
+        }
+    }
+}
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 9774568bd0..df19fe4c8a 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
@@ -39,6 +39,7 @@
 import org.cloudfoundry.CleanupCloudFoundryAfterClass;
 import org.cloudfoundry.CloudFoundryVersion;
 import org.cloudfoundry.IfCloudFoundryVersion;
+import org.cloudfoundry.RequiresV2Api;
 import org.cloudfoundry.client.CloudFoundryClient;
 import org.cloudfoundry.client.v2.applications.AbstractApplicationResource;
 import org.cloudfoundry.client.v2.applications.ApplicationEnvironmentRequest;
@@ -98,6 +99,7 @@
 import reactor.util.function.Tuple2;
 
 @CleanupCloudFoundryAfterClass
+@RequiresV2Api
 public final class ApplicationsTest extends AbstractIntegrationTest {
 
     @Autowired private CloudFoundryClient cloudFoundryClient;
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 f9368a0730..223f55eb4e 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
@@ -19,6 +19,7 @@
 import java.time.Duration;
 import org.cloudfoundry.AbstractIntegrationTest;
 import org.cloudfoundry.ApplicationUtils;
+import org.cloudfoundry.RequiresV2Api;
 import org.cloudfoundry.client.CloudFoundryClient;
 import org.cloudfoundry.client.v2.blobstores.DeleteBlobstoreBuildpackCachesRequest;
 import org.cloudfoundry.util.JobUtils;
@@ -27,6 +28,7 @@
 import reactor.core.publisher.Mono;
 import reactor.test.StepVerifier;
 
+@RequiresV2Api
 public final class BlobstoresTest extends AbstractIntegrationTest {
 
     @Autowired private CloudFoundryClient cloudFoundryClient;
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 03b7d3f0e9..00afd83bcb 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
@@ -20,6 +20,7 @@
 import java.nio.file.Path;
 import java.time.Duration;
 import org.cloudfoundry.AbstractIntegrationTest;
+import org.cloudfoundry.RequiresV2Api;
 import org.cloudfoundry.client.CloudFoundryClient;
 import org.cloudfoundry.client.v2.buildpacks.BuildpackEntity;
 import org.cloudfoundry.client.v2.buildpacks.BuildpackResource;
@@ -40,6 +41,7 @@
 import reactor.core.publisher.Mono;
 import reactor.test.StepVerifier;
 
+@RequiresV2Api
 public final class BuildpacksTest extends AbstractIntegrationTest {
 
     @Autowired private CloudFoundryClient cloudFoundryClient;
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 676d130484..8d4841222d 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
@@ -23,6 +23,7 @@
 import java.time.Duration;
 import java.util.function.Consumer;
 import org.cloudfoundry.AbstractIntegrationTest;
+import org.cloudfoundry.RequiresV2Api;
 import org.cloudfoundry.client.CloudFoundryClient;
 import org.cloudfoundry.client.v2.applications.CreateApplicationRequest;
 import org.cloudfoundry.client.v2.applications.CreateApplicationResponse;
@@ -59,6 +60,7 @@
 import reactor.util.function.Tuple2;
 
 @SuppressWarnings("deprecation")
+@RequiresV2Api
 public final class DomainsTest extends AbstractIntegrationTest {
 
     @Autowired private CloudFoundryClient cloudFoundryClient;
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 76dcea594d..d52358d9db 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
@@ -18,6 +18,7 @@
 
 import java.time.Duration;
 import org.cloudfoundry.AbstractIntegrationTest;
+import org.cloudfoundry.RequiresV2Api;
 import org.cloudfoundry.client.CloudFoundryClient;
 import org.cloudfoundry.client.v2.events.EventResource;
 import org.cloudfoundry.client.v2.events.GetEventRequest;
@@ -29,6 +30,7 @@
 import reactor.core.publisher.Mono;
 import reactor.test.StepVerifier;
 
+@RequiresV2Api
 public final class EventsTest extends AbstractIntegrationTest {
 
     @Autowired private CloudFoundryClient cloudFoundryClient;
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 d47962b5aa..217bdd155a 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
@@ -26,6 +26,7 @@
 import java.util.Set;
 import java.util.stream.Collectors;
 import org.cloudfoundry.AbstractIntegrationTest;
+import org.cloudfoundry.RequiresV2Api;
 import org.cloudfoundry.client.CloudFoundryClient;
 import org.cloudfoundry.client.v2.featureflags.FeatureFlagEntity;
 import org.cloudfoundry.client.v2.featureflags.GetFeatureFlagRequest;
@@ -38,6 +39,7 @@
 import reactor.test.StepVerifier;
 import reactor.util.function.Tuples;
 
+@RequiresV2Api
 public final class FeatureFlagsTest extends AbstractIntegrationTest {
 
     private static final List<String> coreFeatureFlagNameList =
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 471cb284e8..a4395079a5 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
@@ -22,12 +22,14 @@
 import com.github.zafarkhaja.semver.Version;
 import java.time.Duration;
 import org.cloudfoundry.AbstractIntegrationTest;
+import org.cloudfoundry.RequiresV2Api;
 import org.cloudfoundry.client.CloudFoundryClient;
 import org.cloudfoundry.client.v2.info.GetInfoRequest;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 import reactor.test.StepVerifier;
 
+@RequiresV2Api
 public final class InfoTest extends AbstractIntegrationTest {
 
     @Autowired private CloudFoundryClient cloudFoundryClient;
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 0727b062d2..950ae4e35a 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
@@ -20,6 +20,7 @@
 
 import java.time.Duration;
 import org.cloudfoundry.AbstractIntegrationTest;
+import org.cloudfoundry.RequiresV2Api;
 import org.cloudfoundry.client.CloudFoundryClient;
 import org.cloudfoundry.client.v2.jobs.GetJobRequest;
 import org.cloudfoundry.client.v2.organizations.CreateOrganizationRequest;
@@ -31,6 +32,7 @@
 import reactor.core.publisher.Mono;
 import reactor.test.StepVerifier;
 
+@RequiresV2Api
 public final class JobsTest extends AbstractIntegrationTest {
 
     @Autowired private CloudFoundryClient cloudFoundryClient;
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 8a435cfa81..b99f91e307 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
@@ -20,6 +20,7 @@
 
 import java.time.Duration;
 import org.cloudfoundry.AbstractIntegrationTest;
+import org.cloudfoundry.RequiresV2Api;
 import org.cloudfoundry.client.CloudFoundryClient;
 import org.cloudfoundry.client.v2.organizationquotadefinitions.CreateOrganizationQuotaDefinitionRequest;
 import org.cloudfoundry.client.v2.organizationquotadefinitions.CreateOrganizationQuotaDefinitionResponse;
@@ -37,6 +38,7 @@
 import reactor.core.publisher.Mono;
 import reactor.test.StepVerifier;
 
+@RequiresV2Api
 public final class OrganizationQuotaDefinitionsTest extends AbstractIntegrationTest {
 
     @Autowired private CloudFoundryClient cloudFoundryClient;
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 e1d1762e64..1b31140d92 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
@@ -22,6 +22,7 @@
 import java.time.Duration;
 import java.util.function.UnaryOperator;
 import org.cloudfoundry.AbstractIntegrationTest;
+import org.cloudfoundry.RequiresV2Api;
 import org.cloudfoundry.client.CloudFoundryClient;
 import org.cloudfoundry.client.v2.applications.CreateApplicationRequest;
 import org.cloudfoundry.client.v2.applications.CreateApplicationResponse;
@@ -98,13 +99,16 @@
 import reactor.core.publisher.Mono;
 import reactor.test.StepVerifier;
 
+@RequiresV2Api
 public final class OrganizationsTest extends AbstractIntegrationTest {
 
     @Autowired private CloudFoundryClient cloudFoundryClient;
 
     @Autowired private Mono<String> organizationId;
 
-    @Autowired private Mono<String> serviceBrokerId;
+    // Optional: bean requires V2 API; class is guarded by @RequiresV2Api
+    @Autowired(required = false)
+    private Mono<String> serviceBrokerId;
 
     @Autowired private String serviceName;
 
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 587cfa35ae..4dde9496a3 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
@@ -23,6 +23,7 @@
 import java.time.Duration;
 import java.util.function.Consumer;
 import org.cloudfoundry.AbstractIntegrationTest;
+import org.cloudfoundry.RequiresV2Api;
 import org.cloudfoundry.client.CloudFoundryClient;
 import org.cloudfoundry.client.v2.organizations.AssociateOrganizationAuditorRequest;
 import org.cloudfoundry.client.v2.organizations.AssociateOrganizationAuditorResponse;
@@ -57,6 +58,7 @@
 import reactor.test.StepVerifier;
 import reactor.util.function.Tuple2;
 
+@RequiresV2Api
 public final class PrivateDomainsTest extends AbstractIntegrationTest {
 
     @Autowired private CloudFoundryClient cloudFoundryClient;
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 1056e98304..9b31ddf78a 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
@@ -22,6 +22,7 @@
 
 import java.time.Duration;
 import org.cloudfoundry.AbstractIntegrationTest;
+import org.cloudfoundry.RequiresV2Api;
 import org.cloudfoundry.client.CloudFoundryClient;
 import org.cloudfoundry.client.v2.applications.CreateApplicationRequest;
 import org.cloudfoundry.client.v2.applications.CreateApplicationResponse;
@@ -43,6 +44,7 @@
 import reactor.core.publisher.Mono;
 import reactor.test.StepVerifier;
 
+@RequiresV2Api
 public final class RouteMappingsTest extends AbstractIntegrationTest {
 
     @Autowired private CloudFoundryClient cloudFoundryClient;
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 3ee5650893..cb974f35e6 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
@@ -23,6 +23,7 @@
 import java.time.Duration;
 import java.util.function.Consumer;
 import org.cloudfoundry.AbstractIntegrationTest;
+import org.cloudfoundry.RequiresV2Api;
 import org.cloudfoundry.client.CloudFoundryClient;
 import org.cloudfoundry.client.v2.applications.CreateApplicationRequest;
 import org.cloudfoundry.client.v2.applications.CreateApplicationResponse;
@@ -53,6 +54,7 @@
 import reactor.test.StepVerifier;
 import reactor.util.function.Tuple3;
 
+@RequiresV2Api
 public final class RoutesTest extends AbstractIntegrationTest {
 
     @Autowired private CloudFoundryClient cloudFoundryClient;
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 64ee5df01a..ba249ceff2 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
@@ -21,6 +21,7 @@
 
 import java.time.Duration;
 import org.cloudfoundry.AbstractIntegrationTest;
+import org.cloudfoundry.RequiresV2Api;
 import org.cloudfoundry.client.CloudFoundryClient;
 import org.cloudfoundry.client.v2.securitygroups.AssociateSecurityGroupSpaceRequest;
 import org.cloudfoundry.client.v2.securitygroups.AssociateSecurityGroupSpaceResponse;
@@ -55,6 +56,7 @@
 import reactor.core.publisher.Mono;
 import reactor.test.StepVerifier;
 
+@RequiresV2Api
 public final class SecurityGroupsTest extends AbstractIntegrationTest {
 
     @Autowired private CloudFoundryClient cloudFoundryClient;
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 668976376d..f596238704 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
@@ -24,6 +24,7 @@
 import java.util.Optional;
 import java.util.function.Consumer;
 import org.cloudfoundry.AbstractIntegrationTest;
+import org.cloudfoundry.RequiresV2Api;
 import org.cloudfoundry.client.CloudFoundryClient;
 import org.cloudfoundry.client.v2.applications.CreateApplicationRequest;
 import org.cloudfoundry.client.v2.applications.CreateApplicationResponse;
@@ -49,6 +50,7 @@
 import reactor.util.function.Tuple2;
 import reactor.util.function.Tuple3;
 
+@RequiresV2Api
 public final class ServiceBindingsTest extends AbstractIntegrationTest {
 
     @Autowired private CloudFoundryClient cloudFoundryClient;
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 214577e4a9..50be1ea1b5 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
@@ -26,6 +26,7 @@
 import org.cloudfoundry.AbstractIntegrationTest;
 import org.cloudfoundry.ApplicationUtils;
 import org.cloudfoundry.CleanupCloudFoundryAfterClass;
+import org.cloudfoundry.RequiresV2Api;
 import org.cloudfoundry.ServiceBrokerUtils;
 import org.cloudfoundry.client.CloudFoundryClient;
 import org.cloudfoundry.client.v2.servicebrokers.CreateServiceBrokerRequest;
@@ -45,13 +46,16 @@
 import reactor.test.StepVerifier;
 
 @CleanupCloudFoundryAfterClass
+@RequiresV2Api
 public final class ServiceBrokersTest extends AbstractIntegrationTest {
 
     @Autowired private CloudFoundryClient cloudFoundryClient;
 
     @Autowired private Mono<String> organizationId;
 
-    @Autowired private Mono<String> serviceBrokerId;
+    // Optional: bean requires V2 API; class is guarded by @RequiresV2Api
+    @Autowired(required = false)
+    private Mono<String> serviceBrokerId;
 
     @Autowired private String serviceBrokerName;
 
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 ed152f87a3..cad61ddbd5 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
@@ -24,6 +24,7 @@
 import org.cloudfoundry.AbstractIntegrationTest;
 import org.cloudfoundry.CloudFoundryVersion;
 import org.cloudfoundry.IfCloudFoundryVersion;
+import org.cloudfoundry.RequiresV2Api;
 import org.cloudfoundry.client.CloudFoundryClient;
 import org.cloudfoundry.client.v2.applications.CreateApplicationRequest;
 import org.cloudfoundry.client.v2.applications.CreateApplicationResponse;
@@ -65,6 +66,7 @@
 import reactor.test.StepVerifier;
 import reactor.util.function.Tuples;
 
+@RequiresV2Api
 public final class ServiceInstancesTest extends AbstractIntegrationTest {
 
     private static final String DEFAULT_ROUTER_GROUP = "default-tcp";
@@ -75,7 +77,9 @@ public final class ServiceInstancesTest extends AbstractIntegrationTest {
 
     @Autowired private RoutingClient routingClient;
 
-    @Autowired private Mono<String> serviceBrokerId;
+    // Optional: bean requires V2 API; class is guarded by @RequiresV2Api
+    @Autowired(required = false)
+    private Mono<String> serviceBrokerId;
 
     @Autowired private String serviceName;
 
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 58067e0d31..485e9ba571 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
@@ -20,6 +20,7 @@
 
 import java.time.Duration;
 import org.cloudfoundry.AbstractIntegrationTest;
+import org.cloudfoundry.RequiresV2Api;
 import org.cloudfoundry.client.CloudFoundryClient;
 import org.cloudfoundry.client.v2.serviceinstances.CreateServiceInstanceRequest;
 import org.cloudfoundry.client.v2.serviceinstances.CreateServiceInstanceResponse;
@@ -42,11 +43,14 @@
 import reactor.core.publisher.Mono;
 import reactor.test.StepVerifier;
 
+@RequiresV2Api
 public final class ServiceKeysTest extends AbstractIntegrationTest {
 
     @Autowired private CloudFoundryClient cloudFoundryClient;
 
-    @Autowired private Mono<String> serviceBrokerId;
+    // Optional: bean requires V2 API; class is guarded by @RequiresV2Api
+    @Autowired(required = false)
+    private Mono<String> serviceBrokerId;
 
     @Autowired private String serviceName;
 
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 910294d42a..e2a9ecbece 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
@@ -22,6 +22,7 @@
 
 import java.time.Duration;
 import org.cloudfoundry.AbstractIntegrationTest;
+import org.cloudfoundry.RequiresV2Api;
 import org.cloudfoundry.ServiceBrokerUtils;
 import org.cloudfoundry.client.CloudFoundryClient;
 import org.cloudfoundry.client.v2.organizations.CreateOrganizationRequest;
@@ -47,6 +48,7 @@
 import reactor.test.StepVerifier;
 import reactor.util.function.Tuples;
 
+@RequiresV2Api
 public final class ServicePlanVisibilitiesTest extends AbstractIntegrationTest {
 
     @Autowired private CloudFoundryClient cloudFoundryClient;
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 c8f4db7e14..e9fc66b8e8 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
@@ -22,6 +22,7 @@
 
 import java.time.Duration;
 import org.cloudfoundry.AbstractIntegrationTest;
+import org.cloudfoundry.RequiresV2Api;
 import org.cloudfoundry.ServiceBrokerUtils;
 import org.cloudfoundry.client.CloudFoundryClient;
 import org.cloudfoundry.client.v2.applications.CreateApplicationRequest;
@@ -53,6 +54,7 @@
 import reactor.core.publisher.Mono;
 import reactor.test.StepVerifier;
 
+@RequiresV2Api
 public final class ServicePlansTest extends AbstractIntegrationTest {
 
     @Autowired private CloudFoundryClient cloudFoundryClient;
@@ -61,7 +63,9 @@ public final class ServicePlansTest extends AbstractIntegrationTest {
 
     @Autowired private String planName;
 
-    @Autowired private Mono<String> serviceBrokerId;
+    // Optional: bean requires V2 API; class is guarded by @RequiresV2Api
+    @Autowired(required = false)
+    private Mono<String> serviceBrokerId;
 
     @Autowired private String serviceName;
 
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 987de74b28..32703e319e 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
@@ -21,6 +21,7 @@
 import java.time.Duration;
 import org.cloudfoundry.AbstractIntegrationTest;
 import org.cloudfoundry.NameFactory;
+import org.cloudfoundry.RequiresV2Api;
 import org.cloudfoundry.client.CloudFoundryClient;
 import org.cloudfoundry.client.v2.serviceinstances.CreateServiceInstanceRequest;
 import org.cloudfoundry.client.v2.serviceinstances.CreateServiceInstanceResponse;
@@ -40,11 +41,14 @@
 import reactor.core.publisher.Mono;
 import reactor.test.StepVerifier;
 
+@RequiresV2Api
 public final class ServiceUsageEventsTest extends AbstractIntegrationTest {
 
     @Autowired private CloudFoundryClient cloudFoundryClient;
 
-    @Autowired private Mono<String> serviceBrokerId;
+    // Optional: bean requires V2 API; class is guarded by @RequiresV2Api
+    @Autowired(required = false)
+    private Mono<String> serviceBrokerId;
 
     @Autowired private String serviceName;
 
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 9af396d315..1469bfdd36 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
@@ -22,6 +22,7 @@
 
 import java.time.Duration;
 import org.cloudfoundry.AbstractIntegrationTest;
+import org.cloudfoundry.RequiresV2Api;
 import org.cloudfoundry.ServiceBrokerUtils;
 import org.cloudfoundry.client.CloudFoundryClient;
 import org.cloudfoundry.client.v2.serviceinstances.CreateServiceInstanceRequest;
@@ -46,6 +47,7 @@
 import reactor.core.publisher.Mono;
 import reactor.test.StepVerifier;
 
+@RequiresV2Api
 public final class ServicesTest extends AbstractIntegrationTest {
 
     @Autowired private CloudFoundryClient cloudFoundryClient;
@@ -54,7 +56,9 @@ public final class ServicesTest extends AbstractIntegrationTest {
 
     @Autowired private String planName;
 
-    @Autowired private Mono<String> serviceBrokerId;
+    // Optional: bean requires V2 API; class is guarded by @RequiresV2Api
+    @Autowired(required = false)
+    private Mono<String> serviceBrokerId;
 
     @Autowired private String serviceName;
 
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 063992a657..bf60654252 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
@@ -19,6 +19,7 @@
 import java.time.Duration;
 import java.util.Optional;
 import org.cloudfoundry.AbstractIntegrationTest;
+import org.cloudfoundry.RequiresV2Api;
 import org.cloudfoundry.client.CloudFoundryClient;
 import org.cloudfoundry.client.v2.shareddomains.CreateSharedDomainRequest;
 import org.cloudfoundry.client.v2.shareddomains.CreateSharedDomainResponse;
@@ -37,6 +38,7 @@
 import reactor.core.publisher.Mono;
 import reactor.test.StepVerifier;
 
+@RequiresV2Api
 public final class SharedDomainsTest extends AbstractIntegrationTest {
 
     @Autowired private CloudFoundryClient cloudFoundryClient;
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 47c9ae0f5f..ebe8ca1b61 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
@@ -20,6 +20,7 @@
 
 import java.time.Duration;
 import org.cloudfoundry.AbstractIntegrationTest;
+import org.cloudfoundry.RequiresV2Api;
 import org.cloudfoundry.client.CloudFoundryClient;
 import org.cloudfoundry.client.v2.applications.CreateApplicationRequest;
 import org.cloudfoundry.client.v2.applications.CreateApplicationResponse;
@@ -48,6 +49,7 @@
 import reactor.test.StepVerifier;
 import reactor.util.function.Tuples;
 
+@RequiresV2Api
 public final class SpaceQuotaDefinitionsTest extends AbstractIntegrationTest {
 
     @Autowired private CloudFoundryClient cloudFoundryClient;
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 4193ec53d6..eae93b616b 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
@@ -27,6 +27,7 @@
 import java.util.function.Function;
 import java.util.function.UnaryOperator;
 import org.cloudfoundry.AbstractIntegrationTest;
+import org.cloudfoundry.RequiresV2Api;
 import org.cloudfoundry.client.CloudFoundryClient;
 import org.cloudfoundry.client.v2.applications.ApplicationResource;
 import org.cloudfoundry.client.v2.applications.CreateApplicationRequest;
@@ -116,13 +117,16 @@
 import reactor.test.StepVerifier;
 import reactor.util.function.Tuple2;
 
+@RequiresV2Api
 public final class SpacesTest extends AbstractIntegrationTest {
 
     @Autowired private CloudFoundryClient cloudFoundryClient;
 
     @Autowired private Mono<String> organizationId;
 
-    @Autowired private Mono<String> serviceBrokerId;
+    // Optional: bean requires V2 API; class is guarded by @RequiresV2Api
+    @Autowired(required = false)
+    private Mono<String> serviceBrokerId;
 
     @Autowired private String serviceName;
 
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 cbd3ac2d29..3360a86a3f 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
@@ -20,6 +20,7 @@
 
 import java.time.Duration;
 import org.cloudfoundry.AbstractIntegrationTest;
+import org.cloudfoundry.RequiresV2Api;
 import org.cloudfoundry.client.CloudFoundryClient;
 import org.cloudfoundry.client.v2.stacks.CreateStackRequest;
 import org.cloudfoundry.client.v2.stacks.CreateStackResponse;
@@ -38,6 +39,7 @@
 import reactor.core.publisher.Mono;
 import reactor.test.StepVerifier;
 
+@RequiresV2Api
 public final class StacksTest extends AbstractIntegrationTest {
 
     @Autowired private CloudFoundryClient cloudFoundryClient;
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 555741d634..a850b86141 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
@@ -24,6 +24,7 @@
 import java.util.Collections;
 import java.util.function.Consumer;
 import org.cloudfoundry.AbstractIntegrationTest;
+import org.cloudfoundry.RequiresV2Api;
 import org.cloudfoundry.client.CloudFoundryClient;
 import org.cloudfoundry.client.v2.applications.CreateApplicationRequest;
 import org.cloudfoundry.client.v2.applications.CreateApplicationResponse;
@@ -56,6 +57,7 @@
 import reactor.util.function.Tuple3;
 import reactor.util.function.Tuples;
 
+@RequiresV2Api
 public final class UserProvidedServicesTest extends AbstractIntegrationTest {
 
     private static final String DEFAULT_ROUTER_GROUP = "default-tcp";
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 27f1232c3d..08efb1965e 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
@@ -20,6 +20,7 @@
 
 import java.time.Duration;
 import org.cloudfoundry.AbstractIntegrationTest;
+import org.cloudfoundry.RequiresV2Api;
 import org.cloudfoundry.client.CloudFoundryClient;
 import org.cloudfoundry.client.v2.applications.CreateApplicationRequest;
 import org.cloudfoundry.client.v2.applications.CreateApplicationResponse;
@@ -80,6 +81,7 @@
 import reactor.test.StepVerifier;
 import reactor.util.function.Tuples;
 
+@RequiresV2Api
 public final class UsersTest extends AbstractIntegrationTest {
 
     private static final String STATUS_FILTER = "active";
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 d185f15dea..bdbc6778c8 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
@@ -21,6 +21,7 @@
 import org.cloudfoundry.ApplicationUtils;
 import org.cloudfoundry.CloudFoundryVersion;
 import org.cloudfoundry.IfCloudFoundryVersion;
+import org.cloudfoundry.RequiresV2Api;
 import org.cloudfoundry.client.CloudFoundryClient;
 import org.cloudfoundry.client.v3.admin.ClearBuildpackCacheRequest;
 import org.cloudfoundry.util.JobUtils;
@@ -29,6 +30,8 @@
 import reactor.core.publisher.Mono;
 import reactor.test.StepVerifier;
 
+@RequiresV2Api
+// TODO Does it really require V2?
 public final class AdminTest extends AbstractIntegrationTest {
 
     @Autowired private CloudFoundryClient cloudFoundryClient;
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 d823ad7b1c..bcec497842 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
@@ -25,6 +25,7 @@
 import org.cloudfoundry.CleanupCloudFoundryAfterClass;
 import org.cloudfoundry.CloudFoundryVersion;
 import org.cloudfoundry.IfCloudFoundryVersion;
+import org.cloudfoundry.RequiresV2Api;
 import org.cloudfoundry.client.CloudFoundryClient;
 import org.cloudfoundry.client.v3.applications.GetApplicationCurrentDropletRequest;
 import org.cloudfoundry.client.v3.applications.GetApplicationCurrentDropletResponse;
@@ -52,6 +53,7 @@
 import reactor.test.StepVerifier;
 
 @IfCloudFoundryVersion(greaterThanOrEqualTo = CloudFoundryVersion.PCF_2_4)
+@RequiresV2Api // Due to ApplicationUtils
 @CleanupCloudFoundryAfterClass
 public final class DeploymentsTest extends AbstractIntegrationTest {
 
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 0f0a56fc1c..580fb30214 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
@@ -22,6 +22,7 @@
 import org.cloudfoundry.AbstractIntegrationTest;
 import org.cloudfoundry.CloudFoundryVersion;
 import org.cloudfoundry.IfCloudFoundryVersion;
+import org.cloudfoundry.RequiresV2Api;
 import org.cloudfoundry.client.CloudFoundryClient;
 import org.cloudfoundry.client.v2.organizations.CreateOrganizationRequest;
 import org.cloudfoundry.client.v2.organizations.CreateOrganizationResponse;
@@ -53,6 +54,7 @@
 import reactor.test.StepVerifier;
 
 @IfCloudFoundryVersion(greaterThanOrEqualTo = CloudFoundryVersion.PCF_1_11)
+@RequiresV2Api
 public final class IsolationSegmentsTest extends AbstractIntegrationTest {
 
     @Autowired private CloudFoundryClient cloudFoundryClient;
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 a1fbd52f3d..e3da7d85e6 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
@@ -24,6 +24,7 @@
 import org.cloudfoundry.ApplicationUtils;
 import org.cloudfoundry.CloudFoundryVersion;
 import org.cloudfoundry.IfCloudFoundryVersion;
+import org.cloudfoundry.RequiresV2Api;
 import org.cloudfoundry.client.CloudFoundryClient;
 import org.cloudfoundry.client.v3.domains.CreateDomainRequest;
 import org.cloudfoundry.client.v3.domains.CreateDomainResponse;
@@ -57,6 +58,7 @@
 import reactor.test.StepVerifier;
 
 @IfCloudFoundryVersion(greaterThanOrEqualTo = CloudFoundryVersion.PCF_1_12)
+@RequiresV2Api
 public final class OrganizationsTest extends AbstractIntegrationTest {
 
     @Autowired private CloudFoundryClient cloudFoundryClient;
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 e4a4184e85..8e3cbba3cb 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
@@ -25,6 +25,7 @@
 import org.cloudfoundry.CleanupCloudFoundryAfterClass;
 import org.cloudfoundry.CloudFoundryVersion;
 import org.cloudfoundry.IfCloudFoundryVersion;
+import org.cloudfoundry.RequiresV2Api;
 import org.cloudfoundry.client.CloudFoundryClient;
 import org.cloudfoundry.client.v3.applications.GetApplicationProcessRequest;
 import org.cloudfoundry.client.v3.applications.GetApplicationProcessResponse;
@@ -43,6 +44,7 @@
 import reactor.test.StepVerifier;
 
 @IfCloudFoundryVersion(greaterThanOrEqualTo = CloudFoundryVersion.PCF_2_0)
+@RequiresV2Api // Due to ApplicationUtils
 @CleanupCloudFoundryAfterClass
 public final class ProcessesTest extends AbstractIntegrationTest {
 
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 81477aef52..acdb96f1e9 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
@@ -25,6 +25,7 @@
 import org.cloudfoundry.AbstractIntegrationTest;
 import org.cloudfoundry.CloudFoundryVersion;
 import org.cloudfoundry.IfCloudFoundryVersion;
+import org.cloudfoundry.RequiresV2Api;
 import org.cloudfoundry.client.CloudFoundryClient;
 import org.cloudfoundry.client.v3.servicebindings.CreateServiceBindingRequest;
 import org.cloudfoundry.client.v3.servicebindings.DeleteServiceBindingRequest;
@@ -54,11 +55,14 @@
 import reactor.test.StepVerifier;
 
 @IfCloudFoundryVersion(greaterThanOrEqualTo = CloudFoundryVersion.PCF_2_11)
+@RequiresV2Api
 public class ServiceBindingsTest extends AbstractIntegrationTest {
 
     @Autowired private CloudFoundryClient cloudFoundryClient;
 
-    @Autowired private Mono<String> serviceBrokerId;
+    // Optional: bean requires V2 API; class is guarded by @RequiresV2Api
+    @Autowired(required = false)
+    private Mono<String> serviceBrokerId;
 
     @Autowired private String serviceName;
 
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 656a0b0efe..07e0b219cf 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
@@ -28,6 +28,7 @@
 import org.cloudfoundry.CleanupCloudFoundryAfterClass;
 import org.cloudfoundry.CloudFoundryVersion;
 import org.cloudfoundry.IfCloudFoundryVersion;
+import org.cloudfoundry.RequiresV2Api;
 import org.cloudfoundry.ServiceBrokerUtils;
 import org.cloudfoundry.client.CloudFoundryClient;
 import org.cloudfoundry.client.v3.servicebrokers.BasicAuthentication;
@@ -50,6 +51,7 @@
 import reactor.test.StepVerifier;
 
 @IfCloudFoundryVersion(greaterThanOrEqualTo = CloudFoundryVersion.PCF_2_10)
+@RequiresV2Api
 @CleanupCloudFoundryAfterClass
 public final class ServiceBrokersTest extends AbstractIntegrationTest {
 
@@ -57,7 +59,9 @@ public final class ServiceBrokersTest extends AbstractIntegrationTest {
 
     @Autowired private Mono<String> organizationId;
 
-    @Autowired private Mono<String> serviceBrokerId;
+    // Optional: bean requires V2 API; class is guarded by @RequiresV2Api
+    @Autowired(required = false)
+    private Mono<String> serviceBrokerId;
 
     @Autowired private String serviceBrokerName;
 
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 507b288a65..941c0e5616 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
@@ -25,6 +25,7 @@
 import org.cloudfoundry.AbstractIntegrationTest;
 import org.cloudfoundry.CloudFoundryVersion;
 import org.cloudfoundry.IfCloudFoundryVersion;
+import org.cloudfoundry.RequiresV2Api;
 import org.cloudfoundry.client.CloudFoundryClient;
 import org.cloudfoundry.client.v3.serviceinstances.CreateServiceInstanceRequest;
 import org.cloudfoundry.client.v3.serviceinstances.CreateServiceInstanceResponse;
@@ -57,13 +58,16 @@
 import reactor.test.StepVerifier;
 
 @IfCloudFoundryVersion(greaterThanOrEqualTo = CloudFoundryVersion.PCF_2_1)
+@RequiresV2Api
 public final class ServiceInstancesTest extends AbstractIntegrationTest {
 
     @Autowired private CloudFoundryClient cloudFoundryClient;
 
     @Autowired private Mono<String> organizationId;
 
-    @Autowired private Mono<String> serviceBrokerId;
+    // Optional: bean requires V2 API; class is guarded by @RequiresV2Api
+    @Autowired(required = false)
+    private Mono<String> serviceBrokerId;
 
     @Autowired private String serviceName;
 
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 f0b67a37b4..2033493590 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
@@ -24,6 +24,7 @@
 import org.cloudfoundry.AbstractIntegrationTest;
 import org.cloudfoundry.CloudFoundryVersion;
 import org.cloudfoundry.IfCloudFoundryVersion;
+import org.cloudfoundry.RequiresV2Api;
 import org.cloudfoundry.ServiceBrokerUtils;
 import org.cloudfoundry.client.CloudFoundryClient;
 import org.cloudfoundry.client.v3.serviceofferings.DeleteServiceOfferingRequest;
@@ -43,13 +44,16 @@
 import reactor.test.StepVerifier;
 
 @IfCloudFoundryVersion(greaterThanOrEqualTo = CloudFoundryVersion.PCF_2_10)
+@RequiresV2Api
 public final class ServiceOfferingsTest extends AbstractIntegrationTest {
 
     @Autowired private CloudFoundryClient cloudFoundryClient;
 
     @Autowired private Mono<String> organizationId;
 
-    @Autowired private Mono<String> serviceBrokerId;
+    // Optional: bean requires V2 API; class is guarded by @RequiresV2Api
+    @Autowired(required = false)
+    private Mono<String> serviceBrokerId;
 
     @Autowired private String serviceName;
 
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 5e37753b66..7f5f038394 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
@@ -24,6 +24,7 @@
 import org.cloudfoundry.AbstractIntegrationTest;
 import org.cloudfoundry.CloudFoundryVersion;
 import org.cloudfoundry.IfCloudFoundryVersion;
+import org.cloudfoundry.RequiresV2Api;
 import org.cloudfoundry.ServiceBrokerUtils;
 import org.cloudfoundry.client.CloudFoundryClient;
 import org.cloudfoundry.client.v3.serviceplans.DeleteServicePlanRequest;
@@ -45,6 +46,7 @@
 import reactor.test.StepVerifier;
 
 @IfCloudFoundryVersion(greaterThanOrEqualTo = CloudFoundryVersion.PCF_2_10)
+@RequiresV2Api
 public final class ServicePlansTest extends AbstractIntegrationTest {
 
     @Autowired private CloudFoundryClient cloudFoundryClient;
@@ -53,7 +55,9 @@ public final class ServicePlansTest extends AbstractIntegrationTest {
 
     @Autowired private String planName;
 
-    @Autowired private Mono<String> serviceBrokerId;
+    // Optional: bean requires V2 API; class is guarded by @RequiresV2Api
+    @Autowired(required = false)
+    private Mono<String> serviceBrokerId;
 
     @Test
     public void delete() {
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 0e3fdada8c..ec5970a08b 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
@@ -25,6 +25,7 @@
 import org.cloudfoundry.CleanupCloudFoundryAfterClass;
 import org.cloudfoundry.CloudFoundryVersion;
 import org.cloudfoundry.IfCloudFoundryVersion;
+import org.cloudfoundry.RequiresV2Api;
 import org.cloudfoundry.client.CloudFoundryClient;
 import org.cloudfoundry.client.v3.applications.ApplicationResource;
 import org.cloudfoundry.client.v3.applications.GetApplicationCurrentDropletRequest;
@@ -52,6 +53,7 @@
 
 @IfCloudFoundryVersion(greaterThanOrEqualTo = CloudFoundryVersion.PCF_1_12)
 @CleanupCloudFoundryAfterClass
+@RequiresV2Api // Due to ApplicationUtils
 public final class TasksTest extends AbstractIntegrationTest {
 
     @Autowired private CloudFoundryClient cloudFoundryClient;
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 414af210bd..eb53f39123 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
@@ -29,6 +29,8 @@
 import org.cloudfoundry.ApplicationUtils;
 import org.cloudfoundry.CloudFoundryVersion;
 import org.cloudfoundry.IfCloudFoundryVersion;
+import org.cloudfoundry.RequiresMetricRegistrar;
+import org.cloudfoundry.RequiresV2Api;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
@@ -43,13 +45,26 @@ public class LogCacheTest extends AbstractIntegrationTest {
 
     private ApplicationUtils.ApplicationMetadata testLogCacheAppMetadata;
 
-    @Autowired private TestLogCacheEndpoints testLogCacheEndpoints;
+    // Optional: only available when V2 API is enabled (requires deployed test app)
+    @Autowired(required = false)
+    private TestLogCacheEndpoints testLogCacheEndpoints;
 
     private final Random random = new SecureRandom();
 
+    /**
+     * Sets up the test log cache app metadata. The testLogCacheApp bean is optional
+     * ({@code required = false}) because it depends on V2 API calls for app deployment.
+     * When SKIP_V2_TESTS=true, this bean won't be available and setUp becomes a no-op.
+     * Tests that need testLogCacheAppMetadata are annotated with {@code @RequiresV2Api}
+     * and will be skipped in that case.
+     */
     @BeforeEach
-    void setUp(@Autowired Mono<ApplicationUtils.ApplicationMetadata> testLogCacheApp) {
-        this.testLogCacheAppMetadata = testLogCacheApp.block();
+    void setUp(
+            @Autowired(required = false)
+                    Mono<ApplicationUtils.ApplicationMetadata> testLogCacheApp) {
+        if (testLogCacheApp != null) {
+            this.testLogCacheAppMetadata = testLogCacheApp.block();
+        }
     }
 
     @Test
@@ -68,6 +83,7 @@ public void info() {
     }
 
     @Test
+    @RequiresV2Api
     public void meta() {
         this.logCacheClient
                 .meta(MetaRequest.builder().build())
@@ -83,6 +99,8 @@ public void meta() {
     }
 
     @Test
+    @RequiresV2Api
+    @RequiresMetricRegistrar
     public void readCounter() {
         final String name = this.nameFactory.getName("counter-");
         final int delta = this.random.nextInt(1000);
@@ -102,6 +120,8 @@ public void readCounter() {
     }
 
     @Test
+    @RequiresV2Api
+    @RequiresMetricRegistrar
     public void readEvent() {
         final String title = this.nameFactory.getName("event-");
         final String body = "This is the body. " + new BigInteger(1024, this.random).toString(32);
@@ -117,6 +137,7 @@ public void readEvent() {
 
     @Test
     @Disabled("fails often for no reasons")
+    @RequiresV2Api
     public void readGauge() {
         final String gaugeName = this.nameFactory.getName("gauge-");
         final Double value = this.random.nextDouble() % 100;
@@ -138,6 +159,7 @@ public void readGauge() {
     }
 
     @Test
+    @RequiresV2Api
     public void readLogs() {
         final String logMessage = this.nameFactory.getName("log-");
 
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 733e95d6bc..201b9a4988 100644
--- a/integration-test/src/test/java/org/cloudfoundry/operations/AdvancedTest.java
+++ b/integration-test/src/test/java/org/cloudfoundry/operations/AdvancedTest.java
@@ -20,10 +20,12 @@
 
 import java.time.Duration;
 import org.cloudfoundry.AbstractIntegrationTest;
+import org.cloudfoundry.RequiresV2Api;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 import reactor.test.StepVerifier;
 
+@RequiresV2Api
 public final class AdvancedTest extends AbstractIntegrationTest {
 
     @Autowired private CloudFoundryOperations cloudFoundryOperations;
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 36e1bd9456..5b25bbe311 100644
--- a/integration-test/src/test/java/org/cloudfoundry/operations/ApplicationsTest.java
+++ b/integration-test/src/test/java/org/cloudfoundry/operations/ApplicationsTest.java
@@ -29,6 +29,8 @@
 import org.cloudfoundry.CleanupCloudFoundryAfterClass;
 import org.cloudfoundry.CloudFoundryVersion;
 import org.cloudfoundry.IfCloudFoundryVersion;
+import org.cloudfoundry.RequiresTcpRouting;
+import org.cloudfoundry.RequiresV2Api;
 import org.cloudfoundry.client.CloudFoundryClient;
 import org.cloudfoundry.logcache.v1.Envelope;
 import org.cloudfoundry.logcache.v1.EnvelopeBatch;
@@ -96,6 +98,7 @@
 import reactor.test.StepVerifier;
 
 @CleanupCloudFoundryAfterClass
+@RequiresV2Api
 public final class ApplicationsTest extends AbstractIntegrationTest {
 
     private static final String DEFAULT_ROUTER_GROUP = "default-tcp";
@@ -359,6 +362,7 @@ public void getManifest() throws IOException {
     }
 
     @Test
+    @RequiresTcpRouting
     public void getManifestForTcpRoute() throws IOException {
         String applicationName = this.nameFactory.getApplicationName();
 
@@ -445,6 +449,7 @@ public void getStopped() throws IOException {
     }
 
     @Test
+    @RequiresTcpRouting
     public void getTcp() throws IOException {
         String applicationName = this.nameFactory.getApplicationName();
         String domainName = this.nameFactory.getDomainName();
@@ -1186,6 +1191,7 @@ public void pushRoutePath() throws IOException {
     }
 
     @Test
+    @RequiresTcpRouting
     public void pushTcpRoute() throws IOException {
         String applicationName = this.nameFactory.getApplicationName();
         String domainName = this.nameFactory.getDomainName();
@@ -1309,6 +1315,7 @@ public void pushUpdateRoute() throws IOException {
     }
 
     @Test
+    @RequiresTcpRouting
     public void pushUpdateTcpRoute() throws IOException {
         String applicationName = this.nameFactory.getApplicationName();
         String domainName = this.nameFactory.getDomainName();
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 62991cef2e..7dde64ffee 100644
--- a/integration-test/src/test/java/org/cloudfoundry/operations/BuildpacksTest.java
+++ b/integration-test/src/test/java/org/cloudfoundry/operations/BuildpacksTest.java
@@ -21,6 +21,7 @@
 import java.io.IOException;
 import java.time.Duration;
 import org.cloudfoundry.AbstractIntegrationTest;
+import org.cloudfoundry.RequiresV2Api;
 import org.cloudfoundry.operations.buildpacks.Buildpack;
 import org.cloudfoundry.operations.buildpacks.CreateBuildpackRequest;
 import org.cloudfoundry.operations.buildpacks.DeleteBuildpackRequest;
@@ -31,6 +32,7 @@
 import reactor.core.publisher.Mono;
 import reactor.test.StepVerifier;
 
+@RequiresV2Api
 public final class BuildpacksTest extends AbstractIntegrationTest {
 
     @Autowired private CloudFoundryOperations cloudFoundryOperations;
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 b75ca3f3a4..b7b16566ae 100644
--- a/integration-test/src/test/java/org/cloudfoundry/operations/DomainsTest.java
+++ b/integration-test/src/test/java/org/cloudfoundry/operations/DomainsTest.java
@@ -23,6 +23,7 @@
 
 import java.time.Duration;
 import org.cloudfoundry.AbstractIntegrationTest;
+import org.cloudfoundry.RequiresV2Api;
 import org.cloudfoundry.client.CloudFoundryClient;
 import org.cloudfoundry.client.v3.ClientV3Exception;
 import org.cloudfoundry.client.v3.Error;
@@ -40,6 +41,7 @@
 import reactor.core.publisher.Mono;
 import reactor.test.StepVerifier;
 
+@RequiresV2Api
 public final class DomainsTest extends AbstractIntegrationTest {
 
     private static final String DEFAULT_ROUTER_GROUP = "default-tcp";
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 1643a3ef4f..1d32a910a2 100644
--- a/integration-test/src/test/java/org/cloudfoundry/operations/NetworkPoliciesTest.java
+++ b/integration-test/src/test/java/org/cloudfoundry/operations/NetworkPoliciesTest.java
@@ -20,6 +20,7 @@
 import org.cloudfoundry.AbstractIntegrationTest;
 import org.cloudfoundry.CloudFoundryVersion;
 import org.cloudfoundry.IfCloudFoundryVersion;
+import org.cloudfoundry.RequiresV2Api;
 import org.cloudfoundry.client.CloudFoundryClient;
 import org.cloudfoundry.client.v2.applications.CreateApplicationRequest;
 import org.cloudfoundry.client.v2.applications.CreateApplicationResponse;
@@ -34,6 +35,7 @@
 import reactor.core.publisher.Mono;
 import reactor.test.StepVerifier;
 
+@RequiresV2Api
 public final class NetworkPoliciesTest extends AbstractIntegrationTest {
 
     @Autowired private CloudFoundryClient cloudFoundryClient;
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 3518683680..4a4325d191 100644
--- a/integration-test/src/test/java/org/cloudfoundry/operations/OrganizationAdminTest.java
+++ b/integration-test/src/test/java/org/cloudfoundry/operations/OrganizationAdminTest.java
@@ -20,6 +20,7 @@
 
 import java.time.Duration;
 import org.cloudfoundry.AbstractIntegrationTest;
+import org.cloudfoundry.RequiresV2Api;
 import org.cloudfoundry.operations.organizationadmin.CreateQuotaRequest;
 import org.cloudfoundry.operations.organizationadmin.DeleteQuotaRequest;
 import org.cloudfoundry.operations.organizationadmin.GetQuotaRequest;
@@ -33,6 +34,7 @@
 import reactor.core.publisher.Mono;
 import reactor.test.StepVerifier;
 
+@RequiresV2Api
 public final class OrganizationAdminTest extends AbstractIntegrationTest {
 
     @Autowired private CloudFoundryOperations cloudFoundryOperations;
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 3e4e2b57a6..ebe3f90ebe 100644
--- a/integration-test/src/test/java/org/cloudfoundry/operations/OrganizationsTest.java
+++ b/integration-test/src/test/java/org/cloudfoundry/operations/OrganizationsTest.java
@@ -18,12 +18,14 @@
 
 import java.time.Duration;
 import org.cloudfoundry.AbstractIntegrationTest;
+import org.cloudfoundry.RequiresV2Api;
 import org.cloudfoundry.operations.organizations.CreateOrganizationRequest;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 import reactor.core.publisher.Mono;
 import reactor.test.StepVerifier;
 
+@RequiresV2Api
 public final class OrganizationsTest extends AbstractIntegrationTest {
 
     @Autowired private CloudFoundryOperations cloudFoundryOperations;
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 19db1a53b1..47a37e3fb9 100644
--- a/integration-test/src/test/java/org/cloudfoundry/operations/RoutesTest.java
+++ b/integration-test/src/test/java/org/cloudfoundry/operations/RoutesTest.java
@@ -28,6 +28,7 @@
 import java.util.function.Predicate;
 import org.cloudfoundry.AbstractIntegrationTest;
 import org.cloudfoundry.CleanupCloudFoundryAfterClass;
+import org.cloudfoundry.RequiresV2Api;
 import org.cloudfoundry.operations.applications.ApplicationHealthCheck;
 import org.cloudfoundry.operations.applications.PushApplicationRequest;
 import org.cloudfoundry.operations.domains.CreateDomainRequest;
@@ -51,6 +52,7 @@
 import reactor.test.StepVerifier;
 
 @CleanupCloudFoundryAfterClass
+@RequiresV2Api
 public final class RoutesTest extends AbstractIntegrationTest {
 
     private static final String DEFAULT_ROUTER_GROUP = "default-tcp";
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 7a8f1ec378..ebd89c92e3 100644
--- a/integration-test/src/test/java/org/cloudfoundry/operations/ServiceAdminTest.java
+++ b/integration-test/src/test/java/org/cloudfoundry/operations/ServiceAdminTest.java
@@ -22,6 +22,7 @@
 import java.time.Duration;
 import org.cloudfoundry.AbstractIntegrationTest;
 import org.cloudfoundry.CleanupCloudFoundryAfterClass;
+import org.cloudfoundry.RequiresV2Api;
 import org.cloudfoundry.ServiceBrokerUtils;
 import org.cloudfoundry.client.CloudFoundryClient;
 import org.cloudfoundry.client.v2.spaces.CreateSpaceRequest;
@@ -40,6 +41,7 @@
 import reactor.test.StepVerifier;
 
 @CleanupCloudFoundryAfterClass
+@RequiresV2Api
 public final class ServiceAdminTest extends AbstractIntegrationTest {
 
     @Autowired private CloudFoundryClient cloudFoundryClient;
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 520027128b..32b8cb4e68 100644
--- a/integration-test/src/test/java/org/cloudfoundry/operations/ServicesTest.java
+++ b/integration-test/src/test/java/org/cloudfoundry/operations/ServicesTest.java
@@ -24,6 +24,7 @@
 import java.time.Duration;
 import org.cloudfoundry.AbstractIntegrationTest;
 import org.cloudfoundry.CleanupCloudFoundryAfterClass;
+import org.cloudfoundry.RequiresV2Api;
 import org.cloudfoundry.client.CloudFoundryClient;
 import org.cloudfoundry.client.v2.servicebindings.ListServiceBindingsRequest;
 import org.cloudfoundry.client.v2.servicebindings.ServiceBindingResource;
@@ -66,6 +67,7 @@
 import reactor.test.StepVerifier;
 
 @CleanupCloudFoundryAfterClass
+@RequiresV2Api
 public final class ServicesTest extends AbstractIntegrationTest {
 
     @Autowired private CloudFoundryClient cloudFoundryClient;
@@ -76,7 +78,9 @@ public final class ServicesTest extends AbstractIntegrationTest {
 
     @Autowired private String planName;
 
-    @Autowired private Mono<String> serviceBrokerId;
+    // Optional: bean requires V2 API; class is guarded by @RequiresV2Api
+    @Autowired(required = false)
+    private Mono<String> serviceBrokerId;
 
     @Autowired private String serviceName;
 
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 fbb8dc765b..7f862e0478 100644
--- a/integration-test/src/test/java/org/cloudfoundry/operations/SpacesTest.java
+++ b/integration-test/src/test/java/org/cloudfoundry/operations/SpacesTest.java
@@ -20,6 +20,7 @@
 
 import java.time.Duration;
 import org.cloudfoundry.AbstractIntegrationTest;
+import org.cloudfoundry.RequiresV2Api;
 import org.cloudfoundry.operations.spaces.CreateSpaceRequest;
 import org.cloudfoundry.operations.spaces.GetSpaceRequest;
 import org.cloudfoundry.operations.spaces.SpaceDetail;
@@ -27,6 +28,7 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import reactor.test.StepVerifier;
 
+@RequiresV2Api
 public final class SpacesTest extends AbstractIntegrationTest {
 
     @Autowired private CloudFoundryOperations cloudFoundryOperations;
diff --git a/integration-test/src/test/java/org/cloudfoundry/operations/StacksTest.java b/integration-test/src/test/java/org/cloudfoundry/operations/StacksTest.java
index 7db823dd95..4190aaf646 100644
--- a/integration-test/src/test/java/org/cloudfoundry/operations/StacksTest.java
+++ b/integration-test/src/test/java/org/cloudfoundry/operations/StacksTest.java
@@ -2,12 +2,14 @@
 
 import java.time.Duration;
 import org.cloudfoundry.AbstractIntegrationTest;
+import org.cloudfoundry.RequiresV2Api;
 import org.cloudfoundry.operations.stacks.GetStackRequest;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 import reactor.core.publisher.Mono;
 import reactor.test.StepVerifier;
 
+@RequiresV2Api
 class StacksTest extends AbstractIntegrationTest {
     @Autowired private CloudFoundryOperations cloudFoundryOperations;
 
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 b0c12b8ea3..af534acda3 100644
--- a/integration-test/src/test/java/org/cloudfoundry/operations/UserAdminTest.java
+++ b/integration-test/src/test/java/org/cloudfoundry/operations/UserAdminTest.java
@@ -20,6 +20,7 @@
 
 import java.time.Duration;
 import org.cloudfoundry.AbstractIntegrationTest;
+import org.cloudfoundry.RequiresV2Api;
 import org.cloudfoundry.client.CloudFoundryClient;
 import org.cloudfoundry.client.v2.organizations.ListOrganizationAuditorsRequest;
 import org.cloudfoundry.client.v2.organizations.ListOrganizationsRequest;
@@ -47,6 +48,7 @@
 import reactor.core.publisher.Mono;
 import reactor.test.StepVerifier;
 
+@RequiresV2Api
 public final class UserAdminTest extends AbstractIntegrationTest {
 
     @Autowired private CloudFoundryClient cloudFoundryClient;
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 8253f29ad5..7a812c7e26 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
@@ -18,6 +18,7 @@
 
 import java.time.Duration;
 import org.cloudfoundry.AbstractIntegrationTest;
+import org.cloudfoundry.RequiresTcpRouting;
 import org.cloudfoundry.routing.RoutingClient;
 import org.cloudfoundry.routing.v1.routergroups.ListRouterGroupsRequest;
 import org.cloudfoundry.routing.v1.routergroups.ListRouterGroupsResponse;
@@ -29,6 +30,7 @@
 import reactor.core.publisher.Mono;
 import reactor.test.StepVerifier;
 
+@RequiresTcpRouting
 public final class RouterGroupsTest extends AbstractIntegrationTest {
 
     private static final String DEFAULT_ROUTER_GROUP = "default-tcp";
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 a562fa4223..6fb7af061b 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
@@ -19,6 +19,7 @@
 import java.time.Duration;
 import org.cloudfoundry.AbstractIntegrationTest;
 import org.cloudfoundry.NameFactory;
+import org.cloudfoundry.RequiresTcpRouting;
 import org.cloudfoundry.routing.RoutingClient;
 import org.cloudfoundry.routing.v1.routergroups.ListRouterGroupsRequest;
 import org.cloudfoundry.routing.v1.routergroups.ListRouterGroupsResponse;
@@ -39,6 +40,7 @@
 import reactor.test.StepVerifier;
 import reactor.util.retry.Retry;
 
+@RequiresTcpRouting
 public final class TcpRoutesTest extends AbstractIntegrationTest {
 
     private static final String DEFAULT_ROUTER_GROUP = "default-tcp";
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 6480aef0b9..e0eac2d214 100644
--- a/integration-test/src/test/java/org/cloudfoundry/uaa/AuthorizationsTest.java
+++ b/integration-test/src/test/java/org/cloudfoundry/uaa/AuthorizationsTest.java
@@ -21,6 +21,7 @@
 import java.time.Duration;
 import java.util.function.Consumer;
 import org.cloudfoundry.AbstractIntegrationTest;
+import org.cloudfoundry.RequiresBrowserAuth;
 import org.cloudfoundry.uaa.authorizations.AuthorizeByAuthorizationCodeGrantApiRequest;
 import org.cloudfoundry.uaa.authorizations.AuthorizeByAuthorizationCodeGrantBrowserRequest;
 import org.cloudfoundry.uaa.authorizations.AuthorizeByAuthorizationCodeGrantHybridRequest;
@@ -55,6 +56,7 @@ public void authorizeByAuthorizationCodeGrantApi() {
     }
 
     @Test
+    @RequiresBrowserAuth
     public void authorizeByAuthorizationCodeGrantBrowser() {
         this.uaaClient
                 .authorizations()
@@ -70,6 +72,7 @@ public void authorizeByAuthorizationCodeGrantBrowser() {
     }
 
     @Test
+    @RequiresBrowserAuth
     public void authorizeByAuthorizationCodeGrantHybrid() {
         this.uaaClient
                 .authorizations()
@@ -85,6 +88,7 @@ public void authorizeByAuthorizationCodeGrantHybrid() {
     }
 
     @Test
+    @RequiresBrowserAuth
     public void authorizeByImplicitGrantBrowser() {
         this.uaaClient
                 .authorizations()
@@ -100,6 +104,7 @@ public void authorizeByImplicitGrantBrowser() {
     }
 
     @Test
+    @RequiresBrowserAuth
     public void authorizeByOpenIdWithAuthorizationCodeGrant() {
         this.uaaClient
                 .authorizations()
@@ -116,6 +121,7 @@ public void authorizeByOpenIdWithAuthorizationCodeGrant() {
     }
 
     @Test
+    @RequiresBrowserAuth
     public void authorizeByOpenIdWithIdToken() {
         this.uaaClient
                 .authorizations()
@@ -132,6 +138,7 @@ public void authorizeByOpenIdWithIdToken() {
     }
 
     @Test
+    @RequiresBrowserAuth
     public void authorizeByOpenIdWithImplicitGrant() {
         this.uaaClient
                 .authorizations()