diff --git a/lldb/test/lldbutil.py b/lldb/test/lldbutil.py
index eb983fee2367..9227d4b9492b 100644
--- a/lldb/test/lldbutil.py
+++ b/lldb/test/lldbutil.py
@@ -399,8 +399,8 @@ def print_stacktraces(process, string_buffer = False):
 
     print >> output, "Stack traces for " + repr(process)
 
-    for i in range(process.GetNumThreads()):
-        print >> output, print_stacktrace(process.GetThreadAtIndex(i), string_buffer=True)
+    for thread in process:
+        print >> output, print_stacktrace(thread, string_buffer=True)
 
     if string_buffer:
         return output.getvalue()