diff --git a/buildbot/master/master.cfg b/buildbot/master/master.cfg
index 91abfbe4..7773f50e 100644
--- a/buildbot/master/master.cfg
+++ b/buildbot/master/master.cfg
@@ -127,16 +127,20 @@ linux2_factory.addStep(Git(repourl=SERVO_REPO, mode="full", method="clobber"))
 linux2_factory.addStep(Compile(command=["./mach", "build", "--dev"], env=linux_headless_env))
 linux2_factory.addStep(ShellCommand(command=["./mach", "test-wpt-failure"],
                                     env=linux_headless_env))
-linux2_factory.addStep(ShellCommand(command=["./mach", "test-wpt", "--processes", "4"],
-                                    env=linux_headless_env))
+linux2_factory.addStep(ShellCommand(command=["./mach", "test-wpt", "--processes", "4",
+                                             "--log-raw", "wpt_raw.log"],
+                                    env=linux_headless_env,
+                                    logfiles={"wpt_raw.log": "wpt_raw.log"}))
 linux2_factory.addStep(Compile(command=["./mach", "build-cef"], env=linux_headless_env))
 
 linux3_factory = BuildFactory()
 linux3_factory.addStep(Git(repourl=SERVO_REPO, mode="full", method="clobber"))
 linux3_factory.addStep(Compile(command=["./mach", "build", "--dev"], env=linux_headless_env))
-linux3_factory.addStep(ShellCommand(command=["./mach", "test-css", "--processes", "4"],
+linux3_factory.addStep(ShellCommand(command=["./mach", "test-css", "--processes", "4",
+                                             "--log-raw", "wpt_raw.log"],
                                     env=linux_headless_env, decodeRC={0:SUCCESS,
-                                                                      1:SUCCESS}))
+                                                                      1:SUCCESS},
+                                    logfiles={"wpt_raw.log": "wpt_raw.log"}))
 
 
 task_limited_test_env = dict({'RUST_TEST_TASKS': '1'}, **mac_test_env)
@@ -147,8 +151,10 @@ mac1_factory.addStep(ShellCommand(command=["./mach", "test-tidy"]))
 mac1_factory.addStep(Compile(command=["./mach", "build", "--dev"], env=mac_test_env))
 mac1_factory.addStep(ShellCommand(command=["./mach", "test-wpt-failure"],
                                   env=mac_test_env))
-mac1_factory.addStep(ShellCommand(command=["./mach", "test-wpt", "--processes", "4"],
-                                 env=mac_test_env))
+mac1_factory.addStep(ShellCommand(command=["./mach", "test-wpt", "--processes", "4",
+                                           "--log-raw", "wpt_raw.log"],
+                                  env=mac_test_env,
+                                  logfiles={"wpt_raw.log": "wpt_raw.log"}))
 mac1_factory.addStep(ShellCommand(command=["./mach", "test-unit"], env=mac_test_env))
 
 mac2_factory = BuildFactory()
@@ -161,9 +167,11 @@ mac2_factory.addStep(Compile(command=["./mach", "build-cef"], env=mac_test_env))
 mac3_factory = BuildFactory()
 mac3_factory.addStep(Git(repourl=SERVO_REPO, mode="full", method="clobber"))
 mac3_factory.addStep(Compile(command=["./mach", "build"], env=mac_test_env))
-mac3_factory.addStep(ShellCommand(command=["./mach", "test-css", "--processes", "4"],
+mac3_factory.addStep(ShellCommand(command=["./mach", "test-css", "--processes", "4",
+                                           "--log-raw", "wpt_raw.log"],
                                   env=mac_test_env, decodeRC={0:SUCCESS,
-                                                              1:SUCCESS}))
+                                                              1:SUCCESS},
+                                  logfiles={"wpt_raw.log": "wpt_raw.log"}))
 
 android_compile_env = dict({'ANDROID_SDK': '/home/servo/android-sdk-linux/',
                             'ANDROID_NDK': '/home/servo/android-ndk-r10c/',
@@ -217,8 +225,11 @@ linux2_factory_rel.addStep(Git(repourl=SERVO_REPO, mode="full", method="clobber"
 linux2_factory_rel.addStep(Compile(command=["./mach", "build", "--release"], env=linux_test_env))
 linux2_factory_rel.addStep(ShellCommand(command=["./mach", "test-wpt-failure"],
                                     env=linux_test_env))
-linux2_factory_rel.addStep(ShellCommand(command=["./mach", "test-wpt", "--release", "--processes", "4"],
-                                    env=linux_test_env))
+linux2_factory_rel.addStep(ShellCommand(command=["./mach", "test-wpt", "--release",
+                                                 "--processes", "4",
+                                                 "--log-raw", "wpt_raw.log"],
+                                        env=linux_test_env,
+                                        logfiles={"wpt_raw.log": "wpt_raw.log"}))
 linux2_factory_rel.addStep(Compile(command=["./mach", "build-cef", "--release"]))
 
 mac1_factory_rel = BuildFactory()
@@ -227,8 +238,9 @@ mac1_factory_rel.addStep(ShellCommand(command=["./mach", "test-tidy"]))
 mac1_factory_rel.addStep(Compile(command=["./mach", "build", "--release"]))
 mac1_factory_rel.addStep(ShellCommand(command=["./mach", "test-wpt-failure"],
                                   env=common_test_env))
-mac1_factory_rel.addStep(ShellCommand(command=["./mach", "test-wpt", "--release", "--processes", "4", "--total-chunks", "2", "--this-chunk", "1"],
-                                 env=common_test_env))
+mac1_factory_rel.addStep(ShellCommand(command=["./mach", "test-wpt", "--release", "--processes", "4", "--total-chunks", "2", "--this-chunk", "1", "--log-raw", "wpt_raw.log"],
+                                      env=common_test_env,
+                                      logfiles={"wpt_raw.log": "wpt_raw.log"}))
 # https://github.com/rust-lang/cargo/issues/691
 # mac1_factory_rel.addStep(ShellCommand(command=["./mach", "test-unit"], env=common_test_env))
 mac1_factory_rel.addStep(Compile(command=["./mach", "build-cef"]))
@@ -239,8 +251,9 @@ mac2_factory_rel.addStep(Compile(command=["./mach", "build", "--release"]))
 mac2_factory_rel.addStep(ShellCommand(command=["./mach", "test-content"], env=common_test_env))
 mac2_factory_rel.addStep(ShellCommand(command=["./mach", "test-ref", "--kind", "cpu"],
                                  env=task_limited_test_env))
-mac2_factory_rel.addStep(ShellCommand(command=["./mach", "test-wpt", "--processes", "4", "--total-chunks", "2", "--this-chunk", "2"],
-                                 env=common_test_env))
+mac2_factory_rel.addStep(ShellCommand(command=["./mach", "test-wpt", "--processes", "4", "--total-chunks", "2", "--this-chunk", "2", "--log-raw", "wpt_raw.log"],
+                                      env=common_test_env,
+                                      logfiles={"wpt_raw.log": "wpt_raw.log"}))
 from buildbot.config import BuilderConfig
 
 def branch_priority(builder, requests):