1 files changed, 19 insertions, 1 deletions
diff --git a/lib/jinterface/test/jinterface_SUITE.erl b/lib/jinterface/test/jinterface_SUITE.erl
index 73851f47e0..8c6a6368a9 100644
--- a/lib/jinterface/test/jinterface_SUITE.erl
+++ b/lib/jinterface/test/jinterface_SUITE.erl
@@ -176,11 +176,29 @@ init_per_suite(Config) when is_list(Config) ->
 	     {error,bad_name} -> false;
 	     P -> filelib:is_dir(P) end of
 	true ->
-	    jitu:init_all(Config);
+            case hostname_resolves() of
+                true ->
+                    jitu:init_all(Config);
+                Skip ->
+                    Skip
+            end;
 	false ->
 	    {skip,"No jinterface application"}
     end.
 
+%% Check if inet:gethostname() can be resolved by
+%% the native resolver. If it can, we know that
+%% jinterface name resolution works. If it cannot
+%% jinterface tests will fail.
+hostname_resolves() ->
+    {ok, HN} = inet:gethostname(),
+    case inet_gethost_native:gethostbyname(HN) of
+        {ok, _} ->
+            true;
+        _ ->
+            {skip, "Cannot resolve short hostname, add " ++ HN ++ " to /etc/hosts"}
+    end.
+
 end_per_suite(Config) when is_list(Config) ->
     jitu:finish_all(Config).