diff --git a/tests/regressiontests/makemessages/__init__.py b/tests/regressiontests/i18n/commands/__init__.py
similarity index 100%
rename from tests/regressiontests/makemessages/__init__.py
rename to tests/regressiontests/i18n/commands/__init__.py
diff --git a/tests/regressiontests/makemessages/compilation.py b/tests/regressiontests/i18n/commands/compilation.py
similarity index 100%
rename from tests/regressiontests/makemessages/compilation.py
rename to tests/regressiontests/i18n/commands/compilation.py
diff --git a/tests/regressiontests/makemessages/extraction.py b/tests/regressiontests/i18n/commands/extraction.py
similarity index 100%
rename from tests/regressiontests/makemessages/extraction.py
rename to tests/regressiontests/i18n/commands/extraction.py
diff --git a/tests/regressiontests/makemessages/ignore_dir/ignored.html b/tests/regressiontests/i18n/commands/ignore_dir/ignored.html
similarity index 100%
rename from tests/regressiontests/makemessages/ignore_dir/ignored.html
rename to tests/regressiontests/i18n/commands/ignore_dir/ignored.html
diff --git a/tests/regressiontests/makemessages/javascript.js b/tests/regressiontests/i18n/commands/javascript.js
similarity index 100%
rename from tests/regressiontests/makemessages/javascript.js
rename to tests/regressiontests/i18n/commands/javascript.js
diff --git a/tests/regressiontests/makemessages/locale/dummy b/tests/regressiontests/i18n/commands/locale/dummy
similarity index 100%
rename from tests/regressiontests/makemessages/locale/dummy
rename to tests/regressiontests/i18n/commands/locale/dummy
diff --git a/tests/regressiontests/makemessages/locale/es_AR/LC_MESSAGES/django.po b/tests/regressiontests/i18n/commands/locale/es_AR/LC_MESSAGES/django.po
similarity index 100%
rename from tests/regressiontests/makemessages/locale/es_AR/LC_MESSAGES/django.po
rename to tests/regressiontests/i18n/commands/locale/es_AR/LC_MESSAGES/django.po
diff --git a/tests/regressiontests/makemessages/templates/test.html b/tests/regressiontests/i18n/commands/templates/test.html
similarity index 100%
rename from tests/regressiontests/makemessages/templates/test.html
rename to tests/regressiontests/i18n/commands/templates/test.html
diff --git a/tests/regressiontests/makemessages/tests.py b/tests/regressiontests/i18n/commands/tests.py
similarity index 100%
rename from tests/regressiontests/makemessages/tests.py
rename to tests/regressiontests/i18n/commands/tests.py
diff --git a/tests/regressiontests/i18n/tests.py b/tests/regressiontests/i18n/tests.py
index f58c69e9b6..4aa52b6b55 100644
--- a/tests/regressiontests/i18n/tests.py
+++ b/tests/regressiontests/i18n/tests.py
@@ -18,6 +18,8 @@ from django.utils.importlib import import_module
 from forms import I18nForm, SelectDateForm, SelectDateWidget, CompanyForm
 from models import Company, TestModel
 
+from commands.tests import *
+
 
 class TranslationTests(TestCase):
 
diff --git a/tests/regressiontests/makemessages/models.py b/tests/regressiontests/makemessages/models.py
deleted file mode 100644
index e69de29bb2..0000000000