diff --git a/master/buildbot/process/buildstep.py b/master/buildbot/process/buildstep.py
index 3d0f63bad95..78ced98a73c 100644
--- a/master/buildbot/process/buildstep.py
+++ b/master/buildbot/process/buildstep.py
@@ -1209,7 +1209,7 @@ def regex_log_evaluator(cmd, step_status, regexes):
         if worst_status(worst, possible_status) == possible_status:
             if isinstance(err, (basestring)):
                 err = re.compile(".*%s.*" % err, re.DOTALL)
-            for l in cmd.logs:
+            for l in cmd.logs.values():
                 if err.search(l.getText()):
                     worst = possible_status
     return worst
diff --git a/master/buildbot/status/tinderbox.py b/master/buildbot/status/tinderbox.py
index e35a786729f..583e581c053 100644
--- a/master/buildbot/status/tinderbox.py
+++ b/master/buildbot/status/tinderbox.py
@@ -7,7 +7,7 @@
 
 from buildbot import interfaces
 from buildbot.status import mail
-from buildbot.status.builder import SUCCESS, WARNINGS, EXCEPTION
+from buildbot.status.builder import SUCCESS, WARNINGS, EXCEPTION, RETRY
 from buildbot.steps.shell import WithProperties
 
 import gzip, bz2, base64, re, cStringIO