diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index 3e609cf62d..04d9450a85 100644
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2013-10-01  Doug Evans  <dje@google.com>
+
+	* gdb.python/python.exp: Remove redundant print-stack tests.
+	Make all print-stack test names unique.  Fix spelling of print-stack.
+
 2013-09-29  Yao Qi  <yao@codesourcery.com>
 
 	* gdb.base/shreloc.exp: Set $msymfile to 'shreloc.txt' if host
diff --git a/gdb/testsuite/gdb.python/python.exp b/gdb/testsuite/gdb.python/python.exp
index dd64a4210a..b0faf9abe3 100644
--- a/gdb/testsuite/gdb.python/python.exp
+++ b/gdb/testsuite/gdb.python/python.exp
@@ -208,15 +208,9 @@ gdb_test "python gdb.write(\"Error stream\\n\", stream=gdb.STDERR)" "Error strea
 gdb_test "python gdb.write(\"Normal stream\\n\", stream=gdb.STDOUT)" "Normal stream" "Test stdout write"
 gdb_test "python gdb.write(\"Log stream\\n\", stream=gdb.STDLOG)" "Log stream" "Test stdlog write"
 
-# print-stack
-gdb_test "show python print-stack" \
-    "The mode of Python stack printing on error is \"message\".*" \
-    "Test print-backtrace show setting. Default is message."
+# Turn on full stack printing for subsequent tests.
 gdb_py_test_silent_cmd "set python print-stack full" \
-    "Test print-backtrace set setting" 1
-gdb_test "show python print-stack" \
-    "The mode of Python stack printing on error is \"full\".*" \
-    "Test print-backtrace show setting to full."
+    "Set print-stack full for prompt tests" 1
 
 # Test prompt substituion
 
@@ -339,20 +333,20 @@ if ![runto_main] then {
 # print-stack settings
 gdb_test "show python print-stack" \
     "The mode of Python stack printing on error is \"message\".*" \
-    "Test print-backtrace show setting. Default is message."
+    "Test print-stack show setting. Default is message."
 gdb_py_test_silent_cmd "set python print-stack full" \
-    "Test print-backtrace set setting" 1
+    "Test print-stack set setting to full" 1
 gdb_test "show python print-stack" \
     "The mode of Python stack printing on error is \"full\".*" \
-    "Test print-backtrace show setting to full."
+    "Test print-stack show setting to full"
 gdb_py_test_silent_cmd "set python print-stack none" \
-    "Test print-backtrace set setting" 1
+    "Test print-stack set setting to none" 1
 gdb_test "show python print-stack" \
     "The mode of Python stack printing on error is \"none\".*" \
-    "Test print-backtrace show setting to none."
+    "Test print-stack show setting to none"
 
 gdb_py_test_silent_cmd "set python print-stack message" \
-    "Test print-backtrace set setting" 1
+    "Test print-stack set setting to message" 1
 
 gdb_py_test_multiple "prompt substitution readline" \
   "python" "" \
@@ -371,7 +365,7 @@ gdb_py_test_silent_cmd "python gdb.prompt_hook = None" \
     "set the hook to default" 1
 
 gdb_py_test_silent_cmd "set python print-stack full" \
-    "Test print-backtrace set setting" 1
+    "set print-stack full for prompt error test" 1
 
 gdb_test_multiple "python gdb.prompt_hook = error_prompt" "set the hook" {
     -re "Traceback.*File.*line.*RuntimeError.*Python exception called.*" {