diff --git a/lib/tools/src/cover.erl b/lib/tools/src/cover.erl
index 8827a1064701..f0160b9e022b 100644
--- a/lib/tools/src/cover.erl
+++ b/lib/tools/src/cover.erl
@@ -1259,7 +1259,7 @@ main_process_loop(State) ->
 	    ?MODULE:main_process_loop(S);
 
 	{From, {export,OutFile,Module}} ->
-	    spawn(fun() ->
+	    spawn_link(fun() ->
 			  ?SPAWN_DBG(export,{OutFile, Module}),
 			  do_export(Module, OutFile, From, State)
 		  end),
@@ -1671,7 +1671,7 @@ remote_start(MainNode) ->
     case whereis(?SERVER) of
 	undefined ->
 	    Starter = self(),
-	    Pid = spawn(fun() -> 
+	    Pid = spawn_link(fun() -> 
 				?SPAWN_DBG(remote_start,{MainNode}),
 				init_remote(Starter,MainNode) 
 			end),