diff --git a/tests/sls/homu/get_buildbot_cfg.py b/tests/sls/homu/get_buildbot_cfg.py
new file mode 100644
index 00000000..7380eeb8
--- /dev/null
+++ b/tests/sls/homu/get_buildbot_cfg.py
@@ -0,0 +1,30 @@
+from __future__ import print_function
+
+import imp
+import json
+import os.path
+import sys
+
+BUILDBOT_MASTER_PATH = '/home/servo/buildbot/master/'
+
+
+def main():
+    sys.path.append(BUILDBOT_MASTER_PATH)
+
+    config = imp.load_source(
+        'config',
+        os.path.join(BUILDBOT_MASTER_PATH, 'master.cfg')
+    )
+
+    for sched in config.c['schedulers']:
+        if sched.name == 'servo-auto':
+            out = {'builders': sched.builderNames}
+            print(json.dumps(out))
+            return 0
+
+    print('error: "servo-auto" scheduler not found', file=sys.stderr)
+    return 1
+
+
+if __name__ == '__main__':
+    sys.exit(main())
diff --git a/tests/sls/homu/valid_builders.py b/tests/sls/homu/valid_builders.py
new file mode 100644
index 00000000..1aa0f378
--- /dev/null
+++ b/tests/sls/homu/valid_builders.py
@@ -0,0 +1,41 @@
+import json
+import os.path
+import subprocess
+import toml
+
+from tests.util import Failure, Success
+
+
+def run():
+    homu_cfg = toml.load('/home/servo/homu/cfg.toml')
+    homu_builders = homu_cfg['repo']['servo']['buildbot']
+
+    # We need to invoke a new process to read the Buildbot master config
+    # because Buildbot is written in python2.
+    scriptpath = os.path.join(os.path.dirname(__file__), 'get_buildbot_cfg.py')
+    ret = subprocess.run(
+        ['/usr/bin/python2', scriptpath],
+        stdout=subprocess.PIPE,
+        stderr=subprocess.PIPE
+    )
+    if ret.returncode != 0:
+        return Failure(
+            'Unable to retrieve buildbot builders:', ret.stderr
+        )
+
+    buildbot_builders = json.loads(ret.stdout.decode('utf-8'))['builders']
+
+    failure_msg = ''
+    for builder_set in ['builders', 'try_builders']:
+        diff = set(homu_builders[builder_set]) - set(buildbot_builders)
+        if diff:
+            failure_msg += 'Invalid builders for "{}": {}\n' \
+                .format(builder_set, diff)
+
+    if failure_msg:
+        return Failure(
+            "Homu config isn't synced with Buildbot config:",
+            failure_msg
+        )
+
+    return Success('Buildbot and homu configs are synced')