diff --git a/tests/userprog/child-rox.c b/tests/userprog/child-rox.c
index 38151e8..929df94 100644
--- a/tests/userprog/child-rox.c
+++ b/tests/userprog/child-rox.c
@@ -42,10 +42,13 @@ main (int argc UNUSED, char *argv[])
       int child;
       
       snprintf (cmd, sizeof cmd, "child-rox %d", atoi (argv[1]) - 1);
+      msg ("exec \"%s\"", cmd);
       if (!(child = fork ("child-rox"))){
         exec (cmd);
       }
-      CHECK (child != -1, "exec \"%s\"", cmd);
+
+      if (child < 0)
+        fail ("fork() returned %d", child);
       quiet = true;
       CHECK (wait (child) == 12, "wait for \"child-rox\"");
       quiet = false;
diff --git a/tests/userprog/no-vm/Make.tests b/tests/userprog/no-vm/Make.tests
index 8c64e4e..2bae074 100644
--- a/tests/userprog/no-vm/Make.tests
+++ b/tests/userprog/no-vm/Make.tests
@@ -5,4 +5,4 @@ tests/userprog/no-vm_PROGS = $(tests/userprog/no-vm_TESTS)
 tests/userprog/no-vm/multi-oom_SRC = tests/userprog/no-vm/multi-oom.c	\
 tests/lib.c
 
-tests/userprog/no-vm/multi-oom.output: TIMEOUT = 360 -m 20
+tests/userprog/no-vm/multi-oom.output: TIMEOUT = 600 -m 20