diff --git a/buildbot/master/master.cfg b/buildbot/master/master.cfg
index a4568d38..7c76f7ee 100644
--- a/buildbot/master/master.cfg
+++ b/buildbot/master/master.cfg
@@ -137,6 +137,7 @@ linux1_factory.addStep(steps.Compile(command=["./mach", "build", "--dev"], env=l
 linux1_factory.addStep(steps.ShellCommand(command=["./mach", "test-unit"], env=linux_headless_env))
 linux1_factory.addStep(steps.ShellCommand(command=["./mach", "test-ref", "--kind", "cpu"],
                                           env=linux_headless_env))
+linux1_factory.addStep(steps.Compile(command=["./mach", "build-cef", "--release"], env=linux_headless_env))
 
 
 linux2_factory = util.BuildFactory()
@@ -149,7 +150,6 @@ linux2_factory.addStep(steps.ShellCommand(command=["./mach", "test-wpt", "--rele
                                           env=linux_headless_env,
                                           logfiles={"wpt_raw.log": "wpt_raw.log"}))
 linux2_factory.addStep(steps.ShellCommand(command=["gzip", "wpt_raw.log"], env=linux_headless_env))
-linux2_factory.addStep(steps.Compile(command=["./mach", "build-cef", "--release"], env=linux_headless_env))
 
 linux3_factory = util.BuildFactory()
 linux3_factory.addStep(steps.Git(repourl=SERVO_REPO, mode="full", method="clobber"))
@@ -174,13 +174,13 @@ mac1_factory.addStep(steps.ShellCommand(command=["./mach", "test-wpt", "--releas
                                   env=mac_test_env,
                                   logfiles={"wpt_raw.log": "wpt_raw.log"}))
 mac1_factory.addStep(steps.ShellCommand(command=["gzip", "wpt_raw.log"], env=mac_test_env))
-mac1_factory.addStep(steps.ShellCommand(command=["./mach", "test-unit"], env=mac_test_env))
 
 mac2_factory = util.BuildFactory()
 mac2_factory.addStep(steps.Git(repourl=SERVO_REPO, mode="full", method="clobber"))
 mac2_factory.addStep(steps.Compile(command=["./mach", "build", "--dev"], env=mac_test_env))
 mac2_factory.addStep(steps.ShellCommand(command=["./mach", "test-ref", "--kind", "cpu"],
                                  env=task_limited_test_env))
+mac2_factory.addStep(steps.ShellCommand(command=["./mach", "test-unit"], env=mac_test_env))
 mac2_factory.addStep(steps.Compile(command=["./mach", "build-cef"], env=mac_test_env))
 
 mac3_factory = util.BuildFactory()