diff --git a/scripts/set-cli.sh b/scripts/set-cli.sh
index ccf9876..03121c4 100755
--- a/scripts/set-cli.sh
+++ b/scripts/set-cli.sh
@@ -3,6 +3,16 @@
 desired_spring_boot_cli_version="${1}"
 desired_spring_cloud_cli_version="${2}"
 
+echo -e "\nCheck if sdkman is installed"
+SDK_INSTALLED="no"
+[[ -s "${HOME}/.sdkman/bin/sdkman-init.sh" ]] && yes | source "${HOME}/.sdkman/bin/sdkman-init.sh" || echo "Failed to source sdkman"
+sdk version && SDK_INSTALLED="true" || echo "Failed to execute SDKman"
+if [[ "${SDK_INSTALLED}" == "no" ]] ; then
+  echo "Installing SDKman"
+  curl -s "https://get.sdkman.io" | bash
+  source "${HOME}/.sdkman/bin/sdkman-init.sh"
+fi
+
 spring_installed="false"
 spring --version && echo "Spring CLI installed" && spring_installed="true" || echo "No Spring Installed"
 
diff --git a/spring-cloud-cli-integration-tests/pom.xml b/spring-cloud-cli-integration-tests/pom.xml
index ebb407b..aa52739 100644
--- a/spring-cloud-cli-integration-tests/pom.xml
+++ b/spring-cloud-cli-integration-tests/pom.xml
@@ -59,10 +59,10 @@
 						<id>install-cli</id>
 						<phase>generate-test-sources</phase>
 						<configuration>
-							<executable>spring</executable>
+							<executable>${project.basedir}/scripts/set-cli.sh</executable>
 							<arguments>
-								<argument>install</argument>
-								<argument>org.springframework.cloud:spring-cloud-cli:${project.version}</argument>
+								<argument>${spring-boot.version}</argument>
+								<argument>${project.version}</argument>
 							</arguments>
 						</configuration>
 						<goals>