diff --git a/tests/control/__init__.py b/tests/control/__init__.py
deleted file mode 100644
index e69de29b..00000000
diff --git a/tests/control/dummy-cs-pyaml/dummy-cs-pyaml/__init__.py b/tests/control/dummy-cs-pyaml/dummy-cs-pyaml/__init__.py
deleted file mode 100644
index d271102a..00000000
--- a/tests/control/dummy-cs-pyaml/dummy-cs-pyaml/__init__.py
+++ /dev/null
@@ -1,11 +0,0 @@
-"""
-PyAML Dummy control system for tests.
-"""
-
-__title__ = "pyAML Dummy Control System"
-__description__ = "PyAML Dummy Control System"
-__url__ = "https://github.com/python-accelerator-middle-layer/pyaml"
-__version__ = "0.0.0"
-__author__ = "pyAML collaboration"
-__author_email__ = ""
-__all__ = [__version__]
diff --git a/tests/control/dummy-cs-pyaml/dummy-cs-pyaml/dummy_controlsystem.py b/tests/control/dummy-cs-pyaml/dummy-cs-pyaml/dummy_controlsystem.py
deleted file mode 100644
index 812a22de..00000000
--- a/tests/control/dummy-cs-pyaml/dummy-cs-pyaml/dummy_controlsystem.py
+++ /dev/null
@@ -1,37 +0,0 @@
-from pydantic import BaseModel
-from pyaml.control.controlsystem import ControlSystem
-
-PYAMLCLASS = "DummyControlSystem"
-
-class ConfigModel(BaseModel):
-    """
-    Configuration model for a Tango Control System.
-
-    Attributes
-    ----------
-    name : str
-        Name of the control system.
-    """
-    name: str
-
-class DummyControlSystem(ControlSystem):
-
-    def __init__(self, cfg: ConfigModel):
-        super().__init__()
-        self._cfg = cfg
-
-
-    def init_cs(self):
-        pass
-
-
-    def name(self) -> str:
-        """
-        Return the name of the control system.
-
-        Returns
-        -------
-        str
-            Name of the control system.
-        """
-        return self._cfg.name
diff --git a/tests/dummy_cs/tango-pyaml/pyproject.toml b/tests/dummy_cs/tango-pyaml/pyproject.toml
index 48706153..d914c9b9 100644
--- a/tests/dummy_cs/tango-pyaml/pyproject.toml
+++ b/tests/dummy_cs/tango-pyaml/pyproject.toml
@@ -1,3 +1,14 @@
+[build-system]
+requires = ["hatchling"]
+build-backend = "hatchling.build"
+
+[tool.hatch.version]
+path = "tango/pyaml/__init__.py"
+
+# Install tango-pyaml as a sub module of tango (to avoid __init__.py conflicts)
+[tool.hatch.build.targets.wheel]
+packages = ["tango"]
+
 [project]
 name = "tango-pyaml"
 description = "PyAML Tango CS mocking"
diff --git a/tests/dummy_cs/tango-pyaml/tango/__init__.py b/tests/dummy_cs/tango-pyaml/tango/__init__.py
deleted file mode 100644
index 6988dd08..00000000
--- a/tests/dummy_cs/tango-pyaml/tango/__init__.py
+++ /dev/null
@@ -1,11 +0,0 @@
-"""
-PyAML CS mocking module
-"""
-
-__title__ = "pyAML CS"
-__description__ = "PyAML CS mocking module"
-__url__ = "https://github.com/python-accelerator-middle-layer/pyaml"
-__version__ = "0.0.0"
-__author__ = "pyAML collaboration"
-__author_email__ = ""
-__all__ = [__version__]
diff --git a/tests/dummy_cs/tango-pyaml/tango/pyaml/__init__.py b/tests/dummy_cs/tango-pyaml/tango/pyaml/__init__.py
index e69de29b..f102a9ca 100644
--- a/tests/dummy_cs/tango-pyaml/tango/pyaml/__init__.py
+++ b/tests/dummy_cs/tango-pyaml/tango/pyaml/__init__.py
@@ -0,0 +1 @@
+__version__ = "0.0.1"