9 files changed, 12 insertions, 12 deletions
diff --git a/testsuites/psxtests/psx15/init.c b/testsuites/psxtests/psx15/init.c
index 74fbfb9a45..03ddf71996 100644
--- a/testsuites/psxtests/psx15/init.c
+++ b/testsuites/psxtests/psx15/init.c
@@ -60,7 +60,7 @@ static void suicide_task(rtems_task_argument arg)
 
   printf("suicide task %d\n", me);
 
-  rtems_task_delete(RTEMS_SELF);
+  rtems_task_exit();
   rtems_test_assert(false);
 }
 
diff --git a/testsuites/psxtests/psxglobalcon02/init.cc b/testsuites/psxtests/psxglobalcon02/init.cc
index 0ce5bdcea0..be54858320 100644
--- a/testsuites/psxtests/psxglobalcon02/init.cc
+++ b/testsuites/psxtests/psxglobalcon02/init.cc
@@ -44,7 +44,7 @@ extern "C" void Init(rtems_task_argument argument)
 
   rtems_init_done = true;
 
-  rtems_task_delete(RTEMS_SELF);
+  rtems_task_exit();
   rtems_test_assert(0);
 }
 
diff --git a/testsuites/psxtests/psxkey03/init.c b/testsuites/psxtests/psxkey03/init.c
index 6d57b28b86..8f0a890752 100644
--- a/testsuites/psxtests/psxkey03/init.c
+++ b/testsuites/psxtests/psxkey03/init.c
@@ -42,7 +42,7 @@ rtems_task Test_Thread( rtems_task_argument value )
   rtems_test_assert( !sc );
 
   puts( "Test_Thread - pthread_exit to run key destructors - OK" );
-  rtems_task_delete( RTEMS_SELF );
+  rtems_task_exit();
 }
 
 rtems_task Init(rtems_task_argument ignored)
diff --git a/testsuites/psxtests/psxkey04/init.c b/testsuites/psxtests/psxkey04/init.c
index 34e52c8aab..d42633ce25 100644
--- a/testsuites/psxtests/psxkey04/init.c
+++ b/testsuites/psxtests/psxkey04/init.c
@@ -49,7 +49,7 @@ rtems_task Test_Thread1( rtems_task_argument argument )
   value = pthread_getspecific( Key );
   rtems_test_assert( *value == Data_array[0] );
 
-  rtems_task_delete( RTEMS_SELF );
+  rtems_task_exit();
 }
 
 rtems_task Test_Thread2( rtems_task_argument argument )
@@ -65,7 +65,7 @@ rtems_task Test_Thread2( rtems_task_argument argument )
   value = pthread_getspecific( Key );
   rtems_test_assert( *value == Data_array[1] );
 
-  rtems_task_delete( RTEMS_SELF );
+  rtems_task_exit();
 }
 
 rtems_task Init( rtems_task_argument ignored )
diff --git a/testsuites/psxtests/psxkey06/init.c b/testsuites/psxtests/psxkey06/init.c
index 2b64c471c7..aa5977759d 100644
--- a/testsuites/psxtests/psxkey06/init.c
+++ b/testsuites/psxtests/psxkey06/init.c
@@ -74,7 +74,7 @@ static rtems_task Test_Thread1( rtems_task_argument argument )
   value = pthread_getspecific( key2 );
   rtems_test_assert( *value == Data_array[1] );
 
-  rtems_task_delete( RTEMS_SELF );
+  rtems_task_exit();
 }
 
 static rtems_task Test_Thread2( rtems_task_argument argument )
@@ -98,7 +98,7 @@ static rtems_task Test_Thread2( rtems_task_argument argument )
   value = pthread_getspecific( key2 );
   rtems_test_assert( *value == Data_array[3] );
 
-  rtems_task_delete( RTEMS_SELF );
+  rtems_task_exit();
 }
 
 static void Key3_Destructor( void *value )
@@ -125,7 +125,7 @@ static rtems_task Test_Thread3( rtems_task_argument argument )
     rtems_task_restart( RTEMS_SELF, 1 );
   } else if ( argument == 1 ) {
     Wake_Up_Master();
-    rtems_task_delete( RTEMS_SELF );
+    rtems_task_exit();
   }
 
   rtems_test_assert( false );
diff --git a/testsuites/psxtests/psxkey07/init.c b/testsuites/psxtests/psxkey07/init.c
index ffe4d5ada4..378349bbe6 100644
--- a/testsuites/psxtests/psxkey07/init.c
+++ b/testsuites/psxtests/psxkey07/init.c
@@ -56,7 +56,7 @@ rtems_task Test_Thread(rtems_task_argument argument)
   rtems_test_assert( value_p == value_p2 );
   ++got_thread_count;
 
-  rtems_task_delete( RTEMS_SELF );
+  rtems_task_exit();
 }
 
 rtems_task Init(rtems_task_argument argument)
diff --git a/testsuites/psxtests/psxkey08/init.c b/testsuites/psxtests/psxkey08/init.c
index 3b8bdae001..e5277baf8a 100644
--- a/testsuites/psxtests/psxkey08/init.c
+++ b/testsuites/psxtests/psxkey08/init.c
@@ -53,7 +53,7 @@ static rtems_task test_task(rtems_task_argument arg)
   rtems_test_assert( value_p == value_p2 );
   ++got_task_count;
 
-  rtems_task_delete( RTEMS_SELF );
+  rtems_task_exit();
 }
 
 static rtems_task Init(rtems_task_argument arg)
diff --git a/testsuites/psxtests/psxkey09/init.c b/testsuites/psxtests/psxkey09/init.c
index 472e90c907..ac346b4289 100644
--- a/testsuites/psxtests/psxkey09/init.c
+++ b/testsuites/psxtests/psxkey09/init.c
@@ -44,7 +44,7 @@ rtems_task Test_Thread( rtems_task_argument arg )
   rtems_test_assert( !sc );
 
   puts( "Test_Thread - pthread_exit to run key destructors - OK" );
-  rtems_task_delete( RTEMS_SELF );
+  rtems_task_exit();
 }
 
 rtems_task Init( rtems_task_argument ignored )
diff --git a/testsuites/psxtests/psxkey10/init.c b/testsuites/psxtests/psxkey10/init.c
index 6273f1d899..0cd24c0a14 100644
--- a/testsuites/psxtests/psxkey10/init.c
+++ b/testsuites/psxtests/psxkey10/init.c
@@ -49,7 +49,7 @@ rtems_task Test_Thread( rtems_task_argument arg )
   rtems_test_assert( sc == 0 );
 
   puts( "Test_Thread - exit but don't run key destructors - OK" );
-  rtems_task_delete( RTEMS_SELF );
+  rtems_task_exit();
 }
 
 rtems_task Init( rtems_task_argument ignored )