diff --git a/gdb/testsuite/gdb.trace/circ.exp b/gdb/testsuite/gdb.trace/circ.exp
index 4c47228..86e2fe1 100644
--- a/gdb/testsuite/gdb.trace/circ.exp
+++ b/gdb/testsuite/gdb.trace/circ.exp
@@ -15,7 +15,6 @@
 
 load_lib "trace-support.exp"
 
-
 standard_testfile
 
 if {[prepare_for_testing $testfile.exp $testfile $srcfile {debug nowarnings}]} {
@@ -23,35 +22,22 @@ if {[prepare_for_testing $testfile.exp $testfile $srcfile {debug nowarnings}]} {
 }
 
 # Tests:
-# 1) Set up a trace experiment that will collect approximately 10 frames,
+# 1) Calculate the size taken by one trace frame.
+# 2) Set up a trace experiment that will collect approximately 10 frames,
 #    requiring more than 512 but less than 1024 bytes of cache buffer.
 #    (most targets should have at least 1024 bytes of cache buffer!)
 #    Run and confirm that it collects all 10 frames.
-# 2) Artificially limit the trace buffer to 512 bytes, and rerun the
-#    experiment.  Confirm that the first several frames are collected,
+# 3) Artificially limit the trace buffer to 4x + a bytes.  Here x is the size
+#    of single trace frame and a is a small constant.  Rerun the
+#    experiment.  Confirm that the first frames is collected,
 #    but that the last several are not.
-# 3) Set trace buffer to circular mode, still with the artificial limit
-#    of 512 bytes, and rerun the experiment.  Confirm that the last 
-#    several frames are collected, but the first several are not.
+# 4) Set trace buffer to circular mode, with the size buffer size as in 
+#    step 3 above.  Rerun the experiment.  Confirm that the last 
+#    frame is collected, but the first is not.
 #
 
-# return 0 for success, 1 for failure
-proc run_trace_experiment { pass } {
-    gdb_run_cmd 
-
-    if [gdb_test "tstart" \
-	    "\[\r\n\]*" \
-	    "start trace experiment, pass $pass"] then { return 1 }
-    if [gdb_test "continue" \
-	    "Continuing.*Breakpoint \[0-9\]+, end.*" \
-	    "run to end, pass $pass"] then { return 1 }
-    if [gdb_test "tstop" \
-	    "\[\r\n\]*" \
-	    "stop trace experiment, pass $pass"] then { return 1 }
-    return 0
-}
-
-# return 0 for success, 1 for failure
+# Set a tracepoint on given func.  Return 0 for success,
+# 1 for failure.
 proc set_a_tracepoint { func } {
     if [gdb_test "trace $func" \
 	    "Tracepoint \[0-9\]+ at .*" \
@@ -66,7 +52,8 @@ proc set_a_tracepoint { func } {
     return 0
 }
 
-# return 0 for success, 1 for failure
+# Sets the tracepoints from func0 to func9 using
+# set_a_tracepoint.  Return 0 for success, 1 for failure.
 proc setup_tracepoints { } {
     gdb_delete_tracepoints
     if [set_a_tracepoint func0] then { return 1 }
@@ -82,12 +69,34 @@ proc setup_tracepoints { } {
     return 0
 }
 
-# return 0 for success, 1 for failure
-proc trace_buffer_normal { } {
+# Start the trace, run to end and then stop the trace.
+# Return 0 for success, 1 for failure.
+proc run_trace_experiment { } {
+    global decimal
+
+    if [setup_tracepoints] then { return 1 }
+    if [gdb_test "break end" "Breakpoint $decimal.*" \
+	    "breakpoint at end"] then { return 1 }
+    if [gdb_test "tstart" \
+	    "\[\r\n\]*" \
+	    "start trace experiment"] then { return 1 }
+    if [gdb_test "continue" \
+	    "Continuing.*Breakpoint \[0-9\]+, end.*" \
+	    "run to end"] then { return 1 }
+    if [gdb_test "tstop" \
+	    "\[\r\n\]*" \
+	    "stop trace experiment"] then { return 1 }
+    return 0
+}
+
+
+# Test if the target supports the given packet.
+# Return 0 for success, 1 for failure
+proc supports_trace_packet { packet } {
     global gdb_prompt
 
     set ok 0
-    set test "maint packet QTBuffer:size:ffffffff"
+    set test "maint packet $packet"
     gdb_test_multiple $test $test {
 	-re "received: .OK.\r\n$gdb_prompt $" {
 	    set ok 1
@@ -101,116 +110,185 @@ proc trace_buffer_normal { } {
 	return 1
     }
 
-    set ok 0
-    set test "maint packet QTBuffer:circular:0"
-    gdb_test_multiple $test $test {
-	-re "received: .OK.\r\n$gdb_prompt $" {
-	    set ok 1
+    return 0
+}
+
+if { ![runto_main] } {
+    fail "can't run to main to check for trace support"
+    return -1
+}
+
+if { ![gdb_target_supports_trace] } then { 
+    unsupported "target does not support trace"
+    return 1
+}
+
+if { [supports_trace_packet "QTBuffer:size:-1"] } then {
+    unsupported "target does not support changing trace buffer size" 
+    return 1
+}
+
+if { [supports_trace_packet "QTBuffer:circular:0"] } then {
+    unsupported "target does not support circular trace buffer" 
+    return 1
+}
+
+gdb_test_no_output "set circular-trace-buffer on" \
+    "set circular-trace-buffer on"
+
+gdb_test "show circular-trace-buffer" \
+    "Target's use of circular trace buffer is on." \
+    "show circular-trace-buffer (on)"
+
+gdb_test_no_output "set circular-trace-buffer off" \
+    "set circular-trace-buffer off"
+
+gdb_test "show circular-trace-buffer" \
+    "Target's use of circular trace buffer is off." \
+    "show circular-trace-buffer (off)"
+
+set total_size -1
+set free_size -1
+set frame_size -1
+
+# Determine the size used by a single frame.  Put single tracepoint,
+# run and then check the total and free size using tstatus command.
+# Then subtracting free from total gives us the size of a frame.
+with_test_prefix "frame size" {
+    if [set_a_tracepoint func0] {
+	return 1
+    }
+
+    if [gdb_test "break end" "Breakpoint $decimal.*" \
+	    "breakpoint at end"] { 
+	return 1
+    }
+
+    if [gdb_test "tstart" \
+	    "\[\r\n\]*" \
+	    "start trace"] {
+	return 1
+    }
+
+    if [gdb_test "continue" \
+	    "Continuing.*Breakpoint \[0-9\]+, end.*" \
+	    "run to end"] {
+	return 1
+    }
+
+    if [gdb_test "tstop" \
+	    "\[\r\n\]*" \
+	    "stop trace"] {
+	return 1
+    }
+
+    set test "get buffer size"
+
+    gdb_test_multiple "tstatus" $test {
+	-re ".*Trace buffer has ($decimal) bytes of ($decimal) bytes free.*$gdb_prompt $" {
+	    set free_size $expect_out(1,string)
+	    set total_size $expect_out(2,string)
 	    pass $test
 	}
-	-re "\r\n$gdb_prompt $" {
-	}
     }
-    if { !$ok } {
-	unsupported $test
+
+    # Check that we get the total_size and free_size
+    if { $total_size < 0 } {
 	return 1
     }
 
-    return 0
+    if { $free_size < 0 } {
+	return 1
+    }
 }
 
-# return 0 for success, 1 for failure
-proc gdb_trace_circular_tests { } {
-    if { ![gdb_target_supports_trace] } then { 
-	unsupported "Current target does not support trace"
+# Calculate the size of a single frame
+set frame_size "($total_size - $free_size)"
+
+with_test_prefix "normal buffer" {
+    clean_restart $testfile
+
+    if { ![runto_main] } {
+	fail "can't run to main"
 	return 1
     }
 
-    if [trace_buffer_normal] then { return 1 }
+    if { [run_trace_experiment] } then {
+	return 1
+    }
 
-    gdb_test "break begin" ".*" ""
-    gdb_test "break end"   ".*" ""
-    gdb_test "tstop"       ".*" ""
-    gdb_test "tfind none"  ".*" ""
+    # Check that frame 0 is actually at func0.
+    gdb_test "tfind start" ".*#0  func0 .*" \
+	"find frame zero"
 
-    if [setup_tracepoints] then { return 1 }
+    gdb_test "tfind 9" ".*Found trace frame 9.*" \
+	"find frame nine"
+}
 
-    # First, run the trace experiment with default attributes:
-    # Make sure it behaves as expected.
-    if [run_trace_experiment 1] then { return 1 }
-    if [gdb_test "tfind start" \
-	    "#0  func0 .*" \
-	    "find frame zero, pass 1"] then { return 1 }
-
-    if [gdb_test "tfind 9" \
-	    "#0  func9 .*" \
-	    "find frame nine, pass 1"] then { return 1 }
-
-    if [gdb_test "tfind none" \
-	    "#0  end .*" \
-	    "quit trace debugging, pass 1"] then { return 1 }
-
-    # Then, shrink the trace buffer so that it will not hold
-    # all ten trace frames.  Verify that frame zero is still
-    # collected, but frame nine is not.
-    if [gdb_test "maint packet QTBuffer:size:200" \
-	    "received: .OK." "shrink the target trace buffer"] then { 
+# Shrink the trace buffer so that it will not hold
+# all ten trace frames.  Verify that frame zero is still
+# collected, but frame nine is not.
+
+set buffer_size "((4 * $frame_size) + 10)"
+with_test_prefix "small buffer" {
+    clean_restart $testfile
+
+    if { ![runto_main] } {
+	fail "can't run to main"
 	return 1
     }
-    if [run_trace_experiment 2] then { return 1 }
-    if [gdb_test "tfind start" \
-	    "#0  func0 .*" \
-	    "find frame zero, pass 2"] then { return 1 }
-
-    if [gdb_test "tfind 9" \
-	    ".* failed to find .*" \
-	    "fail to find frame nine, pass 2"] then { return 1 }
-
-    if [gdb_test "tfind none" \
-	    "#0  end .*" \
-	    "quit trace debugging, pass 2"] then { return 1 }
-
-    # Finally, make the buffer circular.  Now when it runs out of
-    # space, it should wrap around and overwrite the earliest frames.
-    # This means that:
-    #   1) frame zero will be overwritten and therefore unavailable
-    #   2) the earliest frame in the buffer will be other-than-zero
-    #   3) frame nine will be available (unlike on pass 2).
-    if [gdb_test "maint packet QTBuffer:circular:1" \
-	    "received: .OK." "make the target trace buffer circular"] then { 
-	return 1
+
+    gdb_test_no_output "set trace-buffer-size $buffer_size" \
+	"shrink the target trace buffer"
+
+    if { [run_trace_experiment] } then {
+	return 1 
     }
-    if [run_trace_experiment 3] then { return 1 }
-    if [gdb_test "tfind start" \
-	    "#0  func\[1-9\] .*" \
-	    "first frame is NOT frame zero, pass 3"] then { return 1 }
 
-    if [gdb_test "tfind 9" \
-	    "#0  func9 .*" \
-	    "find frame nine, pass 3"] then { return 1 }
+    gdb_test "tfind start" ".*#0  func0 .*" \
+	"find frame zero"
 
-    if [gdb_test "tfind none" \
-	    "#0  end .*" \
-	    "quit trace debugging, pass 3"] then { return 1 }
+    gdb_test "tfind none" ".*"
 
-    return 0
+    gdb_test "tfind tracepoint 9" ".* failed to find .*" \
+	"find frame nine";
 }
 
-gdb_test_no_output "set circular-trace-buffer on" \
-    "set circular-trace-buffer on"
+# Finally, make the buffer circular.  Now when it runs out of
+# space, it should wrap around and overwrite the earliest frames.
+# This means that:
+#   1) frame zero will be overwritten and therefore unavailable
+#   2) the earliest frame in the buffer will be other-than-zero
+#   3) frame nine will be available (unlike "small buffer" case).
+with_test_prefix "circular buffer" {
+    clean_restart $testfile
+
+    if { ![runto_main] } {
+	fail "can't run to main"
+	return 1
+    }
 
-gdb_test "show circular-trace-buffer" "Target's use of circular trace buffer is on." "show circular-trace-buffer (on)"
+    gdb_test_no_output "set trace-buffer-size $buffer_size" \
+	"shrink the target trace buffer"
 
-gdb_test_no_output "set circular-trace-buffer off" \
-    "set circular-trace-buffer off"
+    gdb_test_no_output "set circular-trace-buffer on" \
+	"make the target trace buffer circular"
 
-gdb_test "show circular-trace-buffer" "Target's use of circular trace buffer is off." "show circular-trace-buffer (off)"
+    if { [run_trace_experiment] } then {
+	return 1
+    }
 
-# Body of test encased in a proc so we can return prematurely.
-if { ![gdb_trace_circular_tests] } then {
-    # Set trace buffer attributes back to normal
-    trace_buffer_normal;
-}
+    gdb_test "tstatus" \
+	".*Buffer contains $decimal trace frames \\(of $decimal created total\\).*Trace buffer is circular.*" \
+	"trace buffer is circular"
 
-# Finished!
-gdb_test "tfind none" ".*" ""
+    # Frame 0 should not be at func0
+    gdb_test "tfind start" ".*#0  func\[1-9\] .*" \
+	"first frame is NOT at func0";
+
+    gdb_test "tfind none" ".*"
+
+    gdb_test \
+	"tfind tracepoint 9" ".*Found trace frame $decimal, tracepoint 9.*" \
+	"find frame nine"
+}