diff --git a/test/buildbot/buildbot_config/master/builders.py b/test/buildbot/buildbot_config/master/builders.py
index 1dcb05dde..1c983e6ad 100644
--- a/test/buildbot/buildbot_config/master/builders.py
+++ b/test/buildbot/buildbot_config/master/builders.py
@@ -17,7 +17,12 @@ def get_builders(slaves):
     slaves.
     """
     f = BuildFactory()
-    # TODO
+    f.addStep(Git(repourl="git://github.com/mitchellh/vagrant.git",
+                  mode="full",
+                  method="fresh",
+                  shallow=True))
+    f.addStep(buildsteps.Bundler())
+    f.addStep(buildsteps.UnitTests())
 
     return [BuilderConfig(
             name="vagrant-master",
diff --git a/test/buildbot/buildbot_config/master/buildsteps.py b/test/buildbot/buildbot_config/master/buildsteps.py
index 4431bef32..a9cf5ee28 100644
--- a/test/buildbot/buildbot_config/master/buildsteps.py
+++ b/test/buildbot/buildbot_config/master/buildsteps.py
@@ -4,4 +4,28 @@ Contains various buildsteps that the build master uses.
 
 import os
 
-# TODO
+from buildbot.steps.shell import ShellCommand
+
+class Bundler(ShellCommand):
+    """
+    Runs bundler to get the dependencies for a Ruby project.
+    """
+
+    name = "bundler"
+    description = "bundle install"
+    descriptionDone = "bundler install complete"
+    command = ["bundle", "install"]
+    flunkOnFailure = True
+    haltOnFailure = True
+
+class UnitTests(ShellCommand):
+    """
+    Runs the unit tests via a rake command.
+    """
+
+    name = "unit tests"
+    description = "unit tests"
+    descriptionDone = "passed unit tests"
+    command = ["rake", "test:unit"]
+    flunkOnFailure = True
+    haltOnFailure = True