diff --git a/test/ejabberd_SUITE_data/ejabberd.yml b/test/ejabberd_SUITE_data/ejabberd.yml
index 58f90c802..c19e22441 100644
--- a/test/ejabberd_SUITE_data/ejabberd.yml
+++ b/test/ejabberd_SUITE_data/ejabberd.yml
@@ -340,7 +340,7 @@ listen:
     shaper: c2s_shaper
     access: c2s
   - 
-    port: 5269
+    port: @@s2s_port@@
     module: ejabberd_s2s_in
   - 
     port: @@web_port@@
diff --git a/test/suite.erl b/test/suite.erl
index 3b5d402c8..fd5e175ea 100644
--- a/test/suite.erl
+++ b/test/suite.erl
@@ -31,6 +31,7 @@ init_config(Config) ->
     {ok, CfgContentTpl} = file:read_file(ConfigPathTpl),
     CfgContent = process_config_tpl(CfgContentTpl, [
                                                     {c2s_port, 5222},
+                                                    {s2s_port, 5269},
                                                     {web_port, 5280},
                                                     {mysql_server, <<"localhost">>},
                                                     {mysql_port, 3306},