diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index ff0332d8b6..0de5fe45b9 100644
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,3 +1,7 @@
+2012-02-17  Yao Qi  <yao@codesourcery.com>
+
+	* gdb.trace/strace.exp (strace_info_marker): Test `info threads'.
+
 2012-02-16  Tom Tromey  <tromey@redhat.com>
 
 	* gdb.base/inferior-died.c: Don't include stdio.h.
diff --git a/gdb/testsuite/gdb.trace/strace.exp b/gdb/testsuite/gdb.trace/strace.exp
index 4d6ea10137..c9947dcaf1 100644
--- a/gdb/testsuite/gdb.trace/strace.exp
+++ b/gdb/testsuite/gdb.trace/strace.exp
@@ -55,6 +55,7 @@ gdb_load_shlibs $libipa
 proc strace_info_marker { } {
     global executable
     global pf_prefix
+    global gdb_prompt
 
     set old_pf_prefix $pf_prefix
     lappend pf_prefix "info_marker"
@@ -71,6 +72,13 @@ proc strace_info_marker { } {
     gdb_test "info static-tracepoint-markers" \
 	".*ust/bar\[\t \]+n\[\t \]+.*ust/bar2\[\t \]+n\[\t \]+.*"
 
+    # List all the thread.  It is expected to get three threads without
+    # any errors.
+    gdb_test_multiple "info threads 3 2 1" "info threads" {
+	-re "3\[ \t\]+Thread .*2\[ \t\]+Thread .*1\[ \t\]+Thread .*${gdb_prompt} $" {
+	    pass "info threads"
+	}
+    }
     set pf_prefix $old_pf_prefix
 }