Merge branch 'master' into schema-alteration

1 files changed, 2 insertions, 2 deletions

diff --git a/tests/utils_tests/test_module_loading.py b/tests/utils_tests/test_module_loading.py
index 0a905ef2f1..5a43a927bf 100644
--- a/tests/utils_tests/test_module_loading.py
+++ b/tests/utils_tests/test_module_loading.py
@@ -1,10 +1,10 @@
+import imp
 import os
 import sys
-import imp
+import unittest
 from zipimport import zipimporter
 
 from django.core.exceptions import ImproperlyConfigured
-from django.utils import unittest
 from django.utils.importlib import import_module
 from django.utils.module_loading import import_by_path, module_has_submodule
 from django.utils._os import upath