diff --git a/paddle/fluid/operators/pscore/CMakeLists.txt b/paddle/fluid/operators/pscore/CMakeLists.txt
index 89b33d9a144c082d699cdfd4a9e424fa0b425bac..d2aa95c2fd37976f8c6cf6c411c109ff060e2b11 100755
--- a/paddle/fluid/operators/pscore/CMakeLists.txt
+++ b/paddle/fluid/operators/pscore/CMakeLists.txt
@@ -73,88 +73,3 @@ register_operators(DEPS ${DISTRIBUTE_DEPS})
 set(OPERATOR_DEPS
     ${OPERATOR_DEPS} ${DISTRIBUTE_DEPS}
     PARENT_SCOPE)
-
-set_source_files_properties(
-  heter_server_test.cc PROPERTIES COMPILE_FLAGS ${DISTRIBUTE_COMPILE_FLAGS})
-cc_test_old(
-  heter_server_test
-  SRCS
-  heter_server_test.cc
-  DEPS
-  ${RPC_DEPS}
-  ${DISTRIBUTE_DEPS}
-  executor
-  scope
-  proto_desc
-  generated_op
-  eigen_function)
-
-set_source_files_properties(
-  send_and_recv_op_cpu_test.cc PROPERTIES COMPILE_FLAGS
-                                          ${DISTRIBUTE_COMPILE_FLAGS})
-cc_test_old(
-  send_and_recv_cpu_test
-  SRCS
-  send_and_recv_op_cpu_test.cc
-  DEPS
-  executor
-  scope
-  proto_desc
-  generated_op
-  send_and_recv_op
-  ${RPC_DEPS}
-  ${DISTRIBUTE_DEPS}
-  eigen_function)
-
-set_source_files_properties(
-  send_and_recv_op_gpu_test.cc PROPERTIES COMPILE_FLAGS
-                                          ${DISTRIBUTE_COMPILE_FLAGS})
-cc_test_old(
-  send_and_recv_gpu_test
-  SRCS
-  send_and_recv_op_gpu_test.cc
-  DEPS
-  executor
-  scope
-  proto_desc
-  generated_op
-  send_and_recv_op
-  ${RPC_DEPS}
-  ${DISTRIBUTE_DEPS}
-  eigen_function)
-
-set_source_files_properties(
-  heter_listen_and_server_test.cc PROPERTIES COMPILE_FLAGS
-                                             ${DISTRIBUTE_COMPILE_FLAGS})
-cc_test_old(
-  heter_listen_and_server_test
-  SRCS
-  heter_listen_and_server_test.cc
-  DEPS
-  executor
-  scope
-  proto_desc
-  generated_op
-  heter_listen_and_serv_op
-  ${RPC_DEPS}
-  ${DISTRIBUTE_DEPS}
-  eigen_function)
-
-#set_source_files_properties(heter_cloud_comm_cpu_test.cc PROPERTIES COMPILE_FLAGS ${DISTRIBUTE_COMPILE_FLAGS})
-#cc_test(heter_cloud_comm_cpu_test SRCS heter_cloud_comm_cpu_test.cc DEPS executor scope proto_desc generated_static_op heter_listen_and_serv_op ${RPC_DEPS} ${DISTRIBUTE_DEPS} eigen_function)
-
-set_source_files_properties(
-  switch_server_test.cc PROPERTIES COMPILE_FLAGS ${DISTRIBUTE_COMPILE_FLAGS})
-cc_binary(
-  switch_server_test
-  SRCS
-  switch_server_test.cc
-  DEPS
-  executor
-  scope
-  proto_desc
-  generated_op
-  heter_listen_and_serv_op
-  ${RPC_DEPS}
-  ${DISTRIBUTE_DEPS}
-  eigen_function)
diff --git a/test/cpp/fluid/CMakeLists.txt b/test/cpp/fluid/CMakeLists.txt
index c1bf46dce291e87a0a787ee5a2d968df1c384eed..ad9160b9750627970ec42a9430883eee483eb454 100644
--- a/test/cpp/fluid/CMakeLists.txt
+++ b/test/cpp/fluid/CMakeLists.txt
@@ -15,9 +15,9 @@ add_subdirectory(math)
 #   add_subdirectory(mkldnn)
 # endif()
 add_subdirectory(nccl)
-# if(WITH_PSCORE)
-#   add_subdirectory(pscore)
-# endif()
+if(WITH_PSCORE)
+  add_subdirectory(pscore)
+endif()
 add_subdirectory(prim_ops)
 add_subdirectory(reader)
 add_subdirectory(reduce_ops)
diff --git a/test/cpp/fluid/pscore/CMakeLists.txt b/test/cpp/fluid/pscore/CMakeLists.txt
new file mode 100644
index 0000000000000000000000000000000000000000..c195c6c7975355fc74616abcbbfeade1dd98c3c5
--- /dev/null
+++ b/test/cpp/fluid/pscore/CMakeLists.txt
@@ -0,0 +1,141 @@
+if(WITH_PSLIB)
+  return()
+endif()
+
+set(DISTRIBUTE_DEPS "")
+
+if(WITH_ARM_BRPC)
+  list(
+    APPEND
+    DISTRIBUTE_DEPS
+    executor
+    fleet
+    ps_service
+    brpc_utils
+    heter_server
+    heter_client
+    ps_framework_proto
+    framework_proto
+    sendrecv_rpc
+    arm_brpc
+    gflags
+    glog
+    snappy
+    device_context)
+else()
+  list(
+    APPEND
+    DISTRIBUTE_DEPS
+    executor
+    fleet
+    ps_service
+    brpc_utils
+    heter_server
+    heter_client
+    ps_framework_proto
+    framework_proto
+    sendrecv_rpc
+    brpc
+    leveldb
+    ssl
+    crypto
+    protobuf
+    gflags
+    glog
+    zlib
+    snappy
+    device_context)
+endif()
+
+set(DISTRIBUTE_COMPILE_FLAGS
+    "-Wno-non-virtual-dtor -Wno-error=non-virtual-dtor -Wno-error=delete-non-virtual-dtor -Wno-error=parentheses"
+)
+
+if(CMAKE_CXX_COMPILER_VERSION VERSION_GREATER 7.0)
+  set(DISTRIBUTE_COMPILE_FLAGS "${DISTRIBUTE_COMPILE_FLAGS} -faligned-new")
+endif()
+
+set_source_files_properties(
+  heter_server_test.cc PROPERTIES COMPILE_FLAGS ${DISTRIBUTE_COMPILE_FLAGS})
+cc_test_old(
+  heter_server_test
+  SRCS
+  heter_server_test.cc
+  DEPS
+  ${RPC_DEPS}
+  ${DISTRIBUTE_DEPS}
+  executor
+  scope
+  proto_desc
+  generated_op
+  eigen_function)
+
+set_source_files_properties(
+  send_and_recv_op_cpu_test.cc PROPERTIES COMPILE_FLAGS
+                                          ${DISTRIBUTE_COMPILE_FLAGS})
+cc_test_old(
+  send_and_recv_cpu_test
+  SRCS
+  send_and_recv_op_cpu_test.cc
+  DEPS
+  executor
+  scope
+  proto_desc
+  generated_op
+  send_and_recv_op
+  ${RPC_DEPS}
+  ${DISTRIBUTE_DEPS}
+  eigen_function)
+
+set_source_files_properties(
+  send_and_recv_op_gpu_test.cc PROPERTIES COMPILE_FLAGS
+                                          ${DISTRIBUTE_COMPILE_FLAGS})
+cc_test_old(
+  send_and_recv_gpu_test
+  SRCS
+  send_and_recv_op_gpu_test.cc
+  DEPS
+  executor
+  scope
+  proto_desc
+  generated_op
+  send_and_recv_op
+  ${RPC_DEPS}
+  ${DISTRIBUTE_DEPS}
+  eigen_function)
+
+set_source_files_properties(
+  heter_listen_and_server_test.cc PROPERTIES COMPILE_FLAGS
+                                             ${DISTRIBUTE_COMPILE_FLAGS})
+cc_test_old(
+  heter_listen_and_server_test
+  SRCS
+  heter_listen_and_server_test.cc
+  DEPS
+  executor
+  scope
+  proto_desc
+  generated_op
+  heter_listen_and_serv_op
+  ${RPC_DEPS}
+  ${DISTRIBUTE_DEPS}
+  eigen_function)
+
+#set_source_files_properties(heter_cloud_comm_cpu_test.cc PROPERTIES COMPILE_FLAGS ${DISTRIBUTE_COMPILE_FLAGS})
+#cc_test(heter_cloud_comm_cpu_test SRCS heter_cloud_comm_cpu_test.cc DEPS executor scope proto_desc generated_static_op heter_listen_and_serv_op ${RPC_DEPS} ${DISTRIBUTE_DEPS} eigen_function)
+
+set_source_files_properties(
+  switch_server_test.cc PROPERTIES COMPILE_FLAGS ${DISTRIBUTE_COMPILE_FLAGS})
+cc_binary(
+  switch_server_test
+  SRCS
+  switch_server_test.cc
+  DEPS
+  executor
+  scope
+  proto_desc
+  generated_op
+  heter_listen_and_serv_op
+  ${RPC_DEPS}
+  ${DISTRIBUTE_DEPS}
+  eigen_function)
diff --git a/paddle/fluid/operators/pscore/heter_cloud_comm_cpu_test.cc b/test/cpp/fluid/pscore/heter_cloud_comm_cpu_test.cc
similarity index 100%
rename from paddle/fluid/operators/pscore/heter_cloud_comm_cpu_test.cc
rename to test/cpp/fluid/pscore/heter_cloud_comm_cpu_test.cc
diff --git a/paddle/fluid/operators/pscore/heter_listen_and_server_test.cc b/test/cpp/fluid/pscore/heter_listen_and_server_test.cc
similarity index 100%
rename from paddle/fluid/operators/pscore/heter_listen_and_server_test.cc
rename to test/cpp/fluid/pscore/heter_listen_and_server_test.cc
diff --git a/paddle/fluid/operators/pscore/heter_server_test.cc b/test/cpp/fluid/pscore/heter_server_test.cc
similarity index 100%
rename from paddle/fluid/operators/pscore/heter_server_test.cc
rename to test/cpp/fluid/pscore/heter_server_test.cc
diff --git a/paddle/fluid/operators/pscore/send_and_recv_op_cpu_test.cc b/test/cpp/fluid/pscore/send_and_recv_op_cpu_test.cc
similarity index 100%
rename from paddle/fluid/operators/pscore/send_and_recv_op_cpu_test.cc
rename to test/cpp/fluid/pscore/send_and_recv_op_cpu_test.cc
diff --git a/paddle/fluid/operators/pscore/send_and_recv_op_gpu_test.cc b/test/cpp/fluid/pscore/send_and_recv_op_gpu_test.cc
similarity index 100%
rename from paddle/fluid/operators/pscore/send_and_recv_op_gpu_test.cc
rename to test/cpp/fluid/pscore/send_and_recv_op_gpu_test.cc
diff --git a/paddle/fluid/operators/pscore/switch_server_test.cc b/test/cpp/fluid/pscore/switch_server_test.cc
similarity index 100%
rename from paddle/fluid/operators/pscore/switch_server_test.cc
rename to test/cpp/fluid/pscore/switch_server_test.cc