diff --git a/gdb/testsuite/gdb.python/Makefile.in b/gdb/testsuite/gdb.python/Makefile.in
index c49f713..655e604 100644
--- a/gdb/testsuite/gdb.python/Makefile.in
+++ b/gdb/testsuite/gdb.python/Makefile.in
@@ -1,7 +1,7 @@
 VPATH = @srcdir@
 srcdir = @srcdir@
 
-EXECUTABLES = python-value python-prettyprint python-template
+EXECUTABLES = py-value py-prettyprint py-template
 
 all info install-info dvi install uninstall installcheck check:
 	@echo "Nothing to be done for $@..."
diff --git a/gdb/testsuite/gdb.python//py-frame.exp b/gdb/testsuite/gdb.python//py-frame.exp
index 82ae814..13af0ba 100644
--- a/gdb/testsuite/gdb.python//py-frame.exp
+++ b/gdb/testsuite/gdb.python//py-frame.exp
@@ -31,7 +31,7 @@ if ![python_supported] then {
   return -1
 }
 
-set testfile "python-frame"
+set testfile "py-frame"
 set srcfile ${testfile}.c
 set binfile ${objdir}/${subdir}/${testfile}
 
diff --git a/gdb/testsuite/gdb.python//py-mi.exp b/gdb/testsuite/gdb.python//py-mi.exp
index e7bfe54..ee000f1 100644
--- a/gdb/testsuite/gdb.python//py-mi.exp
+++ b/gdb/testsuite/gdb.python//py-mi.exp
@@ -24,7 +24,7 @@ if [mi_gdb_start] {
     continue
 }
 
-set testfile "python-prettyprint"
+set testfile "py-prettyprint"
 set srcfile ${testfile}.c
 set binfile ${objdir}/${subdir}/${testfile}
 if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug additional_flags=-DMI}] != "" } {
diff --git a/gdb/testsuite/gdb.python//py-prettyprint.exp b/gdb/testsuite/gdb.python//py-prettyprint.exp
index b2dc85d..2134ab9 100644
--- a/gdb/testsuite/gdb.python//py-prettyprint.exp
+++ b/gdb/testsuite/gdb.python//py-prettyprint.exp
@@ -20,7 +20,7 @@ if $tracelevel then {
     strace $tracelevel
 }
 
-set testfile "python-prettyprint"
+set testfile "py-prettyprint"
 set srcfile ${testfile}.c
 set binfile ${objdir}/${subdir}/${testfile}
 
diff --git a/gdb/testsuite/gdb.python//py-template.exp b/gdb/testsuite/gdb.python//py-template.exp
index b80f56e..2d76371 100644
--- a/gdb/testsuite/gdb.python//py-template.exp
+++ b/gdb/testsuite/gdb.python//py-template.exp
@@ -31,7 +31,7 @@ if ![python_supported] then {
   return -1
 }
 
-set testfile "python-template"
+set testfile "py-template"
 set srcfile ${testfile}.cc
 set binfile ${objdir}/${subdir}/${testfile}
 if { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable \
diff --git a/gdb/testsuite/gdb.python//py-value.exp b/gdb/testsuite/gdb.python//py-value.exp
index ccf438f..a4f58af 100644
--- a/gdb/testsuite/gdb.python//py-value.exp
+++ b/gdb/testsuite/gdb.python//py-value.exp
@@ -220,7 +220,7 @@ proc test_value_in_inferior {} {
 
 # A few objfile tests.
 proc test_objfiles {} {
-    gdb_test "python\nok=False\nfor file in gdb.objfiles():\n  if 'python-value' in file.filename:\n    ok=True\nprint ok\nend" "True"
+    gdb_test "python\nok=False\nfor file in gdb.objfiles():\n  if 'py-value' in file.filename:\n    ok=True\nprint ok\nend" "True"
 
     gdb_test "python print gdb.objfiles()\[0\].pretty_printers" "\\\[\\\]"
 
@@ -275,7 +275,7 @@ if ![python_supported] then {
   return -1
 }
 
-set testfile "python-value"
+set testfile "py-value"
 set srcfile ${testfile}.c
 set binfile ${objdir}/${subdir}/${testfile}