diff --git a/.gitlab/ci/assign-test.yml b/.gitlab/ci/assign-test.yml
index cabe2f8578..29d640398d 100644
--- a/.gitlab/ci/assign-test.yml
+++ b/.gitlab/ci/assign-test.yml
@@ -88,7 +88,7 @@ assign_integration_test:
     paths:
       - $TEST_DIR/test_configs
   variables:
-    TEST_DIR: ${CI_PROJECT_DIR}/components/idf_test/integration_test
+    TEST_DIR: ${CI_PROJECT_DIR}/tools/ci/integration_test
     BUILD_DIR: ${CI_PROJECT_DIR}/SSC/ssc_bin
     INTEGRATION_TEST_CASE_PATH: "${CI_PROJECT_DIR}/auto_test_script/TestCaseFiles"
     ASSIGN_TEST_CASE_SCRIPT: "${CI_PROJECT_DIR}/auto_test_script/bin/CIAssignTestCases.py"
diff --git a/.gitlab/ci/rules.yml b/.gitlab/ci/rules.yml
index 2a15ace71e..8b1cbc641b 100644
--- a/.gitlab/ci/rules.yml
+++ b/.gitlab/ci/rules.yml
@@ -92,6 +92,7 @@
 
 .patterns-integration_test: &patterns-integration_test
   - "tools/ci/python_packages/tiny_test_fw/**/*"
+  - "tools/ci/integration_test/**/*"
 
 .patterns-host_test: &patterns-host_test
   - ".gitlab/ci/host-test.yml"
diff --git a/.gitlab/ci/target-test.yml b/.gitlab/ci/target-test.yml
index 5f2f72b11a..c6cc632fa6 100644
--- a/.gitlab/ci/target-test.yml
+++ b/.gitlab/ci/target-test.yml
@@ -878,8 +878,8 @@ UT_S3_FLASH:
     LOG_PATH: "${CI_PROJECT_DIR}/TEST_LOGS"
     TEST_CASE_FILE_PATH: "$CI_PROJECT_DIR/auto_test_script/TestCaseFiles"
     MODULE_UPDATE_FILE: "$CI_PROJECT_DIR/components/idf_test/ModuleDefinition.yml"
-    CONFIG_FILE_PATH: "${CI_PROJECT_DIR}/components/idf_test/integration_test/test_configs"
-    KNOWN_ISSUE_FILE: "${CI_PROJECT_DIR}/components/idf_test/integration_test/KnownIssues"
+    CONFIG_FILE_PATH: "${CI_PROJECT_DIR}/tools/ci/integration_test/test_configs"
+    KNOWN_ISSUE_FILE: "${CI_PROJECT_DIR}/tools/ci/integration_test/KnownIssues"
     CI_RUNNER_SCRIPT: "${CI_PROJECT_DIR}/auto_test_script/bin/CIRunner.py"
     PYTHONPATH: ${CI_PROJECT_DIR}/auto_test_script/packages
     # auto_test_script only supports python 3.7.x
diff --git a/components/idf_test/integration_test/KnownIssues b/tools/ci/integration_test/KnownIssues
similarity index 100%
rename from components/idf_test/integration_test/KnownIssues
rename to tools/ci/integration_test/KnownIssues
diff --git a/components/idf_test/integration_test/test_configs/nvs_compatible_test_.yml b/tools/ci/integration_test/test_configs/nvs_compatible_test_.yml
similarity index 100%
rename from components/idf_test/integration_test/test_configs/nvs_compatible_test_.yml
rename to tools/ci/integration_test/test_configs/nvs_compatible_test_.yml