diff --git a/tests/core/tests/__init__.py b/tests/core/tests/__init__.py
index d81392674..9707fac47 100644
--- a/tests/core/tests/__init__.py
+++ b/tests/core/tests/__init__.py
@@ -1,6 +1 @@
-from fields_tests import *
-from widgets_tests import *
-from resources_tests import *
-from instance_loaders_tests import *
-from admin_integration_tests import *
-from base_formats_tests import *
+from .test import *
diff --git a/tests/core/tests/test.py b/tests/core/tests/test.py
new file mode 100644
index 000000000..d81392674
--- /dev/null
+++ b/tests/core/tests/test.py
@@ -0,0 +1,6 @@
+from fields_tests import *
+from widgets_tests import *
+from resources_tests import *
+from instance_loaders_tests import *
+from admin_integration_tests import *
+from base_formats_tests import *
diff --git a/tests/settings.py b/tests/settings.py
index 15caf2230..8759fdb07 100644
--- a/tests/settings.py
+++ b/tests/settings.py
@@ -27,7 +27,7 @@
     DATABASES = {
         'default': {
             'ENGINE': 'django.db.backends.mysql',
-            'NAME': 'import_export_test',
+            'TEST_NAME': 'import_export_test',
             'USER': os.environ.get('IMPORT_EXPORT_MYSQL_USER', 'root'),
             'OPTIONS': {
                'init_command': 'SET storage_engine=INNODB',