diff --git a/spring-boot-cli/src/main/java/org/springframework/boot/cli/command/OptionHandler.java b/spring-boot-cli/src/main/java/org/springframework/boot/cli/command/OptionHandler.java
index 194eb054c4b..390ca0176cb 100644
--- a/spring-boot-cli/src/main/java/org/springframework/boot/cli/command/OptionHandler.java
+++ b/spring-boot-cli/src/main/java/org/springframework/boot/cli/command/OptionHandler.java
@@ -168,6 +168,9 @@ public class OptionHandler {
 			for (String option : descriptor.options()) {
 				this.options.add((option.length() == 1 ? "-" : "--") + option);
 			}
+			if (this.options.contains("--cp")) {
+				this.options.add("-cp");
+			}
 			this.description = descriptor.description();
 		}
 
diff --git a/spring-boot-cli/src/test/java/org/springframework/boot/cli/CliTester.java b/spring-boot-cli/src/test/java/org/springframework/boot/cli/CliTester.java
index 7dac98e0f62..bb83d448e32 100644
--- a/spring-boot-cli/src/test/java/org/springframework/boot/cli/CliTester.java
+++ b/spring-boot-cli/src/test/java/org/springframework/boot/cli/CliTester.java
@@ -98,7 +98,7 @@ public class CliTester implements TestRule {
 		final String[] sources = new String[args.length];
 		for (int i = 0; i < args.length; i++) {
 			String arg = args[i];
-			if (arg.startsWith("--")) {
+			if (arg.startsWith("-")) {
 				sources[i] = arg;
 			}
 			else {