3 files changed, 19 insertions, 2 deletions
diff --git a/lib/kernel/src/error_handler.erl b/lib/kernel/src/error_handler.erl
index 17dd02acd4..885eeb2b0f 100644
--- a/lib/kernel/src/error_handler.erl
+++ b/lib/kernel/src/error_handler.erl
@@ -17,6 +17,11 @@
 %% %CopyrightEnd%
 %%
 -module(error_handler).
+%% FIXME: remove no_native directive after HiPE has been changed to make
+%% remote calls link to the target's Export* like BEAM does.
+%% For a detailed explanation see the commit titled
+%% "error_handler: add no_native compiler directive"
+-compile(no_native).
 
 %% A simple error handler.
 
diff --git a/lib/kernel/test/code_SUITE.erl b/lib/kernel/test/code_SUITE.erl
index 705717ff49..6f846ebc56 100644
--- a/lib/kernel/test/code_SUITE.erl
+++ b/lib/kernel/test/code_SUITE.erl
@@ -586,13 +586,21 @@ clash(Config) when is_list(Config) ->
     TmpEzFile = Priv++"foobar-0.tmp.ez",
     ?line {ok, _} = file:copy(DDir++"foobar-0.1.ez", TmpEzFile),
     ?line true = code:add_path(TmpEzFile++"/foobar-0.1/ebin"),
-    ?line ok = file:delete(TmpEzFile),
+    case os:type() of
+        {win32,_} ->
+	    %% The file wont be deleted on windows until it's closed, why we 
+	    %% need to rename instead.
+	    ?line ok = file:rename(TmpEzFile,TmpEzFile++".moved");
+	 _ ->
+    	    ?line ok = file:delete(TmpEzFile)
+    end,
     test_server:capture_start(),
     ?line ok = code:clash(),
     test_server:capture_stop(),
     ?line [BadPathMsg|_] = test_server:capture_get(),
     ?line true = lists:prefix("** Bad path can't read", BadPathMsg),
     ?line true = code:set_path(P),
+    file:delete(TmpEzFile++".moved"), %% Only effect on windows
     ok.
 
 ext_mod_dep(suite) ->
diff --git a/lib/kernel/test/gen_udp_SUITE.erl b/lib/kernel/test/gen_udp_SUITE.erl
index bbdfbd3cb0..2ff1d7210a 100644
--- a/lib/kernel/test/gen_udp_SUITE.erl
+++ b/lib/kernel/test/gen_udp_SUITE.erl
@@ -423,7 +423,11 @@ connect(Config) when is_list(Config) ->
     ?line ok = gen_udp:close(S1),
     ?line ok = gen_udp:connect(S2, Addr, P1),
     ?line ok = gen_udp:send(S2, <<16#deadbeef:32>>),
-    ?line {error,econnrefused} = gen_udp:recv(S2, 0, 5),
+    ?line ok = case gen_udp:recv(S2, 0, 5) of
+        {error,econnrefused} -> ok;
+	{error,econnreset} -> ok;
+	Other -> Other
+    end,
     ok.
 
 implicit_inet6(Config) when is_list(Config) ->