diff --git a/console_conf/controllers/tests/__init__.py b/console_conf/controllers/tests/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/console_conf/controllers/test_chooser.py b/console_conf/controllers/tests/test_chooser.py
similarity index 100%
rename from console_conf/controllers/test_chooser.py
rename to console_conf/controllers/tests/test_chooser.py
diff --git a/console_conf/models/tests/__init__.py b/console_conf/models/tests/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/console_conf/models/test_systems.py b/console_conf/models/tests/test_systems.py
similarity index 100%
rename from console_conf/models/test_systems.py
rename to console_conf/models/tests/test_systems.py