Merge branch 'develop' of github.com:matrix-org/synapse into erikj/alias_disallow_list

1 files changed, 1 insertions, 0 deletions

diff --git a/tests/utils.py b/tests/utils.py

index dd347a0c59..565bb60d08 100644
--- a/tests/utils.py
+++ b/tests/utils.py
@@ -124,6 +124,7 @@ def default_config(name):
     config.user_consent_server_notice_content = None
     config.block_events_without_consent_error = None
     config.media_storage_providers = []
+    config.autocreate_auto_join_rooms = True
     config.auto_join_rooms = []
     config.limit_usage_by_mau = False
     config.hs_disabled = False