diff --git a/tests/executors/__init__.py b/tests/executors/__init__.py
new file mode 100644
index 000000000..e69de29bb
diff --git a/tests/test_executor.py b/tests/executors/test_executor.py
similarity index 100%
rename from tests/test_executor.py
rename to tests/executors/test_executor.py
diff --git a/tests/rpc/__init__.py b/tests/rpc/__init__.py
new file mode 100644
index 000000000..e69de29bb
diff --git a/tests/test_rpc_client.py b/tests/rpc/test_client.py
similarity index 100%
rename from tests/test_rpc_client.py
rename to tests/rpc/test_client.py
diff --git a/tests/test_rpc_dispatcher.py b/tests/rpc/test_dispatcher.py
similarity index 100%
rename from tests/test_rpc_dispatcher.py
rename to tests/rpc/test_dispatcher.py
diff --git a/tests/test_rpc_server.py b/tests/rpc/test_server.py
similarity index 100%
rename from tests/test_rpc_server.py
rename to tests/rpc/test_server.py