diff --git a/paddle/fluid/distributed/auto_parallel/CMakeLists.txt b/paddle/fluid/distributed/auto_parallel/CMakeLists.txt
index 22da1d7d57305d7b0343f4532c56267f8cbcbc66..264172c29ff9c6eed61e7651e51b211d3010e8a9 100644
--- a/paddle/fluid/distributed/auto_parallel/CMakeLists.txt
+++ b/paddle/fluid/distributed/auto_parallel/CMakeLists.txt
@@ -4,36 +4,20 @@ cc_library(
   device_mesh
   SRCS device_mesh.cc
   DEPS auto_parallel_proto)
-cc_test(
-  device_mesh_test
-  SRCS device_mesh_test.cc
-  DEPS device_mesh)
 
 cc_library(
   process_mesh
   SRCS process_mesh.cc
   DEPS auto_parallel_proto)
-cc_test(
-  process_mesh_test
-  SRCS process_mesh_test.cc
-  DEPS process_mesh)
 
 cc_library(
   dist_attr
   SRCS dist_attr.cc
   DEPS process_mesh auto_parallel_proto proto_desc)
-cc_test(
-  dist_attr_test
-  SRCS dist_attr_test.cc
-  DEPS dist_attr)
 
 cc_library(
   dist_mapper
   SRCS dist_mapper.cc
   DEPS device_mesh auto_parallel_proto)
-cc_test(
-  dist_mapper_test
-  SRCS dist_mapper_test.cc
-  DEPS dist_mapper)
 
 cc_library(auto_parallel DEPS device_mesh process_mesh dist_attr dist_mapper)
diff --git a/paddle/fluid/distributed/auto_parallel/test/CMakeLists.txt b/paddle/fluid/distributed/auto_parallel/test/CMakeLists.txt
new file mode 100644
index 0000000000000000000000000000000000000000..625beac1618cae781dcd427d68219a6c7bf98984
--- /dev/null
+++ b/paddle/fluid/distributed/auto_parallel/test/CMakeLists.txt
@@ -0,0 +1,19 @@
+cc_test(
+  device_mesh_test
+  SRCS device_mesh_test.cc
+  DEPS device_mesh)
+
+cc_test(
+  process_mesh_test
+  SRCS process_mesh_test.cc
+  DEPS process_mesh)
+
+cc_test(
+  dist_attr_test
+  SRCS dist_attr_test.cc
+  DEPS dist_attr)
+
+cc_test(
+  dist_mapper_test
+  SRCS dist_mapper_test.cc
+  DEPS dist_mapper)
diff --git a/paddle/fluid/distributed/auto_parallel/device_mesh_test.cc b/paddle/fluid/distributed/auto_parallel/test/device_mesh_test.cc
similarity index 100%
rename from paddle/fluid/distributed/auto_parallel/device_mesh_test.cc
rename to paddle/fluid/distributed/auto_parallel/test/device_mesh_test.cc
diff --git a/paddle/fluid/distributed/auto_parallel/dist_attr_test.cc b/paddle/fluid/distributed/auto_parallel/test/dist_attr_test.cc
similarity index 100%
rename from paddle/fluid/distributed/auto_parallel/dist_attr_test.cc
rename to paddle/fluid/distributed/auto_parallel/test/dist_attr_test.cc
diff --git a/paddle/fluid/distributed/auto_parallel/dist_mapper_test.cc b/paddle/fluid/distributed/auto_parallel/test/dist_mapper_test.cc
similarity index 100%
rename from paddle/fluid/distributed/auto_parallel/dist_mapper_test.cc
rename to paddle/fluid/distributed/auto_parallel/test/dist_mapper_test.cc
diff --git a/paddle/fluid/distributed/auto_parallel/process_mesh_test.cc b/paddle/fluid/distributed/auto_parallel/test/process_mesh_test.cc
similarity index 100%
rename from paddle/fluid/distributed/auto_parallel/process_mesh_test.cc
rename to paddle/fluid/distributed/auto_parallel/test/process_mesh_test.cc