diff --git a/tests/__init__.py b/conversion_utils/tests/__init__.py
similarity index 100%
rename from tests/__init__.py
rename to conversion_utils/tests/__init__.py
diff --git a/tests/test_jos_msd_to_properties.py b/conversion_utils/tests/test_jos_msd_to_properties.py
similarity index 100%
rename from tests/test_jos_msd_to_properties.py
rename to conversion_utils/tests/test_jos_msd_to_properties.py
diff --git a/tests/test_jos_properties_to_msd.py b/conversion_utils/tests/test_jos_properties_to_msd.py
similarity index 100%
rename from tests/test_jos_properties_to_msd.py
rename to conversion_utils/tests/test_jos_properties_to_msd.py
diff --git a/tests/test_jos_translate_msd.py b/conversion_utils/tests/test_jos_translate_msd.py
similarity index 100%
rename from tests/test_jos_translate_msd.py
rename to conversion_utils/tests/test_jos_translate_msd.py
diff --git a/tests/test_jos_translate_properties.py b/conversion_utils/tests/test_jos_translate_properties.py
similarity index 100%
rename from tests/test_jos_translate_properties.py
rename to conversion_utils/tests/test_jos_translate_properties.py
diff --git a/setup.py b/setup.py
index 4b63ee0..dec83d2 100644
--- a/setup.py
+++ b/setup.py
@@ -6,7 +6,7 @@ setup(name='conversion_utils',
       url='https://gitea.cjvt.si/generic/conversion_utils',
       author='Cyprian Laskowski',
       author_email='cyp@cjvt.si',
-      packages=['conversion_utils', 'conversion_utils.resources'],
+      packages=['conversion_utils', 'conversion_utils.resources', 'conversion_utils.tests'],
       install_requires=['importlib_resources'],
       include_package_data=True,
       zip_safe=True)