--- gdb.python/py-completion.exp-orig	2014-07-07 21:32:17.891045058 +0200
+++ gdb.python/py-completion.exp	2014-07-08 17:29:36.500459749 +0200
@@ -26,9 +26,9 @@ if { [skip_python_tests] } { continue }
 gdb_test_no_output "source ${srcdir}/${subdir}/${testfile}.py"
 
 # Create a temporary directory
-set testdir "${objdir}/${subdir}/py-completion-testdir/"
+set testdir "[standard_output_file "py-completion-testdir"]/"
 set testdir_regex [string_to_regexp $testdir]
-set testdir_complete "${objdir}/${subdir}/py-completion-test"
+set testdir_complete [standard_output_file "py-completion-test"]
 file mkdir $testdir
 
 # This one should always pass.
@@ -40,8 +40,7 @@ gdb_test_multiple "" "completefileinit c
 }
 
 # Just discarding whatever we typed.
-send_gdb "\n"
-gdb_test "print" ".*"
+gdb_test " " ".*" "discard #1"
 
 # This is the problematic one.
 send_gdb "completefilemethod ${testdir_complete}\t"
@@ -55,16 +54,16 @@ gdb_test_multiple "" "completefilemethod
 }
 
 # Discarding again
-send_gdb "\n"
-gdb_test "print" ".*"
+gdb_test " " ".*" "discard #2"
 
 # Another problematic
-send_gdb "completefilecommandcond ${objdir}/${subdir}/py-completion-t\t"
+set completion_regex "[string_to_regexp [standard_output_file "py-completion-t"]]"
+send_gdb "completefilecommandcond [standard_output_file "py-completion-t\t"]"
 gdb_test_multiple "" "completefilecommandcond completion" {
     -re "^completefilecommandcond ${testdir}$" {
 	fail "completefilecommandcond completion (completed filename instead of command)"
     }
-    -re "^completefilecommandcond ${objdir}/${subdir}/py-completion-t$" {
+    -re "^completefilecommandcond ${completion_regex}$" {
 	pass "completefilecommandcond completion"
     }
 }