diff --git a/Source/cmakemain.cxx b/Source/cmakemain.cxx
index 50bb084cc1..f104ca01ba 100644
--- a/Source/cmakemain.cxx
+++ b/Source/cmakemain.cxx
@@ -991,7 +991,8 @@ int do_workflow(int ac, char const* const* av)
     cmCommandLineArgument<bool(std::string const& value)>;
 
   std::vector<CommandArgument> arguments = {
-    CommandArgument{ "--preset", CommandArgument::Values::One,
+    CommandArgument{ "--preset", "No preset specified for --preset",
+                     CommandArgument::Values::One,
                      CommandArgument::setToValue(presetName) },
     CommandArgument{ "--list-presets", CommandArgument::Values::Zero,
                      [&listPresets](std::string const&) -> bool {
diff --git a/Tests/RunCMake/CMakePresetsWorkflow/PresetsNoArg-workflow-result.txt b/Tests/RunCMake/CMakePresetsWorkflow/PresetsNoArg-workflow-result.txt
new file mode 100644
index 0000000000..d00491fd7e
--- /dev/null
+++ b/Tests/RunCMake/CMakePresetsWorkflow/PresetsNoArg-workflow-result.txt
@@ -0,0 +1 @@
+1
diff --git a/Tests/RunCMake/CMakePresetsWorkflow/PresetsNoArg-workflow-stderr.txt b/Tests/RunCMake/CMakePresetsWorkflow/PresetsNoArg-workflow-stderr.txt
new file mode 100644
index 0000000000..aa348abead
--- /dev/null
+++ b/Tests/RunCMake/CMakePresetsWorkflow/PresetsNoArg-workflow-stderr.txt
@@ -0,0 +1 @@
+^CMake Error: No preset specified for --preset
diff --git a/Tests/RunCMake/CMakePresetsWorkflow/PresetsNoArgEq-workflow-result.txt b/Tests/RunCMake/CMakePresetsWorkflow/PresetsNoArgEq-workflow-result.txt
new file mode 100644
index 0000000000..d00491fd7e
--- /dev/null
+++ b/Tests/RunCMake/CMakePresetsWorkflow/PresetsNoArgEq-workflow-result.txt
@@ -0,0 +1 @@
+1
diff --git a/Tests/RunCMake/CMakePresetsWorkflow/PresetsNoArgEq-workflow-stderr.txt b/Tests/RunCMake/CMakePresetsWorkflow/PresetsNoArgEq-workflow-stderr.txt
new file mode 100644
index 0000000000..aa348abead
--- /dev/null
+++ b/Tests/RunCMake/CMakePresetsWorkflow/PresetsNoArgEq-workflow-stderr.txt
@@ -0,0 +1 @@
+^CMake Error: No preset specified for --preset
diff --git a/Tests/RunCMake/CMakePresetsWorkflow/RunCMakeTest.cmake b/Tests/RunCMake/CMakePresetsWorkflow/RunCMakeTest.cmake
index 8c1002d009..fac8dfc158 100644
--- a/Tests/RunCMake/CMakePresetsWorkflow/RunCMakeTest.cmake
+++ b/Tests/RunCMake/CMakePresetsWorkflow/RunCMakeTest.cmake
@@ -81,6 +81,8 @@ unset(CMakeUserPresets_FILE)
 unset(CMakePresets_ASSETS)
 
 run_cmake_workflow_presets(ListPresets --list-presets)
+run_cmake_command(PresetsNoArg-workflow ${CMAKE_COMMAND} "--workflow" "--preset")
+run_cmake_command(PresetsNoArgEq-workflow ${CMAKE_COMMAND} "--workflow" "--preset=")
 run_cmake_workflow_presets(InvalidOption -DINVALID_OPTION)
 
 set(RunCMake_TEST_NO_CLEAN TRUE)