Merge remote-tracking branch 'origin/develop' into shhs shhs-v1.1.1

1 files changed, 1 insertions, 1 deletions

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

index 89bd1e174c..4c0fb029fd 100644
--- a/tests/unittest.py
+++ b/tests/unittest.py
@@ -31,9 +31,9 @@ from synapse.api.constants import EventTypes
 from synapse.config.homeserver import HomeServerConfig
 from synapse.http.server import JsonResource
 from synapse.http.site import SynapseRequest
+from synapse.logging.context import LoggingContext
 from synapse.server import HomeServer
 from synapse.types import Requester, UserID, create_requester
-from synapse.util.logcontext import LoggingContext
 
 from tests.server import get_clock, make_request, render, setup_test_homeserver
 from tests.test_utils.logging_setup import setup_logging