diff --git a/paddle/fluid/operators/CMakeLists.txt b/paddle/fluid/operators/CMakeLists.txt
index e4add9ae4bd3cedd5c12e8c1f9f142c6c49d8848..984dacfa8bf88c5ba516b54ff0f08b6354f9a11d 100644
--- a/paddle/fluid/operators/CMakeLists.txt
+++ b/paddle/fluid/operators/CMakeLists.txt
@@ -194,7 +194,6 @@ if (WITH_PYTHON)
 endif()
 
 set(GLOB_OP_LIB ${OP_LIBRARY} CACHE INTERNAL "Global OP library")
-add_subdirectory(benchmark)
 
 cc_test_old(op_debug_string_test SRCS op_debug_string_test.cc DEPS elementwise_add_op ${COMMON_OP_DEPS})
 
diff --git a/test/cpp/fluid/CMakeLists.txt b/test/cpp/fluid/CMakeLists.txt
index e2d08eac64b73cf56552bc791bdcb6d9e4394d3f..cabad612e0d07805c37882fe748ab494554be40d 100644
--- a/test/cpp/fluid/CMakeLists.txt
+++ b/test/cpp/fluid/CMakeLists.txt
@@ -1,3 +1,23 @@
+add_subdirectory(benchmark)
 if(WITH_CINN)
   add_subdirectory(cinn)
 endif()
+# add_subdirectory(controlflow)
+# add_subdirectory(detection)
+# add_subdirectory(dlnne)
+# add_subdirectory(elementwise)
+# add_subdirectory(fused)
+# if(WITH_LITE)
+#   add_subdirectory(lite)
+# endif()
+# add_subdirectory(math)
+# if(WITH_MKLDNN)
+#   add_subdirectory(mkldnn)
+# endif()
+# add_subdirectory(nccl)
+# if(WITH_PSCORE)
+#   add_subdirectory(pscore)
+# endif()
+# add_subdirectory(prim_ops)
+# add_subdirectory(reduce_ops)
+# add_subdirectory(tensorrt)
diff --git a/paddle/fluid/operators/benchmark/CMakeLists.txt b/test/cpp/fluid/benchmark/CMakeLists.txt
similarity index 100%
rename from paddle/fluid/operators/benchmark/CMakeLists.txt
rename to test/cpp/fluid/benchmark/CMakeLists.txt
diff --git a/paddle/fluid/operators/benchmark/op_tester.cc b/test/cpp/fluid/benchmark/op_tester.cc
similarity index 99%
rename from paddle/fluid/operators/benchmark/op_tester.cc
rename to test/cpp/fluid/benchmark/op_tester.cc
index 20c6b848248ffdcfaac3e81b0629740eeba2bc4b..482cdf4348124b5bae3be56efe4b3204e8b904a7 100644
--- a/paddle/fluid/operators/benchmark/op_tester.cc
+++ b/test/cpp/fluid/benchmark/op_tester.cc
@@ -12,7 +12,7 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 See the License for the specific language governing permissions and
 limitations under the License. */
 
-#include "paddle/fluid/operators/benchmark/op_tester.h"
+#include "test/cpp/fluid/benchmark/op_tester.h"
 
 #include <fstream>
 
diff --git a/paddle/fluid/operators/benchmark/op_tester.h b/test/cpp/fluid/benchmark/op_tester.h
similarity index 97%
rename from paddle/fluid/operators/benchmark/op_tester.h
rename to test/cpp/fluid/benchmark/op_tester.h
index 2135febc47f3233114eeb59d17b9b14bdacc686f..de8f62cfe07cd6e7a2ec95b838ad32961fffa4d7 100644
--- a/paddle/fluid/operators/benchmark/op_tester.h
+++ b/test/cpp/fluid/benchmark/op_tester.h
@@ -21,8 +21,8 @@ limitations under the License. */
 
 #include "paddle/fluid/framework/op_desc.h"
 #include "paddle/fluid/framework/operator.h"
-#include "paddle/fluid/operators/benchmark/op_tester_config.h"
 #include "paddle/phi/core/ddim.h"
+#include "test/cpp/fluid/benchmark/op_tester_config.h"
 
 namespace paddle {
 namespace operators {
diff --git a/paddle/fluid/operators/benchmark/op_tester_config.cc b/test/cpp/fluid/benchmark/op_tester_config.cc
similarity index 92%
rename from paddle/fluid/operators/benchmark/op_tester_config.cc
rename to test/cpp/fluid/benchmark/op_tester_config.cc
index a7370e30f2f65b21ca3d79bfcf8e35693ccc3e87..ba9997e846afe8194df4895572b1092e9306a2d6 100644
--- a/paddle/fluid/operators/benchmark/op_tester_config.cc
+++ b/test/cpp/fluid/benchmark/op_tester_config.cc
@@ -12,7 +12,7 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 See the License for the specific language governing permissions and
 limitations under the License. */
 
-#include "paddle/fluid/operators/benchmark/op_tester_config.h"
+#include "test/cpp/fluid/benchmark/op_tester_config.h"
 
 #include <fstream>
 
diff --git a/paddle/fluid/operators/benchmark/op_tester_config.h b/test/cpp/fluid/benchmark/op_tester_config.h
similarity index 100%
rename from paddle/fluid/operators/benchmark/op_tester_config.h
rename to test/cpp/fluid/benchmark/op_tester_config.h