diff --git a/tools_webrtc/gtest-parallel-wrapper.py b/tools_webrtc/gtest-parallel-wrapper.py
index c3a0649d03..e7a659f286 100755
--- a/tools_webrtc/gtest-parallel-wrapper.py
+++ b/tools_webrtc/gtest-parallel-wrapper.py
@@ -64,10 +64,10 @@ def CatFiles(file_list, output_file):
 
 
 def get_args_and_env():
-  if '--' not in sys.argv:
-    return sys.argv, os.environ
-
-  argv_index = sys.argv.index('--')
+  if '--' in sys.argv:
+    argv_index = sys.argv.index('--')
+  else:
+    argv_index = len(sys.argv)
 
   gtest_parallel_args = sys.argv[1:argv_index]
   executable_args = sys.argv[argv_index + 1:]