diff --git a/src/Test/Headers.h b/src/Test/Headers.h
index 60b260b4..f9d9a5e7 100644
--- a/src/Test/Headers.h
+++ b/src/Test/Headers.h
@@ -160,7 +160,9 @@ int wd_setup(int argc, char *argv[])
     
     CommandLine cmd_line(CommandLine::NO_PROGRAM);
 #if defined(OS_WIN)
-    cmd_line.ParseFromString(::GetCommandLineW());
+    for (int var = 0; var < argc; ++var) {
+        cmd_line.AppendSwitch(argv[var]);
+    }
 #elif defined(OS_POSIX)
     cmd_line.InitFromArgv(argc, argv);
 #endif