--- orig/lib/stap_run.exp	2005-09-03 06:34:12.000000000 +0800
+++ runtest/lib/stap_run.exp	2005-11-14 03:21:55.000000000 +0800
@@ -42,6 +42,16 @@
 	    expect {
 		-re  $output {
 		    pass "$test shutdown and output"
+		
+		    set output "^systemtap unload module successfully\n$"
+		    expect {
+			-re $output{
+				pass "$test unload module"
+				close
+			}
+			timeout {fail "$test unload module (timeout)"}
+			eof { fail "$test unload module (eof)"}	
+		    }			
 		}
 		timeout { fail "$test shutdown (timeout)" }
 		eof { fail "$test shutdown (eof)" }
@@ -51,6 +61,7 @@
 	timeout { fail "$test startup (timeout)" }
 	eof { fail "$test startup (eof)" }
     }
+    wait
 }
 
 proc no_load {} {