diff --git a/.gitlab/ci/target-test.yml b/.gitlab/ci/target-test.yml
index 566938b7d1..9579dee137 100644
--- a/.gitlab/ci/target-test.yml
+++ b/.gitlab/ci/target-test.yml
@@ -190,22 +190,6 @@ example_test_pytest_esp32c3_flash_encryption:
     - build_pytest_examples_esp32c3
   tags: [ esp32c3, flash_encryption ]
 
-example_test_pytest_esp32s2_deepsleep: # Temp tag, will be removed IDF-5213
-  extends:
-    - .pytest_examples_dir_template
-    - .rules:test:example_test-esp32s2
-  needs:
-    - build_pytest_examples_esp32s2
-  tags: [ esp32s2, deepsleep_temp_tag ]
-
-example_test_pytest_esp32s3_deepsleep: # Temp tag, will be removed IDF-5213
-  extends:
-    - .pytest_examples_dir_template
-    - .rules:test:example_test-esp32s3
-  needs:
-    - build_pytest_examples_esp32s3
-  tags: [esp32s3, deepsleep_temp_tag ]
-
 .pytest_components_dir_template:
   extends: .pytest_template
   variables:
diff --git a/components/ulp/test/ulp_riscv/test_ulp_riscv_main.c b/components/ulp/test/ulp_riscv/test_ulp_riscv_main.c
index 392abb1548..e34acfa94b 100644
--- a/components/ulp/test/ulp_riscv/test_ulp_riscv_main.c
+++ b/components/ulp/test/ulp_riscv/test_ulp_riscv_main.c
@@ -175,7 +175,7 @@ TEST_CASE("ULP-RISC-V can be stopped and resumed from main CPU", "[ulp]")
 
 TEST_CASE("ULP-RISC-V can stop itself and be resumed from the main CPU", "[ulp]")
 {
-    volatile riscv_test_commands_t *command_resp = &ulp_command_resp;
+    volatile riscv_test_commands_t *command_resp = (riscv_test_commands_t*)&ulp_command_resp;
 
     /* Load ULP RISC-V firmware and start the ULP RISC-V Coprocessor */
     load_and_start_ulp_firmware();
diff --git a/examples/system/deep_sleep/pytest_deep_sleep.py b/examples/system/deep_sleep/pytest_deep_sleep.py
index dddfe4e735..12ef483fda 100644
--- a/examples/system/deep_sleep/pytest_deep_sleep.py
+++ b/examples/system/deep_sleep/pytest_deep_sleep.py
@@ -10,7 +10,15 @@ from pytest_embedded import Dut
 touch_wake_up_support = ['esp32', 'esp32s2']
 
 
-def deep_sleep_test(dut: Dut) -> None:
+CONFIGS = [
+    pytest.param('esp32_singlecore', marks=[pytest.mark.esp32]),
+    pytest.param('basic', marks=[pytest.mark.esp32, pytest.mark.esp32s2, pytest.mark.esp32s3, pytest.mark.esp32c3]),
+]
+
+
+@pytest.mark.parametrize('config', CONFIGS, indirect=True)
+@pytest.mark.generic
+def test_deep_sleep(dut: Dut) -> None:
 
     def expect_enable_deep_sleep_touch() -> None:
         # different targets configure different wake pin(s)
@@ -57,26 +65,3 @@ def deep_sleep_test(dut: Dut) -> None:
     # Check that it measured 2xxxxms in deep sleep, i.e at least 20 seconds:
     dut.expect(r'Wake up from timer. Time spent in deep sleep: 2\d{4}ms', timeout=2)
     expect_enable_deep_sleep()
-
-
-CONFIGS = [
-    pytest.param('esp32_singlecore', marks=[pytest.mark.esp32]),
-    pytest.param('basic', marks=[pytest.mark.esp32, pytest.mark.esp32c3]),
-]
-
-
-@pytest.mark.parametrize('config', CONFIGS, indirect=True)
-@pytest.mark.generic
-def test_deep_sleep(dut: Dut) -> None:
-    deep_sleep_test(dut)
-
-
-CONFIGS_S2_S3 = [
-    pytest.param('basic', marks=[pytest.mark.esp32s2, pytest.mark.esp32s3]),  # S2/S3 runner on isolated runners for now, IDF-5213
-]
-
-
-@pytest.mark.parametrize('config', CONFIGS_S2_S3, indirect=True)
-@pytest.mark.deepsleep_temp_tag
-def test_deep_sleep_s2_s3(dut: Dut) -> None:
-    deep_sleep_test(dut)
diff --git a/examples/system/ulp_fsm/ulp/pytest_ulp_fsm.py b/examples/system/ulp_fsm/ulp/pytest_ulp_fsm.py
index 0494d0ebce..bdae64b455 100644
--- a/examples/system/ulp_fsm/ulp/pytest_ulp_fsm.py
+++ b/examples/system/ulp_fsm/ulp/pytest_ulp_fsm.py
@@ -8,8 +8,11 @@ import pytest
 from pytest_embedded import Dut
 
 
-def ulp_fsm_test_function(dut: Dut) -> None:
-
+@pytest.mark.esp32
+@pytest.mark.esp32s2
+@pytest.mark.esp32s3
+@pytest.mark.generic
+def test_ulp_fsm(dut: Dut) -> None:
     dut.expect_exact('Not ULP wakeup')
     dut.expect_exact('Entering deep sleep')
 
@@ -39,16 +42,3 @@ def ulp_fsm_test_function(dut: Dut) -> None:
         nvs_value = new_count
         logging.info('Pulse count written to NVS: {}. Entering deep sleep...'.format(nvs_value))
         dut.expect_exact('Entering deep sleep', timeout=5)
-
-
-@pytest.mark.esp32
-@pytest.mark.generic
-def test_ulp_fsm(dut: Dut) -> None:
-    ulp_fsm_test_function(dut)
-
-
-@pytest.mark.esp32s2
-@pytest.mark.esp32s3
-@pytest.mark.deepsleep_temp_tag  # S2/S3 runner on isolated runners for now, IDF-5213
-def test_ulp_fsm_s2_s3(dut: Dut) -> None:
-    ulp_fsm_test_function(dut)
diff --git a/examples/system/ulp_riscv/gpio/pytest_ulp_riscv_gpio.py b/examples/system/ulp_riscv/gpio/pytest_ulp_riscv_gpio.py
index 6f588e48ad..cdc5d1f162 100644
--- a/examples/system/ulp_riscv/gpio/pytest_ulp_riscv_gpio.py
+++ b/examples/system/ulp_riscv/gpio/pytest_ulp_riscv_gpio.py
@@ -10,7 +10,7 @@ from pytest_embedded import Dut
 
 @pytest.mark.esp32s2
 @pytest.mark.esp32s3
-@pytest.mark.deepsleep_temp_tag
+@pytest.mark.generic
 def test_ulp_riscv_gpio(dut: Dut) -> None:
 
     dut.expect_exact('Not a ULP-RISC-V wakeup, initializing it!')
diff --git a/pytest.ini b/pytest.ini
index 0e31e46f8f..872330371b 100644
--- a/pytest.ini
+++ b/pytest.ini
@@ -47,7 +47,6 @@ markers =
   wifi_router: both the runner and dut connect to the same wifi router
   wifi_high_traffic: wifi high traffic runners
   wifi_wlan: wifi runner with a wireless NIC
-  deepsleep_temp_tag: temporary env for running potentially harmfull deepsleep related tests
 
   # multi-dut markers
   multi_dut_generic: tests should be run on generic runners, at least have two duts connected.