diff --git a/test/buildbot-master.cfg b/test/buildbot/master/ietfdb/master.cfg
similarity index 90%
rename from test/buildbot-master.cfg
rename to test/buildbot/master/ietfdb/master.cfg
index b1c349d36..535c5346a 100644
--- a/test/buildbot-master.cfg
+++ b/test/buildbot/master/ietfdb/master.cfg
@@ -93,25 +93,14 @@ from buildbot.process import factory
 from buildbot.steps.source import SVN
 from buildbot.steps.dummy import Dummy
 from buildbot.steps.python import PyFlakes
-from buildbot.steps.shell import ShellCommand as BaseShellCommand
-from buildbot.status.builder import SUCCESS, WARNINGS, FAILURE
-
-class ShellCommand(BaseShellCommand):
-    def evaluateCommand(self, cmd):
-        if cmd.rc == 0:
-            return SUCCESS
-        if cmd.rc == 1:
-            return WARNINGS
-        else:
-            return FAILURE
+from buildbot.steps.shell import ShellCommand, Test
             
 f1 = factory.BuildFactory()
 f1.addStep(SVN, svnurl="http://svn.tools.ietf.org/svn/tools/ietfdb/trunk/", username="buildbot@tools.ietf.org", password="U64#GUxr")
-f1.addStep(ShellCommand, command=["test/test-setup"])
-f1.addStep(PyFlakes, command=["pyflakes", "ietf"], warnOnFailure=True)
-f1.addStep(ShellCommand, command=["python", "ietf/manage.py", "test"], env={'PYTHONPATH': ["test/lib",]} )
-f1.addStep(ShellCommand, command=["test/test-teardown"])
-f1.addStep(Dummy, timeout=10)
+f1.addStep(ShellCommand, name="test-setup", command=["test/test-setup"])
+f1.addStep(PyFlakes,     command=["pyflakes", "ietf"], warnOnFailure=True)
+f1.addStep(Test,         name="django-tests", command=["python", "ietf/manage.py", "test"], env={'PYTHONPATH': ["test/lib",]} )
+f1.addStep(ShellCommand, name="test-teardown", command=["test/test-teardown"])
 
 b1 = {'name': "merlot-builder-1",
       'slavename': "merlot",