diff --git a/integration-test/src/test/java/org/cloudfoundry/CloudFoundryVersion.java b/integration-test/src/test/java/org/cloudfoundry/CloudFoundryVersion.java
index 4400bc600d..9eea44a58a 100644
--- a/integration-test/src/test/java/org/cloudfoundry/CloudFoundryVersion.java
+++ b/integration-test/src/test/java/org/cloudfoundry/CloudFoundryVersion.java
@@ -50,6 +50,8 @@ public enum CloudFoundryVersion {
 
     PCF_2_10(Version.forIntegers(2, 150, 0)),
 
+    PCF_2_11(Version.forIntegers(2, 164, 0)),
+
     UNSPECIFIED(Version.forIntegers(0));
 
     private final Version version;
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 69670ae96e..859e3d22b5 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
@@ -18,6 +18,8 @@
 
 import org.cloudfoundry.AbstractIntegrationTest;
 import org.cloudfoundry.ApplicationUtils;
+import org.cloudfoundry.CloudFoundryVersion;
+import org.cloudfoundry.IfCloudFoundryVersion;
 import org.cloudfoundry.ServiceBrokerUtils;
 import org.cloudfoundry.client.CloudFoundryClient;
 import org.cloudfoundry.client.v3.servicebrokers.BasicAuthentication;
@@ -47,6 +49,7 @@
 import static org.cloudfoundry.ServiceBrokerUtils.createServiceBroker;
 import static org.cloudfoundry.ServiceBrokerUtils.deleteServiceBroker;
 
+@IfCloudFoundryVersion(greaterThanOrEqualTo = CloudFoundryVersion.PCF_2_10)
 public final class ServiceBrokersTest extends AbstractIntegrationTest {
 
     @Autowired