1 files changed, 6 insertions, 25 deletions
diff --git a/spec/rtems/signal/req/catch.yml b/spec/rtems/signal/req/catch.yml
index ba1d71c4..6d80b9cd 100644
--- a/spec/rtems/signal/req/catch.yml
+++ b/spec/rtems/signal/req/catch.yml
@@ -324,7 +324,8 @@ test-includes:
 - rtems.h
 - string.h
 - rtems/score/smpbarrier.h
-test-local-includes: []
+test-local-includes:
+- tc-support.h
 test-prepare: |
   rtems_status_code sc;
 
@@ -349,15 +350,7 @@ test-setup:
       rtems_status_code sc;
       rtems_id          scheduler_id;
 
-      sc = rtems_task_create(
-        rtems_build_name( 'W', 'O', 'R', 'K' ),
-        1,
-        RTEMS_MINIMUM_STACK_SIZE,
-        RTEMS_DEFAULT_MODES,
-        RTEMS_DEFAULT_ATTRIBUTES,
-        &ctx->worker_id
-      );
-      T_assert_rsc_success( sc );
+      ctx->worker_id = CreateTask( "WORK", 1 );
 
       sc = rtems_scheduler_ident_by_processor( 1, &scheduler_id );
       T_assert_rsc_success( sc );
@@ -365,12 +358,7 @@ test-setup:
       sc = rtems_task_set_scheduler( ctx->worker_id, scheduler_id, 1 );
       T_assert_rsc_success( sc );
 
-      sc = rtems_task_start(
-        ctx->worker_id,
-        Worker,
-        (rtems_task_argument) ctx
-      );
-      T_assert_rsc_success( sc );
+      StartTask( ctx->worker_id, Worker, ctx );
     }
   description: null
 test-stop: null
@@ -452,15 +440,8 @@ test-target: testsuites/validation/tc-signal-catch.c
 test-teardown:
   brief: null
   code: |
-    rtems_status_code sc;
-
-    if ( ctx->worker_id != 0 ) {
-      sc = rtems_task_delete( ctx->worker_id );
-      T_rsc_success( sc );
-    }
-
-    sc = rtems_signal_catch( NULL, RTEMS_DEFAULT_MODES );
-    T_rsc_success( sc );
+    DeleteTask( ctx->worker_id );
+    RestoreRunnerASR();
   description: null
 text: ${.:text-template}
 transition-map: