diff --git a/test/ejabberd_SUITE.erl b/test/ejabberd_SUITE.erl
index a2fa16483..9ab9c247e 100644
--- a/test/ejabberd_SUITE.erl
+++ b/test/ejabberd_SUITE.erl
@@ -1,6 +1,6 @@
 %%%-------------------------------------------------------------------
 %%% @author Evgeniy Khramtsov <ekhramtsov@process-one.net>
-%%% @copyright (C) 2013, Evgeniy Khramtsov
+%%% @copyright (C) 2002-2015, ProcessOne
 %%% @doc
 %%%
 %%% @end
diff --git a/test/elixir_SUITE.erl b/test/elixir_SUITE.erl
index ec5dc5ec6..64480aef5 100644
--- a/test/elixir_SUITE.erl
+++ b/test/elixir_SUITE.erl
@@ -42,16 +42,19 @@ is_elixir_available() ->
 
 undefined_function(?MODULE, Func, Args) ->
     case lists:suffix(".exs", atom_to_list(Func)) of
-        true ->            
-            'Elixir.ExUnit':start([]),
-            'Elixir.Code':load_file(list_to_binary(filename:join(test_dir(), atom_to_list(Func)))),
-            'Elixir.ExUnit':run();
+        true ->
+            run_elixir_test(Func);
         false ->
             error_handler:undefined_function(?MODULE, Func, Args)
     end;
 undefined_function(Module, Func, Args) ->
     error_handler:undefined_function(Module, Func,Args).
 
+run_elixir_test(Func) ->
+    'Elixir.ExUnit':start([]),
+    'Elixir.Code':load_file(list_to_binary(filename:join(test_dir(), atom_to_list(Func)))),
+    #{failures := 0} = 'Elixir.ExUnit':run().
+
 test_dir() ->
     {ok, CWD} = file:get_cwd(),
     filename:join(CWD, "../../test").