diff --git a/tools/ci/config/target-test.yml b/tools/ci/config/target-test.yml
index a506db4349..f17b6b70cd 100644
--- a/tools/ci/config/target-test.yml
+++ b/tools/ci/config/target-test.yml
@@ -315,7 +315,6 @@ example_test_016:
 
 test_app_test_001:
   extends: .test_app_template
-  parallel: 4
   tags:
     - ESP32
     - test_jtag_arm
@@ -324,7 +323,6 @@ test_app_test_001:
       - $CI_PROJECT_DIR/tools/test_apps/system/*/*.log
   variables:
     SETUP_TOOLS: "1"
-    PYTHON_VER: 3
 
 test_app_test_002:
   extends: .test_app_template
@@ -340,9 +338,12 @@ test_app_test_003:
 
 test_app_test_004:
   extends: .test_app_template
+  parallel: 4
   tags:
-    - ESP32S2
+    - ESP32
     - Example_GENERIC
+  variables:
+    SETUP_TOOLS: "1"
 
 component_ut_test_001:
   extends: .component_ut_32_template
diff --git a/tools/test_apps/system/panic/test_panic_util/test_panic_util.py b/tools/test_apps/system/panic/test_panic_util/test_panic_util.py
index 520256d546..66cab91283 100644
--- a/tools/test_apps/system/panic/test_panic_util/test_panic_util.py
+++ b/tools/test_apps/system/panic/test_panic_util/test_panic_util.py
@@ -252,7 +252,7 @@ def panic_test(**kwargs):
 
     if 'additional_duts' not in kwargs:
         kwargs['additional_duts'] = PANIC_TEST_DUT_DICT
-    return ttfw_idf.idf_custom_test(app=PanicTestApp, env_tag="test_jtag_arm", **kwargs)
+    return ttfw_idf.idf_custom_test(app=PanicTestApp, env_tag="Example_GENERIC", **kwargs)
 
 
 def get_dut(env, app_config_name, test_name, qemu_wdt_enable=False):
diff --git a/tools/test_apps/system/startup/app_test.py b/tools/test_apps/system/startup/app_test.py
index ebd4cf3306..6d3950ca1f 100644
--- a/tools/test_apps/system/startup/app_test.py
+++ b/tools/test_apps/system/startup/app_test.py
@@ -6,7 +6,7 @@ import ttfw_idf
 from tiny_test_fw import Utility
 
 
-@ttfw_idf.idf_custom_test(env_tag="test_jtag_arm", group="test-apps")
+@ttfw_idf.idf_custom_test(env_tag="Example_GENERIC", group="test-apps")
 def test_startup(env, extra_data):
     config_files = glob.glob(os.path.join(os.path.dirname(__file__), "sdkconfig.ci.*"))
     config_names = [os.path.basename(s).replace("sdkconfig.ci.", "") for s in config_files]