Merge branch 'develop' of github.com:matrix-org/synapse into registration-api-changes

1 files changed, 1 insertions, 1 deletions

diff --git a/tests/federation/test_pdu_codec.py b/tests/federation/test_pdu_codec.py

index 9f74ba119f..344e1baf60 100644
--- a/tests/federation/test_pdu_codec.py
+++ b/tests/federation/test_pdu_codec.py
@@ -13,7 +13,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from twisted.trial import unittest
+from tests import unittest
 
 from synapse.federation.pdu_codec import (
     PduCodec, encode_event_id, decode_event_id