diff --git a/paddle/phi/kernels/autotune/CMakeLists.txt b/paddle/phi/kernels/autotune/CMakeLists.txt
index 9379c78c8d005f0092baf336f0dbf8de0c740694..33c10e7f48b2a709e43e76001eedc93b07caeb86 100644
--- a/paddle/phi/kernels/autotune/CMakeLists.txt
+++ b/paddle/phi/kernels/autotune/CMakeLists.txt
@@ -1,30 +1,5 @@
-if(WITH_GPU)
-  nv_test(
-    gpu_timer_test
-    SRCS gpu_timer_test.cu
-    DEPS gtest)
-  nv_test(
-    auto_tune_test
-    SRCS auto_tune_test.cu
-    DEPS gtest)
-elseif(WITH_ROCM)
-  hip_test(
-    gpu_timer_test
-    SRCS gpu_timer_test.cu
-    DEPS gtest)
-  hip_test(
-    auto_tune_test
-    SRCS auto_tune_test.cu
-    DEPS gtest)
-endif()
-
 cc_library(cache SRCS cache.cc)
 cc_library(
   switch_autotune
   SRCS switch_autotune.cc
   DEPS cache flags)
-
-cc_test(
-  cache_test
-  SRCS cache_test.cc
-  DEPS gtest cache)
diff --git a/paddle/phi/tests/kernels/CMakeLists.txt b/paddle/phi/tests/kernels/CMakeLists.txt
index da4aca85353c49958658c5e37e82266a0ddb9d1a..ed79b26d1c2916fd86d7904682e5c696ba602240 100644
--- a/paddle/phi/tests/kernels/CMakeLists.txt
+++ b/paddle/phi/tests/kernels/CMakeLists.txt
@@ -66,3 +66,28 @@ cc_test(
   test_transfer_layout_dev_api
   SRCS test_transfer_layout_dev_api.cc
   DEPS phi phi_api_utils)
+
+if(WITH_GPU)
+  nv_test(
+    test_gpu_timer
+    SRCS test_gpu_timer.cu
+    DEPS gtest)
+  nv_test(
+    test_auto_tune
+    SRCS test_auto_tune.cu
+    DEPS gtest)
+elseif(WITH_ROCM)
+  hip_test(
+    test_gpu_timer
+    SRCS test_gpu_timer.cu
+    DEPS gtest)
+  hip_test(
+    test_auto_tune
+    SRCS test_auto_tune.cu
+    DEPS gtest)
+endif()
+
+cc_test(
+  test_cache
+  SRCS test_cache.cc
+  DEPS gtest cache)
diff --git a/paddle/phi/kernels/autotune/auto_tune_test.cu b/paddle/phi/tests/kernels/test_auto_tune.cu
similarity index 100%
rename from paddle/phi/kernels/autotune/auto_tune_test.cu
rename to paddle/phi/tests/kernels/test_auto_tune.cu
diff --git a/paddle/phi/kernels/autotune/cache_test.cc b/paddle/phi/tests/kernels/test_cache.cc
similarity index 100%
rename from paddle/phi/kernels/autotune/cache_test.cc
rename to paddle/phi/tests/kernels/test_cache.cc
index 18454ad3e19977d6e98ef5b5613be52137d06940..3dcd1b4ebae297adf50303f6846f54c023033cb3 100644
--- a/paddle/phi/kernels/autotune/cache_test.cc
+++ b/paddle/phi/tests/kernels/test_cache.cc
@@ -12,13 +12,13 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include "paddle/phi/kernels/autotune/cache.h"
-
 #include <gtest/gtest.h>
 
 #include <cmath>
 #include <functional>
 
+#include "paddle/phi/kernels/autotune/cache.h"
+
 #include "glog/logging.h"
 
 enum ConvAlgos { GEMMKernel = 0, CuDNNKernel_1 = 1, CuDNNKernel_2 = 2 };
diff --git a/paddle/phi/kernels/autotune/gpu_timer_test.cu b/paddle/phi/tests/kernels/test_gpu_timer.cu
similarity index 100%
rename from paddle/phi/kernels/autotune/gpu_timer_test.cu
rename to paddle/phi/tests/kernels/test_gpu_timer.cu