diff --git a/servo/python/mach_bootstrap.py b/servo/python/mach_bootstrap.py
index f34689993a79..889a63f312c4 100644
--- a/servo/python/mach_bootstrap.py
+++ b/servo/python/mach_bootstrap.py
@@ -115,7 +115,7 @@ def wpt_harness_path(is_firefox, topdir, *paths):
     if is_firefox:
         rel = os.path.join(wpt_root, "tests", "tools", "wptrunner")
     else:
-        rel = os.path.join(wpt_root, "harness")
+        rel = os.path.join(wpt_root, "web-platform-tests", "tools", "wptrunner")
 
     return os.path.join(topdir, rel, *paths)
 
diff --git a/servo/python/servo/devenv_commands.py b/servo/python/servo/devenv_commands.py
index 804e7e1c425a..49fe355c54bd 100644
--- a/servo/python/servo/devenv_commands.py
+++ b/servo/python/servo/devenv_commands.py
@@ -285,29 +285,3 @@ class MachCommands(CommandBase):
         # Fetch Cargo dependencies
         with cd(self.context.topdir):
             call(["cargo", "fetch"], env=self.build_env())
-
-    @Command('wptrunner-upgrade',
-             description='upgrade wptrunner.',
-             category='devenv')
-    def upgrade_wpt_runner(self):
-        env = self.build_env()
-        with cd(path.join(self.context.topdir, 'tests', 'wpt', 'harness')):
-            code = call(["git", "init"], env=env)
-            if code:
-                return code
-            # No need to report an error if this fails, as it will for the first use
-            call(["git", "remote", "rm", "upstream"], env=env)
-            code = call(
-                ["git", "remote", "add", "upstream", "https://github.com/w3c/wptrunner.git"], env=env)
-            if code:
-                return code
-            code = call(["git", "fetch", "upstream"], env=env)
-            if code:
-                return code
-            code = call(["git", "reset", "--hard", "remotes/upstream/master"], env=env)
-            if code:
-                return code
-            code = call(["rm", "-rf", ".git"], env=env)
-            if code:
-                return code
-            return 0