diff --git a/gdb/testsuite/gdb.base/set-cwd.exp b/gdb/testsuite/gdb.base/set-cwd.exp
index 5a4241fd107..172d603f734 100644
--- a/gdb/testsuite/gdb.base/set-cwd.exp
+++ b/gdb/testsuite/gdb.base/set-cwd.exp
@@ -43,15 +43,15 @@ proc_with_prefix test_tilde_expansion { } {
     set home ""
     set test "print home var"
     gdb_test_multiple "print home" $test {
-    	-re "\\\$$decimal = $hex \"\(.+\)\"\r\n$gdb_prompt $" {
-    	    set home $expect_out(1,string)
-    	    pass $test
-    	}
+	-re "\\\$$decimal = $hex \"\(.+\)\"\r\n$gdb_prompt $" {
+	    set home $expect_out(1,string)
+	    pass $test
+	}
     }
 
     if { $home == "" } {
-    	untested "could not retrieve home var"
-    	return
+	untested "could not retrieve home var"
+	return
     }
 
     set curdir ""
@@ -177,13 +177,13 @@ proc_with_prefix test_cwd_reset { } {
 	if { ![runto_main] } {
 	    return -1
 	}
+
+	gdb_breakpoint [gdb_get_line_number "break-here"]
+	gdb_continue_to_breakpoint "break-here" ".* break-here .*"
+
+	gdb_test "print dir" "\\\$$decimal = \"$gdb_cwd\", .*" \
+	    "inferior cwd got reset correctly"
     }
-
-    gdb_breakpoint [gdb_get_line_number "break-here"]
-    gdb_continue_to_breakpoint "break-here" ".* break-here .*"
-
-    gdb_test "print dir" "\\\$$decimal = \"$gdb_cwd\", .*" \
-	"inferior cwd got reset correctly"
 }
 
 test_cd_into_dir