diff --git a/erts/test/run_erl_SUITE.erl b/erts/test/run_erl_SUITE.erl
index 20622c222e62..f1797b209fd7 100644
--- a/erts/test/run_erl_SUITE.erl
+++ b/erts/test/run_erl_SUITE.erl
@@ -104,7 +104,7 @@ count_new_lines(P, N) ->
     receive
 	{P,{data,S}} ->
 	    count_new_lines(P, count_new_lines_1(S, N))
-    after 0 ->
+    after 10 ->
 	    N
     end.
 
diff --git a/lib/kernel/src/user_sup.erl b/lib/kernel/src/user_sup.erl
index 5e9e299bdaf7..5507f47570eb 100644
--- a/lib/kernel/src/user_sup.erl
+++ b/lib/kernel/src/user_sup.erl
@@ -82,16 +82,9 @@ relay1(Pid) ->
 	    relay1(Pid)
     end.
 
-
-%%-----------------------------------------------------------------
-%% Sleep a while in order to let user write all (some) buffered 
-%% information before termination.
-%%-----------------------------------------------------------------
-
 -spec terminate(term(), pid()) -> 'ok'.
 
 terminate(_Reason, UserPid) ->
-    receive after 1000 -> ok end,
     exit(UserPid, kill),
     ok.