diff --git a/tests/Makefile.am b/test/Makefile.am
similarity index 100%
rename from tests/Makefile.am
rename to test/Makefile.am
diff --git a/tests/ganeti.config_unittest.py b/test/ganeti.config_unittest.py
similarity index 100%
rename from tests/ganeti.config_unittest.py
rename to test/ganeti.config_unittest.py
diff --git a/tests/ganeti.hooks_unittest.py b/test/ganeti.hooks_unittest.py
similarity index 100%
rename from tests/ganeti.hooks_unittest.py
rename to test/ganeti.hooks_unittest.py
diff --git a/tests/ganeti.utils_unittest.py b/test/ganeti.utils_unittest.py
similarity index 100%
rename from tests/ganeti.utils_unittest.py
rename to test/ganeti.utils_unittest.py
diff --git a/tests/mocks.py b/test/mocks.py
similarity index 100%
rename from tests/mocks.py
rename to test/mocks.py