diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index 39a09a696c..544bd692f5 100644
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+Wed May 21 21:23:16 1997  Bob Manson  <manson@charmed.cygnus.com>
+
+	* gdb.base/setshow.exp: Don't run the set prompt tests if
+	the board has gdb_prompt set.
+
 Tue May 20 08:58:49 1997  Jeffrey A Law  (law@cygnus.com)
 
 	* gdb.base/a2-run.exp: Change "gdb,noargs" to just "noargs".
diff --git a/gdb/testsuite/gdb.base/setshow.exp b/gdb/testsuite/gdb.base/setshow.exp
index 25819ed961..60736f3c33 100644
--- a/gdb/testsuite/gdb.base/setshow.exp
+++ b/gdb/testsuite/gdb.base/setshow.exp
@@ -176,28 +176,30 @@ gdb_test "set listsize 100" "" "set listsize 100"
 #test show listsize 100
 gdb_test "show listsize" "Number of source lines gdb will list by default is 100..*" "show listsize (100)" 
 
-#test set prompt (FooBarBaz) 
-set newprompt "\\(FooBarBaz\\)"
-send_gdb "set prompt (FooBarBaz) \n"
-gdb_expect {
+if ![board_info target exists gdb_prompt] {
+    #test set prompt (FooBarBaz) 
+    set newprompt "\\(FooBarBaz\\)"
+    send_gdb "set prompt (FooBarBaz) \n"
+    gdb_expect {
 	-re "$newprompt $"	{ pass "set prompt (FooBarBaz) " }
 	timeout			{ fail "(timeout) set prompt (FooBarBaz) " }
-	}
+    }
 
-#test show prompt (FooBarBaz) 
-send_gdb "show prompt\n"
-gdb_expect {
+    #test show prompt (FooBarBaz) 
+    send_gdb "show prompt\n"
+    gdb_expect {
 	-re "Gdb's prompt is \"$newprompt \"..* $" \
-				{ pass "show prompt (FooBarBaz) " }
+		{ pass "show prompt (FooBarBaz) " }
 	timeout			{ fail "(timeout) show prompt (FooBarBaz) " }
-	}
+    }
 
-#test set prompt (gdb) 
-send_gdb "set prompt (gdb) \n"
-gdb_expect {
+    #test set prompt (gdb) 
+    send_gdb "set prompt (gdb) \n"
+    gdb_expect {
 	-re "$gdb_prompt $"		{ pass "set prompt (gdb) " }
 	timeout			{ fail "(timeout) set prompt (gdb) " }
-	}
+    }
+}
 
 #test set radix 11
 gdb_test "set radix 11" "Unsupported output radix ``decimal 11''; output radix unchanged..*"  "set radix 11"