diff --git a/tests/fork.exp b/tests/fork.exp
index 49d9c1e..d30cfa2 100644
--- a/tests/fork.exp
+++ b/tests/fork.exp
@@ -1,4 +1,10 @@
 set timeout -1
+set send_slow {1 .1}
+proc send {ignore arg} {
+    sleep .1
+    exp_send -s -- $arg
+}
+
 cd ../kernel
 spawn make run arch=x86_64
 sleep 2
@@ -8,5 +14,4 @@ send -- "biscuit/fork\r"
 sleep 5
 expect "hello from 100"
 expect "parent done!"
-send -- "^Ax"
-wait
+send -- "busybox halt -f\r"
diff --git a/tests/killtest.exp b/tests/killtest.exp
index 22c84b6..c903036 100644
--- a/tests/killtest.exp
+++ b/tests/killtest.exp
@@ -1,4 +1,10 @@
 set timeout -1
+set send_slow {1 .1}
+proc send {ignore arg} {
+    sleep .1
+    exp_send -s -- $arg
+}
+
 cd ../kernel
 spawn make run arch=x86_64
 sleep 2
@@ -7,5 +13,4 @@ sleep 2
 send -- "biscuit/killtest\r"
 sleep 2
 expect "success"
-send -- "^Ax"
-wait
+send -- "busybox halt -f\r"
diff --git a/tests/test.sh b/tests/test.sh
index dd70e13..455c830 100755
--- a/tests/test.sh
+++ b/tests/test.sh
@@ -1,2 +1,6 @@
 #!/bin/bash
-expect *.exp
+for f in *.exp
+do
+    echo run $f
+    timeout 30s expect $f
+done
diff --git a/tests/usertests.exp b/tests/usertests.exp
deleted file mode 100644
index 8d318f1..0000000
--- a/tests/usertests.exp
+++ /dev/null
@@ -1,11 +0,0 @@
-set timeout -1
-cd ../kernel
-spawn make run arch=x86_64
-sleep 2
-expect ">>"
-sleep 2
-send -- "biscuit/usertests\r"
-sleep 2
-expect "exec test"
-send -- "^Ax"
-wait -nowait
diff --git a/user b/user
index 095cfa8..5b6efc5 160000
--- a/user
+++ b/user
@@ -1 +1 @@
-Subproject commit 095cfa8e66792544e491945eec18daad3e6d58b3
+Subproject commit 5b6efc54fbecf5f08517be0e03c434484f7efe90