diff --git a/src/test/resources/picocompletion-demo-help_completion.bash b/src/test/resources/picocompletion-demo-help_completion.bash
index d760a9ac8..136897faa 100644
--- a/src/test/resources/picocompletion-demo-help_completion.bash
+++ b/src/test/resources/picocompletion-demo-help_completion.bash
@@ -435,7 +435,7 @@ function _picocli_picocompletion-demo-help_sub2_sub2child2alias() {
   local commands=""
   local flag_opts=""
   local arg_opts="-u --timeUnit -t --timeout"
-  local timeUnit_option_args="NANOSECONDS MICROSECONDS MILLISECONDS SECONDS MINUTES HOURS DAYS" # --timeUnit values
+  local timeUnit_option_args="%2$s" # --timeUnit values
 
   compopt +o default
 
@@ -588,7 +588,7 @@ function _picocli_picocompletion-demo-help_sub2alias_subsub2() {
   local commands=""
   local flag_opts=""
   local arg_opts="-u --timeUnit -t --timeout"
-  local timeUnit_option_args="NANOSECONDS MICROSECONDS MILLISECONDS SECONDS MINUTES HOURS DAYS" # --timeUnit values
+  local timeUnit_option_args="%2$s" # --timeUnit values
 
   compopt +o default
 
@@ -625,7 +625,7 @@ function _picocli_picocompletion-demo-help_sub2alias_sub2child2alias() {
   local commands=""
   local flag_opts=""
   local arg_opts="-u --timeUnit -t --timeout"
-  local timeUnit_option_args="NANOSECONDS MICROSECONDS MILLISECONDS SECONDS MINUTES HOURS DAYS" # --timeUnit values
+  local timeUnit_option_args="%2$s" # --timeUnit values
 
   compopt +o default
 
diff --git a/src/test/resources/picocompletion-demo_completion.bash b/src/test/resources/picocompletion-demo_completion.bash
index b3f8db004..66fb5952d 100644
--- a/src/test/resources/picocompletion-demo_completion.bash
+++ b/src/test/resources/picocompletion-demo_completion.bash
@@ -416,7 +416,7 @@ function _picocli_picocompletion-demo_sub2_sub2child2alias() {
   local commands=""
   local flag_opts=""
   local arg_opts="-u --timeUnit -t --timeout"
-  local timeUnit_option_args="NANOSECONDS MICROSECONDS MILLISECONDS SECONDS MINUTES HOURS DAYS" # --timeUnit values
+  local timeUnit_option_args="%2$s" # --timeUnit values
 
   compopt +o default
 
@@ -569,7 +569,7 @@ function _picocli_picocompletion-demo_sub2alias_subsub2() {
   local commands=""
   local flag_opts=""
   local arg_opts="-u --timeUnit -t --timeout"
-  local timeUnit_option_args="NANOSECONDS MICROSECONDS MILLISECONDS SECONDS MINUTES HOURS DAYS" # --timeUnit values
+  local timeUnit_option_args="%2$s" # --timeUnit values
 
   compopt +o default
 
@@ -606,7 +606,7 @@ function _picocli_picocompletion-demo_sub2alias_sub2child2alias() {
   local commands=""
   local flag_opts=""
   local arg_opts="-u --timeUnit -t --timeout"
-  local timeUnit_option_args="NANOSECONDS MICROSECONDS MILLISECONDS SECONDS MINUTES HOURS DAYS" # --timeUnit values
+  local timeUnit_option_args="%2$s" # --timeUnit values
 
   compopt +o default