diff --git a/tobiko/tests/functional/shell/test_execute.py b/tobiko/tests/functional/shell/sh/test_execute.py
similarity index 100%
rename from tobiko/tests/functional/shell/test_execute.py
rename to tobiko/tests/functional/shell/sh/test_execute.py
diff --git a/tobiko/tests/functional/shell/test_hostname.py b/tobiko/tests/functional/shell/sh/test_hostname.py
similarity index 100%
rename from tobiko/tests/functional/shell/test_hostname.py
rename to tobiko/tests/functional/shell/sh/test_hostname.py
diff --git a/tobiko/tests/functional/shell/test_process.py b/tobiko/tests/functional/shell/sh/test_process.py
similarity index 100%
rename from tobiko/tests/functional/shell/test_process.py
rename to tobiko/tests/functional/shell/sh/test_process.py
diff --git a/tobiko/tests/functional/shell/test_ps.py b/tobiko/tests/functional/shell/sh/test_ps.py
similarity index 100%
rename from tobiko/tests/functional/shell/test_ps.py
rename to tobiko/tests/functional/shell/sh/test_ps.py
diff --git a/tobiko/tests/functional/shell/test_reboot.py b/tobiko/tests/functional/shell/sh/test_reboot.py
similarity index 100%
rename from tobiko/tests/functional/shell/test_reboot.py
rename to tobiko/tests/functional/shell/sh/test_reboot.py
diff --git a/tobiko/tests/functional/shell/test_systemctl.py b/tobiko/tests/functional/shell/sh/test_systemctl.py
similarity index 100%
rename from tobiko/tests/functional/shell/test_systemctl.py
rename to tobiko/tests/functional/shell/sh/test_systemctl.py
diff --git a/tobiko/tests/functional/shell/test_wc.py b/tobiko/tests/functional/shell/sh/test_wc.py
similarity index 100%
rename from tobiko/tests/functional/shell/test_wc.py
rename to tobiko/tests/functional/shell/sh/test_wc.py