Merge remote-tracking branch 'origin/develop' into test-sqlite-memory

1 files changed, 1 insertions, 1 deletions

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

index 04933f0ecf..39c5b8dff2 100644
--- a/tests/test_distributor.py
+++ b/tests/test_distributor.py
@@ -13,8 +13,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+from tests import unittest
 from twisted.internet import defer
-from twisted.trial import unittest
 
 from mock import Mock, patch