diff --git a/tobiko/tests/shell/__init__.py b/tobiko/tests/functional/__init__.py
similarity index 100%
rename from tobiko/tests/shell/__init__.py
rename to tobiko/tests/functional/__init__.py
diff --git a/tobiko/tests/functional/shell/__init__.py b/tobiko/tests/functional/shell/__init__.py
new file mode 100644
index 000000000..e69de29bb
diff --git a/tobiko/tests/shell/test_ping.py b/tobiko/tests/functional/shell/test_ping.py
similarity index 100%
rename from tobiko/tests/shell/test_ping.py
rename to tobiko/tests/functional/shell/test_ping.py
diff --git a/tobiko/tests/shell/test_sh.py b/tobiko/tests/functional/shell/test_sh.py
similarity index 100%
rename from tobiko/tests/shell/test_sh.py
rename to tobiko/tests/functional/shell/test_sh.py