Index: zorg/buildbot/builders/LLDBBuilder.py
===================================================================
--- zorg/buildbot/builders/LLDBBuilder.py
+++ zorg/buildbot/builders/LLDBBuilder.py
@@ -296,6 +296,14 @@
                                      workdir='%s' % llvm_builddir,
                                      env=testenv))
             f=cleanSVNSourceTree(f, '%s/tools/lldb' % llvm_srcdir)
+    # After test, move test traces to outer folder
+    # Those test traces will accumulate on slave machine until being cleaned up manully or by script
+    f.addStep(ShellCommand(name="archive test traces",
+                           command=WithProperties('mkdir -p ../testtraces/build-%(buildnumber)s && mv lldb-test-traces-* ../testtraces/build-%(buildnumber)s/'),
+                           description="archive test traces ",
+                           haltOnFailure=False,
+                           env=env,
+                           workdir='%s' % llvm_builddir))
     return f
 
 # Define a structure to describe remote target