diff --git a/paddle/fluid/platform/device/xpu/CMakeLists.txt b/paddle/fluid/platform/device/xpu/CMakeLists.txt
index 242f2a8e26002e12a939c28fba489afa9049abb2..70a1c3fc3b04f8bf92107fbe2be0880a95f4bf75 100644
--- a/paddle/fluid/platform/device/xpu/CMakeLists.txt
+++ b/paddle/fluid/platform/device/xpu/CMakeLists.txt
@@ -35,5 +35,3 @@ cc_library(
   xpu_resource_pool
   SRCS xpu_resource_pool.cc
   DEPS xpu_info)
-
-add_subdirectory(tests)
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index 57d3e6c380f6356b94c3ef91bb281b4c4994cf83..7645401175914b49e6d8511f0f7cf170a90ba352 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -86,7 +86,7 @@ if(WITH_TESTING)
   # add_subdirectory(standalone_executor)
   # add_subdirectory(tokenizer)
   # add_subdirectory(white_list)
-  # add_subdirectory(xpu)
+  add_subdirectory(xpu)
 endif()
 
 get_property(test_srcs GLOBAL PROPERTY TEST_SRCS)
diff --git a/test/xpu/CMakeLists.txt b/test/xpu/CMakeLists.txt
new file mode 100644
index 0000000000000000000000000000000000000000..e0543ef9e50f583339bed29700ba04f3bfd7c8bf
--- /dev/null
+++ b/test/xpu/CMakeLists.txt
@@ -0,0 +1,3 @@
+if(WITH_XPU)
+  add_subdirectory(cpp)
+endif()
diff --git a/paddle/fluid/platform/device/xpu/tests/CMakeLists.txt b/test/xpu/cpp/CMakeLists.txt
similarity index 100%
rename from paddle/fluid/platform/device/xpu/tests/CMakeLists.txt
rename to test/xpu/cpp/CMakeLists.txt
diff --git a/paddle/fluid/platform/device/xpu/tests/enforce_xpu_test.cc b/test/xpu/cpp/enforce_xpu_test.cc
similarity index 100%
rename from paddle/fluid/platform/device/xpu/tests/enforce_xpu_test.cc
rename to test/xpu/cpp/enforce_xpu_test.cc