diff --git a/test/mpi/CMakeLists.txt b/test/mpi/CMakeLists.txt
index 9066de66970..3d5e3cadd58 100644
--- a/test/mpi/CMakeLists.txt
+++ b/test/mpi/CMakeLists.txt
@@ -1 +1,5 @@
-add_subdirectory(distributed)
+ginkgo_create_common_and_reference_test(matrix MPI_SIZE 3 DISABLE_EXECUTORS dpcpp)
+ginkgo_create_common_and_reference_test(vector MPI_SIZE 3)
+
+add_subdirectory(preconditioner)
+add_subdirectory(solver)
diff --git a/test/mpi/distributed/CMakeLists.txt b/test/mpi/distributed/CMakeLists.txt
deleted file mode 100644
index 3d5e3cadd58..00000000000
--- a/test/mpi/distributed/CMakeLists.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-ginkgo_create_common_and_reference_test(matrix MPI_SIZE 3 DISABLE_EXECUTORS dpcpp)
-ginkgo_create_common_and_reference_test(vector MPI_SIZE 3)
-
-add_subdirectory(preconditioner)
-add_subdirectory(solver)
diff --git a/test/mpi/distributed/matrix.cpp b/test/mpi/matrix.cpp
similarity index 100%
rename from test/mpi/distributed/matrix.cpp
rename to test/mpi/matrix.cpp
diff --git a/test/mpi/distributed/preconditioner/CMakeLists.txt b/test/mpi/preconditioner/CMakeLists.txt
similarity index 100%
rename from test/mpi/distributed/preconditioner/CMakeLists.txt
rename to test/mpi/preconditioner/CMakeLists.txt
diff --git a/test/mpi/distributed/preconditioner/schwarz.cpp b/test/mpi/preconditioner/schwarz.cpp
similarity index 100%
rename from test/mpi/distributed/preconditioner/schwarz.cpp
rename to test/mpi/preconditioner/schwarz.cpp
diff --git a/test/mpi/distributed/solver/CMakeLists.txt b/test/mpi/solver/CMakeLists.txt
similarity index 100%
rename from test/mpi/distributed/solver/CMakeLists.txt
rename to test/mpi/solver/CMakeLists.txt
diff --git a/test/mpi/distributed/solver/solver.cpp b/test/mpi/solver/solver.cpp
similarity index 100%
rename from test/mpi/distributed/solver/solver.cpp
rename to test/mpi/solver/solver.cpp
diff --git a/test/mpi/distributed/vector.cpp b/test/mpi/vector.cpp
similarity index 100%
rename from test/mpi/distributed/vector.cpp
rename to test/mpi/vector.cpp