diff --git a/conftest.py b/conftest.py
index cf924ec032..5469089cdd 100644
--- a/conftest.py
+++ b/conftest.py
@@ -265,20 +265,14 @@ def build_dir(app_path: str, target: Optional[str], config: Optional[str]) -> st
     Returns:
         valid build directory
     """
-    if target == 'linux':
-        # IDF-6644
-        # hard-coded in components/esp_partition/partition_linux.c
-        # const char *partition_table_file_name = "build/partition_table/partition-table.bin";
-        check_dirs = ['build']
-    else:
-        check_dirs = []
-        if target is not None and config is not None:
-            check_dirs.append(f'build_{target}_{config}')
-        if target is not None:
-            check_dirs.append(f'build_{target}')
-        if config is not None:
-            check_dirs.append(f'build_{config}')
-        check_dirs.append('build')
+    check_dirs = []
+    if target is not None and config is not None:
+        check_dirs.append(f'build_{target}_{config}')
+    if target is not None:
+        check_dirs.append(f'build_{target}')
+    if config is not None:
+        check_dirs.append(f'build_{config}')
+    check_dirs.append('build')
 
     for check_dir in check_dirs:
         binary_path = os.path.join(app_path, check_dir)
@@ -294,15 +288,6 @@ def build_dir(app_path: str, target: Optional[str], config: Optional[str]) -> st
     )
 
 
-@pytest.fixture(autouse=True)
-def linux_cd_into_app_folder(app_path: str, target: Optional[str]) -> None:
-    # IDF-6644
-    # hard-coded in components/esp_partition/partition_linux.c
-    # const char *partition_table_file_name = "build/partition_table/partition-table.bin";
-    if target == 'linux':
-        os.chdir(app_path)
-
-
 @pytest.fixture(autouse=True)
 @multi_dut_fixture
 def junit_properties(test_case_name: str, record_xml_attribute: Callable[[str, object], None]) -> None:
diff --git a/tools/ci/ci_build_apps.py b/tools/ci/ci_build_apps.py
index f245cf8cd4..64e8beeb72 100644
--- a/tools/ci/ci_build_apps.py
+++ b/tools/ci/ci_build_apps.py
@@ -64,10 +64,6 @@ def get_pytest_apps(
     build_dir = 'build_@t_@w'
     if target == 'linux':  # no esp_idf_size for linux target
         default_size_json_path = None  # type: ignore
-        # IDF-6644
-        # hard-coded in components/esp_partition/partition_linux.c
-        # const char *partition_table_file_name = "build/partition_table/partition-table.bin";
-        build_dir = 'build'
 
     apps = find_apps(
         app_dirs,