diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index 9a8ca24be2..6bfe3531ec 100644
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,3 +1,7 @@
+2010-06-11  Ulrich Weigand  <Ulrich.Weigand@de.ibm.com>
+
+	* gdb.trace/packetlen.exp: Respect gdb_target_supports_trace.
+
 2010-06-11  Jan Kratochvil  <jan.kratochvil@redhat.com>
 
 	* lib/gdb.exp (gdb_run_cmd): Return on $gdb_prompt.
diff --git a/gdb/testsuite/gdb.trace/packetlen.exp b/gdb/testsuite/gdb.trace/packetlen.exp
index be89ee6edc..16be2a00e2 100644
--- a/gdb/testsuite/gdb.trace/packetlen.exp
+++ b/gdb/testsuite/gdb.trace/packetlen.exp
@@ -39,6 +39,14 @@ gdb_test "tfind none"  ".*" ""
 runto_main
 gdb_reinitialize_dir $srcdir/$subdir
 
+# We generously give ourselves one "pass" if we successfully
+# detect that this test cannot be run on this target!
+if { ![gdb_target_supports_trace] } then {
+    pass "Current target does not support trace"
+    return 1;
+
+}
+
 # If testing on a remote host, download the source file.
 # remote_download host $srcdir/$subdir/$srcfile