3 files changed, 3 insertions, 7 deletions
diff --git a/testsuites/sptests/sp07/init.c b/testsuites/sptests/sp07/init.c
index d5b606d12a..b44b5b967e 100644
--- a/testsuites/sptests/sp07/init.c
+++ b/testsuites/sptests/sp07/init.c
@@ -210,6 +210,5 @@ rtems_task Init(
   directive_failed( status, "rtems_task_restart of TA3" );
   assert_extension_counts( &Task_restarted[ 0 ], 0x0 );
 
-  status = rtems_task_delete( RTEMS_SELF );
-  directive_failed( status, "rtems_task_delete of RTEMS_SELF" );
+  rtems_task_exit();
 }
diff --git a/testsuites/sptests/sp07/task1.c b/testsuites/sptests/sp07/task1.c
index 25831afef6..6c7f38eab4 100644
--- a/testsuites/sptests/sp07/task1.c
+++ b/testsuites/sptests/sp07/task1.c
@@ -48,8 +48,7 @@ rtems_task Task_1(
       status = rtems_task_delete( Task_id[ 2 ] );
       directive_failed( status, "rtems_task_delete of TA2" );
 
-      status = rtems_task_delete( RTEMS_SELF );
-      directive_failed( status, "rtems_task_delete of RTEMS_SELF" );
+      rtems_task_exit();
     }
 
     printf(
diff --git a/testsuites/sptests/sp07/task2.c b/testsuites/sptests/sp07/task2.c
index 7baee1b3b0..efa66b6114 100644
--- a/testsuites/sptests/sp07/task2.c
+++ b/testsuites/sptests/sp07/task2.c
@@ -46,9 +46,7 @@ rtems_task Task_2(
       directive_failed( status, "rtems_task_delete of TA3" );
       assert_extension_counts( &Task_deleted[ 0 ], 0x0 );
 
-      status = rtems_task_delete( RTEMS_SELF );
-      directive_failed( status, "rtems_task_delete of SELD" );
-
+      rtems_task_exit();
     } else {
 
       printf(