diff --git a/Makefile b/Makefile
index 4021c5b..53dfb6b 100644
--- a/Makefile
+++ b/Makefile
@@ -13,8 +13,10 @@ install: all
 test: all
 	./rebar eunit
 	(cd test; make) 
-	erl -noshell -pa ebin -pa test -s ibrowse -s ibrowse_test unit_tests \
+	erl -noshell -pa .eunit -pa test -s ibrowse -s ibrowse_test unit_tests \
 	-s ibrowse_test verify_chunked_streaming \
 	-s ibrowse_test test_chunked_streaming_once \
 	-s erlang halt
 
+xref: all
+	./rebar xref
diff --git a/rebar.config b/rebar.config
index a23b6e1..9cbcba9 100644
--- a/rebar.config
+++ b/rebar.config
@@ -1,2 +1,3 @@
 {erl_opts, [debug_info, warn_unused_vars, nowarn_shadow_vars, warn_unused_import]}.
-{eunit_opts, [verbose]}.
\ No newline at end of file
+{xref_checks, [undefined_function_calls, deprecated_function_calls]}.
+{eunit_opts, [verbose]}.
diff --git a/src/ibrowse_test.erl b/test/ibrowse_test.erl
similarity index 100%
rename from src/ibrowse_test.erl
rename to test/ibrowse_test.erl