Merge remote-tracking branch 'origin/develop' into erikj/join_logging

1 files changed, 1 insertions, 1 deletions

diff --git a/tests/rest/client/test_retention.py b/tests/rest/client/test_retention.py

index e1a6e73e17..b58452195a 100644
--- a/tests/rest/client/test_retention.py
+++ b/tests/rest/client/test_retention.py
@@ -15,7 +15,7 @@ from unittest.mock import Mock
 
 from synapse.api.constants import EventTypes
 from synapse.rest import admin
-from synapse.rest.client.v1 import login, room
+from synapse.rest.client import login, room
 from synapse.visibility import filter_events_for_client
 
 from tests import unittest