diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index 4d8f17855a..879afdd76c 100644
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,3 +1,7 @@
+2012-05-18  Thiago Jung Bauermann  <thiago.bauermann@linaro.org>
+
+	* gdb.python/py-prompt.exp: Quit if the target is remote.
+
 2012-05-18  Jan Kratochvil  <jan.kratochvil@redhat.com>
 
 	Fix ERROR: internal buffer is full.
diff --git a/gdb/testsuite/gdb.python/py-prompt.exp b/gdb/testsuite/gdb.python/py-prompt.exp
index eacb074d2f..ab17ab93bd 100644
--- a/gdb/testsuite/gdb.python/py-prompt.exp
+++ b/gdb/testsuite/gdb.python/py-prompt.exp
@@ -20,6 +20,10 @@ set testfile "py-prompt"
 set srcfile ${testfile}.c
 set binfile ${objdir}/${subdir}/${testfile}
 
+# We need to use TCL's exec to get the pid.
+if [is_remote target] then {
+    return 0
+}
 
 load_lib gdb-python.exp
 load_lib prompt.exp