diff --git a/rebar.config b/rebar.config
index 84bb4e2e..13244450 100644
--- a/rebar.config
+++ b/rebar.config
@@ -5,7 +5,8 @@
 
 {xref_checks, [undefined_function_calls]}.
 
-{deps, [{mochiweb, ".*", {git, "git://github.com/mochi/mochiweb.git", {branch, "master"}}}]}.
+{deps, [{envy,     ".*", {git, "https://github.com/markan/envy",    {branch, "master"}}},
+        {mochiweb, ".*", {git, "https://github.com/mochi/mochiweb", {branch, "master"}}}]}.
 
 {eunit_opts, [
               no_tty,
@@ -14,9 +15,9 @@
 
 {profiles,
  [{test,
-   [{deps, [meck,
-            {ibrowse, {git, "git://github.com/chef/ibrowse.git", {branch, "ma/revert_ipv6"}}},
-            {eunit_formatters, {git, "git://github.com/seancribbs/eunit_formatters", {branch, "master"}}}
+   [{deps, [ meck,
+            {ibrowse,           {git, "https://github.com/chef/ibrowse",                {branch, "chef-server"}}},
+            {eunit_formatters,  {git, "https://github.com/seancribbs/eunit_formatters", {branch, "master"}}}
            ]},
     {erl_opts, [debug_info]}
    ]}
diff --git a/rebar.lock b/rebar.lock
index 16d0af09..251ace70 100644
--- a/rebar.lock
+++ b/rebar.lock
@@ -1,5 +1,5 @@
 {"1.1.0",
 [{<<"mochiweb">>,
-  {git,"git://github.com/mochi/mochiweb.git",
+  {git,"https://github.com/mochi/mochiweb.git",
        {ref,"070594e4d66163d662ac7e3bfb75dadcc922dd7c"}},
   0}]}.
diff --git a/rebar3 b/rebar3
index 0f0d126c..ed2a36d5 100755
Binary files a/rebar3 and b/rebar3 differ
diff --git a/test/decision_core_test.erl b/test/decision_core_test.erl
index 857d733d..3add5129 100644
--- a/test/decision_core_test.erl
+++ b/test/decision_core_test.erl
@@ -20,7 +20,7 @@
 -include("wm_reqdata.hrl").
 -include_lib("eunit/include/eunit.hrl").
 
--compile(export_all).
+-compile([export_all, nowarn_export_all]).
 
 -define(RESOURCE, atom_to_list(?MODULE)).
 -define(RESOURCE_PATH, "/" ++ ?RESOURCE).
diff --git a/test/etag_test.erl b/test/etag_test.erl
index 60b8b86c..709f6fdb 100644
--- a/test/etag_test.erl
+++ b/test/etag_test.erl
@@ -22,7 +22,7 @@
 -include_lib("eunit/include/eunit.hrl").
 -include("webmachine.hrl").
 
--compile(export_all).
+-compile(export_all, nowarn_export_all).
 
 -define(QC_OUT(P),
         eqc:on_output(fun(Str, Args) -> io:format(user, Str, Args) end, P)).
diff --git a/test/wm_integration_test.erl b/test/wm_integration_test.erl
index 9aac6413..d980bef7 100644
--- a/test/wm_integration_test.erl
+++ b/test/wm_integration_test.erl
@@ -17,7 +17,7 @@
 -include_lib("eunit/include/eunit.hrl").
 -include("webmachine.hrl").
 
--compile([export_all]).
+-compile([export_all, nowarn_export_all]).
 
 integration_test_() ->
     {foreach,