diff --git a/src/test/wpt/config.ini b/src/test/wpt/config.ini
new file mode 100644
index 00000000000..8d9e2f52916
--- /dev/null
+++ b/src/test/wpt/config.ini
@@ -0,0 +1,12 @@
+#TODO: most of this doesn't really need to be configurable like this
+[web-platform-tests]
+remote_url = https://github.com/w3c/web-platform-tests.git
+branch = master
+sync_path = web-platform-tests
+
+[local]
+test_path = tests
+metadata_path = metadata
+
+[try]
+url = ssh://hg.mozilla.org/try
diff --git a/src/test/wpt/run.py b/src/test/wpt/run.py
index ec53fa0268b..c025c4a1075 100644
--- a/src/test/wpt/run.py
+++ b/src/test/wpt/run.py
@@ -36,10 +36,13 @@ def set_defaults(args):
     args.product = "servo"
     args.debug_args = None
     args.interactive = False
-    return vars(args)
+    args.chunk_type = "none"
+    rv = vars(args)
+    wptcommandline.check_args(rv)
+    return rv
 
 def main():
-    parser = wptcommandline.create_parser(False)
+    parser = wptcommandline.create_parser(product_choices=('servo',))
     parser.add_argument('--update-manifest', dest='update_manifest', action='store_true')
     args = parser.parse_args()
     if args.update_manifest:
diff --git a/src/test/wpt/run.sh b/src/test/wpt/run.sh
index c17cb7e0092..5a6a71ffc51 100755
--- a/src/test/wpt/run.sh
+++ b/src/test/wpt/run.sh
@@ -16,4 +16,7 @@ if [[ $* == *--update-manifest* ]]; then
 fi
 (python -c "import wptrunner"  &>/dev/null) || pip install wptrunner
 
-python $servo_root/src/test/wpt/run.py --binary $objdir/../servo "$@"
+python $servo_root/src/test/wpt/run.py \
+  --config $servo_root/src/test/wpt/config.ini \
+  --binary $objdir/../servo \
+  "$@"