diff --git a/.idea/misc.xml b/.idea/misc.xml
index b56f5aa0e7..fc9aaf441c 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -14,7 +14,7 @@
       </list>
     </option>
   </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" project-jdk-name="1.8" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" project-jdk-name="1.8 (2)" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/out" />
   </component>
 </project>
\ No newline at end of file
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 38508a4cb4..4a6da53251 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
@@ -275,7 +275,9 @@ private static Mono<String> updateServiceInstanceByName(CloudFoundryClient cloud
                 .build())
             .map(serviceInstances -> serviceInstances.getResources().get(0))
             .flatMap(serviceInstance -> updateServiceInstanceById(cloudFoundryClient, serviceInstance.getId()))
-            .flatMap(serviceInstance -> waitForCompletionOnUpdate(cloudFoundryClient, serviceInstance, serviceInstanceName));
+            .map(response -> response.getJobId().get())
+            .flatMap(jobId -> JobUtils.waitForCompletion(cloudFoundryClient, Duration.ofMinutes(5), jobId))
+            .then(getServiceInstanceIdByName(cloudFoundryClient, serviceInstanceName));
     }
 
     private static Mono<UpdateServiceInstanceResponse> updateServiceInstanceById(CloudFoundryClient cloudFoundryClient, String serviceInstanceId) {
@@ -287,26 +289,14 @@ private static Mono<UpdateServiceInstanceResponse> updateServiceInstanceById(Clo
                 .build());
     }
 
-
-    private static Mono<String> waitForCompletionOnUpdate(CloudFoundryClient cloudFoundryClient, UpdateServiceInstanceResponse updateServiceInstanceResponse, String serviceInstanceName) {
-        if (updateServiceInstanceResponse.getJobId().isPresent()) {
-            JobUtils.waitForCompletion(cloudFoundryClient, Duration.ofMinutes(1), updateServiceInstanceResponse.getJobId().get());
-        }
-        return getServiceInstanceIdByName(cloudFoundryClient, serviceInstanceName);
-    }
-
     private static Mono<String> createManagedServiceInstanceId(CloudFoundryClient cloudFoundryClient, Mono<String> serviceBrokerId, String serviceInstanceName, String serviceName, String spaceId) {
         return serviceBrokerId
             .flatMap(brokerId -> getPlanId(cloudFoundryClient, brokerId, serviceName))
             .flatMap(planId -> requestCreateServiceInstance(cloudFoundryClient, planId, serviceInstanceName, spaceId))
-            .flatMap(serviceInstance -> waitForCompletionOnCreate(cloudFoundryClient, serviceInstance, serviceInstanceName));
-    }
-
-    private static Mono<String> waitForCompletionOnCreate(CloudFoundryClient cloudFoundryClient, CreateServiceInstanceResponse createServiceInstanceResponse, String serviceInstanceName) {
-        if (createServiceInstanceResponse.getJobId().isPresent()) {
-            JobUtils.waitForCompletion(cloudFoundryClient, Duration.ofMinutes(1), createServiceInstanceResponse.getJobId().get());
-        }
-        return getServiceInstanceIdByName(cloudFoundryClient, serviceInstanceName);
+            .map(response -> response.getJobId()
+                .get())
+            .flatMap(jobId -> JobUtils.waitForCompletion(cloudFoundryClient, Duration.ofMinutes(5), jobId))
+            .then(getServiceInstanceIdByName(cloudFoundryClient, serviceInstanceName));
     }
 
     private static Mono<String> getServiceInstanceIdByName(CloudFoundryClient cloudFoundryClient, String serviceInstanceName) {