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