diff --git a/servo/.gitignore b/servo/.gitignore
index 054b1488743f4..7dd0a9c682cb5 100644
--- a/servo/.gitignore
+++ b/servo/.gitignore
@@ -27,3 +27,4 @@ src/components/script/dom/bindings/codegen/RegisterBindings.cpp
 src/components/script/dom/bindings/codegen/PrototypeList.h
 src/components/script/dom/bindings/codegen/UnionTypes.h
 src/components/script/dom/bindings/codegen/UnionConversions.h
+src/test/wpt/metadata/
diff --git a/servo/mk/check.mk b/servo/mk/check.mk
index e8c4796fa8551..9fcda7cd7ad59 100644
--- a/servo/mk/check.mk
+++ b/servo/mk/check.mk
@@ -91,6 +91,10 @@ check-content: contenttest
 	@$(call E, check: contenttests)
 	$(Q)./contenttest --source-dir=$(S)src/test/content $(TESTNAME)
 
+.PHONY: check-wpt
+check-wpt:
+	bash $(S)src/test/wpt/run.sh $(S)
+
 .PHONY: tidy
 tidy:
 	@$(call E, check: tidy)
diff --git a/servo/mk/clean.mk b/servo/mk/clean.mk
index fd2f56920b8b7..ee14ac806ffc6 100644
--- a/servo/mk/clean.mk
+++ b/servo/mk/clean.mk
@@ -49,6 +49,10 @@ clean-style:
 	@$(call E, "cleaning style")
 	$(Q)cd $(B)/src/components/style/ && rm -rf libstyle*.dylib libstyle*.rlib libstyle*.dSYM libstyle*.so $(DONE_style)
 
+clean-wpt:
+	$(Q)rm -r _virtualenv
+	$(Q)rm $(S)/src/test/wpt/metadata/MANIFEST.json
+
 clean-servo: clean-gfx clean-util clean-net clean-script clean-msg clean-style
 	@$(call E, "cleaning servo")
 	$(Q)rm -f servo servo-test $(foreach lib_crate,$(SERVO_LIB_CRATES),servo-test-$(lib_crate)) libservo*.so libservo*.a
diff --git a/servo/src/etc/tidy.py b/servo/src/etc/tidy.py
index 28a6ff2a92ea5..9e9c25b25deba 100644
--- a/servo/src/etc/tidy.py
+++ b/servo/src/etc/tidy.py
@@ -37,6 +37,7 @@ def do_license_check(name, contents):
     "src/compiler", # Upstream
     "src/components/main/dom/bindings/codegen", # Generated and upstream code combined with our own. Could use cleanup
     "src/components/script/dom/bindings/codegen", # Generated and upstream code combined with our own. Could use cleanup
+    "src/test/wpt/web-platform-tests", # Upstream
 ]
 
 def should_check(name):