diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index bbe607fc00..0d1eb49e79 100644
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,3 +1,9 @@
+2011-10-18  Tom Tromey  <tromey@redhat.com>
+
+	* gdb.base/source.exp: Don't include full file name in test name.
+	* gdb.python/python.exp: Don't include full file name in test
+	name.
+
 2011-10-18  Jan Kratochvil  <jan.kratochvil@redhat.com>
 
 	* gdb.base/attach-pie-noexec.c: New files.
diff --git a/gdb/testsuite/gdb.base/source.exp b/gdb/testsuite/gdb.base/source.exp
index 7a67ff2d1b..5d40eaf7f5 100644
--- a/gdb/testsuite/gdb.base/source.exp
+++ b/gdb/testsuite/gdb.base/source.exp
@@ -49,7 +49,8 @@ gdb_test_multiple "source ${srcdir}/${subdir}/source-test.gdb" $test {
     }
 }
 
-gdb_test "dir ${srcdir}/${subdir}" "Source directories searched: .*"
+gdb_test "dir ${srcdir}/${subdir}" "Source directories searched: .*" \
+    "set search directories"
 gdb_test "source -s ./source-test.gdb" \
     "test source options" \
     "source -s"
diff --git a/gdb/testsuite/gdb.python/python.exp b/gdb/testsuite/gdb.python/python.exp
index ee39dbad51..ea8a4d56ca 100644
--- a/gdb/testsuite/gdb.python/python.exp
+++ b/gdb/testsuite/gdb.python/python.exp
@@ -47,7 +47,9 @@ gdb_test_multiple "python print 23" "verify python support" {
 
       # If Python is not supported, verify that sourcing a python script
       # causes an error.
-      gdb_test "source $srcdir/$subdir/source2.py" "Error in sourced command file:.*"
+      gdb_test "source $srcdir/$subdir/source2.py" \
+	  "Error in sourced command file:.*" \
+	  "source source2.py when python disabled"
       return -1
     }
     -re "$gdb_prompt $"	{}
@@ -73,7 +75,7 @@ gdb_py_test_multiple "indented multi-line python command" \
   "foo ()" "" \
   "end" "hello, world!"
 
-gdb_test "source $srcdir/$subdir/source2.py" "yes"
+gdb_test "source $srcdir/$subdir/source2.py" "yes" "source source2.py"
 
 gdb_test "python print gdb.current_objfile()" "None"
 gdb_test "python print gdb.objfiles()" "\\\[\\\]"