Index: zorg/buildbot/builders/LLDBBuilder.py
===================================================================
--- zorg/buildbot/builders/LLDBBuilder.py
+++ zorg/buildbot/builders/LLDBBuilder.py
@@ -314,6 +314,7 @@
                                      flunkOnFailure=flunkTestFailure,
                                      warnOnFailure=flunkTestFailure,
                                      workdir='%s' % llvm_builddir,
+                                     timeout=1800,
                                      env=testenv))
             f=cleanSVNSourceTree(f, '%s/tools/lldb' % llvm_srcdir)
     return f