diff --git a/tests/test_communicator.py b/tests/chainermn_tests/communicator_tests/test_communicator.py similarity index 100% rename from tests/test_communicator.py rename to tests/chainermn_tests/communicator_tests/test_communicator.py diff --git a/tests/test_node_aware_communicator_base.py b/tests/chainermn_tests/communicator_tests/test_node_aware_communicator_base.py similarity index 100% rename from tests/test_node_aware_communicator_base.py rename to tests/chainermn_tests/communicator_tests/test_node_aware_communicator_base.py diff --git a/tests/test_dataset.py b/tests/chainermn_tests/datasets_tests/test_dataset.py similarity index 100% rename from tests/test_dataset.py rename to tests/chainermn_tests/datasets_tests/test_dataset.py diff --git a/tests/datasets_tests/test_empty_dataset.py b/tests/chainermn_tests/datasets_tests/test_empty_dataset.py similarity index 100% rename from tests/datasets_tests/test_empty_dataset.py rename to tests/chainermn_tests/datasets_tests/test_empty_dataset.py diff --git a/tests/test_mnist.py b/tests/chainermn_tests/datasets_tests/test_mnist.py similarity index 100% rename from tests/test_mnist.py rename to tests/chainermn_tests/datasets_tests/test_mnist.py diff --git a/tests/test_checkpoint.py b/tests/chainermn_tests/extensions_tests/test_checkpoint.py similarity index 100% rename from tests/test_checkpoint.py rename to tests/chainermn_tests/extensions_tests/test_checkpoint.py diff --git a/tests/functions_tests/test_collective_communication.py b/tests/chainermn_tests/functions_tests/test_collective_communication.py similarity index 100% rename from tests/functions_tests/test_collective_communication.py rename to tests/chainermn_tests/functions_tests/test_collective_communication.py diff --git a/tests/functions_tests/test_point_to_point_communication.py b/tests/chainermn_tests/functions_tests/test_point_to_point_communication.py similarity index 100% rename from tests/functions_tests/test_point_to_point_communication.py rename to tests/chainermn_tests/functions_tests/test_point_to_point_communication.py diff --git a/tests/functions_tests/test_pseudo_connect.py b/tests/chainermn_tests/functions_tests/test_pseudo_connect.py similarity index 100% rename from tests/functions_tests/test_pseudo_connect.py rename to tests/chainermn_tests/functions_tests/test_pseudo_connect.py diff --git a/tests/links_tests/test_batch_normalization.py b/tests/chainermn_tests/links_tests/test_batch_normalization.py similarity index 100% rename from tests/links_tests/test_batch_normalization.py rename to tests/chainermn_tests/links_tests/test_batch_normalization.py diff --git a/tests/test_link.py b/tests/chainermn_tests/links_tests/test_multi_node_chain_list.py similarity index 100% rename from tests/test_link.py rename to tests/chainermn_tests/links_tests/test_multi_node_chain_list.py diff --git a/tests/optimizer_tests/test_multi_node_optimizer.py b/tests/chainermn_tests/optimizer_tests/test_multi_node_optimizer.py similarity index 100% rename from tests/optimizer_tests/test_multi_node_optimizer.py rename to tests/chainermn_tests/optimizer_tests/test_multi_node_optimizer.py