diff --git a/tools/ci/config/target-test.yml b/tools/ci/config/target-test.yml
index f17b6b70cd..dd479ae896 100644
--- a/tools/ci/config/target-test.yml
+++ b/tools/ci/config/target-test.yml
@@ -337,6 +337,12 @@ test_app_test_003:
     - Example_PPP
 
 test_app_test_004:
+  extends: .test_app_template
+  tags:
+    - ESP32S2
+    - Example_GENERIC
+
+test_app_test_esp32_generic:
   extends: .test_app_template
   parallel: 4
   tags:
diff --git a/tools/test_apps/system/panic/app_test.py b/tools/test_apps/system/panic/app_test.py
index 15ce730a3d..bb0869f738 100644
--- a/tools/test_apps/system/panic/app_test.py
+++ b/tools/test_apps/system/panic/app_test.py
@@ -6,7 +6,7 @@ from test_panic_util.test_panic_util import panic_test, run_all
 
 # test_task_wdt
 
-@panic_test()
+@panic_test(target=['ESP32', 'ESP32S2'])
 def test_panic_task_wdt(env, _extra_data):
     test.task_wdt_inner(env, "panic")
 
@@ -134,7 +134,7 @@ def test_gdbstub_cache_error(env, _extra_data):
 
 # test_stack_overflow
 
-@panic_test()
+@panic_test(target=['ESP32', 'ESP32S2'])
 def test_panic_stack_overflow(env, _extra_data):
     test.stack_overflow_inner(env, "panic")
 
@@ -166,7 +166,7 @@ def test_gdbstub_stack_overflow(env, _extra_data):
 
 # test_instr_fetch_prohibited
 
-@panic_test()
+@panic_test(target=['ESP32', 'ESP32S2'])
 def test_panic_instr_fetch_prohibited(env, _extra_data):
     test.instr_fetch_prohibited_inner(env, "panic")
 
@@ -198,7 +198,7 @@ def test_gdbstub_instr_fetch_prohibited(env, _extra_data):
 
 # test_illegal_instruction
 
-@panic_test()
+@panic_test(target=['ESP32', 'ESP32S2'])
 def test_panic_illegal_instruction(env, _extra_data):
     test.illegal_instruction_inner(env, "panic")
 
@@ -230,7 +230,7 @@ def test_gdbstub_illegal_instruction(env, _extra_data):
 
 # test_storeprohibited
 
-@panic_test()
+@panic_test(target=['ESP32', 'ESP32S2'])
 def test_panic_storeprohibited(env, _extra_data):
     test.storeprohibited_inner(env, "panic")
 
@@ -262,7 +262,7 @@ def test_gdbstub_storeprohibited(env, _extra_data):
 
 # test_abort
 
-@panic_test()
+@panic_test(target=['ESP32', 'ESP32S2'])
 def test_panic_abort(env, _extra_data):
     test.abort_inner(env, "panic")
 
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 66cab91283..2c68b91475 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
@@ -248,7 +248,7 @@ PANIC_TEST_DUT_DICT = {
 def panic_test(**kwargs):
     """ Decorator for the panic tests, sets correct App and DUT classes """
     if 'target' not in kwargs:
-        kwargs['target'] = ['ESP32', 'ESP32S2']
+        kwargs['target'] = ['ESP32']
 
     if 'additional_duts' not in kwargs:
         kwargs['additional_duts'] = PANIC_TEST_DUT_DICT