--- a/Makefile
+++ b/Makefile
@@ -223,12 +223,13 @@
 
 test_stdlib: compile
 	@ echo "==> elixir (exunit)"
-	$(Q) exec epmd & exit
+	$(Q) epmd -daemon
 	$(Q) if [ "$(OS)" = "Windows_NT" ]; then \
 		cd lib/elixir && cmd //C call ../../bin/elixir.bat -r "test/elixir/test_helper.exs" -pr "test/elixir/**/*_test.exs"; \
 	else \
 		cd lib/elixir && ../../bin/elixir -r "test/elixir/test_helper.exs" -pr "test/elixir/**/*_test.exs"; \
 	fi
+	$(Q) epmd -kill
 
 #==> Dialyzer tasks