diff --git a/tests/test_zinolib_config_tcl.py b/tests/config/test_tcl.py
similarity index 97%
rename from tests/test_zinolib_config_tcl.py
rename to tests/config/test_tcl.py
index c4174d2..d18363e 100644
--- a/tests/test_zinolib_config_tcl.py
+++ b/tests/config/test_tcl.py
@@ -4,7 +4,7 @@
 
 from zinolib.config.tcl import parse_tcl_config, normalize, parse
 
-from .utils import clean_textfile, make_tmptextfile, delete_tmpfile
+from ..utils import clean_textfile, make_tmptextfile, delete_tmpfile
 
 
 RITZ_CONFIG = """
diff --git a/tests/test_zinolib_config_toml.py b/tests/config/test_toml.py
similarity index 96%
rename from tests/test_zinolib_config_toml.py
rename to tests/config/test_toml.py
index 08dbaa9..7eb18eb 100644
--- a/tests/test_zinolib_config_toml.py
+++ b/tests/config/test_toml.py
@@ -4,7 +4,7 @@
 
 from zinolib.config.toml import parse_toml_config
 
-from .utils import make_tmptextfile, delete_tmpfile
+from ..utils import make_tmptextfile, delete_tmpfile
 
 
 CONFIG = """
diff --git a/tests/test_zinolib_config_utils.py b/tests/config/test_utils.py
similarity index 95%
rename from tests/test_zinolib_config_utils.py
rename to tests/config/test_utils.py
index 826e75c..70304ee 100644
--- a/tests/test_zinolib_config_utils.py
+++ b/tests/config/test_utils.py
@@ -5,7 +5,7 @@
 
 from zinolib.config.utils import find_config_file, make_filename_safe
 
-from .utils import make_tmptextfile, delete_tmpfile
+from ..utils import make_tmptextfile, delete_tmpfile
 
 
 class MakeFilenameSafeTest(TestCase):
diff --git a/tests/test_zinolib_config_zino1.py b/tests/config/test_zino1.py
similarity index 100%
rename from tests/test_zinolib_config_zino1.py
rename to tests/config/test_zino1.py
diff --git a/tests/ritz/__init__.py b/tests/ritz/__init__.py
new file mode 100644
index 0000000..e69de29
diff --git a/tests/test_default.py b/tests/ritz/test_default.py
similarity index 99%
rename from tests/test_default.py
rename to tests/ritz/test_default.py
index 3f1f8fe..8ccfcfa 100644
--- a/tests/test_default.py
+++ b/tests/ritz/test_default.py
@@ -8,7 +8,7 @@
 from zinolib.ritz import ritz, ProtocolError, AuthenticationError, caseState, caseType
 from zinolib.zino_emu import zinoemu
 
-from .utils import executor
+from ..utils import executor
 
 
 class DefaultTest(unittest.TestCase):
diff --git a/tests/test_slow.py b/tests/ritz/test_slow.py
similarity index 97%
rename from tests/test_slow.py
rename to tests/ritz/test_slow.py
index 3d6d5fc..8f68344 100644
--- a/tests/test_slow.py
+++ b/tests/ritz/test_slow.py
@@ -8,7 +8,7 @@
 from zinolib.ritz import ritz, ProtocolError, AuthenticationError, caseState, caseType
 from zinolib.zino_emu import zinoemu
 
-from .utils import executor
+from ..utils import executor
 
 
 class SlowTest(unittest.TestCase):