1 files changed, 5 insertions, 27 deletions
diff --git a/spec/rtems/barrier/req/create.yml b/spec/rtems/barrier/req/create.yml
index 815f1eb1..6fb6cf3c 100644
--- a/spec/rtems/barrier/req/create.yml
+++ b/spec/rtems/barrier/req/create.yml
@@ -256,28 +256,16 @@ test-header: null
 test-includes:
 - rtems.h
 - string.h
-test-local-includes: []
+test-local-includes:
+- tc-support.h
 test-prepare: null
 test-setup:
   brief: null
   code: |
-    rtems_status_code sc;
-
     memset( ctx, 0, sizeof( *ctx ) );
     ctx->id_value = INVALID_ID;
-
-    sc = rtems_task_create(
-      rtems_build_name( 'W', 'O', 'R', 'K' ),
-      PRIO_LOW,
-      RTEMS_MINIMUM_STACK_SIZE,
-      RTEMS_DEFAULT_MODES,
-      RTEMS_DEFAULT_ATTRIBUTES,
-      &ctx->worker_id
-    );
-    T_assert_rsc_success( sc );
-
-    sc = rtems_task_start( ctx->worker_id, Worker, (rtems_task_argument) ctx );
-    T_assert_rsc_success( sc );
+    ctx->worker_id = CreateTask( "WORK", PRIO_LOW );
+    StartTask( ctx->worker_id, Worker, ctx );
   description: null
 test-stop: null
 test-support: |
@@ -287,11 +275,6 @@ test-support: |
 
   typedef RtemsBarrierReqCreate_Context Context;
 
-  typedef enum {
-    PRIO_NORMAL = 1,
-    PRIO_LOW
-  } Priorities;
-
   static void Worker( rtems_task_argument arg )
   {
     Context *ctx;
@@ -324,12 +307,7 @@ test-target: testsuites/validation/tc-barrier-create.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 );
-    }
+    DeleteTask( ctx->worker_id );
   description: null
 text: ${.:text-template}
 transition-map: