diff --git a/programs/cmd/tests/test_builtins.cmd.exp b/programs/cmd/tests/test_builtins.cmd.exp
index 11384858607..4846cf348a9 100644
--- a/programs/cmd/tests/test_builtins.cmd.exp
+++ b/programs/cmd/tests/test_builtins.cmd.exp
@@ -158,8 +158,8 @@ BAZ=bazbaz
 bazbaz
 set "FOO=bar" should not include the quotes in the variable value
 bar
-@todo_wine@foo
-@todo_wine@''
+foo
+''
 'foo@space@'
 'foo@tab@'
 ------------ Testing variable expansion --------------
diff --git a/programs/cmd/wcmdmain.c b/programs/cmd/wcmdmain.c
index 0edc00579b3..47af612bc7b 100644
--- a/programs/cmd/wcmdmain.c
+++ b/programs/cmd/wcmdmain.c
@@ -443,7 +443,7 @@ void WCMD_strsubstW(WCHAR *start, const WCHAR *next, const WCHAR *insert, int le
 /***************************************************************************
  * WCMD_skip_leading_spaces
  *
- *  Return a pointer to the first non-space character of string.
+ *  Return a pointer to the first non-whitespace character of string.
  *  Does not modify the input string.
  */
 WCHAR *WCMD_skip_leading_spaces (WCHAR *string) {
@@ -451,7 +451,7 @@ WCHAR *WCMD_skip_leading_spaces (WCHAR *string) {
   WCHAR *ptr;
 
   ptr = string;
-  while (*ptr == ' ') ptr++;
+  while (*ptr == ' ' || *ptr == '\t') ptr++;
   return ptr;
 }