diff --git a/test/ejabberd_SUITE_data/ejabberd.yml b/test/ejabberd_SUITE_data/ejabberd.yml
index 29243d683..9d663a116 100644
--- a/test/ejabberd_SUITE_data/ejabberd.yml
+++ b/test/ejabberd_SUITE_data/ejabberd.yml
@@ -456,6 +456,7 @@ route_subdomains: s2s
 domain_certfile: CERTFILE
 s2s_use_starttls: false
 s2s_cafile: CAFILE
+outgoing_s2s_port: @@s2s_port@@
 shaper: 
   fast: 50000
   normal: 10000
diff --git a/test/suite.erl b/test/suite.erl
index a288a5f66..e2390c599 100644
--- a/test/suite.erl
+++ b/test/suite.erl
@@ -142,7 +142,9 @@ process_config_tpl(Content, [{Name, DefaultValue} | Rest]) ->
               V3 ->
                   V3
           end,
-    NewContent = binary:replace(Content, <<"@@",(atom_to_binary(Name, latin1))/binary, "@@">>, Val),
+    NewContent = binary:replace(Content,
+				<<"@@",(atom_to_binary(Name,latin1))/binary, "@@">>,
+				Val, [global]),
     process_config_tpl(NewContent, Rest).
 
 stream_header(Config) ->