2 files changed, 7 insertions, 4 deletions
diff --git a/gl/tests/test-option-parser-helper b/gl/tests/test-option-parser-helper
index d92747a2..52ba6689 100755
--- a/gl/tests/test-option-parser-helper
+++ b/gl/tests/test-option-parser-helper
@@ -119,10 +119,13 @@ test_parse_eat_test ()
     _G_opt=$1 ; shift
     case $_G_opt in
       --test|-t)
-        test $# = 0 && func_missing_arg $_G_opt
         _t_parse_match=:
-        opt_test=$1
-        shift
+        if test $# = 0; then
+          func_missing_arg $_G_opt
+        else
+          opt_test=$1
+          shift
+        fi
         ;;
     esac
 
diff --git a/gl/tests/test-option-parser.sh b/gl/tests/test-option-parser.sh
index 816dd03c..43bef64d 100755
--- a/gl/tests/test-option-parser.sh
+++ b/gl/tests/test-option-parser.sh
@@ -23,7 +23,7 @@ all_shells_script=$0
 
 . "$abs_aux_dir"/options-parser || exit 1
 
-helper=$abs_srcdir/test-option-parser-helper
+helper="$__GL_ALL_SHELLS_SHELL $abs_srcdir/test-option-parser-helper"
 
 check_output_inner ()
 {