diff --git a/.unittests b/.unittests
index 8bba09a..5c20a19 100755
--- a/.unittests
+++ b/.unittests
@@ -1,4 +1,4 @@
 #!/bin/bash
 
-nosetests test_swauth/unit --exe --with-coverage --cover-package slogging --cover-erase
+nosetests test_slogging/unit --exe --with-coverage --cover-package slogging --cover-erase
 rm -f .coverage
diff --git a/test_slogging/__init__.py b/test_slogging/unit/__init__.py
similarity index 100%
rename from test_slogging/__init__.py
rename to test_slogging/unit/__init__.py
diff --git a/test_slogging/test_access_processor.py b/test_slogging/unit/test_access_processor.py
similarity index 100%
rename from test_slogging/test_access_processor.py
rename to test_slogging/unit/test_access_processor.py
diff --git a/test_slogging/test_compressing_file_reader.py b/test_slogging/unit/test_compressing_file_reader.py
similarity index 100%
rename from test_slogging/test_compressing_file_reader.py
rename to test_slogging/unit/test_compressing_file_reader.py
diff --git a/test_slogging/test_db_stats_collector.py b/test_slogging/unit/test_db_stats_collector.py
similarity index 100%
rename from test_slogging/test_db_stats_collector.py
rename to test_slogging/unit/test_db_stats_collector.py
diff --git a/test_slogging/test_internal_proxy.py b/test_slogging/unit/test_internal_proxy.py
similarity index 100%
rename from test_slogging/test_internal_proxy.py
rename to test_slogging/unit/test_internal_proxy.py
diff --git a/test_slogging/test_log_processor.py b/test_slogging/unit/test_log_processor.py
similarity index 100%
rename from test_slogging/test_log_processor.py
rename to test_slogging/unit/test_log_processor.py
diff --git a/test_slogging/test_log_uploader.py b/test_slogging/unit/test_log_uploader.py
similarity index 100%
rename from test_slogging/test_log_uploader.py
rename to test_slogging/unit/test_log_uploader.py
diff --git a/test_slogging/test_stats_processor.py b/test_slogging/unit/test_stats_processor.py
similarity index 100%
rename from test_slogging/test_stats_processor.py
rename to test_slogging/unit/test_stats_processor.py