diff --git a/programs/cmd/tests/test_builtins.cmd b/programs/cmd/tests/test_builtins.cmd
index f3b1fc5f370..04d8fdda5a9 100644
--- a/programs/cmd/tests/test_builtins.cmd
+++ b/programs/cmd/tests/test_builtins.cmd
@@ -542,6 +542,13 @@ rem External script
 echo echo foo %%1> foo.cmd
 call foo
 call foo.cmd 8
+echo echo %%1 %%2 > foo.cmd
+call foo.cmd foo
+call foo.cmd foo bar
+call foo.cmd foo ""
+call foo.cmd "" bar
+call foo.cmd foo ''
+call foo.cmd '' bar
 del foo.cmd
 rem Internal routines
 call :testRoutine :testRoutine
@@ -550,6 +557,19 @@ goto :endTestRoutine
 echo bar %1
 goto :eof
 :endTestRoutine
+
+call :testRoutineArgs foo
+call :testRoutineArgs foo bar
+call :testRoutineArgs foo ""
+call :testRoutineArgs ""  bar
+call :testRoutineArgs foo ''
+call :testRoutineArgs ''  bar
+goto :endTestRoutineArgs
+:testRoutineArgs
+echo %1 %2
+goto :eof
+:endTestRoutineArgs
+
 rem Should work for builtins...
 call mkdir foo
 echo %ErrorLevel%
diff --git a/programs/cmd/tests/test_builtins.cmd.exp b/programs/cmd/tests/test_builtins.cmd.exp
index 51239b06599..d7ac58a1245 100644
--- a/programs/cmd/tests/test_builtins.cmd.exp
+++ b/programs/cmd/tests/test_builtins.cmd.exp
@@ -288,7 +288,19 @@ bar\baz removed
 ------------ Testing CALL --------------
 foo@space@
 @todo_wine@foo 8
+foo@space@@space@
+foo bar@space@
+@todo_wine@foo ""@space@
+@todo_wine@"" bar@space@
+foo ''@space@
+'' bar@space@
 bar :testRoutine
+foo@space@
+foo bar
+@todo_wine@foo ""
+@todo_wine@"" bar
+foo ''
+'' bar
 @todo_wine@0
 @todo_wine@foo created
 @todo_wine@Should expand foobaz