diff --git a/test/ejabberd_SUITE.erl b/test/ejabberd_SUITE.erl
index 9d3224bba..e8e475554 100644
--- a/test/ejabberd_SUITE.erl
+++ b/test/ejabberd_SUITE.erl
@@ -55,7 +55,8 @@ init_per_suite(Config) ->
     {ok, _} = file:copy(ExtAuthScript, filename:join([CWD, "extauth.py"])),
     {ok, _} = ldap_srv:start(LDIFFile),
     inet_db:add_host({127,0,0,1}, [binary_to_list(?S2S_VHOST),
-				   binary_to_list(?MNESIA_VHOST)]),
+				   binary_to_list(?MNESIA_VHOST),
+				   binary_to_list(?UPLOAD_VHOST)]),
     inet_db:set_domain(binary_to_list(randoms:get_string())),
     inet_db:set_lookup([file, native]),
     start_ejabberd(NewConfig),
diff --git a/test/suite.hrl b/test/suite.hrl
index 00239f8cf..a92611145 100644
--- a/test/suite.hrl
+++ b/test/suite.hrl
@@ -84,6 +84,7 @@
 -define(EXTAUTH_VHOST, <<"extauth.localhost">>).
 -define(RIAK_VHOST, <<"riak.localhost">>).
 -define(S2S_VHOST, <<"s2s.localhost">>).
+-define(UPLOAD_VHOST, <<"upload.localhost">>).
 
 insert(Val, N, Tuple) ->
     L = tuple_to_list(Tuple),