diff --git a/ninjalog_uploader.py b/ninjalog_uploader.py
index 26432dc662..54ddb62b3a 100755
--- a/ninjalog_uploader.py
+++ b/ninjalog_uploader.py
@@ -75,8 +75,8 @@ def ParseGNArgs(gn_args):
 def GetBuildTargetFromCommandLine(cmdline):
   """Get build targets from commandline."""
 
-  # Skip argv0.
-  idx = 1
+  # Skip argv0, argv1: ['/path/to/python3', '/path/to/depot_tools/ninja.py']
+  idx = 2
 
   # Skipping all args that involve these flags, and taking all remaining args
   # as targets.
diff --git a/tests/ninjalog_uploader_test.py b/tests/ninjalog_uploader_test.py
index a4098e72f2..1e29783a24 100755
--- a/tests/ninjalog_uploader_test.py
+++ b/tests/ninjalog_uploader_test.py
@@ -93,26 +93,34 @@ class NinjalogUploaderTest(unittest.TestCase):
         'out/Debug/.ninja_log')
 
   def test_get_build_target_from_command_line(self):
-    self.assertEqual(ninjalog_uploader.GetBuildTargetFromCommandLine(
-        ['ninja', 'chrome']), ['chrome'])
+    self.assertEqual(
+        ninjalog_uploader.GetBuildTargetFromCommandLine(
+            ['python3', 'ninja.py', 'chrome']), ['chrome'])
 
-    self.assertEqual(ninjalog_uploader.GetBuildTargetFromCommandLine(
-        ['ninja']), [])
+    self.assertEqual(
+        ninjalog_uploader.GetBuildTargetFromCommandLine(['python3',
+                                                         'ninja.py']), [])
 
-    self.assertEqual(ninjalog_uploader.GetBuildTargetFromCommandLine(
-        ['ninja', '-j', '1000', 'chrome']), ['chrome'])
+    self.assertEqual(
+        ninjalog_uploader.GetBuildTargetFromCommandLine(
+            ['python3', 'ninja.py', '-j', '1000', 'chrome']), ['chrome'])
 
-    self.assertEqual(ninjalog_uploader.GetBuildTargetFromCommandLine(
-        ['ninja', 'chrome', '-j', '1000']), ['chrome'])
+    self.assertEqual(
+        ninjalog_uploader.GetBuildTargetFromCommandLine(
+            ['python3', 'ninja.py', 'chrome', '-j', '1000']), ['chrome'])
 
-    self.assertEqual(ninjalog_uploader.GetBuildTargetFromCommandLine(
-        ['ninja', '-C', 'chrome']), [])
+    self.assertEqual(
+        ninjalog_uploader.GetBuildTargetFromCommandLine(
+            ['python3', 'ninja.py', '-C', 'chrome']), [])
 
-    self.assertEqual(ninjalog_uploader.GetBuildTargetFromCommandLine(
-        ['ninja', '-Cout/Release', 'chrome']), ['chrome'])
+    self.assertEqual(
+        ninjalog_uploader.GetBuildTargetFromCommandLine(
+            ['python3', 'ninja.py', '-Cout/Release', 'chrome']), ['chrome'])
 
-    self.assertEqual(ninjalog_uploader.GetBuildTargetFromCommandLine(
-        ['ninja', '-C', 'out/Release', 'chrome', 'all']), ['chrome', 'all'])
+    self.assertEqual(
+        ninjalog_uploader.GetBuildTargetFromCommandLine(
+            ['python3', 'ninja.py', '-C', 'out/Release', 'chrome', 'all']),
+        ['chrome', 'all'])
 
   def test_get_j_flag(self):
     self.assertEqual(ninjalog_uploader.GetJflag(