3 files changed, 7 insertions, 3 deletions
diff --git a/testsuite/systemtap.context/args.tcl b/testsuite/systemtap.context/args.tcl
index 3a1ecb23..7cb79cdf 100644
--- a/testsuite/systemtap.context/args.tcl
+++ b/testsuite/systemtap.context/args.tcl
@@ -54,4 +54,5 @@ expect {
     eof {fail "function arguments: unexpected timeout"}
 }
 exec kill -INT -[exp_pid]
-closewait
+close
+wait
diff --git a/testsuite/systemtap.context/backtrace.tcl b/testsuite/systemtap.context/backtrace.tcl
index f9e14b31..6c8aee40 100644
--- a/testsuite/systemtap.context/backtrace.tcl
+++ b/testsuite/systemtap.context/backtrace.tcl
@@ -163,4 +163,6 @@ if {$m6 == 5} {
 }
 
 
-closewait
+
+close
+wait
diff --git a/testsuite/systemtap.context/pid.tcl b/testsuite/systemtap.context/pid.tcl
index f9dffba7..a2c091f1 100644
--- a/testsuite/systemtap.context/pid.tcl
+++ b/testsuite/systemtap.context/pid.tcl
@@ -28,4 +28,5 @@ expect {
     timeout {fail "all pid tests - timeout"}
     eof {fail "all pid tests - unexpected EOF"}
 }
-closewait
+catch {close}
+wait