[rtems commit] tests: Remove TEST_INIT

Sebastian Huber sebh at rtems.org
Sat Oct 28 12:09:07 UTC 2017


Module:    rtems
Branch:    master
Commit:    af4355459ee843fb984aafe22a7531e922ee753e
Changeset: http://git.rtems.org/rtems/commit/?id=af4355459ee843fb984aafe22a7531e922ee753e

Author:    Sebastian Huber <sebastian.huber at embedded-brains.de>
Date:      Thu Oct 26 13:59:11 2017 +0200

tests: Remove TEST_INIT

The TEST_EXTERN is a used only by the system.h style tests and they use
CONFIGURE_INIT appropriately.

Update #3170.
Update #3199.

---

 testsuites/benchmarks/dhrystone/init.c             | 2 --
 testsuites/benchmarks/linpack/init.c               | 2 --
 testsuites/benchmarks/whetstone/init.c             | 2 --
 testsuites/fstests/fsbdpart01/init.c               | 2 --
 testsuites/fstests/fsclose01/init.c                | 2 --
 testsuites/fstests/fsdosfsformat01/init.c          | 2 --
 testsuites/fstests/fsdosfsname01/init.c            | 2 --
 testsuites/fstests/fsdosfsname02/init.c            | 2 --
 testsuites/fstests/fsdosfssync01/init.c            | 2 --
 testsuites/fstests/fsdosfswrite01/init.c           | 2 --
 testsuites/fstests/fsfseeko01/init.c               | 2 --
 testsuites/fstests/fsimfsconfig01/init.c           | 2 --
 testsuites/fstests/fsimfsconfig02/init.c           | 2 --
 testsuites/fstests/fsimfsconfig03/init.c           | 2 --
 testsuites/fstests/fsimfsgeneric01/init.c          | 2 --
 testsuites/fstests/fsnofs01/init.c                 | 2 --
 testsuites/fstests/fsrofs01/init.c                 | 2 --
 testsuites/fstests/imfs_support/fs_support.c       | 2 --
 testsuites/fstests/jffs2_support/fs_support.c      | 2 --
 testsuites/fstests/mdosfs_support/fs_support.c     | 2 --
 testsuites/fstests/mimfs_support/fs_support.c      | 2 --
 testsuites/fstests/mrfs_support/fs_support.c       | 2 --
 testsuites/libtests/block01/init.c                 | 2 --
 testsuites/libtests/block02/init.c                 | 2 --
 testsuites/libtests/block03/init.c                 | 2 --
 testsuites/libtests/block04/init.c                 | 2 --
 testsuites/libtests/block05/init.c                 | 2 --
 testsuites/libtests/block06/init.c                 | 2 --
 testsuites/libtests/block07/init.c                 | 2 --
 testsuites/libtests/block08/init.c                 | 2 --
 testsuites/libtests/block09/init.c                 | 2 --
 testsuites/libtests/block10/init.c                 | 2 --
 testsuites/libtests/block11/init.c                 | 2 --
 testsuites/libtests/block12/init.c                 | 2 --
 testsuites/libtests/block13/init.c                 | 2 --
 testsuites/libtests/block14/init.c                 | 2 --
 testsuites/libtests/block15/init.c                 | 2 --
 testsuites/libtests/block16/init.c                 | 2 --
 testsuites/libtests/block17/init.c                 | 2 --
 testsuites/libtests/bspcmdline01/init.c            | 2 --
 testsuites/libtests/capture01/init.c               | 2 --
 testsuites/libtests/cpuuse/init.c                  | 2 --
 testsuites/libtests/crypt01/init.c                 | 2 --
 testsuites/libtests/debugger01/init.c              | 2 --
 testsuites/libtests/defaultconfig01/init.c         | 2 --
 testsuites/libtests/devfs01/init.c                 | 2 --
 testsuites/libtests/devfs02/init.c                 | 2 --
 testsuites/libtests/devfs03/init.c                 | 2 --
 testsuites/libtests/devfs04/init.c                 | 2 --
 testsuites/libtests/deviceio01/init.c              | 2 --
 testsuites/libtests/dl01/init.c                    | 2 --
 testsuites/libtests/dl02/init.c                    | 2 --
 testsuites/libtests/dl03/init.c                    | 2 --
 testsuites/libtests/dl04/init.c                    | 2 --
 testsuites/libtests/dl05/init.c                    | 2 --
 testsuites/libtests/dumpbuf01/init.c               | 2 --
 testsuites/libtests/exit01/init.c                  | 2 --
 testsuites/libtests/exit02/init.c                  | 2 --
 testsuites/libtests/flashdisk01/init.c             | 2 --
 testsuites/libtests/ftp01/init.c                   | 2 --
 testsuites/libtests/gxx01/init.c                   | 2 --
 testsuites/libtests/heapwalk/init.c                | 2 --
 testsuites/libtests/i2c01/init.c                   | 2 --
 testsuites/libtests/libfdt01/init.c                | 2 --
 testsuites/libtests/malloc02/init.c                | 2 --
 testsuites/libtests/malloc03/init.c                | 2 --
 testsuites/libtests/malloc04/init.c                | 2 --
 testsuites/libtests/malloctest/init.c              | 2 --
 testsuites/libtests/md501/init.c                   | 2 --
 testsuites/libtests/mghttpd01/init.c               | 2 --
 testsuites/libtests/monitor/init.c                 | 2 --
 testsuites/libtests/monitor02/init.c               | 2 --
 testsuites/libtests/mouse01/init.c                 | 2 --
 testsuites/libtests/networking01/init.c            | 2 --
 testsuites/libtests/newlib01/init.c                | 2 --
 testsuites/libtests/putenvtest/init.c              | 2 --
 testsuites/libtests/pwdgrp01/init.c                | 2 --
 testsuites/libtests/pwdgrp02/init.c                | 2 --
 testsuites/libtests/rbheap01/init.c                | 2 --
 testsuites/libtests/rtmonuse/init.c                | 2 --
 testsuites/libtests/sha/init.c                     | 2 --
 testsuites/libtests/shell01/init.c                 | 2 --
 testsuites/libtests/sparsedisk01/init.c            | 2 --
 testsuites/libtests/spi01/init.c                   | 2 --
 testsuites/libtests/stackchk/init.c                | 2 --
 testsuites/libtests/stackchk01/init.c              | 2 --
 testsuites/libtests/stringto01/init.c              | 2 --
 testsuites/libtests/syscall01/init.c               | 2 --
 testsuites/libtests/tar01/init.c                   | 2 --
 testsuites/libtests/tar02/init.c                   | 2 --
 testsuites/libtests/tar03/init.c                   | 2 --
 testsuites/libtests/termios/init.c                 | 2 --
 testsuites/libtests/termios01/init.c               | 2 --
 testsuites/libtests/termios02/init.c               | 2 --
 testsuites/libtests/termios03/init.c               | 2 --
 testsuites/libtests/termios04/init.c               | 2 --
 testsuites/libtests/termios05/init.c               | 2 --
 testsuites/libtests/termios06/init.c               | 2 --
 testsuites/libtests/termios07/init.c               | 2 --
 testsuites/libtests/termios08/init.c               | 2 --
 testsuites/libtests/termios09/init.c               | 2 --
 testsuites/libtests/top/init.c                     | 2 --
 testsuites/libtests/tztest/init.c                  | 2 --
 testsuites/libtests/uid01/init.c                   | 2 --
 testsuites/libtests/utf8proc01/init.c              | 2 --
 testsuites/mptests/mp01/init.c                     | 2 --
 testsuites/mptests/mp03/init.c                     | 2 --
 testsuites/mptests/mp04/init.c                     | 2 --
 testsuites/mptests/mp05/init.c                     | 2 --
 testsuites/mptests/mp06/init.c                     | 2 --
 testsuites/mptests/mp07/init.c                     | 2 --
 testsuites/mptests/mp08/init.c                     | 2 --
 testsuites/mptests/mp09/init.c                     | 2 --
 testsuites/mptests/mp10/init.c                     | 2 --
 testsuites/mptests/mp11/init.c                     | 2 --
 testsuites/mptests/mp12/init.c                     | 2 --
 testsuites/mptests/mp13/init.c                     | 2 --
 testsuites/mptests/mp14/init.c                     | 2 --
 testsuites/psxtests/psx01/init.c                   | 2 --
 testsuites/psxtests/psx02/init.c                   | 2 --
 testsuites/psxtests/psx03/init.c                   | 2 --
 testsuites/psxtests/psx04/init.c                   | 2 --
 testsuites/psxtests/psx05/init.c                   | 2 --
 testsuites/psxtests/psx06/init.c                   | 2 --
 testsuites/psxtests/psx07/init.c                   | 2 --
 testsuites/psxtests/psx08/init.c                   | 2 --
 testsuites/psxtests/psx09/init.c                   | 2 --
 testsuites/psxtests/psx10/init.c                   | 2 --
 testsuites/psxtests/psx11/init.c                   | 2 --
 testsuites/psxtests/psx12/init.c                   | 2 --
 testsuites/psxtests/psx13/main.c                   | 2 --
 testsuites/psxtests/psx14/init.c                   | 2 --
 testsuites/psxtests/psx15/init.c                   | 2 --
 testsuites/psxtests/psx16/init.c                   | 2 --
 testsuites/psxtests/psxaio01/init.c                | 2 --
 testsuites/psxtests/psxaio02/init.c                | 2 --
 testsuites/psxtests/psxaio03/init.c                | 2 --
 testsuites/psxtests/psxalarm01/init.c              | 2 --
 testsuites/psxtests/psxautoinit01/init.c           | 2 --
 testsuites/psxtests/psxautoinit02/init.c           | 2 --
 testsuites/psxtests/psxbarrier01/main.c            | 2 --
 testsuites/psxtests/psxcancel/init.c               | 2 --
 testsuites/psxtests/psxcancel01/init.c             | 2 --
 testsuites/psxtests/psxchroot01/main.c             | 2 --
 testsuites/psxtests/psxclassic01/init.c            | 2 --
 testsuites/psxtests/psxcleanup/psxcleanup.c        | 2 --
 testsuites/psxtests/psxcleanup01/init.c            | 2 --
 testsuites/psxtests/psxcleanup02/init.c            | 2 --
 testsuites/psxtests/psxclock/init.c                | 2 --
 testsuites/psxtests/psxclock01/init.c              | 2 --
 testsuites/psxtests/psxclockrealtime01/init.c      | 2 --
 testsuites/psxtests/psxconcurrency01/init.c        | 2 --
 testsuites/psxtests/psxcond01/init.c               | 2 --
 testsuites/psxtests/psxcond02/init.c               | 2 --
 testsuites/psxtests/psxconfig01/init.c             | 2 --
 testsuites/psxtests/psxdevctl01/main.c             | 2 --
 testsuites/psxtests/psxeintr_join/init.c           | 2 --
 testsuites/psxtests/psxenosys/init.c               | 2 --
 testsuites/psxtests/psxfatal_support/init.c        | 2 --
 testsuites/psxtests/psxfchx01/init.c               | 2 --
 testsuites/psxtests/psxfile01/main.c               | 2 --
 testsuites/psxtests/psxfile02/init.c               | 2 --
 testsuites/psxtests/psxfilelock01/init.c           | 2 --
 testsuites/psxtests/psxgetattrnp01/init.c          | 2 --
 testsuites/psxtests/psxgetrusage01/init.c          | 2 --
 testsuites/psxtests/psxglobalcon01/init.cc         | 2 --
 testsuites/psxtests/psxglobalcon02/init.cc         | 2 --
 testsuites/psxtests/psxid01/init.c                 | 2 --
 testsuites/psxtests/psximfs01/init.c               | 2 --
 testsuites/psxtests/psximfs02/init.c               | 2 --
 testsuites/psxtests/psxintrcritical01/init.c       | 2 --
 testsuites/psxtests/psxitimer/init.c               | 2 --
 testsuites/psxtests/psxkey01/init.c                | 2 --
 testsuites/psxtests/psxkey02/init.c                | 2 --
 testsuites/psxtests/psxkey03/init.c                | 2 --
 testsuites/psxtests/psxkey04/init.c                | 2 --
 testsuites/psxtests/psxkey05/init.c                | 2 --
 testsuites/psxtests/psxkey06/init.c                | 2 --
 testsuites/psxtests/psxkey07/init.c                | 2 --
 testsuites/psxtests/psxkey08/init.c                | 2 --
 testsuites/psxtests/psxkey09/init.c                | 2 --
 testsuites/psxtests/psxkey10/init.c                | 2 --
 testsuites/psxtests/psxmmap01/init.c               | 2 --
 testsuites/psxtests/psxmount/main.c                | 2 --
 testsuites/psxtests/psxmsgq01/init.c               | 2 --
 testsuites/psxtests/psxmsgq02/init.c               | 2 --
 testsuites/psxtests/psxmsgq03/init.c               | 2 --
 testsuites/psxtests/psxmsgq04/init.c               | 2 --
 testsuites/psxtests/psxmutexattr01/init.c          | 2 --
 testsuites/psxtests/psxobj01/init.c                | 2 --
 testsuites/psxtests/psxonce01/init.c               | 2 --
 testsuites/psxtests/psxpasswd01/init.c             | 2 --
 testsuites/psxtests/psxpasswd02/init.c             | 2 --
 testsuites/psxtests/psxpipe01/init.c               | 2 --
 testsuites/psxtests/psxrdwrv/main.c                | 2 --
 testsuites/psxtests/psxreaddir/main.c              | 2 --
 testsuites/psxtests/psxrwlock01/main.c             | 2 --
 testsuites/psxtests/psxsem01/init.c                | 2 --
 testsuites/psxtests/psxshm01/init.c                | 2 --
 testsuites/psxtests/psxshm02/init.c                | 2 --
 testsuites/psxtests/psxsignal01/init.c             | 2 --
 testsuites/psxtests/psxsignal02/init.c             | 2 --
 testsuites/psxtests/psxsignal03/init.c             | 2 --
 testsuites/psxtests/psxsignal05/init.c             | 2 --
 testsuites/psxtests/psxsignal06/init.c             | 2 --
 testsuites/psxtests/psxspin01/main.c               | 2 --
 testsuites/psxtests/psxstack01/init.c              | 2 --
 testsuites/psxtests/psxstack02/init.c              | 2 --
 testsuites/psxtests/psxstat/main.c                 | 2 --
 testsuites/psxtests/psxstrsignal01/init.c          | 2 --
 testsuites/psxtests/psxsysconf/init.c              | 2 --
 testsuites/psxtests/psxthreadname01/init.c         | 2 --
 testsuites/psxtests/psxtime/main.c                 | 2 --
 testsuites/psxtests/psxtimer01/psxtimer.c          | 2 --
 testsuites/psxtests/psxtimer02/psxtimer.c          | 2 --
 testsuites/psxtests/psxtimes01/init.c              | 2 --
 testsuites/psxtests/psxualarm/init.c               | 2 --
 testsuites/psxtests/psxusleep/init.c               | 2 --
 testsuites/psxtmtests/psxtmbarrier01/init.c        | 2 --
 testsuites/psxtmtests/psxtmbarrier02/init.c        | 2 --
 testsuites/psxtmtests/psxtmbarrier03/init.c        | 2 --
 testsuites/psxtmtests/psxtmbarrier04/init.c        | 2 --
 testsuites/psxtmtests/psxtmclocknanosleep01/init.c | 2 --
 testsuites/psxtmtests/psxtmclocknanosleep02/init.c | 2 --
 testsuites/psxtmtests/psxtmclocknanosleep03/init.c | 2 --
 testsuites/psxtmtests/psxtmcond01/init.c           | 2 --
 testsuites/psxtmtests/psxtmcond02/init.c           | 2 --
 testsuites/psxtmtests/psxtmcond03/init.c           | 2 --
 testsuites/psxtmtests/psxtmcond04/init.c           | 2 --
 testsuites/psxtmtests/psxtmcond05/init.c           | 2 --
 testsuites/psxtmtests/psxtmcond06/init.c           | 2 --
 testsuites/psxtmtests/psxtmcond07/init.c           | 2 --
 testsuites/psxtmtests/psxtmcond08/init.c           | 2 --
 testsuites/psxtmtests/psxtmkey01/init.c            | 2 --
 testsuites/psxtmtests/psxtmkey02/init.c            | 2 --
 testsuites/psxtmtests/psxtmmq01/init.c             | 2 --
 testsuites/psxtmtests/psxtmmutex01/init.c          | 2 --
 testsuites/psxtmtests/psxtmmutex02/init.c          | 2 --
 testsuites/psxtmtests/psxtmmutex03/init.c          | 2 --
 testsuites/psxtmtests/psxtmmutex04/init.c          | 2 --
 testsuites/psxtmtests/psxtmmutex05/init.c          | 2 --
 testsuites/psxtmtests/psxtmmutex06/init.c          | 2 --
 testsuites/psxtmtests/psxtmmutex07/init.c          | 2 --
 testsuites/psxtmtests/psxtmnanosleep01/init.c      | 2 --
 testsuites/psxtmtests/psxtmnanosleep02/init.c      | 2 --
 testsuites/psxtmtests/psxtmrwlock01/init.c         | 2 --
 testsuites/psxtmtests/psxtmrwlock02/init.c         | 2 --
 testsuites/psxtmtests/psxtmrwlock03/init.c         | 2 --
 testsuites/psxtmtests/psxtmrwlock04/init.c         | 2 --
 testsuites/psxtmtests/psxtmrwlock05/init.c         | 2 --
 testsuites/psxtmtests/psxtmrwlock06/init.c         | 2 --
 testsuites/psxtmtests/psxtmrwlock07/init.c         | 2 --
 testsuites/psxtmtests/psxtmsem01/init.c            | 2 --
 testsuites/psxtmtests/psxtmsem02/init.c            | 2 --
 testsuites/psxtmtests/psxtmsem03/init.c            | 2 --
 testsuites/psxtmtests/psxtmsem04/init.c            | 2 --
 testsuites/psxtmtests/psxtmsem05/init.c            | 2 --
 testsuites/psxtmtests/psxtmsleep01/init.c          | 2 --
 testsuites/psxtmtests/psxtmsleep02/init.c          | 2 --
 testsuites/psxtmtests/psxtmthread01/init.c         | 2 --
 testsuites/psxtmtests/psxtmthread02/init.c         | 2 --
 testsuites/psxtmtests/psxtmthread03/init.c         | 2 --
 testsuites/psxtmtests/psxtmthread04/init.c         | 2 --
 testsuites/psxtmtests/psxtmthread05/init.c         | 2 --
 testsuites/psxtmtests/psxtmthread06/init.c         | 2 --
 testsuites/rhealstone/rhdeadlockbrk/deadlockbrk.c  | 2 --
 testsuites/rhealstone/rhilatency/ilatency.c        | 2 --
 testsuites/rhealstone/rhmlatency/mlatency.c        | 2 --
 testsuites/rhealstone/rhsemshuffle/semshuffle.c    | 2 --
 testsuites/rhealstone/rhtaskpreempt/taskpreempt.c  | 2 --
 testsuites/rhealstone/rhtaskswitch/taskswitch.c    | 2 --
 testsuites/samples/base_mp/init.c                  | 2 --
 testsuites/samples/base_sp/init.c                  | 2 --
 testsuites/samples/capture/init.c                  | 2 --
 testsuites/samples/cdtest/init.c                   | 2 --
 testsuites/samples/fileio/init.c                   | 2 --
 testsuites/samples/nsecs/init.c                    | 2 --
 testsuites/samples/paranoia/init.c                 | 2 --
 testsuites/samples/pppd/init.c                     | 2 --
 testsuites/samples/ticker/init.c                   | 2 --
 testsuites/samples/unlimited/init.c                | 2 --
 testsuites/smptests/smp01/init.c                   | 2 --
 testsuites/smptests/smp02/init.c                   | 2 --
 testsuites/smptests/smp03/init.c                   | 2 --
 testsuites/smptests/smp05/init.c                   | 2 --
 testsuites/smptests/smp07/init.c                   | 2 --
 testsuites/smptests/smp08/init.c                   | 2 --
 testsuites/smptests/smp09/init.c                   | 2 --
 testsuites/smptests/smpaffinity01/init.c           | 2 --
 testsuites/smptests/smpatomic01/init.c             | 2 --
 testsuites/smptests/smpcache01/init.c              | 2 --
 testsuites/smptests/smpcapture01/init.c            | 2 --
 testsuites/smptests/smpcapture02/init.c            | 2 --
 testsuites/smptests/smpclock01/init.c              | 2 --
 testsuites/smptests/smpfatal01/init.c              | 2 --
 testsuites/smptests/smpfatal02/init.c              | 2 --
 testsuites/smptests/smpfatal03/init.c              | 2 --
 testsuites/smptests/smpfatal04/init.c              | 2 --
 testsuites/smptests/smpfatal05/init.c              | 2 --
 testsuites/smptests/smpfatal06/init.c              | 2 --
 testsuites/smptests/smpfatal08/init.c              | 2 --
 testsuites/smptests/smpipi01/init.c                | 2 --
 testsuites/smptests/smpload01/init.c               | 2 --
 testsuites/smptests/smplock01/init.c               | 2 --
 testsuites/smptests/smpmigration01/init.c          | 2 --
 testsuites/smptests/smpmigration02/init.c          | 2 --
 testsuites/smptests/smpmrsp01/init.c               | 2 --
 testsuites/smptests/smpmutex01/init.c              | 2 --
 testsuites/smptests/smpmutex02/init.c              | 2 --
 testsuites/smptests/smppsxaffinity01/init.c        | 2 --
 testsuites/smptests/smppsxaffinity02/init.c        | 2 --
 testsuites/smptests/smppsxmutex01/init.c           | 2 --
 testsuites/smptests/smppsxsignal01/init.c          | 2 --
 testsuites/smptests/smpschedaffinity01/init.c      | 2 --
 testsuites/smptests/smpschedaffinity02/init.c      | 2 --
 testsuites/smptests/smpschedaffinity03/init.c      | 2 --
 testsuites/smptests/smpschedaffinity04/init.c      | 2 --
 testsuites/smptests/smpschedaffinity05/init.c      | 2 --
 testsuites/smptests/smpschededf01/init.c           | 2 --
 testsuites/smptests/smpschededf02/init.c           | 2 --
 testsuites/smptests/smpschededf03/init.c           | 2 --
 testsuites/smptests/smpschedsem01/init.c           | 2 --
 testsuites/smptests/smpscheduler01/init.c          | 2 --
 testsuites/smptests/smpscheduler02/init.c          | 2 --
 testsuites/smptests/smpscheduler03/test.c          | 2 --
 testsuites/smptests/smpscheduler04/init.c          | 2 --
 testsuites/smptests/smpsignal01/init.c             | 2 --
 testsuites/smptests/smpstrongapa01/init.c          | 2 --
 testsuites/smptests/smpswitchextension01/init.c    | 2 --
 testsuites/smptests/smpthreadlife01/init.c         | 2 --
 testsuites/smptests/smpunsupported01/init.c        | 2 --
 testsuites/smptests/smpwakeafter01/init.c          | 2 --
 testsuites/sptests/sp01/init.c                     | 2 --
 testsuites/sptests/sp02/init.c                     | 2 --
 testsuites/sptests/sp03/init.c                     | 2 --
 testsuites/sptests/sp04/init.c                     | 2 --
 testsuites/sptests/sp05/init.c                     | 2 --
 testsuites/sptests/sp06/init.c                     | 2 --
 testsuites/sptests/sp07/init.c                     | 2 --
 testsuites/sptests/sp08/init.c                     | 2 --
 testsuites/sptests/sp11/init.c                     | 2 --
 testsuites/sptests/sp12/init.c                     | 2 --
 testsuites/sptests/sp13/init.c                     | 2 --
 testsuites/sptests/sp14/init.c                     | 2 --
 testsuites/sptests/sp15/init.c                     | 2 --
 testsuites/sptests/sp16/init.c                     | 2 --
 testsuites/sptests/sp17/init.c                     | 2 --
 testsuites/sptests/sp18/init.c                     | 2 --
 testsuites/sptests/sp19/init.c                     | 2 --
 testsuites/sptests/sp20/init.c                     | 2 --
 testsuites/sptests/sp2038/init.c                   | 2 --
 testsuites/sptests/sp21/init.c                     | 2 --
 testsuites/sptests/sp22/init.c                     | 2 --
 testsuites/sptests/sp23/init.c                     | 2 --
 testsuites/sptests/sp24/init.c                     | 2 --
 testsuites/sptests/sp25/init.c                     | 2 --
 testsuites/sptests/sp26/init.c                     | 2 --
 testsuites/sptests/sp27/init.c                     | 2 --
 testsuites/sptests/sp29/init.c                     | 2 --
 testsuites/sptests/sp30/init.c                     | 2 --
 testsuites/sptests/sp31/init.c                     | 2 --
 testsuites/sptests/sp32/init.c                     | 2 --
 testsuites/sptests/sp33/init.c                     | 2 --
 testsuites/sptests/sp34/changepri.c                | 2 --
 testsuites/sptests/sp35/priinv.c                   | 2 --
 testsuites/sptests/sp36/strict_order_mut.c         | 2 --
 testsuites/sptests/sp37/init.c                     | 2 --
 testsuites/sptests/sp38/init.c                     | 2 --
 testsuites/sptests/sp40/init.c                     | 2 --
 testsuites/sptests/sp41/init.c                     | 2 --
 testsuites/sptests/sp42/init.c                     | 2 --
 testsuites/sptests/sp43/init.c                     | 2 --
 testsuites/sptests/sp44/init.c                     | 2 --
 testsuites/sptests/sp45/init.c                     | 2 --
 testsuites/sptests/sp46/init.c                     | 2 --
 testsuites/sptests/sp47/init.c                     | 2 --
 testsuites/sptests/sp48/init.c                     | 2 --
 testsuites/sptests/sp49/init.c                     | 2 --
 testsuites/sptests/sp50/init.c                     | 2 --
 testsuites/sptests/sp51/init.c                     | 2 --
 testsuites/sptests/sp52/init.c                     | 2 --
 testsuites/sptests/sp54/init.c                     | 2 --
 testsuites/sptests/sp55/init.c                     | 2 --
 testsuites/sptests/sp56/init.c                     | 2 --
 testsuites/sptests/sp57/init.c                     | 2 --
 testsuites/sptests/sp58/init.c                     | 2 --
 testsuites/sptests/sp59/init.c                     | 2 --
 testsuites/sptests/sp60/init.c                     | 2 --
 testsuites/sptests/sp62/init.c                     | 2 --
 testsuites/sptests/sp63/init.c                     | 2 --
 testsuites/sptests/sp64/init.c                     | 2 --
 testsuites/sptests/sp65/init.c                     | 2 --
 testsuites/sptests/sp67/init.c                     | 2 --
 testsuites/sptests/sp68/init.c                     | 2 --
 testsuites/sptests/sp69/init.c                     | 2 --
 testsuites/sptests/sp70/init.c                     | 2 --
 testsuites/sptests/sp71/init.c                     | 2 --
 testsuites/sptests/sp72/init.c                     | 2 --
 testsuites/sptests/sp73/init.c                     | 2 --
 testsuites/sptests/sp74/init.c                     | 2 --
 testsuites/sptests/sp75/init.c                     | 2 --
 testsuites/sptests/sp76/init.c                     | 2 --
 testsuites/sptests/sp77/init.c                     | 2 --
 testsuites/sptests/spassoc01/init.c                | 2 --
 testsuites/sptests/spatomic01/init.c               | 2 --
 testsuites/sptests/spcache01/init.c                | 2 --
 testsuites/sptests/spcbssched01/init.c             | 2 --
 testsuites/sptests/spcbssched02/init.c             | 2 --
 testsuites/sptests/spcbssched03/init.c             | 2 --
 testsuites/sptests/spchain/init.c                  | 2 --
 testsuites/sptests/spclock_err01/init.c            | 2 --
 testsuites/sptests/spclock_err02/init.c            | 2 --
 testsuites/sptests/spcontext01/init.c              | 2 --
 testsuites/sptests/spcoverage/init.c               | 2 --
 testsuites/sptests/spcpucounter01/init.c           | 2 --
 testsuites/sptests/spcpuset01/init.c               | 2 --
 testsuites/sptests/spedfsched01/init.c             | 2 --
 testsuites/sptests/spedfsched02/init.c             | 2 --
 testsuites/sptests/spedfsched03/init.c             | 2 --
 testsuites/sptests/spedfsched04/init.c             | 2 --
 testsuites/sptests/sperror01/init.c                | 2 --
 testsuites/sptests/sperror02/init.c                | 2 --
 testsuites/sptests/sperror03/init.c                | 2 --
 testsuites/sptests/spevent_err03/init.c            | 2 --
 testsuites/sptests/speventsystem01/init.c          | 2 --
 testsuites/sptests/speventtransient01/init.c       | 2 --
 testsuites/sptests/spextensions01/init.c           | 2 --
 testsuites/sptests/spfatal26/init.c                | 2 --
 testsuites/sptests/spfatal30/init.c                | 2 --
 testsuites/sptests/spfatal31/init.c                | 2 --
 testsuites/sptests/spfatal_support/init.c          | 2 --
 testsuites/sptests/spfifo01/init.c                 | 2 --
 testsuites/sptests/spfifo02/init.c                 | 2 --
 testsuites/sptests/spfifo03/init.c                 | 2 --
 testsuites/sptests/spfifo04/init.c                 | 2 --
 testsuites/sptests/spfifo05/init.c                 | 2 --
 testsuites/sptests/spfreechain01/init.c            | 2 --
 testsuites/sptests/spheapprot/init.c               | 2 --
 testsuites/sptests/spinternalerror01/init.c        | 2 --
 testsuites/sptests/spinternalerror02/init.c        | 2 --
 testsuites/sptests/spintr_err01/init.c             | 2 --
 testsuites/sptests/spintrcritical01/init.c         | 2 --
 testsuites/sptests/spintrcritical06/init.c         | 2 --
 testsuites/sptests/spintrcritical08/init.c         | 2 --
 testsuites/sptests/spintrcritical09/init.c         | 2 --
 testsuites/sptests/spintrcritical10/init.c         | 2 --
 testsuites/sptests/spintrcritical11/init.c         | 2 --
 testsuites/sptests/spintrcritical13/init.c         | 2 --
 testsuites/sptests/spintrcritical15/init.c         | 2 --
 testsuites/sptests/spintrcritical16/init.c         | 2 --
 testsuites/sptests/spintrcritical18/init.c         | 2 --
 testsuites/sptests/spintrcritical20/init.c         | 2 --
 testsuites/sptests/spintrcritical21/init.c         | 2 --
 testsuites/sptests/spintrcritical22/init.c         | 2 --
 testsuites/sptests/spintrcritical23/init.c         | 2 --
 testsuites/sptests/spintrcritical24/init.c         | 2 --
 testsuites/sptests/splinkersets01/init.c           | 2 --
 testsuites/sptests/spmkdir/init.c                  | 2 --
 testsuites/sptests/spmountmgr01/init.c             | 2 --
 testsuites/sptests/spmrsp01/init.c                 | 2 --
 testsuites/sptests/spmsgq_err01/init.c             | 2 --
 testsuites/sptests/spmsgq_err02/init.c             | 2 --
 testsuites/sptests/spmutex01/init.c                | 2 --
 testsuites/sptests/spnsext01/init.c                | 2 --
 testsuites/sptests/spobjgetnext/init.c             | 2 --
 testsuites/sptests/sppagesize/init.c               | 2 --
 testsuites/sptests/sppartition_err01/init.c        | 2 --
 testsuites/sptests/spport_err01/init.c             | 2 --
 testsuites/sptests/spprintk/init.c                 | 2 --
 testsuites/sptests/spprivenv01/init.c              | 2 --
 testsuites/sptests/spprofiling01/init.c            | 2 --
 testsuites/sptests/spqreslib/init.c                | 2 --
 testsuites/sptests/spratemon_err01/init.c          | 2 --
 testsuites/sptests/sprbtree01/init.c               | 2 --
 testsuites/sptests/spregion_err01/init.c           | 2 --
 testsuites/sptests/sprmsched01/init.c              | 2 --
 testsuites/sptests/sprmsched02/init.c              | 2 --
 testsuites/sptests/spscheduler01/init.c            | 1 -
 testsuites/sptests/spsem01/init.c                  | 2 --
 testsuites/sptests/spsem02/init.c                  | 2 --
 testsuites/sptests/spsem03/init.c                  | 2 --
 testsuites/sptests/spsem_err01/init.c              | 2 --
 testsuites/sptests/spsem_err02/init.c              | 2 --
 testsuites/sptests/spsignal_err01/init.c           | 2 --
 testsuites/sptests/spsimplesched01/init.c          | 2 --
 testsuites/sptests/spsimplesched02/init.c          | 2 --
 testsuites/sptests/spsimplesched03/init.c          | 2 --
 testsuites/sptests/spsize/init.c                   | 2 --
 testsuites/sptests/spstdthreads01/init.c           | 2 --
 testsuites/sptests/spstkalloc/init.c               | 2 --
 testsuites/sptests/spstkalloc02/init.c             | 2 --
 testsuites/sptests/spsysinit01/init.c              | 2 --
 testsuites/sptests/spsyslock01/init.c              | 2 --
 testsuites/sptests/sptask_err01/init.c             | 2 --
 testsuites/sptests/sptask_err02/init.c             | 2 --
 testsuites/sptests/sptask_err03/init.c             | 2 --
 testsuites/sptests/sptask_err04/init.c             | 2 --
 testsuites/sptests/sptasknopreempt01/init.c        | 2 --
 testsuites/sptests/spthreadlife01/init.c           | 2 --
 testsuites/sptests/spthreadq01/init.c              | 2 --
 testsuites/sptests/sptimecounter01/init.c          | 2 --
 testsuites/sptests/sptimecounter02/init.c          | 2 --
 testsuites/sptests/sptimecounter03/init.c          | 2 --
 testsuites/sptests/sptimecounter04/init.c          | 2 --
 testsuites/sptests/sptimer_err01/init.c            | 2 --
 testsuites/sptests/sptimer_err02/init.c            | 2 --
 testsuites/sptests/sptimerserver01/init.c          | 2 --
 testsuites/sptests/sptimespec01/init.c             | 2 --
 testsuites/sptests/sptls01/init.c                  | 2 --
 testsuites/sptests/sptls02/init.cc                 | 2 --
 testsuites/sptests/sptls03/init.c                  | 2 --
 testsuites/sptests/spwatchdog/init.c               | 2 --
 testsuites/sptests/spwkspace/init.c                | 2 --
 testsuites/support/include/tmacros.h               | 2 +-
 testsuites/tmtests/tm01/task1.c                    | 2 --
 testsuites/tmtests/tm02/task1.c                    | 2 --
 testsuites/tmtests/tm03/task1.c                    | 2 --
 testsuites/tmtests/tm04/task1.c                    | 2 --
 testsuites/tmtests/tm05/task1.c                    | 2 --
 testsuites/tmtests/tm06/task1.c                    | 2 --
 testsuites/tmtests/tm07/task1.c                    | 2 --
 testsuites/tmtests/tm08/task1.c                    | 2 --
 testsuites/tmtests/tm09/task1.c                    | 2 --
 testsuites/tmtests/tm10/task1.c                    | 2 --
 testsuites/tmtests/tm11/task1.c                    | 2 --
 testsuites/tmtests/tm12/task1.c                    | 2 --
 testsuites/tmtests/tm13/task1.c                    | 2 --
 testsuites/tmtests/tm14/task1.c                    | 2 --
 testsuites/tmtests/tm15/task1.c                    | 2 --
 testsuites/tmtests/tm16/task1.c                    | 2 --
 testsuites/tmtests/tm17/task1.c                    | 2 --
 testsuites/tmtests/tm18/task1.c                    | 2 --
 testsuites/tmtests/tm19/task1.c                    | 2 --
 testsuites/tmtests/tm20/task1.c                    | 2 --
 testsuites/tmtests/tm21/task1.c                    | 2 --
 testsuites/tmtests/tm22/task1.c                    | 2 --
 testsuites/tmtests/tm23/task1.c                    | 2 --
 testsuites/tmtests/tm24/task1.c                    | 2 --
 testsuites/tmtests/tm25/task1.c                    | 2 --
 testsuites/tmtests/tm26/task1.c                    | 2 --
 testsuites/tmtests/tm27/task1.c                    | 2 --
 testsuites/tmtests/tm28/task1.c                    | 2 --
 testsuites/tmtests/tm29/task1.c                    | 2 --
 testsuites/tmtests/tm30/init.c                     | 2 --
 testsuites/tmtests/tmck/task1.c                    | 2 --
 testsuites/tmtests/tmcontext01/init.c              | 2 --
 testsuites/tmtests/tmfine01/init.c                 | 2 --
 testsuites/tmtests/tmoverhd/testtask.c             | 2 --
 testsuites/tmtests/tmtimer01/init.c                | 2 --
 549 files changed, 1 insertion(+), 1096 deletions(-)

diff --git a/testsuites/benchmarks/dhrystone/init.c b/testsuites/benchmarks/dhrystone/init.c
index a109f4e..3e6245c 100644
--- a/testsuites/benchmarks/dhrystone/init.c
+++ b/testsuites/benchmarks/dhrystone/init.c
@@ -16,8 +16,6 @@
 #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #include "tmacros.h"
 
 const char rtems_test_name[] = "DHRYSTONE";
diff --git a/testsuites/benchmarks/linpack/init.c b/testsuites/benchmarks/linpack/init.c
index 38bfbaf..c94314b 100644
--- a/testsuites/benchmarks/linpack/init.c
+++ b/testsuites/benchmarks/linpack/init.c
@@ -16,8 +16,6 @@
 #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #include "tmacros.h"
 
 const char rtems_test_name[] = "LINPACK";
diff --git a/testsuites/benchmarks/whetstone/init.c b/testsuites/benchmarks/whetstone/init.c
index 572b6cc..b166118 100644
--- a/testsuites/benchmarks/whetstone/init.c
+++ b/testsuites/benchmarks/whetstone/init.c
@@ -16,8 +16,6 @@
 #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #include "tmacros.h"
 
 const char rtems_test_name[] = "WHETSTONE";
diff --git a/testsuites/fstests/fsbdpart01/init.c b/testsuites/fstests/fsbdpart01/init.c
index ec0b3f6..f339255 100644
--- a/testsuites/fstests/fsbdpart01/init.c
+++ b/testsuites/fstests/fsbdpart01/init.c
@@ -16,8 +16,6 @@
   #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #include "tmacros.h"
 
 #include <sys/stat.h>
diff --git a/testsuites/fstests/fsclose01/init.c b/testsuites/fstests/fsclose01/init.c
index 9e8a51e..77df082 100644
--- a/testsuites/fstests/fsclose01/init.c
+++ b/testsuites/fstests/fsclose01/init.c
@@ -16,8 +16,6 @@
 #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #include <sys/stat.h>
 #include <sys/ioctl.h>
 #include <sys/uio.h>
diff --git a/testsuites/fstests/fsdosfsformat01/init.c b/testsuites/fstests/fsdosfsformat01/init.c
index d84a80b..b7df748 100644
--- a/testsuites/fstests/fsdosfsformat01/init.c
+++ b/testsuites/fstests/fsdosfsformat01/init.c
@@ -16,8 +16,6 @@
   #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #include "tmacros.h"
 
 #include <fcntl.h>
diff --git a/testsuites/fstests/fsdosfsname01/init.c b/testsuites/fstests/fsdosfsname01/init.c
index ab01296..f272945 100644
--- a/testsuites/fstests/fsdosfsname01/init.c
+++ b/testsuites/fstests/fsdosfsname01/init.c
@@ -17,8 +17,6 @@
 #endif
 
 
-#define TEST_INIT
-
 #include "tmacros.h"
 
 #include <errno.h>
diff --git a/testsuites/fstests/fsdosfsname02/init.c b/testsuites/fstests/fsdosfsname02/init.c
index bfb3bd3..0496ca0 100644
--- a/testsuites/fstests/fsdosfsname02/init.c
+++ b/testsuites/fstests/fsdosfsname02/init.c
@@ -16,8 +16,6 @@
 #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #include <sys/stat.h>
 #include <fcntl.h>
 #include <stdlib.h>
diff --git a/testsuites/fstests/fsdosfssync01/init.c b/testsuites/fstests/fsdosfssync01/init.c
index 2b27408..c53d2cc 100644
--- a/testsuites/fstests/fsdosfssync01/init.c
+++ b/testsuites/fstests/fsdosfssync01/init.c
@@ -16,8 +16,6 @@
   #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #include "tmacros.h"
 
 #include <sys/stat.h>
diff --git a/testsuites/fstests/fsdosfswrite01/init.c b/testsuites/fstests/fsdosfswrite01/init.c
index b787e3c..525a882 100644
--- a/testsuites/fstests/fsdosfswrite01/init.c
+++ b/testsuites/fstests/fsdosfswrite01/init.c
@@ -16,8 +16,6 @@
   #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #include "tmacros.h"
 #include <fcntl.h>
 #include <rtems/dosfs.h>
diff --git a/testsuites/fstests/fsfseeko01/init.c b/testsuites/fstests/fsfseeko01/init.c
index ca6ce47..dd073ce 100644
--- a/testsuites/fstests/fsfseeko01/init.c
+++ b/testsuites/fstests/fsfseeko01/init.c
@@ -16,8 +16,6 @@
   #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #include "tmacros.h"
 
 #include <sys/types.h>
diff --git a/testsuites/fstests/fsimfsconfig01/init.c b/testsuites/fstests/fsimfsconfig01/init.c
index ed0e804..5ba3f1f 100644
--- a/testsuites/fstests/fsimfsconfig01/init.c
+++ b/testsuites/fstests/fsimfsconfig01/init.c
@@ -16,8 +16,6 @@
   #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #include "tmacros.h"
 
 #include <sys/stat.h>
diff --git a/testsuites/fstests/fsimfsconfig02/init.c b/testsuites/fstests/fsimfsconfig02/init.c
index 07df216..35f9c83 100644
--- a/testsuites/fstests/fsimfsconfig02/init.c
+++ b/testsuites/fstests/fsimfsconfig02/init.c
@@ -16,8 +16,6 @@
   #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #include "tmacros.h"
 
 #include <sys/stat.h>
diff --git a/testsuites/fstests/fsimfsconfig03/init.c b/testsuites/fstests/fsimfsconfig03/init.c
index 47f1fef..4905697 100644
--- a/testsuites/fstests/fsimfsconfig03/init.c
+++ b/testsuites/fstests/fsimfsconfig03/init.c
@@ -16,8 +16,6 @@
   #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #include "tmacros.h"
 
 #include <sys/stat.h>
diff --git a/testsuites/fstests/fsimfsgeneric01/init.c b/testsuites/fstests/fsimfsgeneric01/init.c
index fff59e4..45d6d1c 100644
--- a/testsuites/fstests/fsimfsgeneric01/init.c
+++ b/testsuites/fstests/fsimfsgeneric01/init.c
@@ -16,8 +16,6 @@
   #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #include "tmacros.h"
 
 #include <sys/stat.h>
diff --git a/testsuites/fstests/fsnofs01/init.c b/testsuites/fstests/fsnofs01/init.c
index 623f6bc..fc69879 100644
--- a/testsuites/fstests/fsnofs01/init.c
+++ b/testsuites/fstests/fsnofs01/init.c
@@ -16,8 +16,6 @@
   #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #include "tmacros.h"
 
 #include <sys/stat.h>
diff --git a/testsuites/fstests/fsrofs01/init.c b/testsuites/fstests/fsrofs01/init.c
index 323e275..45aae88 100644
--- a/testsuites/fstests/fsrofs01/init.c
+++ b/testsuites/fstests/fsrofs01/init.c
@@ -16,8 +16,6 @@
   #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #include "tmacros.h"
 
 #include <sys/stat.h>
diff --git a/testsuites/fstests/imfs_support/fs_support.c b/testsuites/fstests/imfs_support/fs_support.c
index 53271fe..966b01f 100644
--- a/testsuites/fstests/imfs_support/fs_support.c
+++ b/testsuites/fstests/imfs_support/fs_support.c
@@ -1,5 +1,3 @@
-#define TEST_INIT
-
 /*
  *  COPYRIGHT (c) 1989-2011.
  *  On-Line Applications Research Corporation (OAR).
diff --git a/testsuites/fstests/jffs2_support/fs_support.c b/testsuites/fstests/jffs2_support/fs_support.c
index 18dbe20..da80de6 100644
--- a/testsuites/fstests/jffs2_support/fs_support.c
+++ b/testsuites/fstests/jffs2_support/fs_support.c
@@ -12,8 +12,6 @@
  * http://www.rtems.org/license/LICENSE.
  */
 
-#define TEST_INIT
-
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
diff --git a/testsuites/fstests/mdosfs_support/fs_support.c b/testsuites/fstests/mdosfs_support/fs_support.c
index b233a33..1a07edf 100644
--- a/testsuites/fstests/mdosfs_support/fs_support.c
+++ b/testsuites/fstests/mdosfs_support/fs_support.c
@@ -1,5 +1,3 @@
-#define TEST_INIT
-
 /*
  *  COPYRIGHT (c) 1989-2011.
  *  On-Line Applications Research Corporation (OAR).
diff --git a/testsuites/fstests/mimfs_support/fs_support.c b/testsuites/fstests/mimfs_support/fs_support.c
index efcd5c4..7760ff7 100644
--- a/testsuites/fstests/mimfs_support/fs_support.c
+++ b/testsuites/fstests/mimfs_support/fs_support.c
@@ -7,8 +7,6 @@
  *  http://www.rtems.org/license/LICENSE.
  */
 
-#define TEST_INIT
-
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
diff --git a/testsuites/fstests/mrfs_support/fs_support.c b/testsuites/fstests/mrfs_support/fs_support.c
index 85e1217..1105350 100644
--- a/testsuites/fstests/mrfs_support/fs_support.c
+++ b/testsuites/fstests/mrfs_support/fs_support.c
@@ -7,8 +7,6 @@
  *  http://www.rtems.org/license/LICENSE.
  */
 
-#define TEST_INIT
-
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
diff --git a/testsuites/libtests/block01/init.c b/testsuites/libtests/block01/init.c
index c1a2069..b7eaa2b 100644
--- a/testsuites/libtests/block01/init.c
+++ b/testsuites/libtests/block01/init.c
@@ -24,8 +24,6 @@
 #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #include <sys/stat.h>
 #include <stdio.h>
 #include <fcntl.h>
diff --git a/testsuites/libtests/block02/init.c b/testsuites/libtests/block02/init.c
index 361475d..51a286e 100644
--- a/testsuites/libtests/block02/init.c
+++ b/testsuites/libtests/block02/init.c
@@ -24,8 +24,6 @@
 #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #include "tmacros.h"
 
 #include <rtems.h>
diff --git a/testsuites/libtests/block03/init.c b/testsuites/libtests/block03/init.c
index 3a5e110..41f7730 100644
--- a/testsuites/libtests/block03/init.c
+++ b/testsuites/libtests/block03/init.c
@@ -24,8 +24,6 @@
 #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #include "tmacros.h"
 
 #include <rtems.h>
diff --git a/testsuites/libtests/block04/init.c b/testsuites/libtests/block04/init.c
index cf39ea9..372b62b 100644
--- a/testsuites/libtests/block04/init.c
+++ b/testsuites/libtests/block04/init.c
@@ -24,8 +24,6 @@
 #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #include "tmacros.h"
 
 #include <rtems.h>
diff --git a/testsuites/libtests/block05/init.c b/testsuites/libtests/block05/init.c
index 4003c34..bbe2bf6 100644
--- a/testsuites/libtests/block05/init.c
+++ b/testsuites/libtests/block05/init.c
@@ -24,8 +24,6 @@
 #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #include "tmacros.h"
 #include <stdarg.h>
 #include <errno.h>
diff --git a/testsuites/libtests/block06/init.c b/testsuites/libtests/block06/init.c
index ea4bc4d..1f91f45 100644
--- a/testsuites/libtests/block06/init.c
+++ b/testsuites/libtests/block06/init.c
@@ -16,8 +16,6 @@
 #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #include <errno.h>
 #include <setjmp.h>
 #include <stdio.h>
diff --git a/testsuites/libtests/block07/init.c b/testsuites/libtests/block07/init.c
index 727bb6f..0d467e8 100644
--- a/testsuites/libtests/block07/init.c
+++ b/testsuites/libtests/block07/init.c
@@ -23,8 +23,6 @@
 #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #include <sys/ioctl.h>
 #include <sys/types.h>
 #include <sys/stat.h>
diff --git a/testsuites/libtests/block08/init.c b/testsuites/libtests/block08/init.c
index e712b07..83eaf6d 100644
--- a/testsuites/libtests/block08/init.c
+++ b/testsuites/libtests/block08/init.c
@@ -19,8 +19,6 @@
 #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #include "tmacros.h"
 
 #define CONFIGURE_INIT
diff --git a/testsuites/libtests/block09/init.c b/testsuites/libtests/block09/init.c
index ca6efd2..1a7b02a 100644
--- a/testsuites/libtests/block09/init.c
+++ b/testsuites/libtests/block09/init.c
@@ -24,8 +24,6 @@
 #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #include "tmacros.h"
 
 #include <assert.h>
diff --git a/testsuites/libtests/block10/init.c b/testsuites/libtests/block10/init.c
index 9827744..c7aff42 100644
--- a/testsuites/libtests/block10/init.c
+++ b/testsuites/libtests/block10/init.c
@@ -23,8 +23,6 @@
 #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #define TESTS_USE_PRINTF
 #include "tmacros.h"
 
diff --git a/testsuites/libtests/block11/init.c b/testsuites/libtests/block11/init.c
index 68f962f..4d19d19 100644
--- a/testsuites/libtests/block11/init.c
+++ b/testsuites/libtests/block11/init.c
@@ -24,8 +24,6 @@
   #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #include "tmacros.h"
 
 #include <sys/stat.h>
diff --git a/testsuites/libtests/block12/init.c b/testsuites/libtests/block12/init.c
index c7a409d..5b74977 100644
--- a/testsuites/libtests/block12/init.c
+++ b/testsuites/libtests/block12/init.c
@@ -16,8 +16,6 @@
   #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #include "tmacros.h"
 
 #include <errno.h>
diff --git a/testsuites/libtests/block13/init.c b/testsuites/libtests/block13/init.c
index c936e0c..82c9b3a 100644
--- a/testsuites/libtests/block13/init.c
+++ b/testsuites/libtests/block13/init.c
@@ -16,8 +16,6 @@
   #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #include "tmacros.h"
 
 #include <errno.h>
diff --git a/testsuites/libtests/block14/init.c b/testsuites/libtests/block14/init.c
index d7cd640..ab5ba57 100644
--- a/testsuites/libtests/block14/init.c
+++ b/testsuites/libtests/block14/init.c
@@ -16,8 +16,6 @@
   #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #include "tmacros.h"
 
 #include <errno.h>
diff --git a/testsuites/libtests/block15/init.c b/testsuites/libtests/block15/init.c
index fa2f1dd..19d30d1 100644
--- a/testsuites/libtests/block15/init.c
+++ b/testsuites/libtests/block15/init.c
@@ -16,8 +16,6 @@
   #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #include "tmacros.h"
 
 #include <errno.h>
diff --git a/testsuites/libtests/block16/init.c b/testsuites/libtests/block16/init.c
index 0c83f05..c7d4148 100644
--- a/testsuites/libtests/block16/init.c
+++ b/testsuites/libtests/block16/init.c
@@ -16,8 +16,6 @@
   #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #include "tmacros.h"
 
 #include <sys/ioctl.h>
diff --git a/testsuites/libtests/block17/init.c b/testsuites/libtests/block17/init.c
index 43dcde0..384cb95 100644
--- a/testsuites/libtests/block17/init.c
+++ b/testsuites/libtests/block17/init.c
@@ -16,8 +16,6 @@
   #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #include <rtems/bdbuf.h>
 
 #include "tmacros.h"
diff --git a/testsuites/libtests/bspcmdline01/init.c b/testsuites/libtests/bspcmdline01/init.c
index 64d70bc..bea5021 100644
--- a/testsuites/libtests/bspcmdline01/init.c
+++ b/testsuites/libtests/bspcmdline01/init.c
@@ -11,8 +11,6 @@
 #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #include <tmacros.h>
 #include <rtems/bspcmdline.h>
 
diff --git a/testsuites/libtests/capture01/init.c b/testsuites/libtests/capture01/init.c
index 4791c5a..a7a8e0c 100644
--- a/testsuites/libtests/capture01/init.c
+++ b/testsuites/libtests/capture01/init.c
@@ -13,8 +13,6 @@
 #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #include "system.h"
 #include <ctype.h>
 #include <stdlib.h>
diff --git a/testsuites/libtests/cpuuse/init.c b/testsuites/libtests/cpuuse/init.c
index 899b7db..11fb273 100644
--- a/testsuites/libtests/cpuuse/init.c
+++ b/testsuites/libtests/cpuuse/init.c
@@ -19,8 +19,6 @@
 #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #define CONFIGURE_INIT
 #include "system.h"
 
diff --git a/testsuites/libtests/crypt01/init.c b/testsuites/libtests/crypt01/init.c
index 7c9dca0..545c533 100644
--- a/testsuites/libtests/crypt01/init.c
+++ b/testsuites/libtests/crypt01/init.c
@@ -39,8 +39,6 @@
   #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #include <crypt.h>
 #include <string.h>
 
diff --git a/testsuites/libtests/debugger01/init.c b/testsuites/libtests/debugger01/init.c
index 1bb28d4..9fb8500 100644
--- a/testsuites/libtests/debugger01/init.c
+++ b/testsuites/libtests/debugger01/init.c
@@ -12,8 +12,6 @@
 #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #define CONFIGURE_INIT
 #include "system.h"
 
diff --git a/testsuites/libtests/defaultconfig01/init.c b/testsuites/libtests/defaultconfig01/init.c
index 66bb9d3..21c326d 100644
--- a/testsuites/libtests/defaultconfig01/init.c
+++ b/testsuites/libtests/defaultconfig01/init.c
@@ -16,8 +16,6 @@
   #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #include <stdio.h>
 
 #include <bsp.h>
diff --git a/testsuites/libtests/devfs01/init.c b/testsuites/libtests/devfs01/init.c
index c727cb3..44b55e1 100644
--- a/testsuites/libtests/devfs01/init.c
+++ b/testsuites/libtests/devfs01/init.c
@@ -11,8 +11,6 @@
 #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #include <tmacros.h>
 #include "test_support.h"
 #include <rtems/devfs.h>
diff --git a/testsuites/libtests/devfs02/init.c b/testsuites/libtests/devfs02/init.c
index 16121a5..b9de92a 100644
--- a/testsuites/libtests/devfs02/init.c
+++ b/testsuites/libtests/devfs02/init.c
@@ -14,8 +14,6 @@
   #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #include "test_support.h"
 
 #include <tmacros.h>
diff --git a/testsuites/libtests/devfs03/init.c b/testsuites/libtests/devfs03/init.c
index 34d488b..147deeb 100644
--- a/testsuites/libtests/devfs03/init.c
+++ b/testsuites/libtests/devfs03/init.c
@@ -14,8 +14,6 @@
 #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #include <tmacros.h>
 #include "test_support.h"
 #include <rtems/devfs.h>
diff --git a/testsuites/libtests/devfs04/init.c b/testsuites/libtests/devfs04/init.c
index 1c3ea05..ea952d8 100644
--- a/testsuites/libtests/devfs04/init.c
+++ b/testsuites/libtests/devfs04/init.c
@@ -11,8 +11,6 @@
 #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #include <tmacros.h>
 #include "test_support.h"
 #include <rtems/devfs.h>
diff --git a/testsuites/libtests/deviceio01/init.c b/testsuites/libtests/deviceio01/init.c
index 6271463..519719d 100644
--- a/testsuites/libtests/deviceio01/init.c
+++ b/testsuites/libtests/deviceio01/init.c
@@ -11,8 +11,6 @@
 #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #include <tmacros.h>
 #include "test_support.h"
 #include <rtems/devfs.h>
diff --git a/testsuites/libtests/dl01/init.c b/testsuites/libtests/dl01/init.c
index d511c19..ec7ae1a 100644
--- a/testsuites/libtests/dl01/init.c
+++ b/testsuites/libtests/dl01/init.c
@@ -10,8 +10,6 @@
   #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #include "tmacros.h"
 
 #include <errno.h>
diff --git a/testsuites/libtests/dl02/init.c b/testsuites/libtests/dl02/init.c
index b796b9e..bf2d1a9 100644
--- a/testsuites/libtests/dl02/init.c
+++ b/testsuites/libtests/dl02/init.c
@@ -10,8 +10,6 @@
   #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #include "tmacros.h"
 
 #include <errno.h>
diff --git a/testsuites/libtests/dl03/init.c b/testsuites/libtests/dl03/init.c
index ddfda7a..ae82722 100644
--- a/testsuites/libtests/dl03/init.c
+++ b/testsuites/libtests/dl03/init.c
@@ -10,8 +10,6 @@
   #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #include "tmacros.h"
 
 #include <errno.h>
diff --git a/testsuites/libtests/dl04/init.c b/testsuites/libtests/dl04/init.c
index d8655a6..eb3018e 100644
--- a/testsuites/libtests/dl04/init.c
+++ b/testsuites/libtests/dl04/init.c
@@ -10,8 +10,6 @@
   #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #include "tmacros.h"
 
 #include <errno.h>
diff --git a/testsuites/libtests/dl05/init.c b/testsuites/libtests/dl05/init.c
index a224f9a..0c58204 100644
--- a/testsuites/libtests/dl05/init.c
+++ b/testsuites/libtests/dl05/init.c
@@ -10,8 +10,6 @@
   #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #include "tmacros.h"
 
 #include <errno.h>
diff --git a/testsuites/libtests/dumpbuf01/init.c b/testsuites/libtests/dumpbuf01/init.c
index 4d03ffc..e9671cd 100644
--- a/testsuites/libtests/dumpbuf01/init.c
+++ b/testsuites/libtests/dumpbuf01/init.c
@@ -11,8 +11,6 @@
 #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #include <tmacros.h>
 #include "test_support.h"
 #include <rtems/dumpbuf.h>
diff --git a/testsuites/libtests/exit01/init.c b/testsuites/libtests/exit01/init.c
index 75da2df..c73738d 100644
--- a/testsuites/libtests/exit01/init.c
+++ b/testsuites/libtests/exit01/init.c
@@ -16,8 +16,6 @@
   #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #include "tmacros.h"
 
 #include <stdlib.h>
diff --git a/testsuites/libtests/exit02/init.c b/testsuites/libtests/exit02/init.c
index 95eba4f..b9874a8 100644
--- a/testsuites/libtests/exit02/init.c
+++ b/testsuites/libtests/exit02/init.c
@@ -16,8 +16,6 @@
   #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #include "tmacros.h"
 
 #include <stdlib.h>
diff --git a/testsuites/libtests/flashdisk01/init.c b/testsuites/libtests/flashdisk01/init.c
index 276ba5d..ea1b583 100644
--- a/testsuites/libtests/flashdisk01/init.c
+++ b/testsuites/libtests/flashdisk01/init.c
@@ -16,8 +16,6 @@
   #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #include "tmacros.h"
 
 #include <sys/stat.h>
diff --git a/testsuites/libtests/ftp01/init.c b/testsuites/libtests/ftp01/init.c
index af8dd07..ad166c3 100644
--- a/testsuites/libtests/ftp01/init.c
+++ b/testsuites/libtests/ftp01/init.c
@@ -16,8 +16,6 @@
 #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #include <sys/stat.h>
 #include <fcntl.h>
 #include <string.h>
diff --git a/testsuites/libtests/gxx01/init.c b/testsuites/libtests/gxx01/init.c
index c73e2b2..a0debcd 100644
--- a/testsuites/libtests/gxx01/init.c
+++ b/testsuites/libtests/gxx01/init.c
@@ -11,8 +11,6 @@
 #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #include <errno.h>
 #include <tmacros.h>
 #include "test_support.h"
diff --git a/testsuites/libtests/heapwalk/init.c b/testsuites/libtests/heapwalk/init.c
index 7d221aa..3bd6c91 100644
--- a/testsuites/libtests/heapwalk/init.c
+++ b/testsuites/libtests/heapwalk/init.c
@@ -15,8 +15,6 @@
 #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #define CONFIGURE_INIT
 #include "system.h"
 
diff --git a/testsuites/libtests/i2c01/init.c b/testsuites/libtests/i2c01/init.c
index 9994a9c..0d6fc83 100644
--- a/testsuites/libtests/i2c01/init.c
+++ b/testsuites/libtests/i2c01/init.c
@@ -16,8 +16,6 @@
   #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #include <dev/i2c/i2c.h>
 #include <dev/i2c/eeprom.h>
 #include <dev/i2c/gpio-nxp-pca9535.h>
diff --git a/testsuites/libtests/libfdt01/init.c b/testsuites/libtests/libfdt01/init.c
index 9324aa9..a13fc82 100644
--- a/testsuites/libtests/libfdt01/init.c
+++ b/testsuites/libtests/libfdt01/init.c
@@ -16,8 +16,6 @@
   #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #include "tmacros.h"
 
 #include <libfdt.h>
diff --git a/testsuites/libtests/malloc02/init.c b/testsuites/libtests/malloc02/init.c
index d3937ca..c333b228 100644
--- a/testsuites/libtests/malloc02/init.c
+++ b/testsuites/libtests/malloc02/init.c
@@ -11,8 +11,6 @@
 #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #include <tmacros.h>
 
 const char rtems_test_name[] = "MALLOC 2";
diff --git a/testsuites/libtests/malloc03/init.c b/testsuites/libtests/malloc03/init.c
index 51d1c13..3b23a07 100644
--- a/testsuites/libtests/malloc03/init.c
+++ b/testsuites/libtests/malloc03/init.c
@@ -11,8 +11,6 @@
 #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #include <tmacros.h>
 #include "test_support.h"
 
diff --git a/testsuites/libtests/malloc04/init.c b/testsuites/libtests/malloc04/init.c
index 3fc6906..dabbf98 100644
--- a/testsuites/libtests/malloc04/init.c
+++ b/testsuites/libtests/malloc04/init.c
@@ -11,8 +11,6 @@
 #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #include <tmacros.h>
 #include "test_support.h"
 #include <rtems/libcsupport.h>
diff --git a/testsuites/libtests/malloctest/init.c b/testsuites/libtests/malloctest/init.c
index 59aa1a1..6be6c1c 100644
--- a/testsuites/libtests/malloctest/init.c
+++ b/testsuites/libtests/malloctest/init.c
@@ -13,8 +13,6 @@
 #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #define CONFIGURE_INIT
 #include "system.h"
 
diff --git a/testsuites/libtests/md501/init.c b/testsuites/libtests/md501/init.c
index f743454..124c2d7 100644
--- a/testsuites/libtests/md501/init.c
+++ b/testsuites/libtests/md501/init.c
@@ -16,8 +16,6 @@
   #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #include "tmacros.h"
 
 #include <md5.h>
diff --git a/testsuites/libtests/mghttpd01/init.c b/testsuites/libtests/mghttpd01/init.c
index 31f0972..39071a8 100644
--- a/testsuites/libtests/mghttpd01/init.c
+++ b/testsuites/libtests/mghttpd01/init.c
@@ -16,8 +16,6 @@
   #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #include <rtems.h>
 
 #include <tmacros.h>
diff --git a/testsuites/libtests/monitor/init.c b/testsuites/libtests/monitor/init.c
index e579d3c..1511228 100644
--- a/testsuites/libtests/monitor/init.c
+++ b/testsuites/libtests/monitor/init.c
@@ -15,8 +15,6 @@
 #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #define CONFIGURE_INIT
 #include "system.h"
 
diff --git a/testsuites/libtests/monitor02/init.c b/testsuites/libtests/monitor02/init.c
index 105f1fd..22818cc 100644
--- a/testsuites/libtests/monitor02/init.c
+++ b/testsuites/libtests/monitor02/init.c
@@ -15,8 +15,6 @@
 #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #define CONFIGURE_INIT
 #include "bsp.h"
 #include "system.h"
diff --git a/testsuites/libtests/mouse01/init.c b/testsuites/libtests/mouse01/init.c
index 24d6a2e..d0a127d 100644
--- a/testsuites/libtests/mouse01/init.c
+++ b/testsuites/libtests/mouse01/init.c
@@ -11,8 +11,6 @@
 #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #include <bsp.h>
 
 #include <stdlib.h>
diff --git a/testsuites/libtests/networking01/init.c b/testsuites/libtests/networking01/init.c
index 00f0bd4..f22b332 100644
--- a/testsuites/libtests/networking01/init.c
+++ b/testsuites/libtests/networking01/init.c
@@ -16,8 +16,6 @@
 #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #include <sys/socket.h>
 #include <netdb.h>
 #include <string.h>
diff --git a/testsuites/libtests/newlib01/init.c b/testsuites/libtests/newlib01/init.c
index bbe260e..24dad1c 100644
--- a/testsuites/libtests/newlib01/init.c
+++ b/testsuites/libtests/newlib01/init.c
@@ -16,8 +16,6 @@
   #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #include <stdio.h>
 
 #include <rtems.h>
diff --git a/testsuites/libtests/putenvtest/init.c b/testsuites/libtests/putenvtest/init.c
index a71ed42..0c2ca66 100644
--- a/testsuites/libtests/putenvtest/init.c
+++ b/testsuites/libtests/putenvtest/init.c
@@ -23,8 +23,6 @@
 #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #define CONFIGURE_INIT
 #include <tmacros.h>
 #include <stdio.h>
diff --git a/testsuites/libtests/pwdgrp01/init.c b/testsuites/libtests/pwdgrp01/init.c
index af04cc8..bc37367 100644
--- a/testsuites/libtests/pwdgrp01/init.c
+++ b/testsuites/libtests/pwdgrp01/init.c
@@ -16,8 +16,6 @@
   #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #include <sys/stat.h>
 #include <sys/types.h>
 #include <errno.h>
diff --git a/testsuites/libtests/pwdgrp02/init.c b/testsuites/libtests/pwdgrp02/init.c
index 15939cd..ebc8d0b 100644
--- a/testsuites/libtests/pwdgrp02/init.c
+++ b/testsuites/libtests/pwdgrp02/init.c
@@ -16,8 +16,6 @@
   #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #include <sys/stat.h>
 #include <sys/types.h>
 #include <errno.h>
diff --git a/testsuites/libtests/rbheap01/init.c b/testsuites/libtests/rbheap01/init.c
index c97f677..a85d107 100644
--- a/testsuites/libtests/rbheap01/init.c
+++ b/testsuites/libtests/rbheap01/init.c
@@ -16,8 +16,6 @@
   #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #include "tmacros.h"
 
 #include <rtems.h>
diff --git a/testsuites/libtests/rtmonuse/init.c b/testsuites/libtests/rtmonuse/init.c
index f6cb347..a3f2ee1 100644
--- a/testsuites/libtests/rtmonuse/init.c
+++ b/testsuites/libtests/rtmonuse/init.c
@@ -23,8 +23,6 @@
 #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #define CONFIGURE_INIT
 #include "system.h"
 
diff --git a/testsuites/libtests/sha/init.c b/testsuites/libtests/sha/init.c
index c53f2f8..797eec7 100644
--- a/testsuites/libtests/sha/init.c
+++ b/testsuites/libtests/sha/init.c
@@ -16,8 +16,6 @@
   #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #include <sha256.h>
 #include <sha512.h>
 #include <stdio.h>
diff --git a/testsuites/libtests/shell01/init.c b/testsuites/libtests/shell01/init.c
index bf3b50d..b7ec2d1 100644
--- a/testsuites/libtests/shell01/init.c
+++ b/testsuites/libtests/shell01/init.c
@@ -16,8 +16,6 @@
   #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #include <sys/stat.h>
 #include <sys/types.h>
 #include <errno.h>
diff --git a/testsuites/libtests/sparsedisk01/init.c b/testsuites/libtests/sparsedisk01/init.c
index 6d3a648..7c556cd 100644
--- a/testsuites/libtests/sparsedisk01/init.c
+++ b/testsuites/libtests/sparsedisk01/init.c
@@ -16,8 +16,6 @@
   #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #include <fcntl.h>
 #include <rtems/blkdev.h>
 #include "rtems/sparse-disk.h"
diff --git a/testsuites/libtests/spi01/init.c b/testsuites/libtests/spi01/init.c
index e478d7b..990d3ec 100644
--- a/testsuites/libtests/spi01/init.c
+++ b/testsuites/libtests/spi01/init.c
@@ -16,8 +16,6 @@
   #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #include <dev/spi/spi.h>
 
 #include <sys/ioctl.h>
diff --git a/testsuites/libtests/stackchk/init.c b/testsuites/libtests/stackchk/init.c
index a88d01a..72e3c23 100644
--- a/testsuites/libtests/stackchk/init.c
+++ b/testsuites/libtests/stackchk/init.c
@@ -23,8 +23,6 @@
 #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #define CONFIGURE_INIT
 #include "system.h"
 
diff --git a/testsuites/libtests/stackchk01/init.c b/testsuites/libtests/stackchk01/init.c
index cb72c94..be0d494 100644
--- a/testsuites/libtests/stackchk01/init.c
+++ b/testsuites/libtests/stackchk01/init.c
@@ -11,8 +11,6 @@
 #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #include <tmacros.h>
 #include <rtems/stackchk.h>
 
diff --git a/testsuites/libtests/stringto01/init.c b/testsuites/libtests/stringto01/init.c
index fd1c262..d36a4e5 100644
--- a/testsuites/libtests/stringto01/init.c
+++ b/testsuites/libtests/stringto01/init.c
@@ -11,8 +11,6 @@
 #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #include "tmacros.h"
 #include <rtems/stringto.h>
 #include <limits.h>
diff --git a/testsuites/libtests/syscall01/init.c b/testsuites/libtests/syscall01/init.c
index b58f73c..253b91f 100644
--- a/testsuites/libtests/syscall01/init.c
+++ b/testsuites/libtests/syscall01/init.c
@@ -16,8 +16,6 @@
   #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #include "tmacros.h"
 
 #include <sys/select.h>
diff --git a/testsuites/libtests/tar01/init.c b/testsuites/libtests/tar01/init.c
index 8f3d690..858c941 100644
--- a/testsuites/libtests/tar01/init.c
+++ b/testsuites/libtests/tar01/init.c
@@ -11,8 +11,6 @@
 #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #include <bsp.h> /* for device driver prototypes */
 #include "tmacros.h"
 #include <rtems/untar.h>
diff --git a/testsuites/libtests/tar02/init.c b/testsuites/libtests/tar02/init.c
index 6d0c9a7..23c1187 100644
--- a/testsuites/libtests/tar02/init.c
+++ b/testsuites/libtests/tar02/init.c
@@ -11,8 +11,6 @@
 #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #include <bsp.h> /* for device driver prototypes */
 #include "tmacros.h"
 #include <rtems/imfs.h>
diff --git a/testsuites/libtests/tar03/init.c b/testsuites/libtests/tar03/init.c
index 9a79222..72e95ec 100644
--- a/testsuites/libtests/tar03/init.c
+++ b/testsuites/libtests/tar03/init.c
@@ -11,8 +11,6 @@
 #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #include <tmacros.h>
 #include "test_support.h"
 
diff --git a/testsuites/libtests/termios/init.c b/testsuites/libtests/termios/init.c
index deb6a88..558f095 100644
--- a/testsuites/libtests/termios/init.c
+++ b/testsuites/libtests/termios/init.c
@@ -24,8 +24,6 @@
 #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #include <bsp.h>
 
 #include <rtems/shell.h>
diff --git a/testsuites/libtests/termios01/init.c b/testsuites/libtests/termios01/init.c
index 865b55c..a892762 100644
--- a/testsuites/libtests/termios01/init.c
+++ b/testsuites/libtests/termios01/init.c
@@ -11,8 +11,6 @@
 #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #include "tmacros.h"
 #define TTYDEFCHARS
 #include <termios.h>
diff --git a/testsuites/libtests/termios02/init.c b/testsuites/libtests/termios02/init.c
index eead771..fe16150 100644
--- a/testsuites/libtests/termios02/init.c
+++ b/testsuites/libtests/termios02/init.c
@@ -11,8 +11,6 @@
 #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #include "tmacros.h"
 #include <termios.h>
 #include <errno.h>
diff --git a/testsuites/libtests/termios03/init.c b/testsuites/libtests/termios03/init.c
index d18c1c3..ab33ac8 100644
--- a/testsuites/libtests/termios03/init.c
+++ b/testsuites/libtests/termios03/init.c
@@ -11,8 +11,6 @@
 #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #include <tmacros.h>
 #include "test_support.h"
 #include "termios_testdriver_polled.h"
diff --git a/testsuites/libtests/termios04/init.c b/testsuites/libtests/termios04/init.c
index ed76962..dd9f653 100644
--- a/testsuites/libtests/termios04/init.c
+++ b/testsuites/libtests/termios04/init.c
@@ -11,8 +11,6 @@
 #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #include <tmacros.h>
 #include "test_support.h"
 #include "termios_testdriver_intr.h"
diff --git a/testsuites/libtests/termios05/init.c b/testsuites/libtests/termios05/init.c
index d359165..72c9e81 100644
--- a/testsuites/libtests/termios05/init.c
+++ b/testsuites/libtests/termios05/init.c
@@ -11,8 +11,6 @@
 #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #include <tmacros.h>
 #include "test_support.h"
 #include "termios_testdriver_intr.h"
diff --git a/testsuites/libtests/termios06/init.c b/testsuites/libtests/termios06/init.c
index c1e04eb..acdcc33 100644
--- a/testsuites/libtests/termios06/init.c
+++ b/testsuites/libtests/termios06/init.c
@@ -11,8 +11,6 @@
 #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #include <tmacros.h>
 #include "test_support.h"
 #include "termios_testdriver_polled.h"
diff --git a/testsuites/libtests/termios07/init.c b/testsuites/libtests/termios07/init.c
index d6a91ef..bda570d 100644
--- a/testsuites/libtests/termios07/init.c
+++ b/testsuites/libtests/termios07/init.c
@@ -11,8 +11,6 @@
 #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #include <tmacros.h>
 #include "test_support.h"
 #include "termios_testdriver_intr.h"
diff --git a/testsuites/libtests/termios08/init.c b/testsuites/libtests/termios08/init.c
index 7c29098..317ce72 100644
--- a/testsuites/libtests/termios08/init.c
+++ b/testsuites/libtests/termios08/init.c
@@ -11,8 +11,6 @@
 #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #include <tmacros.h>
 #include "test_support.h"
 #include "termios_testdriver_polled.h"
diff --git a/testsuites/libtests/termios09/init.c b/testsuites/libtests/termios09/init.c
index 46b4c76..6feb521 100644
--- a/testsuites/libtests/termios09/init.c
+++ b/testsuites/libtests/termios09/init.c
@@ -16,8 +16,6 @@
 #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #include <sys/stat.h>
 #include <fcntl.h>
 #include <string.h>
diff --git a/testsuites/libtests/top/init.c b/testsuites/libtests/top/init.c
index ed33d82..8a824ae 100644
--- a/testsuites/libtests/top/init.c
+++ b/testsuites/libtests/top/init.c
@@ -21,8 +21,6 @@
 #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #define CONFIGURE_INIT
 #include "system.h"
 
diff --git a/testsuites/libtests/tztest/init.c b/testsuites/libtests/tztest/init.c
index 263bd8e..88799f5 100644
--- a/testsuites/libtests/tztest/init.c
+++ b/testsuites/libtests/tztest/init.c
@@ -20,8 +20,6 @@
 
 #define CONFIGURE_INIT
 
-#define TEST_INIT
-
 #include <tmacros.h>
 #include <time.h>
 #include <stdlib.h>
diff --git a/testsuites/libtests/uid01/init.c b/testsuites/libtests/uid01/init.c
index 90490fa..aae4b4b 100644
--- a/testsuites/libtests/uid01/init.c
+++ b/testsuites/libtests/uid01/init.c
@@ -10,8 +10,6 @@
 #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #include <bsp.h>
 
 #include <stdlib.h>
diff --git a/testsuites/libtests/utf8proc01/init.c b/testsuites/libtests/utf8proc01/init.c
index 142af2b..fda1444 100644
--- a/testsuites/libtests/utf8proc01/init.c
+++ b/testsuites/libtests/utf8proc01/init.c
@@ -16,8 +16,6 @@
   #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #include "tmacros.h"
 
 #include <string.h>
diff --git a/testsuites/mptests/mp01/init.c b/testsuites/mptests/mp01/init.c
index 33e8110..9e1a1a7 100644
--- a/testsuites/mptests/mp01/init.c
+++ b/testsuites/mptests/mp01/init.c
@@ -23,8 +23,6 @@
 #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #define CONFIGURE_INIT
 #include "system.h"
 
diff --git a/testsuites/mptests/mp03/init.c b/testsuites/mptests/mp03/init.c
index 6197f40..9607a44 100644
--- a/testsuites/mptests/mp03/init.c
+++ b/testsuites/mptests/mp03/init.c
@@ -23,8 +23,6 @@
 #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #define CONFIGURE_INIT
 #include "system.h"
 
diff --git a/testsuites/mptests/mp04/init.c b/testsuites/mptests/mp04/init.c
index 9d5bfc7..5fbcaf8 100644
--- a/testsuites/mptests/mp04/init.c
+++ b/testsuites/mptests/mp04/init.c
@@ -23,8 +23,6 @@
 #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #define CONFIGURE_INIT
 #include "system.h"
 
diff --git a/testsuites/mptests/mp05/init.c b/testsuites/mptests/mp05/init.c
index b93c81a..9ecac0e 100644
--- a/testsuites/mptests/mp05/init.c
+++ b/testsuites/mptests/mp05/init.c
@@ -23,8 +23,6 @@
 #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #define CONFIGURE_INIT
 #include "system.h"
 
diff --git a/testsuites/mptests/mp06/init.c b/testsuites/mptests/mp06/init.c
index 12e57a1..3907517 100644
--- a/testsuites/mptests/mp06/init.c
+++ b/testsuites/mptests/mp06/init.c
@@ -23,8 +23,6 @@
 #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #define CONFIGURE_INIT
 #include "system.h"
 
diff --git a/testsuites/mptests/mp07/init.c b/testsuites/mptests/mp07/init.c
index 7cdf386..4bf3d57 100644
--- a/testsuites/mptests/mp07/init.c
+++ b/testsuites/mptests/mp07/init.c
@@ -23,8 +23,6 @@
 #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #define CONFIGURE_INIT
 #include "system.h"
 
diff --git a/testsuites/mptests/mp08/init.c b/testsuites/mptests/mp08/init.c
index 8ce0c9a..a4e1ad4 100644
--- a/testsuites/mptests/mp08/init.c
+++ b/testsuites/mptests/mp08/init.c
@@ -23,8 +23,6 @@
 #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #define CONFIGURE_INIT
 #include "system.h"
 
diff --git a/testsuites/mptests/mp09/init.c b/testsuites/mptests/mp09/init.c
index 7cc24a6..8f64a3a 100644
--- a/testsuites/mptests/mp09/init.c
+++ b/testsuites/mptests/mp09/init.c
@@ -23,8 +23,6 @@
 #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #define CONFIGURE_INIT
 #include "system.h"
 
diff --git a/testsuites/mptests/mp10/init.c b/testsuites/mptests/mp10/init.c
index b235600..b5c5a20 100644
--- a/testsuites/mptests/mp10/init.c
+++ b/testsuites/mptests/mp10/init.c
@@ -29,8 +29,6 @@
 #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #define CONFIGURE_INIT
 #include "system.h"
 
diff --git a/testsuites/mptests/mp11/init.c b/testsuites/mptests/mp11/init.c
index 527f187..e44b151 100644
--- a/testsuites/mptests/mp11/init.c
+++ b/testsuites/mptests/mp11/init.c
@@ -26,8 +26,6 @@
 #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #define CONFIGURE_INIT
 #include "system.h"
 
diff --git a/testsuites/mptests/mp12/init.c b/testsuites/mptests/mp12/init.c
index 7d1e23d..7486e66 100644
--- a/testsuites/mptests/mp12/init.c
+++ b/testsuites/mptests/mp12/init.c
@@ -28,8 +28,6 @@
 #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #define CONFIGURE_INIT
 #include "system.h"
 
diff --git a/testsuites/mptests/mp13/init.c b/testsuites/mptests/mp13/init.c
index 3889796..e82a1d1 100644
--- a/testsuites/mptests/mp13/init.c
+++ b/testsuites/mptests/mp13/init.c
@@ -23,8 +23,6 @@
 #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #define CONFIGURE_INIT
 #include "system.h"
 
diff --git a/testsuites/mptests/mp14/init.c b/testsuites/mptests/mp14/init.c
index 47ad312..68359bc 100644
--- a/testsuites/mptests/mp14/init.c
+++ b/testsuites/mptests/mp14/init.c
@@ -23,8 +23,6 @@
 #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #define CONFIGURE_INIT
 #include "system.h"
 
diff --git a/testsuites/psxtests/psx01/init.c b/testsuites/psxtests/psx01/init.c
index 7b7a4ef..2b2fafd 100644
--- a/testsuites/psxtests/psx01/init.c
+++ b/testsuites/psxtests/psx01/init.c
@@ -11,8 +11,6 @@
 #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #include <sched.h>
 #include <sys/utsname.h>
 
diff --git a/testsuites/psxtests/psx02/init.c b/testsuites/psxtests/psx02/init.c
index 7ea8b98..0d2ab06 100644
--- a/testsuites/psxtests/psx02/init.c
+++ b/testsuites/psxtests/psx02/init.c
@@ -11,8 +11,6 @@
 #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #define CONFIGURE_INIT
 #include "system.h"
 #include <signal.h>
diff --git a/testsuites/psxtests/psx03/init.c b/testsuites/psxtests/psx03/init.c
index a78c72d..5c5383c 100644
--- a/testsuites/psxtests/psx03/init.c
+++ b/testsuites/psxtests/psx03/init.c
@@ -11,8 +11,6 @@
 #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #define CONFIGURE_INIT
 #include "system.h"
 #include <signal.h>
diff --git a/testsuites/psxtests/psx04/init.c b/testsuites/psxtests/psx04/init.c
index b35fb68..76c76af 100644
--- a/testsuites/psxtests/psx04/init.c
+++ b/testsuites/psxtests/psx04/init.c
@@ -11,8 +11,6 @@
 #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #define CONFIGURE_INIT
 #include "system.h"
 #include <signal.h>
diff --git a/testsuites/psxtests/psx05/init.c b/testsuites/psxtests/psx05/init.c
index 17249ee..70e8d4a 100644
--- a/testsuites/psxtests/psx05/init.c
+++ b/testsuites/psxtests/psx05/init.c
@@ -11,8 +11,6 @@
 #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #include <sched.h>
 
 #define CONFIGURE_INIT
diff --git a/testsuites/psxtests/psx06/init.c b/testsuites/psxtests/psx06/init.c
index e10a7f5..e077a28 100644
--- a/testsuites/psxtests/psx06/init.c
+++ b/testsuites/psxtests/psx06/init.c
@@ -11,8 +11,6 @@
 #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #define CONFIGURE_INIT
 #include "system.h"
 #include <errno.h>
diff --git a/testsuites/psxtests/psx07/init.c b/testsuites/psxtests/psx07/init.c
index b41e77e..be5208b 100644
--- a/testsuites/psxtests/psx07/init.c
+++ b/testsuites/psxtests/psx07/init.c
@@ -11,8 +11,6 @@
 #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #include <pthread.h>
 #include <sched.h>
 
diff --git a/testsuites/psxtests/psx08/init.c b/testsuites/psxtests/psx08/init.c
index b5839ea..781ac1e 100644
--- a/testsuites/psxtests/psx08/init.c
+++ b/testsuites/psxtests/psx08/init.c
@@ -11,8 +11,6 @@
 #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #define CONFIGURE_INIT
 #include "system.h"
 #include <errno.h>
diff --git a/testsuites/psxtests/psx09/init.c b/testsuites/psxtests/psx09/init.c
index db10206..d9226c9 100644
--- a/testsuites/psxtests/psx09/init.c
+++ b/testsuites/psxtests/psx09/init.c
@@ -11,8 +11,6 @@
 #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #include <sched.h>
 
 #define CONFIGURE_INIT
diff --git a/testsuites/psxtests/psx10/init.c b/testsuites/psxtests/psx10/init.c
index d58024a..ad4e60e 100644
--- a/testsuites/psxtests/psx10/init.c
+++ b/testsuites/psxtests/psx10/init.c
@@ -11,8 +11,6 @@
 #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #define CONFIGURE_INIT
 #include "system.h"
 #include <sched.h>
diff --git a/testsuites/psxtests/psx11/init.c b/testsuites/psxtests/psx11/init.c
index 8a4c0c4..9adde6e 100644
--- a/testsuites/psxtests/psx11/init.c
+++ b/testsuites/psxtests/psx11/init.c
@@ -11,8 +11,6 @@
 #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #include <sched.h>
 
 #define CONFIGURE_INIT
diff --git a/testsuites/psxtests/psx12/init.c b/testsuites/psxtests/psx12/init.c
index 90f1e5c..471fe73 100644
--- a/testsuites/psxtests/psx12/init.c
+++ b/testsuites/psxtests/psx12/init.c
@@ -11,8 +11,6 @@
 #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #include <sys/time.h>
 #include <errno.h>
 #include <inttypes.h>
diff --git a/testsuites/psxtests/psx13/main.c b/testsuites/psxtests/psx13/main.c
index 2d91111..2045de3 100644
--- a/testsuites/psxtests/psx13/main.c
+++ b/testsuites/psxtests/psx13/main.c
@@ -14,8 +14,6 @@
 #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #include <bsp.h>
 #include <pmacros.h>
 
diff --git a/testsuites/psxtests/psx14/init.c b/testsuites/psxtests/psx14/init.c
index 94a43fd..070501f 100644
--- a/testsuites/psxtests/psx14/init.c
+++ b/testsuites/psxtests/psx14/init.c
@@ -11,8 +11,6 @@
 #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #define CONFIGURE_INIT
 #include "system.h"
 #include <rtems.h>
diff --git a/testsuites/psxtests/psx15/init.c b/testsuites/psxtests/psx15/init.c
index 36eadf4..654f0c8 100644
--- a/testsuites/psxtests/psx15/init.c
+++ b/testsuites/psxtests/psx15/init.c
@@ -16,8 +16,6 @@
 #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #include <stdio.h>
 #include <inttypes.h>
 
diff --git a/testsuites/psxtests/psx16/init.c b/testsuites/psxtests/psx16/init.c
index c9ddfeb..55f6526 100644
--- a/testsuites/psxtests/psx16/init.c
+++ b/testsuites/psxtests/psx16/init.c
@@ -11,8 +11,6 @@
 #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #include <tmacros.h>
 #include "test_support.h"
 #include <pthread.h>
diff --git a/testsuites/psxtests/psxaio01/init.c b/testsuites/psxtests/psxaio01/init.c
index 32479d4..283507f 100644
--- a/testsuites/psxtests/psxaio01/init.c
+++ b/testsuites/psxtests/psxaio01/init.c
@@ -10,8 +10,6 @@
 #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #define CONFIGURE_INIT
 #include "system.h"
 #include <rtems.h>
diff --git a/testsuites/psxtests/psxaio02/init.c b/testsuites/psxtests/psxaio02/init.c
index 781f01b..3c75a36 100644
--- a/testsuites/psxtests/psxaio02/init.c
+++ b/testsuites/psxtests/psxaio02/init.c
@@ -10,8 +10,6 @@
 #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #define CONFIGURE_INIT
 #include "system.h"
 #include <rtems.h>
diff --git a/testsuites/psxtests/psxaio03/init.c b/testsuites/psxtests/psxaio03/init.c
index e0da0ee..d8a13fa 100644
--- a/testsuites/psxtests/psxaio03/init.c
+++ b/testsuites/psxtests/psxaio03/init.c
@@ -11,8 +11,6 @@
 #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #define CONFIGURE_INIT
 #include "system.h"
 #include <rtems.h>
diff --git a/testsuites/psxtests/psxalarm01/init.c b/testsuites/psxtests/psxalarm01/init.c
index d8ef475..e4ab9b4 100644
--- a/testsuites/psxtests/psxalarm01/init.c
+++ b/testsuites/psxtests/psxalarm01/init.c
@@ -11,8 +11,6 @@
 #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #include <pmacros.h>
 
 #include <sys/time.h>
diff --git a/testsuites/psxtests/psxautoinit01/init.c b/testsuites/psxtests/psxautoinit01/init.c
index 630fa1d..9001de2 100644
--- a/testsuites/psxtests/psxautoinit01/init.c
+++ b/testsuites/psxtests/psxautoinit01/init.c
@@ -11,8 +11,6 @@
 #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #include "tmacros.h"
 #include <pthread.h>
 #include <errno.h>
diff --git a/testsuites/psxtests/psxautoinit02/init.c b/testsuites/psxtests/psxautoinit02/init.c
index e281746..5d652f7 100644
--- a/testsuites/psxtests/psxautoinit02/init.c
+++ b/testsuites/psxtests/psxautoinit02/init.c
@@ -11,8 +11,6 @@
 #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #include "tmacros.h"
 #include <pthread.h>
 #include <errno.h>
diff --git a/testsuites/psxtests/psxbarrier01/main.c b/testsuites/psxtests/psxbarrier01/main.c
index a9c98ca..5788078 100644
--- a/testsuites/psxtests/psxbarrier01/main.c
+++ b/testsuites/psxtests/psxbarrier01/main.c
@@ -12,8 +12,6 @@
 #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #include <rtems/test.h>
 #include <bsp.h>
 #include <pmacros.h>
diff --git a/testsuites/psxtests/psxcancel/init.c b/testsuites/psxtests/psxcancel/init.c
index 0e92db6..c4c442b 100644
--- a/testsuites/psxtests/psxcancel/init.c
+++ b/testsuites/psxtests/psxcancel/init.c
@@ -8,8 +8,6 @@
 #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #include <stdio.h>
 #include <stdlib.h>
 #include <pthread.h>
diff --git a/testsuites/psxtests/psxcancel01/init.c b/testsuites/psxtests/psxcancel01/init.c
index 5f4b1f8..fce188e 100644
--- a/testsuites/psxtests/psxcancel01/init.c
+++ b/testsuites/psxtests/psxcancel01/init.c
@@ -11,8 +11,6 @@
 #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #include <pmacros.h>
 #include <errno.h>
 
diff --git a/testsuites/psxtests/psxchroot01/main.c b/testsuites/psxtests/psxchroot01/main.c
index 0c1e6a6..5e8bedb 100644
--- a/testsuites/psxtests/psxchroot01/main.c
+++ b/testsuites/psxtests/psxchroot01/main.c
@@ -7,8 +7,6 @@
 #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #include <bsp.h>
 #include <pmacros.h>
 
diff --git a/testsuites/psxtests/psxclassic01/init.c b/testsuites/psxtests/psxclassic01/init.c
index e9bca2a..1acc141 100644
--- a/testsuites/psxtests/psxclassic01/init.c
+++ b/testsuites/psxtests/psxclassic01/init.c
@@ -17,8 +17,6 @@
 #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #include "tmacros.h"
 
 #include <stdio.h>
diff --git a/testsuites/psxtests/psxcleanup/psxcleanup.c b/testsuites/psxtests/psxcleanup/psxcleanup.c
index f3f5de2..2af4aaf 100644
--- a/testsuites/psxtests/psxcleanup/psxcleanup.c
+++ b/testsuites/psxtests/psxcleanup/psxcleanup.c
@@ -13,8 +13,6 @@
 #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #define CONFIGURE_INIT
 #include "system.h"
 #include <pthread.h>  /* thread facilities */
diff --git a/testsuites/psxtests/psxcleanup01/init.c b/testsuites/psxtests/psxcleanup01/init.c
index 15f18e2..f38b48e 100644
--- a/testsuites/psxtests/psxcleanup01/init.c
+++ b/testsuites/psxtests/psxcleanup01/init.c
@@ -11,8 +11,6 @@
 #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #include <rtems.h>
 #include "pmacros.h"
 #include <pthread.h>  /* thread facilities */
diff --git a/testsuites/psxtests/psxcleanup02/init.c b/testsuites/psxtests/psxcleanup02/init.c
index 7891e62..88ecfee 100644
--- a/testsuites/psxtests/psxcleanup02/init.c
+++ b/testsuites/psxtests/psxcleanup02/init.c
@@ -16,8 +16,6 @@
   #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #include "tmacros.h"
 
 int main(int argc, char **argv);
diff --git a/testsuites/psxtests/psxclock/init.c b/testsuites/psxtests/psxclock/init.c
index 4aedd3e..669f4bb 100644
--- a/testsuites/psxtests/psxclock/init.c
+++ b/testsuites/psxtests/psxclock/init.c
@@ -11,8 +11,6 @@
 #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #include <time.h>
 #include <errno.h>
 
diff --git a/testsuites/psxtests/psxclock01/init.c b/testsuites/psxtests/psxclock01/init.c
index 9178e89..6be85d2 100644
--- a/testsuites/psxtests/psxclock01/init.c
+++ b/testsuites/psxtests/psxclock01/init.c
@@ -6,8 +6,6 @@
  * http://www.rtems.org/license/LICENSE.
  */
 
-#define TEST_INIT
-
 #include <tmacros.h>
 #include "test_support.h"
 
diff --git a/testsuites/psxtests/psxclockrealtime01/init.c b/testsuites/psxtests/psxclockrealtime01/init.c
index f3ad3ac..8deac3c 100644
--- a/testsuites/psxtests/psxclockrealtime01/init.c
+++ b/testsuites/psxtests/psxclockrealtime01/init.c
@@ -24,8 +24,6 @@
 #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #include <sys/stat.h>
 #include <errno.h>
 #include <fcntl.h>
diff --git a/testsuites/psxtests/psxconcurrency01/init.c b/testsuites/psxtests/psxconcurrency01/init.c
index f93fda0..60aef92 100644
--- a/testsuites/psxtests/psxconcurrency01/init.c
+++ b/testsuites/psxtests/psxconcurrency01/init.c
@@ -11,8 +11,6 @@
 #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #include <pmacros.h>
 #include <pthread.h>
 #include <errno.h>
diff --git a/testsuites/psxtests/psxcond01/init.c b/testsuites/psxtests/psxcond01/init.c
index 2e4da67..5747696 100644
--- a/testsuites/psxtests/psxcond01/init.c
+++ b/testsuites/psxtests/psxcond01/init.c
@@ -11,8 +11,6 @@
 #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #include "tmacros.h"
 #include <pthread.h>
 #include <errno.h>
diff --git a/testsuites/psxtests/psxcond02/init.c b/testsuites/psxtests/psxcond02/init.c
index c458cfc..6314762 100644
--- a/testsuites/psxtests/psxcond02/init.c
+++ b/testsuites/psxtests/psxcond02/init.c
@@ -11,8 +11,6 @@
 #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #include "tmacros.h"
 #include <pthread.h>
 #include <time.h>
diff --git a/testsuites/psxtests/psxconfig01/init.c b/testsuites/psxtests/psxconfig01/init.c
index 45bc168..a1dc4c6 100644
--- a/testsuites/psxtests/psxconfig01/init.c
+++ b/testsuites/psxtests/psxconfig01/init.c
@@ -25,8 +25,6 @@
   #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #include <rtems/test.h>
 #include <tmacros.h>
 
diff --git a/testsuites/psxtests/psxdevctl01/main.c b/testsuites/psxtests/psxdevctl01/main.c
index 664f82c..d74fb6b 100644
--- a/testsuites/psxtests/psxdevctl01/main.c
+++ b/testsuites/psxtests/psxdevctl01/main.c
@@ -18,8 +18,6 @@
 #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #include <bsp.h>
 #include <pmacros.h>
 
diff --git a/testsuites/psxtests/psxeintr_join/init.c b/testsuites/psxtests/psxeintr_join/init.c
index 935047d..f0810b5 100644
--- a/testsuites/psxtests/psxeintr_join/init.c
+++ b/testsuites/psxtests/psxeintr_join/init.c
@@ -11,8 +11,6 @@
 #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #include <stdio.h>
 #include <signal.h>
 #include <semaphore.h>
diff --git a/testsuites/psxtests/psxenosys/init.c b/testsuites/psxtests/psxenosys/init.c
index ef9a1ba..e092744 100644
--- a/testsuites/psxtests/psxenosys/init.c
+++ b/testsuites/psxtests/psxenosys/init.c
@@ -11,8 +11,6 @@
 #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #include <sys/types.h>
 #include <sys/wait.h>
 #if HAVE_SYS_MMAN_H
diff --git a/testsuites/psxtests/psxfatal_support/init.c b/testsuites/psxtests/psxfatal_support/init.c
index 7943497..38caa3f 100644
--- a/testsuites/psxtests/psxfatal_support/init.c
+++ b/testsuites/psxtests/psxfatal_support/init.c
@@ -11,8 +11,6 @@
 #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #include "tmacros.h"
 
 #define CONFIGURE_INIT
diff --git a/testsuites/psxtests/psxfchx01/init.c b/testsuites/psxtests/psxfchx01/init.c
index dc6d537..89a0d06 100644
--- a/testsuites/psxtests/psxfchx01/init.c
+++ b/testsuites/psxtests/psxfchx01/init.c
@@ -11,8 +11,6 @@
 #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #include <bsp.h>
 #include <pmacros.h>
 #include <unistd.h>
diff --git a/testsuites/psxtests/psxfile01/main.c b/testsuites/psxtests/psxfile01/main.c
index 7b1ea9a..bba7a58 100644
--- a/testsuites/psxtests/psxfile01/main.c
+++ b/testsuites/psxtests/psxfile01/main.c
@@ -12,8 +12,6 @@
 #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #include <bsp.h>
 #include <pmacros.h>
 
diff --git a/testsuites/psxtests/psxfile02/init.c b/testsuites/psxtests/psxfile02/init.c
index 80e5d86..d668152 100644
--- a/testsuites/psxtests/psxfile02/init.c
+++ b/testsuites/psxtests/psxfile02/init.c
@@ -11,8 +11,6 @@
 #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #include <stdio.h>
 #include <sys/uio.h>
 #include <sys/types.h>
diff --git a/testsuites/psxtests/psxfilelock01/init.c b/testsuites/psxtests/psxfilelock01/init.c
index 7453317..d64d1a1 100644
--- a/testsuites/psxtests/psxfilelock01/init.c
+++ b/testsuites/psxtests/psxfilelock01/init.c
@@ -11,8 +11,6 @@
 #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #include <tmacros.h>
 #include "test_support.h"
 #include <errno.h>
diff --git a/testsuites/psxtests/psxgetattrnp01/init.c b/testsuites/psxtests/psxgetattrnp01/init.c
index 33735cc..1998157 100644
--- a/testsuites/psxtests/psxgetattrnp01/init.c
+++ b/testsuites/psxtests/psxgetattrnp01/init.c
@@ -11,8 +11,6 @@
 #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #define _GNU_SOURCE
 #include <tmacros.h>
 #include <errno.h>
diff --git a/testsuites/psxtests/psxgetrusage01/init.c b/testsuites/psxtests/psxgetrusage01/init.c
index 8723386..590bc20 100644
--- a/testsuites/psxtests/psxgetrusage01/init.c
+++ b/testsuites/psxtests/psxgetrusage01/init.c
@@ -19,8 +19,6 @@
 extern int getrusage(int who, struct rusage *usage);
 #endif
 
-#define TEST_INIT
-
 #include <tmacros.h>
 #include "test_support.h"
 
diff --git a/testsuites/psxtests/psxglobalcon01/init.cc b/testsuites/psxtests/psxglobalcon01/init.cc
index f531410..d485526 100644
--- a/testsuites/psxtests/psxglobalcon01/init.cc
+++ b/testsuites/psxtests/psxglobalcon01/init.cc
@@ -16,8 +16,6 @@
   #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #include "tmacros.h"
 
 const char rtems_test_name[] = "PSXGLOBALCON 1";
diff --git a/testsuites/psxtests/psxglobalcon02/init.cc b/testsuites/psxtests/psxglobalcon02/init.cc
index 44a3c1a..c5f09b0 100644
--- a/testsuites/psxtests/psxglobalcon02/init.cc
+++ b/testsuites/psxtests/psxglobalcon02/init.cc
@@ -16,8 +16,6 @@
   #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #include "tmacros.h"
 
 const char rtems_test_name[] = "PSXGLOBALCON 2";
diff --git a/testsuites/psxtests/psxid01/init.c b/testsuites/psxtests/psxid01/init.c
index 2ffb84e..5aa0399 100644
--- a/testsuites/psxtests/psxid01/init.c
+++ b/testsuites/psxtests/psxid01/init.c
@@ -11,8 +11,6 @@
 #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #include <tmacros.h>
 #include "test_support.h"
 
diff --git a/testsuites/psxtests/psximfs01/init.c b/testsuites/psxtests/psximfs01/init.c
index 380ece7..5c826fb 100644
--- a/testsuites/psxtests/psximfs01/init.c
+++ b/testsuites/psxtests/psximfs01/init.c
@@ -11,8 +11,6 @@
 #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #include <tmacros.h>
 #include "test_support.h"
 
diff --git a/testsuites/psxtests/psximfs02/init.c b/testsuites/psxtests/psximfs02/init.c
index 07e55c4..047a4fc 100644
--- a/testsuites/psxtests/psximfs02/init.c
+++ b/testsuites/psxtests/psximfs02/init.c
@@ -11,8 +11,6 @@
 #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #include <tmacros.h>
 #include "test_support.h"
 
diff --git a/testsuites/psxtests/psxintrcritical01/init.c b/testsuites/psxtests/psxintrcritical01/init.c
index 72686cc..a6a64ba 100644
--- a/testsuites/psxtests/psxintrcritical01/init.c
+++ b/testsuites/psxtests/psxintrcritical01/init.c
@@ -11,8 +11,6 @@
 #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #include <tmacros.h>
 #include <intrcritical.h>
 #include <time.h>
diff --git a/testsuites/psxtests/psxitimer/init.c b/testsuites/psxtests/psxitimer/init.c
index 915c445..dc32f34 100644
--- a/testsuites/psxtests/psxitimer/init.c
+++ b/testsuites/psxtests/psxitimer/init.c
@@ -11,8 +11,6 @@
 #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #include <pmacros.h>
 #include <sys/time.h>
 #include <errno.h>
diff --git a/testsuites/psxtests/psxkey01/init.c b/testsuites/psxtests/psxkey01/init.c
index c1ce6cb..6b8f57e 100644
--- a/testsuites/psxtests/psxkey01/init.c
+++ b/testsuites/psxtests/psxkey01/init.c
@@ -11,8 +11,6 @@
 #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #define CONFIGURE_INIT
 #include "system.h"
 #include <errno.h>
diff --git a/testsuites/psxtests/psxkey02/init.c b/testsuites/psxtests/psxkey02/init.c
index e36c586..23a392b 100644
--- a/testsuites/psxtests/psxkey02/init.c
+++ b/testsuites/psxtests/psxkey02/init.c
@@ -11,8 +11,6 @@
 #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #include <pthread.h>
 #include <errno.h>
 #include <rtems/libcsupport.h>
diff --git a/testsuites/psxtests/psxkey03/init.c b/testsuites/psxtests/psxkey03/init.c
index e0c2f7d..b133e50 100644
--- a/testsuites/psxtests/psxkey03/init.c
+++ b/testsuites/psxtests/psxkey03/init.c
@@ -11,8 +11,6 @@
 #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #include <pthread.h>
 #include <errno.h>
 #include "tmacros.h"
diff --git a/testsuites/psxtests/psxkey04/init.c b/testsuites/psxtests/psxkey04/init.c
index 2540dd9..4dcc342 100644
--- a/testsuites/psxtests/psxkey04/init.c
+++ b/testsuites/psxtests/psxkey04/init.c
@@ -12,8 +12,6 @@
 #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #include <pthread.h>
 #include <errno.h>
 #include "tmacros.h"
diff --git a/testsuites/psxtests/psxkey05/init.c b/testsuites/psxtests/psxkey05/init.c
index e848fa3..6ebe49f 100644
--- a/testsuites/psxtests/psxkey05/init.c
+++ b/testsuites/psxtests/psxkey05/init.c
@@ -12,8 +12,6 @@
 #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #include <pthread.h>
 #include <errno.h>
 #include "tmacros.h"
diff --git a/testsuites/psxtests/psxkey06/init.c b/testsuites/psxtests/psxkey06/init.c
index fa3f2cf..28236c2 100644
--- a/testsuites/psxtests/psxkey06/init.c
+++ b/testsuites/psxtests/psxkey06/init.c
@@ -12,8 +12,6 @@
 #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #include <pthread.h>
 #include <errno.h>
 #include "tmacros.h"
diff --git a/testsuites/psxtests/psxkey07/init.c b/testsuites/psxtests/psxkey07/init.c
index b7616c5..91cc7ea 100644
--- a/testsuites/psxtests/psxkey07/init.c
+++ b/testsuites/psxtests/psxkey07/init.c
@@ -12,8 +12,6 @@
 #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #include <pthread.h>
 #include <sched.h>
 #include <errno.h>
diff --git a/testsuites/psxtests/psxkey08/init.c b/testsuites/psxtests/psxkey08/init.c
index 95da493..1e6d53a 100644
--- a/testsuites/psxtests/psxkey08/init.c
+++ b/testsuites/psxtests/psxkey08/init.c
@@ -12,8 +12,6 @@
 #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #include "tmacros.h"
 
 #include <stdio.h>
diff --git a/testsuites/psxtests/psxkey09/init.c b/testsuites/psxtests/psxkey09/init.c
index 9e1b494..2f7e92a 100644
--- a/testsuites/psxtests/psxkey09/init.c
+++ b/testsuites/psxtests/psxkey09/init.c
@@ -12,8 +12,6 @@
 #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #include <pthread.h>
 #include <errno.h>
 #include "tmacros.h"
diff --git a/testsuites/psxtests/psxkey10/init.c b/testsuites/psxtests/psxkey10/init.c
index 1e773e3..1c6ebd8 100644
--- a/testsuites/psxtests/psxkey10/init.c
+++ b/testsuites/psxtests/psxkey10/init.c
@@ -12,8 +12,6 @@
 #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #include <pthread.h>
 #include <errno.h>
 #include "tmacros.h"
diff --git a/testsuites/psxtests/psxmmap01/init.c b/testsuites/psxtests/psxmmap01/init.c
index 7efb36e..e3e8b9a 100644
--- a/testsuites/psxtests/psxmmap01/init.c
+++ b/testsuites/psxtests/psxmmap01/init.c
@@ -30,8 +30,6 @@
 #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #define CONFIGURE_INIT
 #include "system.h"
 #include "pritime.h"
diff --git a/testsuites/psxtests/psxmount/main.c b/testsuites/psxtests/psxmount/main.c
index 140057e..74de986 100644
--- a/testsuites/psxtests/psxmount/main.c
+++ b/testsuites/psxtests/psxmount/main.c
@@ -9,8 +9,6 @@
 #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #include <bsp.h>
 #include <pmacros.h>
 
diff --git a/testsuites/psxtests/psxmsgq01/init.c b/testsuites/psxtests/psxmsgq01/init.c
index 8cab816..3f34d39 100644
--- a/testsuites/psxtests/psxmsgq01/init.c
+++ b/testsuites/psxtests/psxmsgq01/init.c
@@ -11,8 +11,6 @@
 #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #define CONFIGURE_INIT
 #include "system.h"
 #include <sched.h>
diff --git a/testsuites/psxtests/psxmsgq02/init.c b/testsuites/psxtests/psxmsgq02/init.c
index e9f2e92..290663d 100644
--- a/testsuites/psxtests/psxmsgq02/init.c
+++ b/testsuites/psxtests/psxmsgq02/init.c
@@ -11,8 +11,6 @@
 #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #define CONFIGURE_INIT
 #include "system.h"
 #include <errno.h>
diff --git a/testsuites/psxtests/psxmsgq03/init.c b/testsuites/psxtests/psxmsgq03/init.c
index 127bb72..1464442 100644
--- a/testsuites/psxtests/psxmsgq03/init.c
+++ b/testsuites/psxtests/psxmsgq03/init.c
@@ -11,8 +11,6 @@
 #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #define CONFIGURE_INIT
 #include "system.h"
 
diff --git a/testsuites/psxtests/psxmsgq04/init.c b/testsuites/psxtests/psxmsgq04/init.c
index 815cb02..f1e1c96 100644
--- a/testsuites/psxtests/psxmsgq04/init.c
+++ b/testsuites/psxtests/psxmsgq04/init.c
@@ -11,8 +11,6 @@
 #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #include <pmacros.h>
 #include <unistd.h>
 #include <errno.h>
diff --git a/testsuites/psxtests/psxmutexattr01/init.c b/testsuites/psxtests/psxmutexattr01/init.c
index 8ee6774..1ea1ab5 100644
--- a/testsuites/psxtests/psxmutexattr01/init.c
+++ b/testsuites/psxtests/psxmutexattr01/init.c
@@ -11,8 +11,6 @@
 #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #include <tmacros.h>
 #include <errno.h>
 #include <pthread.h>
diff --git a/testsuites/psxtests/psxobj01/init.c b/testsuites/psxtests/psxobj01/init.c
index 3a983b5..c3b3f49 100644
--- a/testsuites/psxtests/psxobj01/init.c
+++ b/testsuites/psxtests/psxobj01/init.c
@@ -16,8 +16,6 @@
 #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #include <tmacros.h>
 
 #include <rtems/score/objectimpl.h>
diff --git a/testsuites/psxtests/psxonce01/init.c b/testsuites/psxtests/psxonce01/init.c
index 9f7f76b..1c90769 100644
--- a/testsuites/psxtests/psxonce01/init.c
+++ b/testsuites/psxtests/psxonce01/init.c
@@ -11,8 +11,6 @@
 #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #define CONFIGURE_INIT
 #include "system.h"
 
diff --git a/testsuites/psxtests/psxpasswd01/init.c b/testsuites/psxtests/psxpasswd01/init.c
index 947478b..eb96e28 100644
--- a/testsuites/psxtests/psxpasswd01/init.c
+++ b/testsuites/psxtests/psxpasswd01/init.c
@@ -11,8 +11,6 @@
 #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #include <bsp.h>
 #include <pmacros.h>
 #include <sys/types.h>
diff --git a/testsuites/psxtests/psxpasswd02/init.c b/testsuites/psxtests/psxpasswd02/init.c
index f299d1e..7090c94 100644
--- a/testsuites/psxtests/psxpasswd02/init.c
+++ b/testsuites/psxtests/psxpasswd02/init.c
@@ -11,8 +11,6 @@
 #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #include <bsp.h>
 #include <pmacros.h>
 #include <sys/types.h>
diff --git a/testsuites/psxtests/psxpipe01/init.c b/testsuites/psxtests/psxpipe01/init.c
index 50ebeef..7066f6c 100644
--- a/testsuites/psxtests/psxpipe01/init.c
+++ b/testsuites/psxtests/psxpipe01/init.c
@@ -11,8 +11,6 @@
 #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #include <bsp.h>
 #include <pmacros.h>
 #include <sys/types.h>
diff --git a/testsuites/psxtests/psxrdwrv/main.c b/testsuites/psxtests/psxrdwrv/main.c
index 701f99a..67ee25e 100644
--- a/testsuites/psxtests/psxrdwrv/main.c
+++ b/testsuites/psxtests/psxrdwrv/main.c
@@ -12,8 +12,6 @@
 #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #include <bsp.h>
 #include <pmacros.h>
 
diff --git a/testsuites/psxtests/psxreaddir/main.c b/testsuites/psxtests/psxreaddir/main.c
index ac421c1..9ed55fc 100644
--- a/testsuites/psxtests/psxreaddir/main.c
+++ b/testsuites/psxtests/psxreaddir/main.c
@@ -7,8 +7,6 @@
 #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #include <bsp.h>
 #include <pmacros.h>
 
diff --git a/testsuites/psxtests/psxrwlock01/main.c b/testsuites/psxtests/psxrwlock01/main.c
index 1386ad4..7e2eda4 100644
--- a/testsuites/psxtests/psxrwlock01/main.c
+++ b/testsuites/psxtests/psxrwlock01/main.c
@@ -12,8 +12,6 @@
 #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #include <rtems/test.h>
 #include <bsp.h>
 #include <pmacros.h>
diff --git a/testsuites/psxtests/psxsem01/init.c b/testsuites/psxtests/psxsem01/init.c
index d4ea8cb..ae0b390 100644
--- a/testsuites/psxtests/psxsem01/init.c
+++ b/testsuites/psxtests/psxsem01/init.c
@@ -11,8 +11,6 @@
 #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #include <sched.h>
 #include <semaphore.h>
 #include <errno.h>
diff --git a/testsuites/psxtests/psxshm01/init.c b/testsuites/psxtests/psxshm01/init.c
index 1769333..4636f9a 100644
--- a/testsuites/psxtests/psxshm01/init.c
+++ b/testsuites/psxtests/psxshm01/init.c
@@ -14,8 +14,6 @@
 #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #define CONFIGURE_INIT
 #include "system.h"
 #include "pritime.h"
diff --git a/testsuites/psxtests/psxshm02/init.c b/testsuites/psxtests/psxshm02/init.c
index ff356ce..071f4c4 100644
--- a/testsuites/psxtests/psxshm02/init.c
+++ b/testsuites/psxtests/psxshm02/init.c
@@ -14,8 +14,6 @@
 #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #define CONFIGURE_INIT
 #include "system.h"
 #include "pritime.h"
diff --git a/testsuites/psxtests/psxsignal01/init.c b/testsuites/psxtests/psxsignal01/init.c
index 7ce2a72..511dd2d 100644
--- a/testsuites/psxtests/psxsignal01/init.c
+++ b/testsuites/psxtests/psxsignal01/init.c
@@ -11,8 +11,6 @@
 #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #define CONFIGURE_INIT
 #include "system.h"
 #include <signal.h>
diff --git a/testsuites/psxtests/psxsignal02/init.c b/testsuites/psxtests/psxsignal02/init.c
index eda7ef7..6ae68d6 100644
--- a/testsuites/psxtests/psxsignal02/init.c
+++ b/testsuites/psxtests/psxsignal02/init.c
@@ -11,8 +11,6 @@
 #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #include <pmacros.h>
 #include <signal.h>
 #include <errno.h>
diff --git a/testsuites/psxtests/psxsignal03/init.c b/testsuites/psxtests/psxsignal03/init.c
index 07fd69a..f3fc266 100644
--- a/testsuites/psxtests/psxsignal03/init.c
+++ b/testsuites/psxtests/psxsignal03/init.c
@@ -47,8 +47,6 @@
   #error "Test Mode not defined"
 #endif
 
-#define TEST_INIT
-
 #include <pmacros.h>
 #include <signal.h>
 #include <errno.h>
diff --git a/testsuites/psxtests/psxsignal05/init.c b/testsuites/psxtests/psxsignal05/init.c
index 196082e..0bc8d7f 100644
--- a/testsuites/psxtests/psxsignal05/init.c
+++ b/testsuites/psxtests/psxsignal05/init.c
@@ -16,8 +16,6 @@
 #define SIGNAL_ONE               SIGUSR1
 #define SIGNAL_TWO               SIGUSR2
 
-#define TEST_INIT
-
 #include <pmacros.h>
 #include <signal.h>
 #include <errno.h>
diff --git a/testsuites/psxtests/psxsignal06/init.c b/testsuites/psxtests/psxsignal06/init.c
index 20277be..cb34bb6 100644
--- a/testsuites/psxtests/psxsignal06/init.c
+++ b/testsuites/psxtests/psxsignal06/init.c
@@ -11,8 +11,6 @@
 #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #include <tmacros.h>
 #include "test_support.h"
 #include <pthread.h>
diff --git a/testsuites/psxtests/psxspin01/main.c b/testsuites/psxtests/psxspin01/main.c
index e646210..5f7e7c0 100644
--- a/testsuites/psxtests/psxspin01/main.c
+++ b/testsuites/psxtests/psxspin01/main.c
@@ -18,8 +18,6 @@
 #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #include <bsp.h>
 #include <pmacros.h>
  
diff --git a/testsuites/psxtests/psxstack01/init.c b/testsuites/psxtests/psxstack01/init.c
index be3617a..7a010c8 100644
--- a/testsuites/psxtests/psxstack01/init.c
+++ b/testsuites/psxtests/psxstack01/init.c
@@ -11,8 +11,6 @@
 #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #include <pmacros.h>
 #include <errno.h>
 #include <pthread.h>
diff --git a/testsuites/psxtests/psxstack02/init.c b/testsuites/psxtests/psxstack02/init.c
index 43fca98..df65ee3 100644
--- a/testsuites/psxtests/psxstack02/init.c
+++ b/testsuites/psxtests/psxstack02/init.c
@@ -11,8 +11,6 @@
 #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #include <tmacros.h>
 #include "test_support.h"
 
diff --git a/testsuites/psxtests/psxstat/main.c b/testsuites/psxtests/psxstat/main.c
index 14a4b42..5b78852 100644
--- a/testsuites/psxtests/psxstat/main.c
+++ b/testsuites/psxtests/psxstat/main.c
@@ -12,8 +12,6 @@
 #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #include <bsp.h>
 #include <pmacros.h>
 
diff --git a/testsuites/psxtests/psxstrsignal01/init.c b/testsuites/psxtests/psxstrsignal01/init.c
index 8f3129f..9614fb9 100644
--- a/testsuites/psxtests/psxstrsignal01/init.c
+++ b/testsuites/psxtests/psxstrsignal01/init.c
@@ -11,8 +11,6 @@
 #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #include "tmacros.h"
 #include <signal.h>
 #include <string.h>
diff --git a/testsuites/psxtests/psxsysconf/init.c b/testsuites/psxtests/psxsysconf/init.c
index d95fdd3..2dd9018 100644
--- a/testsuites/psxtests/psxsysconf/init.c
+++ b/testsuites/psxtests/psxsysconf/init.c
@@ -11,8 +11,6 @@
 #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #define CONFIGURE_INIT
 #include "system.h"
 #include "tmacros.h"
diff --git a/testsuites/psxtests/psxthreadname01/init.c b/testsuites/psxtests/psxthreadname01/init.c
index 2af3ba7..16fdec6 100644
--- a/testsuites/psxtests/psxthreadname01/init.c
+++ b/testsuites/psxtests/psxthreadname01/init.c
@@ -16,8 +16,6 @@
   #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #define _GNU_SOURCE
 #include <errno.h>
 #include <pthread.h>
diff --git a/testsuites/psxtests/psxtime/main.c b/testsuites/psxtests/psxtime/main.c
index a1653ff..7f36c11 100644
--- a/testsuites/psxtests/psxtime/main.c
+++ b/testsuites/psxtests/psxtime/main.c
@@ -14,8 +14,6 @@
 #endif
 
 
-#define TEST_INIT
-
 #include <bsp.h>
 #include <tmacros.h>  /* instantiate buffering code if needed */
 
diff --git a/testsuites/psxtests/psxtimer01/psxtimer.c b/testsuites/psxtests/psxtimer01/psxtimer.c
index d869374..032e9f8 100644
--- a/testsuites/psxtests/psxtimer01/psxtimer.c
+++ b/testsuites/psxtests/psxtimer01/psxtimer.c
@@ -24,8 +24,6 @@
 #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #define CONFIGURE_INIT
 #include "system.h"
 #include <pthread.h>  /* thread facilities */
diff --git a/testsuites/psxtests/psxtimer02/psxtimer.c b/testsuites/psxtests/psxtimer02/psxtimer.c
index 59f1697..e4d6d7d 100644
--- a/testsuites/psxtests/psxtimer02/psxtimer.c
+++ b/testsuites/psxtests/psxtimer02/psxtimer.c
@@ -24,8 +24,6 @@
 #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #define CONFIGURE_INIT
 #include "system.h"
 #include "tmacros.h"
diff --git a/testsuites/psxtests/psxtimes01/init.c b/testsuites/psxtests/psxtimes01/init.c
index e6150b0..30cecd4 100644
--- a/testsuites/psxtests/psxtimes01/init.c
+++ b/testsuites/psxtests/psxtimes01/init.c
@@ -11,8 +11,6 @@
 #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #include <tmacros.h>
 #include "test_support.h"
 #include <sys/times.h>
diff --git a/testsuites/psxtests/psxualarm/init.c b/testsuites/psxtests/psxualarm/init.c
index a5ba5bf..7a4fb21 100644
--- a/testsuites/psxtests/psxualarm/init.c
+++ b/testsuites/psxtests/psxualarm/init.c
@@ -11,8 +11,6 @@
 #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #define CONFIGURE_INIT
 #include "system.h"
 #include <signal.h>
diff --git a/testsuites/psxtests/psxusleep/init.c b/testsuites/psxtests/psxusleep/init.c
index d9d0e71..383943e 100644
--- a/testsuites/psxtests/psxusleep/init.c
+++ b/testsuites/psxtests/psxusleep/init.c
@@ -11,8 +11,6 @@
 #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #include <pmacros.h>
 #include <time.h>
 #include <errno.h>
diff --git a/testsuites/psxtmtests/psxtmbarrier01/init.c b/testsuites/psxtmtests/psxtmbarrier01/init.c
index 0148e1c..cfbca8d 100644
--- a/testsuites/psxtmtests/psxtmbarrier01/init.c
+++ b/testsuites/psxtmtests/psxtmbarrier01/init.c
@@ -11,8 +11,6 @@
 #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #include <timesys.h>
 #include <rtems/btimer.h>
 #include "test_support.h"
diff --git a/testsuites/psxtmtests/psxtmbarrier02/init.c b/testsuites/psxtmtests/psxtmbarrier02/init.c
index d7e8f08..6705125 100644
--- a/testsuites/psxtmtests/psxtmbarrier02/init.c
+++ b/testsuites/psxtmtests/psxtmbarrier02/init.c
@@ -11,8 +11,6 @@
 #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #include <timesys.h>
 #include <tmacros.h>
 #include <rtems/btimer.h>
diff --git a/testsuites/psxtmtests/psxtmbarrier03/init.c b/testsuites/psxtmtests/psxtmbarrier03/init.c
index 05372f5..27feac1 100644
--- a/testsuites/psxtmtests/psxtmbarrier03/init.c
+++ b/testsuites/psxtmtests/psxtmbarrier03/init.c
@@ -11,8 +11,6 @@
 #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #include <coverhd.h>
 #include <tmacros.h>
 #include <timesys.h>
diff --git a/testsuites/psxtmtests/psxtmbarrier04/init.c b/testsuites/psxtmtests/psxtmbarrier04/init.c
index 61675b1..baf1bf1 100644
--- a/testsuites/psxtmtests/psxtmbarrier04/init.c
+++ b/testsuites/psxtmtests/psxtmbarrier04/init.c
@@ -7,8 +7,6 @@
  *  http://www.rtems.org/license/LICENSE.
  */
 
-#define TEST_INIT
-
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
diff --git a/testsuites/psxtmtests/psxtmclocknanosleep01/init.c b/testsuites/psxtmtests/psxtmclocknanosleep01/init.c
index 484ddba..5bc800f 100644
--- a/testsuites/psxtmtests/psxtmclocknanosleep01/init.c
+++ b/testsuites/psxtmtests/psxtmclocknanosleep01/init.c
@@ -13,8 +13,6 @@
 #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #include <timesys.h>
 #include <rtems/btimer.h>
 #include "test_support.h"
diff --git a/testsuites/psxtmtests/psxtmclocknanosleep02/init.c b/testsuites/psxtmtests/psxtmclocknanosleep02/init.c
index 89836f4..3f458ef 100644
--- a/testsuites/psxtmtests/psxtmclocknanosleep02/init.c
+++ b/testsuites/psxtmtests/psxtmclocknanosleep02/init.c
@@ -13,8 +13,6 @@
 #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #include <timesys.h>
 #include <rtems/btimer.h>
 #include "test_support.h"
diff --git a/testsuites/psxtmtests/psxtmclocknanosleep03/init.c b/testsuites/psxtmtests/psxtmclocknanosleep03/init.c
index 8feef4e..999cce2 100644
--- a/testsuites/psxtmtests/psxtmclocknanosleep03/init.c
+++ b/testsuites/psxtmtests/psxtmclocknanosleep03/init.c
@@ -13,8 +13,6 @@
 #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #include <timesys.h>
 #include <rtems/btimer.h>
 #include "test_support.h"
diff --git a/testsuites/psxtmtests/psxtmcond01/init.c b/testsuites/psxtmtests/psxtmcond01/init.c
index ce7be62..7ec876b 100644
--- a/testsuites/psxtmtests/psxtmcond01/init.c
+++ b/testsuites/psxtmtests/psxtmcond01/init.c
@@ -11,8 +11,6 @@
 #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #include <coverhd.h>
 #include <tmacros.h>
 #include <timesys.h>
diff --git a/testsuites/psxtmtests/psxtmcond02/init.c b/testsuites/psxtmtests/psxtmcond02/init.c
index 8f8d16e..1e8e00c 100644
--- a/testsuites/psxtmtests/psxtmcond02/init.c
+++ b/testsuites/psxtmtests/psxtmcond02/init.c
@@ -11,8 +11,6 @@
 #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #include <timesys.h>
 #include <pthread.h>
 #include <rtems/btimer.h>
diff --git a/testsuites/psxtmtests/psxtmcond03/init.c b/testsuites/psxtmtests/psxtmcond03/init.c
index 1a56a5b..4a829bd 100644
--- a/testsuites/psxtmtests/psxtmcond03/init.c
+++ b/testsuites/psxtmtests/psxtmcond03/init.c
@@ -11,8 +11,6 @@
 #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #include <coverhd.h>
 #include <tmacros.h>
 #include <timesys.h>
diff --git a/testsuites/psxtmtests/psxtmcond04/init.c b/testsuites/psxtmtests/psxtmcond04/init.c
index 529139b..1a40f23 100644
--- a/testsuites/psxtmtests/psxtmcond04/init.c
+++ b/testsuites/psxtmtests/psxtmcond04/init.c
@@ -11,8 +11,6 @@
 #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #include <coverhd.h>
 #include <tmacros.h>
 #include <timesys.h>
diff --git a/testsuites/psxtmtests/psxtmcond05/init.c b/testsuites/psxtmtests/psxtmcond05/init.c
index fce8862..fcfad14 100644
--- a/testsuites/psxtmtests/psxtmcond05/init.c
+++ b/testsuites/psxtmtests/psxtmcond05/init.c
@@ -7,8 +7,6 @@
  *  http://www.rtems.org/license/LICENSE.
  */
 
-#define TEST_INIT
-
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
diff --git a/testsuites/psxtmtests/psxtmcond06/init.c b/testsuites/psxtmtests/psxtmcond06/init.c
index 75a00c4..ec87ccd 100644
--- a/testsuites/psxtmtests/psxtmcond06/init.c
+++ b/testsuites/psxtmtests/psxtmcond06/init.c
@@ -11,8 +11,6 @@
 #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #include <coverhd.h>
 #include <tmacros.h>
 #include <timesys.h>
diff --git a/testsuites/psxtmtests/psxtmcond07/init.c b/testsuites/psxtmtests/psxtmcond07/init.c
index 611af66..218fccc 100644
--- a/testsuites/psxtmtests/psxtmcond07/init.c
+++ b/testsuites/psxtmtests/psxtmcond07/init.c
@@ -11,8 +11,6 @@
 #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #include <coverhd.h>
 #include <tmacros.h>
 #include <timesys.h>
diff --git a/testsuites/psxtmtests/psxtmcond08/init.c b/testsuites/psxtmtests/psxtmcond08/init.c
index 636ecb6..377b099 100644
--- a/testsuites/psxtmtests/psxtmcond08/init.c
+++ b/testsuites/psxtmtests/psxtmcond08/init.c
@@ -24,8 +24,6 @@
 #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #include <stdio.h>
 #include <time.h>
 #include <errno.h>
diff --git a/testsuites/psxtmtests/psxtmkey01/init.c b/testsuites/psxtmtests/psxtmkey01/init.c
index 1812247..b58c8d5 100644
--- a/testsuites/psxtmtests/psxtmkey01/init.c
+++ b/testsuites/psxtmtests/psxtmkey01/init.c
@@ -11,8 +11,6 @@
 #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #include <timesys.h>
 #include <rtems/btimer.h>
 #include <errno.h>
diff --git a/testsuites/psxtmtests/psxtmkey02/init.c b/testsuites/psxtmtests/psxtmkey02/init.c
index 3381d41..fafb8f6 100644
--- a/testsuites/psxtmtests/psxtmkey02/init.c
+++ b/testsuites/psxtmtests/psxtmkey02/init.c
@@ -11,8 +11,6 @@
 #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #include <timesys.h>
 #include <rtems/btimer.h>
 #include <errno.h>
diff --git a/testsuites/psxtmtests/psxtmmq01/init.c b/testsuites/psxtmtests/psxtmmq01/init.c
index e023be0..a5ed4fc 100644
--- a/testsuites/psxtmtests/psxtmmq01/init.c
+++ b/testsuites/psxtmtests/psxtmmq01/init.c
@@ -7,8 +7,6 @@
  *  http://www.rtems.org/license/LICENSE.
  */
 
-#define TEST_INIT
-
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
diff --git a/testsuites/psxtmtests/psxtmmutex01/init.c b/testsuites/psxtmtests/psxtmmutex01/init.c
index 558d8e6..7a020f9 100644
--- a/testsuites/psxtmtests/psxtmmutex01/init.c
+++ b/testsuites/psxtmtests/psxtmmutex01/init.c
@@ -11,8 +11,6 @@
 #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #include <timesys.h>
 #include <rtems/btimer.h>
 #include <errno.h>
diff --git a/testsuites/psxtmtests/psxtmmutex02/init.c b/testsuites/psxtmtests/psxtmmutex02/init.c
index 44d74ca..b71e21f 100644
--- a/testsuites/psxtmtests/psxtmmutex02/init.c
+++ b/testsuites/psxtmtests/psxtmmutex02/init.c
@@ -11,8 +11,6 @@
 #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #include <coverhd.h>
 #include <tmacros.h>
 #include <timesys.h>
diff --git a/testsuites/psxtmtests/psxtmmutex03/init.c b/testsuites/psxtmtests/psxtmmutex03/init.c
index 9751b87..13ad5fa 100644
--- a/testsuites/psxtmtests/psxtmmutex03/init.c
+++ b/testsuites/psxtmtests/psxtmmutex03/init.c
@@ -11,8 +11,6 @@
 #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #include <timesys.h>
 #include <rtems/btimer.h>
 #include <errno.h>
diff --git a/testsuites/psxtmtests/psxtmmutex04/init.c b/testsuites/psxtmtests/psxtmmutex04/init.c
index cb6d1f4..6513c59 100644
--- a/testsuites/psxtmtests/psxtmmutex04/init.c
+++ b/testsuites/psxtmtests/psxtmmutex04/init.c
@@ -11,8 +11,6 @@
 #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #include <timesys.h>
 #include <tmacros.h>
 #include <rtems/btimer.h>
diff --git a/testsuites/psxtmtests/psxtmmutex05/init.c b/testsuites/psxtmtests/psxtmmutex05/init.c
index 6ed38c2..d274fc5 100644
--- a/testsuites/psxtmtests/psxtmmutex05/init.c
+++ b/testsuites/psxtmtests/psxtmmutex05/init.c
@@ -11,8 +11,6 @@
 #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #include <coverhd.h>
 #include <tmacros.h>
 #include <timesys.h>
diff --git a/testsuites/psxtmtests/psxtmmutex06/init.c b/testsuites/psxtmtests/psxtmmutex06/init.c
index 01cea46..c2bd001 100644
--- a/testsuites/psxtmtests/psxtmmutex06/init.c
+++ b/testsuites/psxtmtests/psxtmmutex06/init.c
@@ -11,8 +11,6 @@
 #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #include <coverhd.h>
 #include <tmacros.h>
 #include <timesys.h>
diff --git a/testsuites/psxtmtests/psxtmmutex07/init.c b/testsuites/psxtmtests/psxtmmutex07/init.c
index 46ca01c..de69fcc 100644
--- a/testsuites/psxtmtests/psxtmmutex07/init.c
+++ b/testsuites/psxtmtests/psxtmmutex07/init.c
@@ -11,8 +11,6 @@
 #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #include <timesys.h>
 #include <rtems/btimer.h>
 #include <errno.h>
diff --git a/testsuites/psxtmtests/psxtmnanosleep01/init.c b/testsuites/psxtmtests/psxtmnanosleep01/init.c
index 8dc2890..f445af5 100644
--- a/testsuites/psxtmtests/psxtmnanosleep01/init.c
+++ b/testsuites/psxtmtests/psxtmnanosleep01/init.c
@@ -11,8 +11,6 @@
 #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #include <timesys.h>
 #include <rtems/btimer.h>
 #include "test_support.h"
diff --git a/testsuites/psxtmtests/psxtmnanosleep02/init.c b/testsuites/psxtmtests/psxtmnanosleep02/init.c
index 5c8139b..9e227e5 100644
--- a/testsuites/psxtmtests/psxtmnanosleep02/init.c
+++ b/testsuites/psxtmtests/psxtmnanosleep02/init.c
@@ -11,8 +11,6 @@
 #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #include <timesys.h>
 #include <rtems/btimer.h>
 #include "test_support.h"
diff --git a/testsuites/psxtmtests/psxtmrwlock01/init.c b/testsuites/psxtmtests/psxtmrwlock01/init.c
index 49f8e56..5bdfb56 100644
--- a/testsuites/psxtmtests/psxtmrwlock01/init.c
+++ b/testsuites/psxtmtests/psxtmrwlock01/init.c
@@ -11,8 +11,6 @@
 #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #include <errno.h>
 #include <timesys.h>
 #include <rtems/btimer.h>
diff --git a/testsuites/psxtmtests/psxtmrwlock02/init.c b/testsuites/psxtmtests/psxtmrwlock02/init.c
index 0b37e0f..f2462b2 100644
--- a/testsuites/psxtmtests/psxtmrwlock02/init.c
+++ b/testsuites/psxtmtests/psxtmrwlock02/init.c
@@ -7,8 +7,6 @@
  *  http://www.rtems.org/license/LICENSE.
  */
 
-#define TEST_INIT
-
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
diff --git a/testsuites/psxtmtests/psxtmrwlock03/init.c b/testsuites/psxtmtests/psxtmrwlock03/init.c
index e4fc6c5..10c7aee 100644
--- a/testsuites/psxtmtests/psxtmrwlock03/init.c
+++ b/testsuites/psxtmtests/psxtmrwlock03/init.c
@@ -7,8 +7,6 @@
  *  http://www.rtems.org/license/LICENSE.
  */
 
-#define TEST_INIT
-
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
diff --git a/testsuites/psxtmtests/psxtmrwlock04/init.c b/testsuites/psxtmtests/psxtmrwlock04/init.c
index 53df5fa..dd2d735 100644
--- a/testsuites/psxtmtests/psxtmrwlock04/init.c
+++ b/testsuites/psxtmtests/psxtmrwlock04/init.c
@@ -7,8 +7,6 @@
  *  http://www.rtems.org/license/LICENSE.
  */
 
-#define TEST_INIT
-
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
diff --git a/testsuites/psxtmtests/psxtmrwlock05/init.c b/testsuites/psxtmtests/psxtmrwlock05/init.c
index cf7ed6a..f6668c3 100644
--- a/testsuites/psxtmtests/psxtmrwlock05/init.c
+++ b/testsuites/psxtmtests/psxtmrwlock05/init.c
@@ -7,8 +7,6 @@
  *  http://www.rtems.org/license/LICENSE.
  */
 
-#define TEST_INIT
-
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
diff --git a/testsuites/psxtmtests/psxtmrwlock06/init.c b/testsuites/psxtmtests/psxtmrwlock06/init.c
index b68f716..93a49be 100644
--- a/testsuites/psxtmtests/psxtmrwlock06/init.c
+++ b/testsuites/psxtmtests/psxtmrwlock06/init.c
@@ -11,8 +11,6 @@
 #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #include <coverhd.h>
 #include <pthread.h>
 #include <sched.h>
diff --git a/testsuites/psxtmtests/psxtmrwlock07/init.c b/testsuites/psxtmtests/psxtmrwlock07/init.c
index 4c7128c..303c301 100644
--- a/testsuites/psxtmtests/psxtmrwlock07/init.c
+++ b/testsuites/psxtmtests/psxtmrwlock07/init.c
@@ -11,8 +11,6 @@
 #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #include <coverhd.h>
 #include <tmacros.h>
 #include <timesys.h>
diff --git a/testsuites/psxtmtests/psxtmsem01/init.c b/testsuites/psxtmtests/psxtmsem01/init.c
index 031124b..4223a02 100644
--- a/testsuites/psxtmtests/psxtmsem01/init.c
+++ b/testsuites/psxtmtests/psxtmsem01/init.c
@@ -11,8 +11,6 @@
 #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #include <errno.h>
 #include <fcntl.h>
 #include <semaphore.h>
diff --git a/testsuites/psxtmtests/psxtmsem02/init.c b/testsuites/psxtmtests/psxtmsem02/init.c
index 79557ab..3c2f34a 100644
--- a/testsuites/psxtmtests/psxtmsem02/init.c
+++ b/testsuites/psxtmtests/psxtmsem02/init.c
@@ -11,8 +11,6 @@
 #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #include <errno.h>
 #include <fcntl.h>
 #include <semaphore.h>
diff --git a/testsuites/psxtmtests/psxtmsem03/init.c b/testsuites/psxtmtests/psxtmsem03/init.c
index 9037882..687c8c6 100644
--- a/testsuites/psxtmtests/psxtmsem03/init.c
+++ b/testsuites/psxtmtests/psxtmsem03/init.c
@@ -11,8 +11,6 @@
 #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #include <errno.h>
 #include <fcntl.h>
 #include <semaphore.h>
diff --git a/testsuites/psxtmtests/psxtmsem04/init.c b/testsuites/psxtmtests/psxtmsem04/init.c
index b8130a9..540f0a3 100644
--- a/testsuites/psxtmtests/psxtmsem04/init.c
+++ b/testsuites/psxtmtests/psxtmsem04/init.c
@@ -11,8 +11,6 @@
 #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #include <errno.h>
 #include <fcntl.h>
 #include <semaphore.h>
diff --git a/testsuites/psxtmtests/psxtmsem05/init.c b/testsuites/psxtmtests/psxtmsem05/init.c
index fca2e03..07b96b2 100644
--- a/testsuites/psxtmtests/psxtmsem05/init.c
+++ b/testsuites/psxtmtests/psxtmsem05/init.c
@@ -11,8 +11,6 @@
 #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #include <errno.h>
 #include <fcntl.h>
 #include <semaphore.h>
diff --git a/testsuites/psxtmtests/psxtmsleep01/init.c b/testsuites/psxtmtests/psxtmsleep01/init.c
index 5f3b8de..f2ee0af 100644
--- a/testsuites/psxtmtests/psxtmsleep01/init.c
+++ b/testsuites/psxtmtests/psxtmsleep01/init.c
@@ -11,8 +11,6 @@
 #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #include <timesys.h>
 #include <rtems/btimer.h>
 #include "test_support.h"
diff --git a/testsuites/psxtmtests/psxtmsleep02/init.c b/testsuites/psxtmtests/psxtmsleep02/init.c
index 8948c94..1e909a2 100644
--- a/testsuites/psxtmtests/psxtmsleep02/init.c
+++ b/testsuites/psxtmtests/psxtmsleep02/init.c
@@ -11,8 +11,6 @@
 #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #include <timesys.h>
 #include <rtems/btimer.h>
 #include "test_support.h"
diff --git a/testsuites/psxtmtests/psxtmthread01/init.c b/testsuites/psxtmtests/psxtmthread01/init.c
index 35b9cbb..60f94cf 100644
--- a/testsuites/psxtmtests/psxtmthread01/init.c
+++ b/testsuites/psxtmtests/psxtmthread01/init.c
@@ -11,8 +11,6 @@
 #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #include <coverhd.h>
 #include <tmacros.h>
 #include <timesys.h>
diff --git a/testsuites/psxtmtests/psxtmthread02/init.c b/testsuites/psxtmtests/psxtmthread02/init.c
index 52e0ad3..c468f03 100644
--- a/testsuites/psxtmtests/psxtmthread02/init.c
+++ b/testsuites/psxtmtests/psxtmthread02/init.c
@@ -11,8 +11,6 @@
 #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #include <timesys.h>
 #include <pthread.h>
 #include <sched.h>
diff --git a/testsuites/psxtmtests/psxtmthread03/init.c b/testsuites/psxtmtests/psxtmthread03/init.c
index 30e1b64..938a8c6 100644
--- a/testsuites/psxtmtests/psxtmthread03/init.c
+++ b/testsuites/psxtmtests/psxtmthread03/init.c
@@ -11,8 +11,6 @@
 #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #include <coverhd.h>
 #include <tmacros.h>
 #include <timesys.h>
diff --git a/testsuites/psxtmtests/psxtmthread04/init.c b/testsuites/psxtmtests/psxtmthread04/init.c
index 12f5337..4ae0b57 100644
--- a/testsuites/psxtmtests/psxtmthread04/init.c
+++ b/testsuites/psxtmtests/psxtmthread04/init.c
@@ -11,8 +11,6 @@
 #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #include <timesys.h>
 #include <pthread.h>
 #include <sched.h>
diff --git a/testsuites/psxtmtests/psxtmthread05/init.c b/testsuites/psxtmtests/psxtmthread05/init.c
index 682afc0..10d9036 100644
--- a/testsuites/psxtmtests/psxtmthread05/init.c
+++ b/testsuites/psxtmtests/psxtmthread05/init.c
@@ -12,8 +12,6 @@
 #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #include <timesys.h>
 #include <pthread.h>
 #include <sched.h>
diff --git a/testsuites/psxtmtests/psxtmthread06/init.c b/testsuites/psxtmtests/psxtmthread06/init.c
index d7c92fc..6031909 100644
--- a/testsuites/psxtmtests/psxtmthread06/init.c
+++ b/testsuites/psxtmtests/psxtmthread06/init.c
@@ -13,8 +13,6 @@
 #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #include <timesys.h>
 #include <pthread.h>
 #include <sched.h>
diff --git a/testsuites/rhealstone/rhdeadlockbrk/deadlockbrk.c b/testsuites/rhealstone/rhdeadlockbrk/deadlockbrk.c
index 438bff1..a897727 100644
--- a/testsuites/rhealstone/rhdeadlockbrk/deadlockbrk.c
+++ b/testsuites/rhealstone/rhdeadlockbrk/deadlockbrk.c
@@ -4,8 +4,6 @@
  * This file's license is 2-clause BSD as in this distribution's LICENSE file.
  */
 
-#define TEST_INIT
-
 #include <timesys.h>
 #include <rtems/btimer.h>
 
diff --git a/testsuites/rhealstone/rhilatency/ilatency.c b/testsuites/rhealstone/rhilatency/ilatency.c
index 87ca136..0a7741b 100644
--- a/testsuites/rhealstone/rhilatency/ilatency.c
+++ b/testsuites/rhealstone/rhilatency/ilatency.c
@@ -13,8 +13,6 @@
 #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #define CONFIGURE_INIT
 #include <timesys.h>
 #include <rtems/btimer.h>
diff --git a/testsuites/rhealstone/rhmlatency/mlatency.c b/testsuites/rhealstone/rhmlatency/mlatency.c
index 3682dc8..11a29c0 100644
--- a/testsuites/rhealstone/rhmlatency/mlatency.c
+++ b/testsuites/rhealstone/rhmlatency/mlatency.c
@@ -8,8 +8,6 @@
 #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #include <timesys.h>
 #include <rtems/btimer.h>
 
diff --git a/testsuites/rhealstone/rhsemshuffle/semshuffle.c b/testsuites/rhealstone/rhsemshuffle/semshuffle.c
index 6aaf38d..6800926 100644
--- a/testsuites/rhealstone/rhsemshuffle/semshuffle.c
+++ b/testsuites/rhealstone/rhsemshuffle/semshuffle.c
@@ -4,8 +4,6 @@
  * This file's license is 2-clause BSD as in this distribution's LICENSE file.
  */
 
-#define TEST_INIT
-
 #include <timesys.h>
 #include <rtems/btimer.h>
 
diff --git a/testsuites/rhealstone/rhtaskpreempt/taskpreempt.c b/testsuites/rhealstone/rhtaskpreempt/taskpreempt.c
index 0218c6d..c396e74 100644
--- a/testsuites/rhealstone/rhtaskpreempt/taskpreempt.c
+++ b/testsuites/rhealstone/rhtaskpreempt/taskpreempt.c
@@ -4,8 +4,6 @@
  * This file's license is 2-clause BSD as in this distribution's LICENSE file.
  */
 
-#define TEST_INIT
-
 #include <timesys.h>
 #include <rtems/btimer.h>
 
diff --git a/testsuites/rhealstone/rhtaskswitch/taskswitch.c b/testsuites/rhealstone/rhtaskswitch/taskswitch.c
index 972eed8..520de33 100644
--- a/testsuites/rhealstone/rhtaskswitch/taskswitch.c
+++ b/testsuites/rhealstone/rhtaskswitch/taskswitch.c
@@ -4,8 +4,6 @@
  * This file's license is 2-clause BSD as in this distribution's LICENSE file.
  */
 
-#define TEST_INIT
-
 #include <timesys.h>
 #include <rtems/btimer.h>
 
diff --git a/testsuites/samples/base_mp/init.c b/testsuites/samples/base_mp/init.c
index 9986d3c..901dc83 100644
--- a/testsuites/samples/base_mp/init.c
+++ b/testsuites/samples/base_mp/init.c
@@ -11,8 +11,6 @@
 #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #define CONFIGURE_INIT
 #include "system.h"
 #include <stdio.h>
diff --git a/testsuites/samples/base_sp/init.c b/testsuites/samples/base_sp/init.c
index 48dbf79..b1cb4d9 100644
--- a/testsuites/samples/base_sp/init.c
+++ b/testsuites/samples/base_sp/init.c
@@ -11,8 +11,6 @@
 #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #define CONFIGURE_INIT
 #include "system.h"
 #include "tmacros.h"
diff --git a/testsuites/samples/capture/init.c b/testsuites/samples/capture/init.c
index 2bf21c8..3f2bc84 100644
--- a/testsuites/samples/capture/init.c
+++ b/testsuites/samples/capture/init.c
@@ -13,8 +13,6 @@
 #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #include "system.h"
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/testsuites/samples/cdtest/init.c b/testsuites/samples/cdtest/init.c
index b5ea093..1cf2b20 100644
--- a/testsuites/samples/cdtest/init.c
+++ b/testsuites/samples/cdtest/init.c
@@ -11,8 +11,6 @@
 #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #define CONFIGURE_INIT
 #include "system.h"
 #include <stdio.h>
diff --git a/testsuites/samples/fileio/init.c b/testsuites/samples/fileio/init.c
index 7158ab1..433266a 100644
--- a/testsuites/samples/fileio/init.c
+++ b/testsuites/samples/fileio/init.c
@@ -11,8 +11,6 @@
 #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #define CONFIGURE_INIT
 #include "system.h"
 #include <sys/param.h>
diff --git a/testsuites/samples/nsecs/init.c b/testsuites/samples/nsecs/init.c
index 7e4e209..59995f1 100644
--- a/testsuites/samples/nsecs/init.c
+++ b/testsuites/samples/nsecs/init.c
@@ -17,8 +17,6 @@
 #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #include <rtems.h>
 #include <inttypes.h>
 #include <stdio.h>
diff --git a/testsuites/samples/paranoia/init.c b/testsuites/samples/paranoia/init.c
index 1ee4db0..c5110e2 100644
--- a/testsuites/samples/paranoia/init.c
+++ b/testsuites/samples/paranoia/init.c
@@ -11,8 +11,6 @@
 #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #define CONFIGURE_INIT
 #include "system.h"
 #include <stdio.h>
diff --git a/testsuites/samples/pppd/init.c b/testsuites/samples/pppd/init.c
index 1a9ddee..1661e55 100644
--- a/testsuites/samples/pppd/init.c
+++ b/testsuites/samples/pppd/init.c
@@ -11,8 +11,6 @@
 #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
diff --git a/testsuites/samples/ticker/init.c b/testsuites/samples/ticker/init.c
index 1b9ae96..3f3cbd8 100644
--- a/testsuites/samples/ticker/init.c
+++ b/testsuites/samples/ticker/init.c
@@ -11,8 +11,6 @@
 #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #define CONFIGURE_INIT
 #include "system.h"
 
diff --git a/testsuites/samples/unlimited/init.c b/testsuites/samples/unlimited/init.c
index 0466e3d..002a973 100644
--- a/testsuites/samples/unlimited/init.c
+++ b/testsuites/samples/unlimited/init.c
@@ -13,8 +13,6 @@
 
 #define CONFIGURE_INIT
 
-#define TEST_INIT
-
 #include "system.h"
 #include "tmacros.h"
 #include <stdio.h>
diff --git a/testsuites/smptests/smp01/init.c b/testsuites/smptests/smp01/init.c
index ef9d6b8..c77a192 100644
--- a/testsuites/smptests/smp01/init.c
+++ b/testsuites/smptests/smp01/init.c
@@ -11,8 +11,6 @@
 #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #define CONFIGURE_INIT
 #include "system.h"
 
diff --git a/testsuites/smptests/smp02/init.c b/testsuites/smptests/smp02/init.c
index 48d6148..e70eca3 100644
--- a/testsuites/smptests/smp02/init.c
+++ b/testsuites/smptests/smp02/init.c
@@ -11,8 +11,6 @@
 #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #define CONFIGURE_INIT
 #include "system.h"
 
diff --git a/testsuites/smptests/smp03/init.c b/testsuites/smptests/smp03/init.c
index 63383c4..03eddb0 100644
--- a/testsuites/smptests/smp03/init.c
+++ b/testsuites/smptests/smp03/init.c
@@ -11,8 +11,6 @@
 #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #define CONFIGURE_INIT
 #include "system.h"
 
diff --git a/testsuites/smptests/smp05/init.c b/testsuites/smptests/smp05/init.c
index 854c8fe..7211e8c 100644
--- a/testsuites/smptests/smp05/init.c
+++ b/testsuites/smptests/smp05/init.c
@@ -11,8 +11,6 @@
 #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #include <tmacros.h>
 #include "test_support.h"
 
diff --git a/testsuites/smptests/smp07/init.c b/testsuites/smptests/smp07/init.c
index 9bf0529..0dbf70b 100644
--- a/testsuites/smptests/smp07/init.c
+++ b/testsuites/smptests/smp07/init.c
@@ -11,8 +11,6 @@
 #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #include <tmacros.h>
 #include "test_support.h"
 
diff --git a/testsuites/smptests/smp08/init.c b/testsuites/smptests/smp08/init.c
index fb58d70..8500392 100644
--- a/testsuites/smptests/smp08/init.c
+++ b/testsuites/smptests/smp08/init.c
@@ -11,8 +11,6 @@
 #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #define CONFIGURE_INIT
 #include "system.h"
 
diff --git a/testsuites/smptests/smp09/init.c b/testsuites/smptests/smp09/init.c
index 4cb89de..6629064 100644
--- a/testsuites/smptests/smp09/init.c
+++ b/testsuites/smptests/smp09/init.c
@@ -11,8 +11,6 @@
 #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #include <tmacros.h>
 #include "test_support.h"
 #include <rtems/cpuuse.h>
diff --git a/testsuites/smptests/smpaffinity01/init.c b/testsuites/smptests/smpaffinity01/init.c
index c5a24c0..eae6d70 100644
--- a/testsuites/smptests/smpaffinity01/init.c
+++ b/testsuites/smptests/smpaffinity01/init.c
@@ -13,8 +13,6 @@
 
 #define NUM_CPUS   4
 
-#define TEST_INIT
-
 #include "tmacros.h"
 
 const char rtems_test_name[] = "SMPAFFINITY 1";
diff --git a/testsuites/smptests/smpatomic01/init.c b/testsuites/smptests/smpatomic01/init.c
index a780c69..394cc3f 100644
--- a/testsuites/smptests/smpatomic01/init.c
+++ b/testsuites/smptests/smpatomic01/init.c
@@ -18,8 +18,6 @@
   #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #include <rtems/score/atomic.h>
 #include <rtems/score/smpbarrier.h>
 #include <rtems.h>
diff --git a/testsuites/smptests/smpcache01/init.c b/testsuites/smptests/smpcache01/init.c
index ee752c7..73e30a1 100644
--- a/testsuites/smptests/smpcache01/init.c
+++ b/testsuites/smptests/smpcache01/init.c
@@ -11,8 +11,6 @@
   #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #include <rtems/score/atomic.h>
 #include <rtems/score/smpbarrier.h>
 #include <rtems/score/smpimpl.h>
diff --git a/testsuites/smptests/smpcapture01/init.c b/testsuites/smptests/smpcapture01/init.c
index 2650f24..2818b91 100644
--- a/testsuites/smptests/smpcapture01/init.c
+++ b/testsuites/smptests/smpcapture01/init.c
@@ -25,8 +25,6 @@
   #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #include <rtems.h>
 #include <rtems/captureimpl.h>
 
diff --git a/testsuites/smptests/smpcapture02/init.c b/testsuites/smptests/smpcapture02/init.c
index efcb236..9926fbb 100644
--- a/testsuites/smptests/smpcapture02/init.c
+++ b/testsuites/smptests/smpcapture02/init.c
@@ -21,8 +21,6 @@
 #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #include <rtems.h>
 #include <bsp/irq.h>
 #include <rtems/captureimpl.h>
diff --git a/testsuites/smptests/smpclock01/init.c b/testsuites/smptests/smpclock01/init.c
index a4128e4..5972959 100644
--- a/testsuites/smptests/smpclock01/init.c
+++ b/testsuites/smptests/smpclock01/init.c
@@ -16,8 +16,6 @@
   #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #include "tmacros.h"
 
 #include <rtems.h>
diff --git a/testsuites/smptests/smpfatal01/init.c b/testsuites/smptests/smpfatal01/init.c
index e225aa4..a49cb34 100644
--- a/testsuites/smptests/smpfatal01/init.c
+++ b/testsuites/smptests/smpfatal01/init.c
@@ -16,8 +16,6 @@
   #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #include "tmacros.h"
 
 #include <rtems.h>
diff --git a/testsuites/smptests/smpfatal02/init.c b/testsuites/smptests/smpfatal02/init.c
index b6a538f..94a9829 100644
--- a/testsuites/smptests/smpfatal02/init.c
+++ b/testsuites/smptests/smpfatal02/init.c
@@ -16,8 +16,6 @@
   #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #include "tmacros.h"
 
 #include <rtems.h>
diff --git a/testsuites/smptests/smpfatal03/init.c b/testsuites/smptests/smpfatal03/init.c
index 0030afe..3b83034 100644
--- a/testsuites/smptests/smpfatal03/init.c
+++ b/testsuites/smptests/smpfatal03/init.c
@@ -16,8 +16,6 @@
 #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #include "tmacros.h"
 
 const char rtems_test_name[] = "SMPFATAL 3";
diff --git a/testsuites/smptests/smpfatal04/init.c b/testsuites/smptests/smpfatal04/init.c
index 0b76f81..939bf9f 100644
--- a/testsuites/smptests/smpfatal04/init.c
+++ b/testsuites/smptests/smpfatal04/init.c
@@ -16,8 +16,6 @@
   #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #include "tmacros.h"
 
 #include <rtems.h>
diff --git a/testsuites/smptests/smpfatal05/init.c b/testsuites/smptests/smpfatal05/init.c
index 431b7b1..21c7a66 100644
--- a/testsuites/smptests/smpfatal05/init.c
+++ b/testsuites/smptests/smpfatal05/init.c
@@ -16,8 +16,6 @@
   #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #include "tmacros.h"
 
 #include <rtems.h>
diff --git a/testsuites/smptests/smpfatal06/init.c b/testsuites/smptests/smpfatal06/init.c
index f99cdd5..8c89bdb 100644
--- a/testsuites/smptests/smpfatal06/init.c
+++ b/testsuites/smptests/smpfatal06/init.c
@@ -16,8 +16,6 @@
   #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #include "tmacros.h"
 
 #include <rtems.h>
diff --git a/testsuites/smptests/smpfatal08/init.c b/testsuites/smptests/smpfatal08/init.c
index f641278..2b8fa1c 100644
--- a/testsuites/smptests/smpfatal08/init.c
+++ b/testsuites/smptests/smpfatal08/init.c
@@ -16,8 +16,6 @@
   #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #include "tmacros.h"
 
 #include <rtems.h>
diff --git a/testsuites/smptests/smpipi01/init.c b/testsuites/smptests/smpipi01/init.c
index b2f232e..cc85388 100644
--- a/testsuites/smptests/smpipi01/init.c
+++ b/testsuites/smptests/smpipi01/init.c
@@ -16,8 +16,6 @@
   #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #include <rtems/score/smpimpl.h>
 #include <rtems/score/smpbarrier.h>
 #include <rtems/counter.h>
diff --git a/testsuites/smptests/smpload01/init.c b/testsuites/smptests/smpload01/init.c
index 778c3dc..0e10235 100644
--- a/testsuites/smptests/smpload01/init.c
+++ b/testsuites/smptests/smpload01/init.c
@@ -16,8 +16,6 @@
   #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #include "tmacros.h"
 
 #include <stdlib.h>
diff --git a/testsuites/smptests/smplock01/init.c b/testsuites/smptests/smplock01/init.c
index e8e22c6..c53da3b 100644
--- a/testsuites/smptests/smplock01/init.c
+++ b/testsuites/smptests/smplock01/init.c
@@ -16,8 +16,6 @@
   #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #include <rtems/score/smplock.h>
 #include <rtems/score/smplockmcs.h>
 #include <rtems/score/smplockseq.h>
diff --git a/testsuites/smptests/smpmigration01/init.c b/testsuites/smptests/smpmigration01/init.c
index 7203350..6cde34b 100644
--- a/testsuites/smptests/smpmigration01/init.c
+++ b/testsuites/smptests/smpmigration01/init.c
@@ -16,8 +16,6 @@
   #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #define TESTS_USE_PRINTF
 #include "tmacros.h"
 
diff --git a/testsuites/smptests/smpmigration02/init.c b/testsuites/smptests/smpmigration02/init.c
index 15e5d6e..4180f53 100644
--- a/testsuites/smptests/smpmigration02/init.c
+++ b/testsuites/smptests/smpmigration02/init.c
@@ -16,8 +16,6 @@
   #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #include <rtems.h>
 #include <rtems/libcsupport.h>
 #include <rtems/score/objectimpl.h>
diff --git a/testsuites/smptests/smpmrsp01/init.c b/testsuites/smptests/smpmrsp01/init.c
index 92991c3..aa974e2 100644
--- a/testsuites/smptests/smpmrsp01/init.c
+++ b/testsuites/smptests/smpmrsp01/init.c
@@ -16,8 +16,6 @@
   #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #include <sys/param.h>
 
 #include <stdio.h>
diff --git a/testsuites/smptests/smpmutex01/init.c b/testsuites/smptests/smpmutex01/init.c
index ead95cf..c7059e8 100644
--- a/testsuites/smptests/smpmutex01/init.c
+++ b/testsuites/smptests/smpmutex01/init.c
@@ -16,8 +16,6 @@
   #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #include "tmacros.h"
 
 const char rtems_test_name[] = "SMPMUTEX 1";
diff --git a/testsuites/smptests/smpmutex02/init.c b/testsuites/smptests/smpmutex02/init.c
index f902d88..1604bb7 100644
--- a/testsuites/smptests/smpmutex02/init.c
+++ b/testsuites/smptests/smpmutex02/init.c
@@ -16,8 +16,6 @@
   #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #include <inttypes.h>
 #include <string.h>
 #include <stdio.h>
diff --git a/testsuites/smptests/smppsxaffinity01/init.c b/testsuites/smptests/smppsxaffinity01/init.c
index 0178071..58e1db5 100644
--- a/testsuites/smptests/smppsxaffinity01/init.c
+++ b/testsuites/smptests/smppsxaffinity01/init.c
@@ -13,8 +13,6 @@
 
 #define  _GNU_SOURCE
 
-#define TEST_INIT
-
 #include <tmacros.h>
 #include <errno.h>
 #include <pthread.h>
diff --git a/testsuites/smptests/smppsxaffinity02/init.c b/testsuites/smptests/smppsxaffinity02/init.c
index 1b4bd59..21a723d 100644
--- a/testsuites/smptests/smppsxaffinity02/init.c
+++ b/testsuites/smptests/smppsxaffinity02/init.c
@@ -15,8 +15,6 @@
 
 #define  _GNU_SOURCE
 
-#define TEST_INIT
-
 #include <tmacros.h>
 #include <errno.h>
 #include <pthread.h>
diff --git a/testsuites/smptests/smppsxmutex01/init.c b/testsuites/smptests/smppsxmutex01/init.c
index 67ff99c..aeed75c 100644
--- a/testsuites/smptests/smppsxmutex01/init.c
+++ b/testsuites/smptests/smppsxmutex01/init.c
@@ -16,8 +16,6 @@
   #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #include <errno.h>
 #include <pthread.h>
 
diff --git a/testsuites/smptests/smppsxsignal01/init.c b/testsuites/smptests/smppsxsignal01/init.c
index 2c4687d..3676158 100644
--- a/testsuites/smptests/smppsxsignal01/init.c
+++ b/testsuites/smptests/smppsxsignal01/init.c
@@ -16,8 +16,6 @@
   #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #include "tmacros.h"
 
 #include <pthread.h>
diff --git a/testsuites/smptests/smpschedaffinity01/init.c b/testsuites/smptests/smpschedaffinity01/init.c
index d25d7e0..778fda7 100644
--- a/testsuites/smptests/smpschedaffinity01/init.c
+++ b/testsuites/smptests/smpschedaffinity01/init.c
@@ -24,8 +24,6 @@
   #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #include <rtems.h>
 
 #include "tmacros.h"
diff --git a/testsuites/smptests/smpschedaffinity02/init.c b/testsuites/smptests/smpschedaffinity02/init.c
index 6e40c8e..9a8cfed 100644
--- a/testsuites/smptests/smpschedaffinity02/init.c
+++ b/testsuites/smptests/smpschedaffinity02/init.c
@@ -21,8 +21,6 @@
   #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #include <rtems.h>
 
 #include "tmacros.h"
diff --git a/testsuites/smptests/smpschedaffinity03/init.c b/testsuites/smptests/smpschedaffinity03/init.c
index 4036217..a53b30c 100644
--- a/testsuites/smptests/smpschedaffinity03/init.c
+++ b/testsuites/smptests/smpschedaffinity03/init.c
@@ -15,8 +15,6 @@
   #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #include <rtems.h>
 
 #include "tmacros.h"
diff --git a/testsuites/smptests/smpschedaffinity04/init.c b/testsuites/smptests/smpschedaffinity04/init.c
index 8b62ae0..5dbd2ea 100644
--- a/testsuites/smptests/smpschedaffinity04/init.c
+++ b/testsuites/smptests/smpschedaffinity04/init.c
@@ -15,8 +15,6 @@
   #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #include <rtems.h>
 
 #include "tmacros.h"
diff --git a/testsuites/smptests/smpschedaffinity05/init.c b/testsuites/smptests/smpschedaffinity05/init.c
index 7de8763..b89a6e2 100644
--- a/testsuites/smptests/smpschedaffinity05/init.c
+++ b/testsuites/smptests/smpschedaffinity05/init.c
@@ -24,8 +24,6 @@
   #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #include <rtems.h>
 #include <inttypes.h>
 
diff --git a/testsuites/smptests/smpschededf01/init.c b/testsuites/smptests/smpschededf01/init.c
index b162196..4613ebd 100644
--- a/testsuites/smptests/smpschededf01/init.c
+++ b/testsuites/smptests/smpschededf01/init.c
@@ -16,8 +16,6 @@
 #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #include <rtems.h>
 #include <rtems/cpuuse.h>
 
diff --git a/testsuites/smptests/smpschededf02/init.c b/testsuites/smptests/smpschededf02/init.c
index 17976fb..e0c5182 100644
--- a/testsuites/smptests/smpschededf02/init.c
+++ b/testsuites/smptests/smpschededf02/init.c
@@ -16,8 +16,6 @@
   #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #include "tmacros.h"
 
 #include <rtems.h>
diff --git a/testsuites/smptests/smpschededf03/init.c b/testsuites/smptests/smpschededf03/init.c
index 3a1f270..3302953 100644
--- a/testsuites/smptests/smpschededf03/init.c
+++ b/testsuites/smptests/smpschededf03/init.c
@@ -16,8 +16,6 @@
 #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #include "tmacros.h"
 
 #include <rtems.h>
diff --git a/testsuites/smptests/smpschedsem01/init.c b/testsuites/smptests/smpschedsem01/init.c
index 75173e3..cae5d6e 100644
--- a/testsuites/smptests/smpschedsem01/init.c
+++ b/testsuites/smptests/smpschedsem01/init.c
@@ -11,8 +11,6 @@
   #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #include <rtems.h>
 
 #include "tmacros.h"
diff --git a/testsuites/smptests/smpscheduler01/init.c b/testsuites/smptests/smpscheduler01/init.c
index 9f0b5c1..5df3281 100644
--- a/testsuites/smptests/smpscheduler01/init.c
+++ b/testsuites/smptests/smpscheduler01/init.c
@@ -16,8 +16,6 @@
   #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #include <rtems.h>
 #include <rtems/score/threadimpl.h>
 
diff --git a/testsuites/smptests/smpscheduler02/init.c b/testsuites/smptests/smpscheduler02/init.c
index 1107fad..5cd3783 100644
--- a/testsuites/smptests/smpscheduler02/init.c
+++ b/testsuites/smptests/smpscheduler02/init.c
@@ -16,8 +16,6 @@
   #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #include <sched.h>
 #include <limits.h>
 
diff --git a/testsuites/smptests/smpscheduler03/test.c b/testsuites/smptests/smpscheduler03/test.c
index f804bc7..3f6b9e3 100644
--- a/testsuites/smptests/smpscheduler03/test.c
+++ b/testsuites/smptests/smpscheduler03/test.c
@@ -21,8 +21,6 @@
 #include <rtems/score/threadimpl.h>
 #include <rtems/score/schedulersmpimpl.h>
 
-#define TEST_INIT
-
 #include "tmacros.h"
 
 void Init(rtems_task_argument arg);
diff --git a/testsuites/smptests/smpscheduler04/init.c b/testsuites/smptests/smpscheduler04/init.c
index 2515e17..a4e9da1 100644
--- a/testsuites/smptests/smpscheduler04/init.c
+++ b/testsuites/smptests/smpscheduler04/init.c
@@ -16,8 +16,6 @@
   #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #include <inttypes.h>
 #include <string.h>
 #include <stdio.h>
diff --git a/testsuites/smptests/smpsignal01/init.c b/testsuites/smptests/smpsignal01/init.c
index af66c26..52f2edb 100644
--- a/testsuites/smptests/smpsignal01/init.c
+++ b/testsuites/smptests/smpsignal01/init.c
@@ -16,8 +16,6 @@
   #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #include "tmacros.h"
 
 const char rtems_test_name[] = "SMPSIGNAL 1";
diff --git a/testsuites/smptests/smpstrongapa01/init.c b/testsuites/smptests/smpstrongapa01/init.c
index d59714f..75ac79b 100644
--- a/testsuites/smptests/smpstrongapa01/init.c
+++ b/testsuites/smptests/smpstrongapa01/init.c
@@ -16,8 +16,6 @@
   #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #include "tmacros.h"
 
 #include <rtems.h>
diff --git a/testsuites/smptests/smpswitchextension01/init.c b/testsuites/smptests/smpswitchextension01/init.c
index c415863..3fad1d9 100644
--- a/testsuites/smptests/smpswitchextension01/init.c
+++ b/testsuites/smptests/smpswitchextension01/init.c
@@ -16,8 +16,6 @@
   #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #include "tmacros.h"
 
 #include <stdio.h>
diff --git a/testsuites/smptests/smpthreadlife01/init.c b/testsuites/smptests/smpthreadlife01/init.c
index f224dd9..5c2d106 100644
--- a/testsuites/smptests/smpthreadlife01/init.c
+++ b/testsuites/smptests/smpthreadlife01/init.c
@@ -16,8 +16,6 @@
   #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #include "tmacros.h"
 
 #include <rtems.h>
diff --git a/testsuites/smptests/smpunsupported01/init.c b/testsuites/smptests/smpunsupported01/init.c
index 56212a4..a5ccaae 100644
--- a/testsuites/smptests/smpunsupported01/init.c
+++ b/testsuites/smptests/smpunsupported01/init.c
@@ -17,8 +17,6 @@
   #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #include "tmacros.h"
 
 const char rtems_test_name[] = "SMPUNSUPPORTED 1";
diff --git a/testsuites/smptests/smpwakeafter01/init.c b/testsuites/smptests/smpwakeafter01/init.c
index d677059..3d091f5 100644
--- a/testsuites/smptests/smpwakeafter01/init.c
+++ b/testsuites/smptests/smpwakeafter01/init.c
@@ -16,8 +16,6 @@
   #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #include "tmacros.h"
 
 #include <stdio.h>
diff --git a/testsuites/sptests/sp01/init.c b/testsuites/sptests/sp01/init.c
index a726a02..4d73804 100644
--- a/testsuites/sptests/sp01/init.c
+++ b/testsuites/sptests/sp01/init.c
@@ -11,8 +11,6 @@
 #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #define CONFIGURE_INIT
 #include "system.h"
 
diff --git a/testsuites/sptests/sp02/init.c b/testsuites/sptests/sp02/init.c
index ffd330e..d7ff317 100644
--- a/testsuites/sptests/sp02/init.c
+++ b/testsuites/sptests/sp02/init.c
@@ -11,8 +11,6 @@
 #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #define CONFIGURE_INIT
 #include "system.h"
 
diff --git a/testsuites/sptests/sp03/init.c b/testsuites/sptests/sp03/init.c
index a5b6d80..1f02eb6 100644
--- a/testsuites/sptests/sp03/init.c
+++ b/testsuites/sptests/sp03/init.c
@@ -11,8 +11,6 @@
 #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #define CONFIGURE_INIT
 #include "system.h"
 
diff --git a/testsuites/sptests/sp04/init.c b/testsuites/sptests/sp04/init.c
index 3192579..e7bc793 100644
--- a/testsuites/sptests/sp04/init.c
+++ b/testsuites/sptests/sp04/init.c
@@ -23,8 +23,6 @@
 #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #define CONFIGURE_INIT
 #include "system.h"
 
diff --git a/testsuites/sptests/sp05/init.c b/testsuites/sptests/sp05/init.c
index 52db2ea..7d95ee9 100644
--- a/testsuites/sptests/sp05/init.c
+++ b/testsuites/sptests/sp05/init.c
@@ -23,8 +23,6 @@
 #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #define CONFIGURE_INIT
 #include "system.h"
 
diff --git a/testsuites/sptests/sp06/init.c b/testsuites/sptests/sp06/init.c
index 60e7a41..e8379ae 100644
--- a/testsuites/sptests/sp06/init.c
+++ b/testsuites/sptests/sp06/init.c
@@ -23,8 +23,6 @@
 #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #define CONFIGURE_INIT
 #include "system.h"
 
diff --git a/testsuites/sptests/sp07/init.c b/testsuites/sptests/sp07/init.c
index bfae5eb..d5b606d 100644
--- a/testsuites/sptests/sp07/init.c
+++ b/testsuites/sptests/sp07/init.c
@@ -11,8 +11,6 @@
 #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #define CONFIGURE_INIT
 #include "system.h"
 
diff --git a/testsuites/sptests/sp08/init.c b/testsuites/sptests/sp08/init.c
index 88c1445..2364c70 100644
--- a/testsuites/sptests/sp08/init.c
+++ b/testsuites/sptests/sp08/init.c
@@ -11,8 +11,6 @@
 #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #include <tmacros.h>
 
 #include <rtems/score/sysstate.h>
diff --git a/testsuites/sptests/sp11/init.c b/testsuites/sptests/sp11/init.c
index 5b52ba9..ee3f2e8 100644
--- a/testsuites/sptests/sp11/init.c
+++ b/testsuites/sptests/sp11/init.c
@@ -23,8 +23,6 @@
 #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #define CONFIGURE_INIT
 #include "system.h"
 
diff --git a/testsuites/sptests/sp12/init.c b/testsuites/sptests/sp12/init.c
index fb7a5f8..0b92004 100644
--- a/testsuites/sptests/sp12/init.c
+++ b/testsuites/sptests/sp12/init.c
@@ -23,8 +23,6 @@
 #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #define CONFIGURE_INIT
 #include "system.h"
 
diff --git a/testsuites/sptests/sp13/init.c b/testsuites/sptests/sp13/init.c
index ed244bc..ffa2d12 100644
--- a/testsuites/sptests/sp13/init.c
+++ b/testsuites/sptests/sp13/init.c
@@ -23,8 +23,6 @@
 #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #define CONFIGURE_INIT
 #include "system.h"
 
diff --git a/testsuites/sptests/sp14/init.c b/testsuites/sptests/sp14/init.c
index 5e3ef23..b0cedc2 100644
--- a/testsuites/sptests/sp14/init.c
+++ b/testsuites/sptests/sp14/init.c
@@ -23,8 +23,6 @@
 #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #define CONFIGURE_INIT
 #include "system.h"
 
diff --git a/testsuites/sptests/sp15/init.c b/testsuites/sptests/sp15/init.c
index e867a91..dcf8f95 100644
--- a/testsuites/sptests/sp15/init.c
+++ b/testsuites/sptests/sp15/init.c
@@ -23,8 +23,6 @@
 #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #define CONFIGURE_INIT
 #include "system.h"
 
diff --git a/testsuites/sptests/sp16/init.c b/testsuites/sptests/sp16/init.c
index f9e5d0a..3b8543b 100644
--- a/testsuites/sptests/sp16/init.c
+++ b/testsuites/sptests/sp16/init.c
@@ -23,8 +23,6 @@
 #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #define CONFIGURE_INIT
 #include "system.h"
 
diff --git a/testsuites/sptests/sp17/init.c b/testsuites/sptests/sp17/init.c
index 0ee99c1..4f7cba8 100644
--- a/testsuites/sptests/sp17/init.c
+++ b/testsuites/sptests/sp17/init.c
@@ -23,8 +23,6 @@
 #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #define CONFIGURE_INIT
 #include "system.h"
 
diff --git a/testsuites/sptests/sp18/init.c b/testsuites/sptests/sp18/init.c
index 4c9448f..5f39794 100644
--- a/testsuites/sptests/sp18/init.c
+++ b/testsuites/sptests/sp18/init.c
@@ -11,8 +11,6 @@
 #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #include <rtems/libcsupport.h>
 
 #include <tmacros.h>
diff --git a/testsuites/sptests/sp19/init.c b/testsuites/sptests/sp19/init.c
index 9d8fea3..f1b75c4 100644
--- a/testsuites/sptests/sp19/init.c
+++ b/testsuites/sptests/sp19/init.c
@@ -23,8 +23,6 @@
 #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #define CONFIGURE_INIT
 #include "system.h"
 
diff --git a/testsuites/sptests/sp20/init.c b/testsuites/sptests/sp20/init.c
index 8b831ba..bf8afc7 100644
--- a/testsuites/sptests/sp20/init.c
+++ b/testsuites/sptests/sp20/init.c
@@ -23,8 +23,6 @@
 #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #define CONFIGURE_INIT
 #include "system.h"
 
diff --git a/testsuites/sptests/sp2038/init.c b/testsuites/sptests/sp2038/init.c
index 28c8cb1..da7c23e 100644
--- a/testsuites/sptests/sp2038/init.c
+++ b/testsuites/sptests/sp2038/init.c
@@ -16,8 +16,6 @@
 #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #include <tmacros.h>
 
 #include <time.h>
diff --git a/testsuites/sptests/sp21/init.c b/testsuites/sptests/sp21/init.c
index 9a2fec5..0eb453c 100644
--- a/testsuites/sptests/sp21/init.c
+++ b/testsuites/sptests/sp21/init.c
@@ -11,8 +11,6 @@
 #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #include <tmacros.h>
 #include <rtems/devnull.h>
 #include <rtems/devzero.h>
diff --git a/testsuites/sptests/sp22/init.c b/testsuites/sptests/sp22/init.c
index 78e415d..23956e6 100644
--- a/testsuites/sptests/sp22/init.c
+++ b/testsuites/sptests/sp22/init.c
@@ -23,8 +23,6 @@
 #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #define CONFIGURE_INIT
 #include "system.h"
 
diff --git a/testsuites/sptests/sp23/init.c b/testsuites/sptests/sp23/init.c
index a6b52c6..e0ee2f9 100644
--- a/testsuites/sptests/sp23/init.c
+++ b/testsuites/sptests/sp23/init.c
@@ -23,8 +23,6 @@
 #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #define CONFIGURE_INIT
 #include "system.h"
 
diff --git a/testsuites/sptests/sp24/init.c b/testsuites/sptests/sp24/init.c
index 8c50c3a..b0e7f15 100644
--- a/testsuites/sptests/sp24/init.c
+++ b/testsuites/sptests/sp24/init.c
@@ -23,8 +23,6 @@
 #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #define CONFIGURE_INIT
 #include "system.h"
 
diff --git a/testsuites/sptests/sp25/init.c b/testsuites/sptests/sp25/init.c
index ba4f65b..e744e5c 100644
--- a/testsuites/sptests/sp25/init.c
+++ b/testsuites/sptests/sp25/init.c
@@ -23,8 +23,6 @@
 #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #define CONFIGURE_INIT
 #include "system.h"
 
diff --git a/testsuites/sptests/sp26/init.c b/testsuites/sptests/sp26/init.c
index 6df979c..0ac7157 100644
--- a/testsuites/sptests/sp26/init.c
+++ b/testsuites/sptests/sp26/init.c
@@ -23,8 +23,6 @@
 #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #define CONFIGURE_INIT
 #include "system.h"
 
diff --git a/testsuites/sptests/sp27/init.c b/testsuites/sptests/sp27/init.c
index a545914..bb4630d 100644
--- a/testsuites/sptests/sp27/init.c
+++ b/testsuites/sptests/sp27/init.c
@@ -13,8 +13,6 @@
 #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #include <bsp.h>
 #include <tmacros.h>
 
diff --git a/testsuites/sptests/sp29/init.c b/testsuites/sptests/sp29/init.c
index 6f68275..e65fbe3 100644
--- a/testsuites/sptests/sp29/init.c
+++ b/testsuites/sptests/sp29/init.c
@@ -8,8 +8,6 @@
 #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #include <tmacros.h>
 #include <bsp.h>
 
diff --git a/testsuites/sptests/sp30/init.c b/testsuites/sptests/sp30/init.c
index deb1873..616e4cd 100644
--- a/testsuites/sptests/sp30/init.c
+++ b/testsuites/sptests/sp30/init.c
@@ -23,8 +23,6 @@
 #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #define CONFIGURE_INIT
 #include "system.h"
 
diff --git a/testsuites/sptests/sp31/init.c b/testsuites/sptests/sp31/init.c
index 34a9651..020ec25 100644
--- a/testsuites/sptests/sp31/init.c
+++ b/testsuites/sptests/sp31/init.c
@@ -23,8 +23,6 @@
 #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #define CONFIGURE_INIT
 #include "system.h"
 
diff --git a/testsuites/sptests/sp32/init.c b/testsuites/sptests/sp32/init.c
index 86068a3..71cd46c 100644
--- a/testsuites/sptests/sp32/init.c
+++ b/testsuites/sptests/sp32/init.c
@@ -11,8 +11,6 @@
 #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #include <tmacros.h>  /* includes bsp.h, stdio, etc... */
 
 const char rtems_test_name[] = "SP 32";
diff --git a/testsuites/sptests/sp33/init.c b/testsuites/sptests/sp33/init.c
index d45d860..d8e3c50 100644
--- a/testsuites/sptests/sp33/init.c
+++ b/testsuites/sptests/sp33/init.c
@@ -11,8 +11,6 @@
 #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #include <tmacros.h>  /* includes bsp.h, stdio, etc... */
 
 const char rtems_test_name[] = "SP 33";
diff --git a/testsuites/sptests/sp34/changepri.c b/testsuites/sptests/sp34/changepri.c
index d2bdd65..5000f69 100644
--- a/testsuites/sptests/sp34/changepri.c
+++ b/testsuites/sptests/sp34/changepri.c
@@ -25,8 +25,6 @@
 
 #define CONFIGURE_INIT
 
-#define TEST_INIT
-
 #include <bsp.h>
 #include <stdio.h>
 #include "tmacros.h"
diff --git a/testsuites/sptests/sp35/priinv.c b/testsuites/sptests/sp35/priinv.c
index 69f3ca3..a6d252a 100644
--- a/testsuites/sptests/sp35/priinv.c
+++ b/testsuites/sptests/sp35/priinv.c
@@ -51,8 +51,6 @@
 #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #include <bsp.h>
 #include <stdio.h>
 #include "tmacros.h"
diff --git a/testsuites/sptests/sp36/strict_order_mut.c b/testsuites/sptests/sp36/strict_order_mut.c
index d49ee74..db270ca 100644
--- a/testsuites/sptests/sp36/strict_order_mut.c
+++ b/testsuites/sptests/sp36/strict_order_mut.c
@@ -10,8 +10,6 @@
 #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #include <bsp.h>
 #include <stdio.h>
 #include "tmacros.h"
diff --git a/testsuites/sptests/sp37/init.c b/testsuites/sptests/sp37/init.c
index 13e9a33..08d6285 100644
--- a/testsuites/sptests/sp37/init.c
+++ b/testsuites/sptests/sp37/init.c
@@ -18,8 +18,6 @@
 #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #define CONFIGURE_INIT
 #include "system.h"
 
diff --git a/testsuites/sptests/sp38/init.c b/testsuites/sptests/sp38/init.c
index 49c74c2..d77d5d2 100644
--- a/testsuites/sptests/sp38/init.c
+++ b/testsuites/sptests/sp38/init.c
@@ -13,8 +13,6 @@
 #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #define CONFIGURE_INIT
 #include "system.h"
 
diff --git a/testsuites/sptests/sp40/init.c b/testsuites/sptests/sp40/init.c
index b923d9f..44e8d45 100644
--- a/testsuites/sptests/sp40/init.c
+++ b/testsuites/sptests/sp40/init.c
@@ -15,8 +15,6 @@
 #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #include <tmacros.h>
 
 #include <rtems/ioimpl.h>
diff --git a/testsuites/sptests/sp41/init.c b/testsuites/sptests/sp41/init.c
index e08019a..04b855b 100644
--- a/testsuites/sptests/sp41/init.c
+++ b/testsuites/sptests/sp41/init.c
@@ -13,8 +13,6 @@
 
 #pragma GCC diagnostic ignored "-Wdeprecated-declarations"
 
-#define TEST_INIT
-
 #include <tmacros.h>
 
 #include <rtems/score/objectimpl.h>
diff --git a/testsuites/sptests/sp42/init.c b/testsuites/sptests/sp42/init.c
index 9260b7a..f4be2a5 100644
--- a/testsuites/sptests/sp42/init.c
+++ b/testsuites/sptests/sp42/init.c
@@ -13,8 +13,6 @@
 #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #include <stdio.h>
 #include <stdlib.h>
 
diff --git a/testsuites/sptests/sp43/init.c b/testsuites/sptests/sp43/init.c
index 56c3985..a002535 100644
--- a/testsuites/sptests/sp43/init.c
+++ b/testsuites/sptests/sp43/init.c
@@ -13,8 +13,6 @@
 #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #define CONFIGURE_INIT
 #include "system.h"
 
diff --git a/testsuites/sptests/sp44/init.c b/testsuites/sptests/sp44/init.c
index 39b2f50..5b11ead 100644
--- a/testsuites/sptests/sp44/init.c
+++ b/testsuites/sptests/sp44/init.c
@@ -9,8 +9,6 @@
 #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #include <tmacros.h>
 #include <rtems.h>
 #include <stdio.h>
diff --git a/testsuites/sptests/sp45/init.c b/testsuites/sptests/sp45/init.c
index 20b6119..b8b43b4 100644
--- a/testsuites/sptests/sp45/init.c
+++ b/testsuites/sptests/sp45/init.c
@@ -11,8 +11,6 @@
 #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #include <tmacros.h>
 
 const char rtems_test_name[] = "SP 45";
diff --git a/testsuites/sptests/sp46/init.c b/testsuites/sptests/sp46/init.c
index d66108a..55653e0 100644
--- a/testsuites/sptests/sp46/init.c
+++ b/testsuites/sptests/sp46/init.c
@@ -11,8 +11,6 @@
 #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #include <tmacros.h>
 #include <rtems/cpuuse.h>
 
diff --git a/testsuites/sptests/sp47/init.c b/testsuites/sptests/sp47/init.c
index 2c2b637..5d28303 100644
--- a/testsuites/sptests/sp47/init.c
+++ b/testsuites/sptests/sp47/init.c
@@ -6,8 +6,6 @@
 #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #include <tmacros.h>
 
 const char rtems_test_name[] = "SP 47";
diff --git a/testsuites/sptests/sp48/init.c b/testsuites/sptests/sp48/init.c
index a6bfa9d..53d8245 100644
--- a/testsuites/sptests/sp48/init.c
+++ b/testsuites/sptests/sp48/init.c
@@ -13,8 +13,6 @@
 #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #include <tmacros.h>
 #include <rtems/libcsupport.h>
 
diff --git a/testsuites/sptests/sp49/init.c b/testsuites/sptests/sp49/init.c
index 0edbc4a..64db98e 100644
--- a/testsuites/sptests/sp49/init.c
+++ b/testsuites/sptests/sp49/init.c
@@ -11,8 +11,6 @@
 #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #include <tmacros.h>
 
 const char rtems_test_name[] = "SP 49";
diff --git a/testsuites/sptests/sp50/init.c b/testsuites/sptests/sp50/init.c
index abc5a75..58a7be7 100644
--- a/testsuites/sptests/sp50/init.c
+++ b/testsuites/sptests/sp50/init.c
@@ -11,8 +11,6 @@
 #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #include <tmacros.h>
 #include "pritime.h"
 
diff --git a/testsuites/sptests/sp51/init.c b/testsuites/sptests/sp51/init.c
index 51fa006..1e8f9e5 100644
--- a/testsuites/sptests/sp51/init.c
+++ b/testsuites/sptests/sp51/init.c
@@ -11,8 +11,6 @@
 #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #include <tmacros.h>
 
 const char rtems_test_name[] = "SP 51";
diff --git a/testsuites/sptests/sp52/init.c b/testsuites/sptests/sp52/init.c
index 3069e24..f7629a5 100644
--- a/testsuites/sptests/sp52/init.c
+++ b/testsuites/sptests/sp52/init.c
@@ -25,8 +25,6 @@
 #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #include <tmacros.h>
 #include <string.h>
 
diff --git a/testsuites/sptests/sp54/init.c b/testsuites/sptests/sp54/init.c
index e39999c..3b0d458 100644
--- a/testsuites/sptests/sp54/init.c
+++ b/testsuites/sptests/sp54/init.c
@@ -18,8 +18,6 @@
 #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #include <tmacros.h>
 
 const char rtems_test_name[] = "SP 54";
diff --git a/testsuites/sptests/sp55/init.c b/testsuites/sptests/sp55/init.c
index ebc1264..ee06e84 100644
--- a/testsuites/sptests/sp55/init.c
+++ b/testsuites/sptests/sp55/init.c
@@ -17,8 +17,6 @@
 #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #include <tmacros.h>
 
 const char rtems_test_name[] = "SP 55";
diff --git a/testsuites/sptests/sp56/init.c b/testsuites/sptests/sp56/init.c
index c383420..c0ce3c0 100644
--- a/testsuites/sptests/sp56/init.c
+++ b/testsuites/sptests/sp56/init.c
@@ -17,8 +17,6 @@
 #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #include <tmacros.h>
 
 const char rtems_test_name[] = "SP 56";
diff --git a/testsuites/sptests/sp57/init.c b/testsuites/sptests/sp57/init.c
index 8e0be12..3003c2f 100644
--- a/testsuites/sptests/sp57/init.c
+++ b/testsuites/sptests/sp57/init.c
@@ -17,8 +17,6 @@
 #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #include <tmacros.h>
 
 const char rtems_test_name[] = "SP 57";
diff --git a/testsuites/sptests/sp58/init.c b/testsuites/sptests/sp58/init.c
index b5fd843..b611203 100644
--- a/testsuites/sptests/sp58/init.c
+++ b/testsuites/sptests/sp58/init.c
@@ -11,8 +11,6 @@
 #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #include <tmacros.h>
 
 #include <sys/types.h>
diff --git a/testsuites/sptests/sp59/init.c b/testsuites/sptests/sp59/init.c
index 100b540..4120761 100644
--- a/testsuites/sptests/sp59/init.c
+++ b/testsuites/sptests/sp59/init.c
@@ -11,8 +11,6 @@
 #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #include <tmacros.h>
 
 const char rtems_test_name[] = "SP 59";
diff --git a/testsuites/sptests/sp60/init.c b/testsuites/sptests/sp60/init.c
index baa8f2c..b015ac1 100644
--- a/testsuites/sptests/sp60/init.c
+++ b/testsuites/sptests/sp60/init.c
@@ -11,8 +11,6 @@
 #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #include <tmacros.h>
 
 const char rtems_test_name[] = "SP 60";
diff --git a/testsuites/sptests/sp62/init.c b/testsuites/sptests/sp62/init.c
index cbe6c92..7df64df 100644
--- a/testsuites/sptests/sp62/init.c
+++ b/testsuites/sptests/sp62/init.c
@@ -11,8 +11,6 @@
 #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #include <tmacros.h>
 #include <unistd.h>
 
diff --git a/testsuites/sptests/sp63/init.c b/testsuites/sptests/sp63/init.c
index a4d6639..6f1c837 100644
--- a/testsuites/sptests/sp63/init.c
+++ b/testsuites/sptests/sp63/init.c
@@ -11,8 +11,6 @@
 #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #include <tmacros.h>
 
 #include <rtems/score/heapimpl.h>
diff --git a/testsuites/sptests/sp64/init.c b/testsuites/sptests/sp64/init.c
index 76961f7..153a9f2 100644
--- a/testsuites/sptests/sp64/init.c
+++ b/testsuites/sptests/sp64/init.c
@@ -11,8 +11,6 @@
 #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #include <rtems/libcsupport.h>
 
 #include "tmacros.h"
diff --git a/testsuites/sptests/sp65/init.c b/testsuites/sptests/sp65/init.c
index f1fed6e..09c64b9 100644
--- a/testsuites/sptests/sp65/init.c
+++ b/testsuites/sptests/sp65/init.c
@@ -11,8 +11,6 @@
 #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #include <tmacros.h>
 #include <unistd.h>
 
diff --git a/testsuites/sptests/sp67/init.c b/testsuites/sptests/sp67/init.c
index fe05da2..154e836 100644
--- a/testsuites/sptests/sp67/init.c
+++ b/testsuites/sptests/sp67/init.c
@@ -14,8 +14,6 @@
 #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #include <tmacros.h>
 
 #include <rtems/score/watchdogimpl.h>
diff --git a/testsuites/sptests/sp68/init.c b/testsuites/sptests/sp68/init.c
index 9aa8dd2..5642203 100644
--- a/testsuites/sptests/sp68/init.c
+++ b/testsuites/sptests/sp68/init.c
@@ -24,8 +24,6 @@
 #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #include <tmacros.h>
 
 const char rtems_test_name[] = "SP 68";
diff --git a/testsuites/sptests/sp69/init.c b/testsuites/sptests/sp69/init.c
index 83f93cd..c604c2d 100644
--- a/testsuites/sptests/sp69/init.c
+++ b/testsuites/sptests/sp69/init.c
@@ -11,8 +11,6 @@
 #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #include <rtems/cpuuse.h>
 #include <tmacros.h>
 #include "test_support.h"
diff --git a/testsuites/sptests/sp70/init.c b/testsuites/sptests/sp70/init.c
index eafdde5..721e3b9 100644
--- a/testsuites/sptests/sp70/init.c
+++ b/testsuites/sptests/sp70/init.c
@@ -11,8 +11,6 @@
 #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #include <tmacros.h>
 #include "test_support.h"
 
diff --git a/testsuites/sptests/sp71/init.c b/testsuites/sptests/sp71/init.c
index 999a2e8..eff6ba7 100644
--- a/testsuites/sptests/sp71/init.c
+++ b/testsuites/sptests/sp71/init.c
@@ -11,8 +11,6 @@
 #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #include <tmacros.h>
 #include "test_support.h"
 
diff --git a/testsuites/sptests/sp72/init.c b/testsuites/sptests/sp72/init.c
index b8561e0..5e2c8ab 100644
--- a/testsuites/sptests/sp72/init.c
+++ b/testsuites/sptests/sp72/init.c
@@ -11,8 +11,6 @@
 #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #include <tmacros.h>
 #include "test_support.h"
 
diff --git a/testsuites/sptests/sp73/init.c b/testsuites/sptests/sp73/init.c
index 261bf8b..8db5024 100644
--- a/testsuites/sptests/sp73/init.c
+++ b/testsuites/sptests/sp73/init.c
@@ -11,8 +11,6 @@
 #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #include <bsp.h>
 #include <inttypes.h>
 #include "tmacros.h"
diff --git a/testsuites/sptests/sp74/init.c b/testsuites/sptests/sp74/init.c
index a1f9e56..346c676 100644
--- a/testsuites/sptests/sp74/init.c
+++ b/testsuites/sptests/sp74/init.c
@@ -11,8 +11,6 @@
 #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #include <tmacros.h>
 
 const char rtems_test_name[] = "SP 74";
diff --git a/testsuites/sptests/sp75/init.c b/testsuites/sptests/sp75/init.c
index 667e461..e699e76 100644
--- a/testsuites/sptests/sp75/init.c
+++ b/testsuites/sptests/sp75/init.c
@@ -11,8 +11,6 @@
 #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #include <tmacros.h>
 #include "test_support.h"
 
diff --git a/testsuites/sptests/sp76/init.c b/testsuites/sptests/sp76/init.c
index f414080..daf55f1 100644
--- a/testsuites/sptests/sp76/init.c
+++ b/testsuites/sptests/sp76/init.c
@@ -11,8 +11,6 @@
 #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #include <tmacros.h>
 
 const char rtems_test_name[] = "SP 76";
diff --git a/testsuites/sptests/sp77/init.c b/testsuites/sptests/sp77/init.c
index f645209..c6ccacc 100644
--- a/testsuites/sptests/sp77/init.c
+++ b/testsuites/sptests/sp77/init.c
@@ -7,8 +7,6 @@
  *  http://www.rtems.org/license/LICENSE.
  */
 
-#define TEST_INIT
-
 #include <tmacros.h>
 #include "test_support.h"
 
diff --git a/testsuites/sptests/spassoc01/init.c b/testsuites/sptests/spassoc01/init.c
index 959cd40..ba3873a 100644
--- a/testsuites/sptests/spassoc01/init.c
+++ b/testsuites/sptests/spassoc01/init.c
@@ -11,8 +11,6 @@
 #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #include <tmacros.h>
 #include "test_support.h"
 
diff --git a/testsuites/sptests/spatomic01/init.c b/testsuites/sptests/spatomic01/init.c
index e034fcc..b5fa6c4 100644
--- a/testsuites/sptests/spatomic01/init.c
+++ b/testsuites/sptests/spatomic01/init.c
@@ -18,8 +18,6 @@
   #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #include <rtems/score/atomic.h>
 #include <stdio.h>
 #include <rtems.h>
diff --git a/testsuites/sptests/spcache01/init.c b/testsuites/sptests/spcache01/init.c
index 28cf8c0..52fa860 100644
--- a/testsuites/sptests/spcache01/init.c
+++ b/testsuites/sptests/spcache01/init.c
@@ -16,8 +16,6 @@
   #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #include <inttypes.h>
 #include <setjmp.h>
 #include <stdio.h>
diff --git a/testsuites/sptests/spcbssched01/init.c b/testsuites/sptests/spcbssched01/init.c
index eb8a808..be85bce 100644
--- a/testsuites/sptests/spcbssched01/init.c
+++ b/testsuites/sptests/spcbssched01/init.c
@@ -23,8 +23,6 @@
 #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #define CONFIGURE_INIT
 #include "system.h"
 
diff --git a/testsuites/sptests/spcbssched02/init.c b/testsuites/sptests/spcbssched02/init.c
index 3d92de2..acaf7a7 100644
--- a/testsuites/sptests/spcbssched02/init.c
+++ b/testsuites/sptests/spcbssched02/init.c
@@ -20,8 +20,6 @@
 #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #define CONFIGURE_INIT
 #include "system.h"
 
diff --git a/testsuites/sptests/spcbssched03/init.c b/testsuites/sptests/spcbssched03/init.c
index 7b21905..5554915 100644
--- a/testsuites/sptests/spcbssched03/init.c
+++ b/testsuites/sptests/spcbssched03/init.c
@@ -20,8 +20,6 @@
 #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #define CONFIGURE_INIT
 #include "system.h"
 
diff --git a/testsuites/sptests/spchain/init.c b/testsuites/sptests/spchain/init.c
index aa5f91d..8fa7ea0 100644
--- a/testsuites/sptests/spchain/init.c
+++ b/testsuites/sptests/spchain/init.c
@@ -11,8 +11,6 @@
 #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #include <tmacros.h>
 #include <rtems/chain.h>
 
diff --git a/testsuites/sptests/spclock_err01/init.c b/testsuites/sptests/spclock_err01/init.c
index 7e02e5e..087c8d4 100644
--- a/testsuites/sptests/spclock_err01/init.c
+++ b/testsuites/sptests/spclock_err01/init.c
@@ -11,8 +11,6 @@
 #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #define CONFIGURE_INIT
 #include "system.h"
 
diff --git a/testsuites/sptests/spclock_err02/init.c b/testsuites/sptests/spclock_err02/init.c
index d87da5c..7912ab8 100644
--- a/testsuites/sptests/spclock_err02/init.c
+++ b/testsuites/sptests/spclock_err02/init.c
@@ -11,8 +11,6 @@
 #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #include <tmacros.h>
 #include "test_support.h"
 
diff --git a/testsuites/sptests/spcontext01/init.c b/testsuites/sptests/spcontext01/init.c
index 6d2adce..e093c50 100644
--- a/testsuites/sptests/spcontext01/init.c
+++ b/testsuites/sptests/spcontext01/init.c
@@ -16,8 +16,6 @@
   #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #include "tmacros.h"
 
 const char rtems_test_name[] = "SPCONTEXT 1";
diff --git a/testsuites/sptests/spcoverage/init.c b/testsuites/sptests/spcoverage/init.c
index 31fdb4b..a80acec 100644
--- a/testsuites/sptests/spcoverage/init.c
+++ b/testsuites/sptests/spcoverage/init.c
@@ -11,8 +11,6 @@
 #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #include "tmacros.h"
 
 const char rtems_test_name[] = "SPCOVERAGE";
diff --git a/testsuites/sptests/spcpucounter01/init.c b/testsuites/sptests/spcpucounter01/init.c
index 1a582fa..92f2e15 100644
--- a/testsuites/sptests/spcpucounter01/init.c
+++ b/testsuites/sptests/spcpucounter01/init.c
@@ -16,8 +16,6 @@
   #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #include <stdio.h>
 #include <inttypes.h>
 
diff --git a/testsuites/sptests/spcpuset01/init.c b/testsuites/sptests/spcpuset01/init.c
index 39518e2..b13be49 100644
--- a/testsuites/sptests/spcpuset01/init.c
+++ b/testsuites/sptests/spcpuset01/init.c
@@ -6,8 +6,6 @@
 #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #define CONFIGURE_INIT
 #include <rtems.h>
 #include <stdlib.h>
diff --git a/testsuites/sptests/spedfsched01/init.c b/testsuites/sptests/spedfsched01/init.c
index 303cdeb..04fc5ca 100644
--- a/testsuites/sptests/spedfsched01/init.c
+++ b/testsuites/sptests/spedfsched01/init.c
@@ -23,8 +23,6 @@
 #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #define CONFIGURE_INIT
 #include "system.h"
 
diff --git a/testsuites/sptests/spedfsched02/init.c b/testsuites/sptests/spedfsched02/init.c
index 0e7f54d..aa2798c 100644
--- a/testsuites/sptests/spedfsched02/init.c
+++ b/testsuites/sptests/spedfsched02/init.c
@@ -23,8 +23,6 @@
 #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #define CONFIGURE_INIT
 #include "system.h"
 
diff --git a/testsuites/sptests/spedfsched03/init.c b/testsuites/sptests/spedfsched03/init.c
index 6163f9a..0c2425a 100644
--- a/testsuites/sptests/spedfsched03/init.c
+++ b/testsuites/sptests/spedfsched03/init.c
@@ -20,8 +20,6 @@
 #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #define CONFIGURE_INIT
 #include "system.h"
 
diff --git a/testsuites/sptests/spedfsched04/init.c b/testsuites/sptests/spedfsched04/init.c
index 42b2b15..bcaced9 100644
--- a/testsuites/sptests/spedfsched04/init.c
+++ b/testsuites/sptests/spedfsched04/init.c
@@ -30,8 +30,6 @@
 #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #include <rtems/cpuuse.h>
 #include <tmacros.h>
 #include "test_support.h"
diff --git a/testsuites/sptests/sperror01/init.c b/testsuites/sptests/sperror01/init.c
index 3f7bd6a..d2ccf0c 100644
--- a/testsuites/sptests/sperror01/init.c
+++ b/testsuites/sptests/sperror01/init.c
@@ -11,8 +11,6 @@
 #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #include <tmacros.h>
 
 #include "test_support.h"
diff --git a/testsuites/sptests/sperror02/init.c b/testsuites/sptests/sperror02/init.c
index 0c4c9f4..abbe1c3 100644
--- a/testsuites/sptests/sperror02/init.c
+++ b/testsuites/sptests/sperror02/init.c
@@ -11,8 +11,6 @@
 #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #include <tmacros.h>
 
 #include "test_support.h"
diff --git a/testsuites/sptests/sperror03/init.c b/testsuites/sptests/sperror03/init.c
index 48c0ae6..e036951 100644
--- a/testsuites/sptests/sperror03/init.c
+++ b/testsuites/sptests/sperror03/init.c
@@ -11,8 +11,6 @@
 #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #include "tmacros.h"
 #include "test_support.h"
 
diff --git a/testsuites/sptests/spevent_err03/init.c b/testsuites/sptests/spevent_err03/init.c
index 1a1d33d..b13960e 100644
--- a/testsuites/sptests/spevent_err03/init.c
+++ b/testsuites/sptests/spevent_err03/init.c
@@ -11,8 +11,6 @@
 #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #define CONFIGURE_INIT
 #include "system.h"
 
diff --git a/testsuites/sptests/speventsystem01/init.c b/testsuites/sptests/speventsystem01/init.c
index 6a02b85..7fb2429 100644
--- a/testsuites/sptests/speventsystem01/init.c
+++ b/testsuites/sptests/speventsystem01/init.c
@@ -16,8 +16,6 @@
   #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #include <rtems.h>
 
 #include "tmacros.h"
diff --git a/testsuites/sptests/speventtransient01/init.c b/testsuites/sptests/speventtransient01/init.c
index 1473ea6..91d6ecf 100644
--- a/testsuites/sptests/speventtransient01/init.c
+++ b/testsuites/sptests/speventtransient01/init.c
@@ -16,8 +16,6 @@
   #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #include <rtems.h>
 
 #include "tmacros.h"
diff --git a/testsuites/sptests/spextensions01/init.c b/testsuites/sptests/spextensions01/init.c
index 377e4c3..5800083 100644
--- a/testsuites/sptests/spextensions01/init.c
+++ b/testsuites/sptests/spextensions01/init.c
@@ -16,8 +16,6 @@
   #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #include "tmacros.h"
 
 #include <assert.h>
diff --git a/testsuites/sptests/spfatal26/init.c b/testsuites/sptests/spfatal26/init.c
index ade4f0e..1848659 100644
--- a/testsuites/sptests/spfatal26/init.c
+++ b/testsuites/sptests/spfatal26/init.c
@@ -16,8 +16,6 @@
   #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #include "tmacros.h"
 
 #include <limits.h>
diff --git a/testsuites/sptests/spfatal30/init.c b/testsuites/sptests/spfatal30/init.c
index 9cf50a3..a02bf06 100644
--- a/testsuites/sptests/spfatal30/init.c
+++ b/testsuites/sptests/spfatal30/init.c
@@ -16,8 +16,6 @@
 #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #include "tmacros.h"
 
 #include <rtems.h>
diff --git a/testsuites/sptests/spfatal31/init.c b/testsuites/sptests/spfatal31/init.c
index 0dce671..5aab663 100644
--- a/testsuites/sptests/spfatal31/init.c
+++ b/testsuites/sptests/spfatal31/init.c
@@ -16,8 +16,6 @@
 #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #include "tmacros.h"
 
 #include <rtems.h>
diff --git a/testsuites/sptests/spfatal_support/init.c b/testsuites/sptests/spfatal_support/init.c
index b6de0d6..f9b2ed3 100644
--- a/testsuites/sptests/spfatal_support/init.c
+++ b/testsuites/sptests/spfatal_support/init.c
@@ -11,8 +11,6 @@
 #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #define CONFIGURE_INIT
 #include "system.h"
 
diff --git a/testsuites/sptests/spfifo01/init.c b/testsuites/sptests/spfifo01/init.c
index 3c8dc48..0e0f678 100644
--- a/testsuites/sptests/spfifo01/init.c
+++ b/testsuites/sptests/spfifo01/init.c
@@ -11,8 +11,6 @@
 #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #include <sys/stat.h>
 #include <stdio.h>
 #include <fcntl.h>
diff --git a/testsuites/sptests/spfifo02/init.c b/testsuites/sptests/spfifo02/init.c
index 671e6ff..6472401 100644
--- a/testsuites/sptests/spfifo02/init.c
+++ b/testsuites/sptests/spfifo02/init.c
@@ -11,8 +11,6 @@
 #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #include <tmacros.h>
 #include "test_support.h"
 
diff --git a/testsuites/sptests/spfifo03/init.c b/testsuites/sptests/spfifo03/init.c
index 7d94095..5aa4800 100644
--- a/testsuites/sptests/spfifo03/init.c
+++ b/testsuites/sptests/spfifo03/init.c
@@ -11,8 +11,6 @@
 #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #include <bsp.h>
 #include <tmacros.h>
 #include <stdio.h>
diff --git a/testsuites/sptests/spfifo04/init.c b/testsuites/sptests/spfifo04/init.c
index b7966d1..157b45c 100644
--- a/testsuites/sptests/spfifo04/init.c
+++ b/testsuites/sptests/spfifo04/init.c
@@ -11,8 +11,6 @@
 #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #include <bsp.h>
 #include <tmacros.h>
 #include <stdio.h>
diff --git a/testsuites/sptests/spfifo05/init.c b/testsuites/sptests/spfifo05/init.c
index 522a45b..ab3ed66 100644
--- a/testsuites/sptests/spfifo05/init.c
+++ b/testsuites/sptests/spfifo05/init.c
@@ -11,8 +11,6 @@
 #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #include <bsp.h>
 #include <tmacros.h>
 #include <stdio.h>
diff --git a/testsuites/sptests/spfreechain01/init.c b/testsuites/sptests/spfreechain01/init.c
index e741a9b..6efcd93 100644
--- a/testsuites/sptests/spfreechain01/init.c
+++ b/testsuites/sptests/spfreechain01/init.c
@@ -10,8 +10,6 @@
 #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #include <tmacros.h>
 #include <rtems/score/chainimpl.h>
 #include <rtems/score/freechain.h>
diff --git a/testsuites/sptests/spheapprot/init.c b/testsuites/sptests/spheapprot/init.c
index d17bb9a..114abeb 100644
--- a/testsuites/sptests/spheapprot/init.c
+++ b/testsuites/sptests/spheapprot/init.c
@@ -16,8 +16,6 @@
 #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #include <stdio.h>
 #include <stdlib.h>
 #include <assert.h>
diff --git a/testsuites/sptests/spinternalerror01/init.c b/testsuites/sptests/spinternalerror01/init.c
index 230e4cd..4ee70b9 100644
--- a/testsuites/sptests/spinternalerror01/init.c
+++ b/testsuites/sptests/spinternalerror01/init.c
@@ -16,8 +16,6 @@
   #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #include "tmacros.h"
 
 #include <bsp.h>
diff --git a/testsuites/sptests/spinternalerror02/init.c b/testsuites/sptests/spinternalerror02/init.c
index b1a3468..2ed4c95 100644
--- a/testsuites/sptests/spinternalerror02/init.c
+++ b/testsuites/sptests/spinternalerror02/init.c
@@ -16,8 +16,6 @@
   #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #include "tmacros.h"
 
 #include <rtems.h>
diff --git a/testsuites/sptests/spintr_err01/init.c b/testsuites/sptests/spintr_err01/init.c
index afc195e..9bc39bf 100644
--- a/testsuites/sptests/spintr_err01/init.c
+++ b/testsuites/sptests/spintr_err01/init.c
@@ -11,8 +11,6 @@
 #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #define CONFIGURE_INIT
 #include "system.h"
 
diff --git a/testsuites/sptests/spintrcritical01/init.c b/testsuites/sptests/spintrcritical01/init.c
index 255f827..b7cfee4 100644
--- a/testsuites/sptests/spintrcritical01/init.c
+++ b/testsuites/sptests/spintrcritical01/init.c
@@ -11,8 +11,6 @@
 #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #include <tmacros.h>
 #include <intrcritical.h>
 
diff --git a/testsuites/sptests/spintrcritical06/init.c b/testsuites/sptests/spintrcritical06/init.c
index 9015810..423e4b5 100644
--- a/testsuites/sptests/spintrcritical06/init.c
+++ b/testsuites/sptests/spintrcritical06/init.c
@@ -11,8 +11,6 @@
 #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #include <tmacros.h>
 #include <intrcritical.h>
 
diff --git a/testsuites/sptests/spintrcritical08/init.c b/testsuites/sptests/spintrcritical08/init.c
index efe30c2..1a7ed2d 100644
--- a/testsuites/sptests/spintrcritical08/init.c
+++ b/testsuites/sptests/spintrcritical08/init.c
@@ -11,8 +11,6 @@
 #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #include <tmacros.h>
 #include <intrcritical.h>
 #include <rtems/score/watchdogimpl.h>
diff --git a/testsuites/sptests/spintrcritical09/init.c b/testsuites/sptests/spintrcritical09/init.c
index bb495f6..87c1c1a 100644
--- a/testsuites/sptests/spintrcritical09/init.c
+++ b/testsuites/sptests/spintrcritical09/init.c
@@ -11,8 +11,6 @@
 #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #include <tmacros.h>
 #include <intrcritical.h>
 
diff --git a/testsuites/sptests/spintrcritical10/init.c b/testsuites/sptests/spintrcritical10/init.c
index b22b938..f7e372a 100644
--- a/testsuites/sptests/spintrcritical10/init.c
+++ b/testsuites/sptests/spintrcritical10/init.c
@@ -13,8 +13,6 @@
   #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #include <tmacros.h>
 #include <intrcritical.h>
 
diff --git a/testsuites/sptests/spintrcritical11/init.c b/testsuites/sptests/spintrcritical11/init.c
index ee37bac..2a3f83a 100644
--- a/testsuites/sptests/spintrcritical11/init.c
+++ b/testsuites/sptests/spintrcritical11/init.c
@@ -11,8 +11,6 @@
 #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #include <tmacros.h>
 #include <intrcritical.h>
 
diff --git a/testsuites/sptests/spintrcritical13/init.c b/testsuites/sptests/spintrcritical13/init.c
index cd27854..7069938 100644
--- a/testsuites/sptests/spintrcritical13/init.c
+++ b/testsuites/sptests/spintrcritical13/init.c
@@ -11,8 +11,6 @@
 #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #include <tmacros.h>
 #include <intrcritical.h>
 
diff --git a/testsuites/sptests/spintrcritical15/init.c b/testsuites/sptests/spintrcritical15/init.c
index 5c8e46f..72e4832 100644
--- a/testsuites/sptests/spintrcritical15/init.c
+++ b/testsuites/sptests/spintrcritical15/init.c
@@ -11,8 +11,6 @@
 #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #include <tmacros.h>
 #include <intrcritical.h>
 
diff --git a/testsuites/sptests/spintrcritical16/init.c b/testsuites/sptests/spintrcritical16/init.c
index c34828a..3657c06 100644
--- a/testsuites/sptests/spintrcritical16/init.c
+++ b/testsuites/sptests/spintrcritical16/init.c
@@ -11,8 +11,6 @@
 #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #include <tmacros.h>
 #include <intrcritical.h>
 
diff --git a/testsuites/sptests/spintrcritical18/init.c b/testsuites/sptests/spintrcritical18/init.c
index fa2ee6c..f621d21 100644
--- a/testsuites/sptests/spintrcritical18/init.c
+++ b/testsuites/sptests/spintrcritical18/init.c
@@ -16,8 +16,6 @@
   #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #include <tmacros.h>
 #include <intrcritical.h>
 
diff --git a/testsuites/sptests/spintrcritical20/init.c b/testsuites/sptests/spintrcritical20/init.c
index 8c1f376..1697df4 100644
--- a/testsuites/sptests/spintrcritical20/init.c
+++ b/testsuites/sptests/spintrcritical20/init.c
@@ -16,8 +16,6 @@
   #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #include <tmacros.h>
 #include <intrcritical.h>
 #include <rtems/score/threadimpl.h>
diff --git a/testsuites/sptests/spintrcritical21/init.c b/testsuites/sptests/spintrcritical21/init.c
index d5cf8e1..faa48f7 100644
--- a/testsuites/sptests/spintrcritical21/init.c
+++ b/testsuites/sptests/spintrcritical21/init.c
@@ -13,8 +13,6 @@
 #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #define CONFIGURE_INIT
 #include "system.h"
 
diff --git a/testsuites/sptests/spintrcritical22/init.c b/testsuites/sptests/spintrcritical22/init.c
index c95929e..7412bde 100644
--- a/testsuites/sptests/spintrcritical22/init.c
+++ b/testsuites/sptests/spintrcritical22/init.c
@@ -16,8 +16,6 @@
   #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #include <tmacros.h>
 #include <intrcritical.h>
 #include <rtems/rtems/semimpl.h>
diff --git a/testsuites/sptests/spintrcritical23/init.c b/testsuites/sptests/spintrcritical23/init.c
index 019446d..f71de71 100644
--- a/testsuites/sptests/spintrcritical23/init.c
+++ b/testsuites/sptests/spintrcritical23/init.c
@@ -16,8 +16,6 @@
   #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #include <tmacros.h>
 #include <intrcritical.h>
 
diff --git a/testsuites/sptests/spintrcritical24/init.c b/testsuites/sptests/spintrcritical24/init.c
index 6303f9e..8f60c1c 100644
--- a/testsuites/sptests/spintrcritical24/init.c
+++ b/testsuites/sptests/spintrcritical24/init.c
@@ -16,8 +16,6 @@
 #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #include <sys/stat.h>
 #include <fcntl.h>
 #include <unistd.h>
diff --git a/testsuites/sptests/splinkersets01/init.c b/testsuites/sptests/splinkersets01/init.c
index 90d44d6..4e19c6e 100644
--- a/testsuites/sptests/splinkersets01/init.c
+++ b/testsuites/sptests/splinkersets01/init.c
@@ -16,8 +16,6 @@
   #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #include "tmacros.h"
 
 #include "splinkersets01.h"
diff --git a/testsuites/sptests/spmkdir/init.c b/testsuites/sptests/spmkdir/init.c
index debe988..6b016e3 100644
--- a/testsuites/sptests/spmkdir/init.c
+++ b/testsuites/sptests/spmkdir/init.c
@@ -23,8 +23,6 @@
 #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #include <sys/stat.h>
 #include <errno.h>
 #include <fcntl.h>
diff --git a/testsuites/sptests/spmountmgr01/init.c b/testsuites/sptests/spmountmgr01/init.c
index 798838e..2330ca8 100644
--- a/testsuites/sptests/spmountmgr01/init.c
+++ b/testsuites/sptests/spmountmgr01/init.c
@@ -11,8 +11,6 @@
 #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #include <tmacros.h>
 #include "test_support.h"
 #include <errno.h>
diff --git a/testsuites/sptests/spmrsp01/init.c b/testsuites/sptests/spmrsp01/init.c
index 2c01c2c..bf144a9 100644
--- a/testsuites/sptests/spmrsp01/init.c
+++ b/testsuites/sptests/spmrsp01/init.c
@@ -16,8 +16,6 @@
   #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #include <rtems.h>
 #include <rtems/libcsupport.h>
 
diff --git a/testsuites/sptests/spmsgq_err01/init.c b/testsuites/sptests/spmsgq_err01/init.c
index 80a0c54..2453772 100644
--- a/testsuites/sptests/spmsgq_err01/init.c
+++ b/testsuites/sptests/spmsgq_err01/init.c
@@ -11,8 +11,6 @@
 #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #define CONFIGURE_INIT
 #include "system.h"
 #define MESSAGE_SIZE (sizeof(long) * 4)
diff --git a/testsuites/sptests/spmsgq_err02/init.c b/testsuites/sptests/spmsgq_err02/init.c
index e64660e..2ed5057 100644
--- a/testsuites/sptests/spmsgq_err02/init.c
+++ b/testsuites/sptests/spmsgq_err02/init.c
@@ -11,8 +11,6 @@
 #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #define CONFIGURE_INIT
 #include "system.h"
 
diff --git a/testsuites/sptests/spmutex01/init.c b/testsuites/sptests/spmutex01/init.c
index fd490e4..b9d4a05 100644
--- a/testsuites/sptests/spmutex01/init.c
+++ b/testsuites/sptests/spmutex01/init.c
@@ -27,8 +27,6 @@
 #include <pthread.h>
 #endif
 
-#define TEST_INIT
-
 #include "tmacros.h"
 
 const char rtems_test_name[] = "SPMUTEX 1";
diff --git a/testsuites/sptests/spnsext01/init.c b/testsuites/sptests/spnsext01/init.c
index 4ff2067..1a10736 100644
--- a/testsuites/sptests/spnsext01/init.c
+++ b/testsuites/sptests/spnsext01/init.c
@@ -16,8 +16,6 @@
 #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #include <tmacros.h>
 
 const char rtems_test_name[] = "SPNSEXT 1";
diff --git a/testsuites/sptests/spobjgetnext/init.c b/testsuites/sptests/spobjgetnext/init.c
index 25ea114..620185c 100644
--- a/testsuites/sptests/spobjgetnext/init.c
+++ b/testsuites/sptests/spobjgetnext/init.c
@@ -13,8 +13,6 @@
 #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #define CONFIGURE_INIT
 #include "system.h"
 
diff --git a/testsuites/sptests/sppagesize/init.c b/testsuites/sptests/sppagesize/init.c
index 010c1c4..04d735b 100644
--- a/testsuites/sptests/sppagesize/init.c
+++ b/testsuites/sptests/sppagesize/init.c
@@ -10,8 +10,6 @@
 #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #include <tmacros.h>
 #include <rtems.h>
 #include <limits.h>
diff --git a/testsuites/sptests/sppartition_err01/init.c b/testsuites/sptests/sppartition_err01/init.c
index f53ebd2..39ee700 100644
--- a/testsuites/sptests/sppartition_err01/init.c
+++ b/testsuites/sptests/sppartition_err01/init.c
@@ -11,8 +11,6 @@
 #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #define CONFIGURE_INIT
 #include "system.h"
 
diff --git a/testsuites/sptests/spport_err01/init.c b/testsuites/sptests/spport_err01/init.c
index a6c95fc..20e6673 100644
--- a/testsuites/sptests/spport_err01/init.c
+++ b/testsuites/sptests/spport_err01/init.c
@@ -11,8 +11,6 @@
 #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #define CONFIGURE_INIT
 #include "system.h"
 
diff --git a/testsuites/sptests/spprintk/init.c b/testsuites/sptests/spprintk/init.c
index 637ffe9..e956c76 100644
--- a/testsuites/sptests/spprintk/init.c
+++ b/testsuites/sptests/spprintk/init.c
@@ -22,8 +22,6 @@
 #undef RTEMS_PRINTFLIKE
 #define RTEMS_PRINTFLIKE(_a, _b)
 
-#define TEST_INIT
-
 #include <rtems/bspIo.h>
 #include <tmacros.h>
 
diff --git a/testsuites/sptests/spprivenv01/init.c b/testsuites/sptests/spprivenv01/init.c
index 509d05f..88cf5e0 100644
--- a/testsuites/sptests/spprivenv01/init.c
+++ b/testsuites/sptests/spprivenv01/init.c
@@ -11,8 +11,6 @@
 #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #include <tmacros.h>
 #include "test_support.h"
 #include <rtems/libio_.h>
diff --git a/testsuites/sptests/spprofiling01/init.c b/testsuites/sptests/spprofiling01/init.c
index a70343b..7a3b0e1 100644
--- a/testsuites/sptests/spprofiling01/init.c
+++ b/testsuites/sptests/spprofiling01/init.c
@@ -16,8 +16,6 @@
   #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #include <rtems/profiling.h>
 #include <rtems/bspIo.h>
 #include <rtems.h>
diff --git a/testsuites/sptests/spqreslib/init.c b/testsuites/sptests/spqreslib/init.c
index 2db540c..d00b623 100644
--- a/testsuites/sptests/spqreslib/init.c
+++ b/testsuites/sptests/spqreslib/init.c
@@ -16,8 +16,6 @@
  *  http://www.rtems.org/license/LICENSE.
  */
 
-#define TEST_INIT
-
 #define CONFIGURE_INIT
 #include "system.h"
 
diff --git a/testsuites/sptests/spratemon_err01/init.c b/testsuites/sptests/spratemon_err01/init.c
index 92bf1f7..ccc2361 100644
--- a/testsuites/sptests/spratemon_err01/init.c
+++ b/testsuites/sptests/spratemon_err01/init.c
@@ -11,8 +11,6 @@
 #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #define CONFIGURE_INIT
 #include "system.h"
 
diff --git a/testsuites/sptests/sprbtree01/init.c b/testsuites/sptests/sprbtree01/init.c
index 6cb6ea0..746b36e 100644
--- a/testsuites/sptests/sprbtree01/init.c
+++ b/testsuites/sptests/sprbtree01/init.c
@@ -10,8 +10,6 @@
 #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #include <tmacros.h>
 #include <rtems/rbtree.h>
 #include <rtems/score/rbtreeimpl.h>
diff --git a/testsuites/sptests/spregion_err01/init.c b/testsuites/sptests/spregion_err01/init.c
index 27fc326..6dd8db6 100644
--- a/testsuites/sptests/spregion_err01/init.c
+++ b/testsuites/sptests/spregion_err01/init.c
@@ -11,8 +11,6 @@
 #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #define CONFIGURE_INIT
 #include "system.h"
 
diff --git a/testsuites/sptests/sprmsched01/init.c b/testsuites/sptests/sprmsched01/init.c
index 2bdc44d..f806605 100644
--- a/testsuites/sptests/sprmsched01/init.c
+++ b/testsuites/sptests/sprmsched01/init.c
@@ -31,8 +31,6 @@
 #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #include <rtems/cpuuse.h>
 #include <tmacros.h>
 #include "test_support.h"
diff --git a/testsuites/sptests/sprmsched02/init.c b/testsuites/sptests/sprmsched02/init.c
index 235e916..4ee58ab 100644
--- a/testsuites/sptests/sprmsched02/init.c
+++ b/testsuites/sptests/sprmsched02/init.c
@@ -10,8 +10,6 @@
 #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #include <rtems/cpuuse.h>
 #include <tmacros.h>
 #include <rtems/rtems/ratemonimpl.h>
diff --git a/testsuites/sptests/spscheduler01/init.c b/testsuites/sptests/spscheduler01/init.c
index f8f84ac..c7e5518 100644
--- a/testsuites/sptests/spscheduler01/init.c
+++ b/testsuites/sptests/spscheduler01/init.c
@@ -16,7 +16,6 @@
   #include "config.h"
 #endif
 
-#define TEST_INIT
 #define _GNU_SOURCE
 
 #include <rtems.h>
diff --git a/testsuites/sptests/spsem01/init.c b/testsuites/sptests/spsem01/init.c
index e0a7b93..924f4c0 100644
--- a/testsuites/sptests/spsem01/init.c
+++ b/testsuites/sptests/spsem01/init.c
@@ -6,8 +6,6 @@
  * http://www.rtems.org/license/LICENSE.
  */
 
-#define TEST_INIT
-
 #include <rtems.h>
 
 #include <stdio.h>
diff --git a/testsuites/sptests/spsem02/init.c b/testsuites/sptests/spsem02/init.c
index f41f1ef..d5fb47b 100644
--- a/testsuites/sptests/spsem02/init.c
+++ b/testsuites/sptests/spsem02/init.c
@@ -6,8 +6,6 @@
  * http://www.rtems.org/license/LICENSE.
  */
 
-#define TEST_INIT
-
 #include <rtems.h>
 
 #include <stdio.h>
diff --git a/testsuites/sptests/spsem03/init.c b/testsuites/sptests/spsem03/init.c
index 90f116e..859f996 100644
--- a/testsuites/sptests/spsem03/init.c
+++ b/testsuites/sptests/spsem03/init.c
@@ -16,8 +16,6 @@
   #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #include "tmacros.h"
 
 const char rtems_test_name[] = "SPSEM 3";
diff --git a/testsuites/sptests/spsem_err01/init.c b/testsuites/sptests/spsem_err01/init.c
index a1ed0e8..39a366b 100644
--- a/testsuites/sptests/spsem_err01/init.c
+++ b/testsuites/sptests/spsem_err01/init.c
@@ -11,8 +11,6 @@
 #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #define CONFIGURE_INIT
 #include "system.h"
 
diff --git a/testsuites/sptests/spsem_err02/init.c b/testsuites/sptests/spsem_err02/init.c
index 48894dd..4c0acb9 100644
--- a/testsuites/sptests/spsem_err02/init.c
+++ b/testsuites/sptests/spsem_err02/init.c
@@ -11,8 +11,6 @@
 #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #define CONFIGURE_INIT
 #include "system.h"
 
diff --git a/testsuites/sptests/spsignal_err01/init.c b/testsuites/sptests/spsignal_err01/init.c
index 6a8e6d0..6f8cd3e 100644
--- a/testsuites/sptests/spsignal_err01/init.c
+++ b/testsuites/sptests/spsignal_err01/init.c
@@ -11,8 +11,6 @@
 #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #define CONFIGURE_INIT
 #include "system.h"
 
diff --git a/testsuites/sptests/spsimplesched01/init.c b/testsuites/sptests/spsimplesched01/init.c
index 87d8010..6bac9c3 100644
--- a/testsuites/sptests/spsimplesched01/init.c
+++ b/testsuites/sptests/spsimplesched01/init.c
@@ -11,8 +11,6 @@
 #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #include <tmacros.h>
 
 const char rtems_test_name[] = "SPSIMPLESCHED 1";
diff --git a/testsuites/sptests/spsimplesched02/init.c b/testsuites/sptests/spsimplesched02/init.c
index 4e78ab5..884a3ab 100644
--- a/testsuites/sptests/spsimplesched02/init.c
+++ b/testsuites/sptests/spsimplesched02/init.c
@@ -11,8 +11,6 @@
 #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #include <tmacros.h>
 
 #include <rtems/score/threadimpl.h>
diff --git a/testsuites/sptests/spsimplesched03/init.c b/testsuites/sptests/spsimplesched03/init.c
index e077364..2f352af 100644
--- a/testsuites/sptests/spsimplesched03/init.c
+++ b/testsuites/sptests/spsimplesched03/init.c
@@ -11,8 +11,6 @@
 #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #include <tmacros.h>
 
 const char rtems_test_name[] = "SPSIMPLESCHED 3";
diff --git a/testsuites/sptests/spsize/init.c b/testsuites/sptests/spsize/init.c
index 569594c..c26ba06 100644
--- a/testsuites/sptests/spsize/init.c
+++ b/testsuites/sptests/spsize/init.c
@@ -23,8 +23,6 @@
 #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #define CONFIGURE_INIT
 #include "system.h"
 
diff --git a/testsuites/sptests/spstdthreads01/init.c b/testsuites/sptests/spstdthreads01/init.c
index 9f147da..4a9953c 100644
--- a/testsuites/sptests/spstdthreads01/init.c
+++ b/testsuites/sptests/spstdthreads01/init.c
@@ -16,8 +16,6 @@
   #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #include "tmacros.h"
 
 #include <threads.h>
diff --git a/testsuites/sptests/spstkalloc/init.c b/testsuites/sptests/spstkalloc/init.c
index 9df4509..4a26fdb 100644
--- a/testsuites/sptests/spstkalloc/init.c
+++ b/testsuites/sptests/spstkalloc/init.c
@@ -11,8 +11,6 @@
 #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #include <tmacros.h>
 
 const char rtems_test_name[] = "SPSTKALLOC";
diff --git a/testsuites/sptests/spstkalloc02/init.c b/testsuites/sptests/spstkalloc02/init.c
index cd818f2..ae78b41 100644
--- a/testsuites/sptests/spstkalloc02/init.c
+++ b/testsuites/sptests/spstkalloc02/init.c
@@ -24,8 +24,6 @@
   #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #include <tmacros.h>
 
 const char rtems_test_name[] = "SPSTKALLOC 2";
diff --git a/testsuites/sptests/spsysinit01/init.c b/testsuites/sptests/spsysinit01/init.c
index 337740d..d0d3042 100644
--- a/testsuites/sptests/spsysinit01/init.c
+++ b/testsuites/sptests/spsysinit01/init.c
@@ -16,8 +16,6 @@
   #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #include "tmacros.h"
 
 #include <sys/types.h>
diff --git a/testsuites/sptests/spsyslock01/init.c b/testsuites/sptests/spsyslock01/init.c
index 63d18dc..815579a 100644
--- a/testsuites/sptests/spsyslock01/init.c
+++ b/testsuites/sptests/spsyslock01/init.c
@@ -16,8 +16,6 @@
   #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #include "tmacros.h"
 
 #include <sys/lock.h>
diff --git a/testsuites/sptests/sptask_err01/init.c b/testsuites/sptests/sptask_err01/init.c
index 52e6010..b57e751 100644
--- a/testsuites/sptests/sptask_err01/init.c
+++ b/testsuites/sptests/sptask_err01/init.c
@@ -11,8 +11,6 @@
 #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #define CONFIGURE_INIT
 #include "system.h"
 
diff --git a/testsuites/sptests/sptask_err02/init.c b/testsuites/sptests/sptask_err02/init.c
index 8468792..dfdaf39 100644
--- a/testsuites/sptests/sptask_err02/init.c
+++ b/testsuites/sptests/sptask_err02/init.c
@@ -11,8 +11,6 @@
 #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #define CONFIGURE_INIT
 #include "system.h"
 
diff --git a/testsuites/sptests/sptask_err03/init.c b/testsuites/sptests/sptask_err03/init.c
index 203bb1d..d28a601 100644
--- a/testsuites/sptests/sptask_err03/init.c
+++ b/testsuites/sptests/sptask_err03/init.c
@@ -11,8 +11,6 @@
 #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #define CONFIGURE_INIT
 #include "system.h"
 
diff --git a/testsuites/sptests/sptask_err04/init.c b/testsuites/sptests/sptask_err04/init.c
index a9e4ef7..c9af611 100644
--- a/testsuites/sptests/sptask_err04/init.c
+++ b/testsuites/sptests/sptask_err04/init.c
@@ -11,8 +11,6 @@
 #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #define CONFIGURE_INIT
 #include "system.h"
 
diff --git a/testsuites/sptests/sptasknopreempt01/init.c b/testsuites/sptests/sptasknopreempt01/init.c
index 159e21b..4bd49b1 100644
--- a/testsuites/sptests/sptasknopreempt01/init.c
+++ b/testsuites/sptests/sptasknopreempt01/init.c
@@ -16,8 +16,6 @@
   #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #include "tmacros.h"
 
 const char rtems_test_name[] = "SPTASKNOPREEMPT 1";
diff --git a/testsuites/sptests/spthreadlife01/init.c b/testsuites/sptests/spthreadlife01/init.c
index 04712c9..8bf26b9 100644
--- a/testsuites/sptests/spthreadlife01/init.c
+++ b/testsuites/sptests/spthreadlife01/init.c
@@ -16,8 +16,6 @@
   #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #include <rtems.h>
 #include <rtems/libcsupport.h>
 
diff --git a/testsuites/sptests/spthreadq01/init.c b/testsuites/sptests/spthreadq01/init.c
index 13fb36c..0b30754 100644
--- a/testsuites/sptests/spthreadq01/init.c
+++ b/testsuites/sptests/spthreadq01/init.c
@@ -13,8 +13,6 @@
 #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #include <tmacros.h>
 
 #include <rtems.h>
diff --git a/testsuites/sptests/sptimecounter01/init.c b/testsuites/sptests/sptimecounter01/init.c
index 7c5274b..f56e8cf 100644
--- a/testsuites/sptests/sptimecounter01/init.c
+++ b/testsuites/sptests/sptimecounter01/init.c
@@ -16,8 +16,6 @@
   #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #include "tmacros.h"
 
 #include <assert.h>
diff --git a/testsuites/sptests/sptimecounter02/init.c b/testsuites/sptests/sptimecounter02/init.c
index 3d24ff4..4f8de6a 100644
--- a/testsuites/sptests/sptimecounter02/init.c
+++ b/testsuites/sptests/sptimecounter02/init.c
@@ -20,8 +20,6 @@
 
 #define _KERNEL
 
-#define TEST_INIT
-
 #include <sys/time.h>
 #include <sys/timetc.h>
 
diff --git a/testsuites/sptests/sptimecounter03/init.c b/testsuites/sptests/sptimecounter03/init.c
index d6303ba..3b57d95 100644
--- a/testsuites/sptests/sptimecounter03/init.c
+++ b/testsuites/sptests/sptimecounter03/init.c
@@ -16,8 +16,6 @@
   #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #include <rtems/test.h>
 
 #include <rtems/bsd.h>
diff --git a/testsuites/sptests/sptimecounter04/init.c b/testsuites/sptests/sptimecounter04/init.c
index 481f556..72f2a13 100644
--- a/testsuites/sptests/sptimecounter04/init.c
+++ b/testsuites/sptests/sptimecounter04/init.c
@@ -16,8 +16,6 @@
   #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #include <time.h>
 #include <rtems.h>
 #include <rtems/test.h>
diff --git a/testsuites/sptests/sptimer_err01/init.c b/testsuites/sptests/sptimer_err01/init.c
index 1350bc9..35a6d7a 100644
--- a/testsuites/sptests/sptimer_err01/init.c
+++ b/testsuites/sptests/sptimer_err01/init.c
@@ -11,8 +11,6 @@
 #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #include <tmacros.h>
 #include "test_support.h"
 
diff --git a/testsuites/sptests/sptimer_err02/init.c b/testsuites/sptests/sptimer_err02/init.c
index a385ab9..ad25a16 100644
--- a/testsuites/sptests/sptimer_err02/init.c
+++ b/testsuites/sptests/sptimer_err02/init.c
@@ -11,8 +11,6 @@
 #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #include <tmacros.h>
 #include "test_support.h"
 
diff --git a/testsuites/sptests/sptimerserver01/init.c b/testsuites/sptests/sptimerserver01/init.c
index 0690012..88f1fb3 100644
--- a/testsuites/sptests/sptimerserver01/init.c
+++ b/testsuites/sptests/sptimerserver01/init.c
@@ -16,8 +16,6 @@
   #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #include "tmacros.h"
 
 const char rtems_test_name[] = "SPTIMERSERVER 1";
diff --git a/testsuites/sptests/sptimespec01/init.c b/testsuites/sptests/sptimespec01/init.c
index 7115b8b..945bd21 100644
--- a/testsuites/sptests/sptimespec01/init.c
+++ b/testsuites/sptests/sptimespec01/init.c
@@ -10,8 +10,6 @@
  *  http://www.rtems.org/license/LICENSE.
  */
 
-#define TEST_INIT
-
 #include <tmacros.h>
 #include "test_support.h"
 #include <rtems/timespec.h>
diff --git a/testsuites/sptests/sptls01/init.c b/testsuites/sptests/sptls01/init.c
index 9bbf976..ba662aa 100644
--- a/testsuites/sptests/sptls01/init.c
+++ b/testsuites/sptests/sptls01/init.c
@@ -16,8 +16,6 @@
   #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #include <stdio.h>
 
 #include "tmacros.h"
diff --git a/testsuites/sptests/sptls02/init.cc b/testsuites/sptests/sptls02/init.cc
index fbdf53e..86e3158 100644
--- a/testsuites/sptests/sptls02/init.cc
+++ b/testsuites/sptests/sptls02/init.cc
@@ -16,8 +16,6 @@
   #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #include <stdio.h>
 #include <stdlib.h>
 
diff --git a/testsuites/sptests/sptls03/init.c b/testsuites/sptests/sptls03/init.c
index 71f2bea..1487595 100644
--- a/testsuites/sptests/sptls03/init.c
+++ b/testsuites/sptests/sptls03/init.c
@@ -16,8 +16,6 @@
   #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #include <rtems/score/thread.h>
 
 #include "tmacros.h"
diff --git a/testsuites/sptests/spwatchdog/init.c b/testsuites/sptests/spwatchdog/init.c
index 5ab6958..0c7d41f 100644
--- a/testsuites/sptests/spwatchdog/init.c
+++ b/testsuites/sptests/spwatchdog/init.c
@@ -19,8 +19,6 @@
 #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #define CONFIGURE_INIT
 #include "system.h"
 
diff --git a/testsuites/sptests/spwkspace/init.c b/testsuites/sptests/spwkspace/init.c
index 8386daa..5131ebc 100644
--- a/testsuites/sptests/spwkspace/init.c
+++ b/testsuites/sptests/spwkspace/init.c
@@ -13,8 +13,6 @@
 #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #include <tmacros.h>
 
 #include <string.h>
diff --git a/testsuites/support/include/tmacros.h b/testsuites/support/include/tmacros.h
index 86dceb9..354d4cf 100644
--- a/testsuites/support/include/tmacros.h
+++ b/testsuites/support/include/tmacros.h
@@ -37,7 +37,7 @@ extern "C" {
 
 #define FOREVER 1                  /* infinite loop */
 
-#ifdef TEST_INIT
+#ifdef CONFIGURE_INIT
 #define TEST_EXTERN
 #else
 #define TEST_EXTERN extern
diff --git a/testsuites/tmtests/tm01/task1.c b/testsuites/tmtests/tm01/task1.c
index 84aa206..98f9f05 100644
--- a/testsuites/tmtests/tm01/task1.c
+++ b/testsuites/tmtests/tm01/task1.c
@@ -11,8 +11,6 @@
 #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #define CONFIGURE_INIT
 #include "system.h"
 
diff --git a/testsuites/tmtests/tm02/task1.c b/testsuites/tmtests/tm02/task1.c
index 827baba..b376150 100644
--- a/testsuites/tmtests/tm02/task1.c
+++ b/testsuites/tmtests/tm02/task1.c
@@ -11,8 +11,6 @@
 #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #define CONFIGURE_INIT
 #include "system.h"
 
diff --git a/testsuites/tmtests/tm03/task1.c b/testsuites/tmtests/tm03/task1.c
index f364292..42126ac 100644
--- a/testsuites/tmtests/tm03/task1.c
+++ b/testsuites/tmtests/tm03/task1.c
@@ -11,8 +11,6 @@
 #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #define CONFIGURE_INIT
 #include "system.h"
 
diff --git a/testsuites/tmtests/tm04/task1.c b/testsuites/tmtests/tm04/task1.c
index 8df1010..7be2afd 100644
--- a/testsuites/tmtests/tm04/task1.c
+++ b/testsuites/tmtests/tm04/task1.c
@@ -11,8 +11,6 @@
 #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #define CONFIGURE_INIT
 #include "system.h"
 
diff --git a/testsuites/tmtests/tm05/task1.c b/testsuites/tmtests/tm05/task1.c
index 19b94e2..d1485e2 100644
--- a/testsuites/tmtests/tm05/task1.c
+++ b/testsuites/tmtests/tm05/task1.c
@@ -11,8 +11,6 @@
 #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #define CONFIGURE_INIT
 #include "system.h"
 
diff --git a/testsuites/tmtests/tm06/task1.c b/testsuites/tmtests/tm06/task1.c
index 3f68d5f..a784f9c 100644
--- a/testsuites/tmtests/tm06/task1.c
+++ b/testsuites/tmtests/tm06/task1.c
@@ -11,8 +11,6 @@
 #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #define CONFIGURE_INIT
 #include "system.h"
 
diff --git a/testsuites/tmtests/tm07/task1.c b/testsuites/tmtests/tm07/task1.c
index f79dfe5..a14f1a8 100644
--- a/testsuites/tmtests/tm07/task1.c
+++ b/testsuites/tmtests/tm07/task1.c
@@ -11,8 +11,6 @@
 #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #define CONFIGURE_INIT
 #include "system.h"
 
diff --git a/testsuites/tmtests/tm08/task1.c b/testsuites/tmtests/tm08/task1.c
index acf65d4..a86322c 100644
--- a/testsuites/tmtests/tm08/task1.c
+++ b/testsuites/tmtests/tm08/task1.c
@@ -11,8 +11,6 @@
 #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #define CONFIGURE_INIT
 #include "system.h"
 
diff --git a/testsuites/tmtests/tm09/task1.c b/testsuites/tmtests/tm09/task1.c
index 3d8ab19..ff81571 100644
--- a/testsuites/tmtests/tm09/task1.c
+++ b/testsuites/tmtests/tm09/task1.c
@@ -11,8 +11,6 @@
 #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #define CONFIGURE_INIT
 #include "system.h"
 
diff --git a/testsuites/tmtests/tm10/task1.c b/testsuites/tmtests/tm10/task1.c
index 42615ab..f7e4d27 100644
--- a/testsuites/tmtests/tm10/task1.c
+++ b/testsuites/tmtests/tm10/task1.c
@@ -11,8 +11,6 @@
 #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #define CONFIGURE_INIT
 #include "system.h"
 
diff --git a/testsuites/tmtests/tm11/task1.c b/testsuites/tmtests/tm11/task1.c
index 5ba13f7..01beb79 100644
--- a/testsuites/tmtests/tm11/task1.c
+++ b/testsuites/tmtests/tm11/task1.c
@@ -11,8 +11,6 @@
 #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #define CONFIGURE_INIT
 #include "system.h"
 
diff --git a/testsuites/tmtests/tm12/task1.c b/testsuites/tmtests/tm12/task1.c
index ea499c5..dcd84c6 100644
--- a/testsuites/tmtests/tm12/task1.c
+++ b/testsuites/tmtests/tm12/task1.c
@@ -11,8 +11,6 @@
 #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #define CONFIGURE_INIT
 #include "system.h"
 
diff --git a/testsuites/tmtests/tm13/task1.c b/testsuites/tmtests/tm13/task1.c
index 00a5a0e..eac1b8b 100644
--- a/testsuites/tmtests/tm13/task1.c
+++ b/testsuites/tmtests/tm13/task1.c
@@ -11,8 +11,6 @@
 #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #define CONFIGURE_INIT
 #include "system.h"
 
diff --git a/testsuites/tmtests/tm14/task1.c b/testsuites/tmtests/tm14/task1.c
index 69faff3..8a7a5d7 100644
--- a/testsuites/tmtests/tm14/task1.c
+++ b/testsuites/tmtests/tm14/task1.c
@@ -11,8 +11,6 @@
 #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #define CONFIGURE_INIT
 #include "system.h"
 
diff --git a/testsuites/tmtests/tm15/task1.c b/testsuites/tmtests/tm15/task1.c
index d91f67d..c3afd68 100644
--- a/testsuites/tmtests/tm15/task1.c
+++ b/testsuites/tmtests/tm15/task1.c
@@ -11,8 +11,6 @@
 #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #define CONFIGURE_INIT
 #include "system.h"
 
diff --git a/testsuites/tmtests/tm16/task1.c b/testsuites/tmtests/tm16/task1.c
index 0c63b26..c4aa255 100644
--- a/testsuites/tmtests/tm16/task1.c
+++ b/testsuites/tmtests/tm16/task1.c
@@ -11,8 +11,6 @@
 #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #define CONFIGURE_INIT
 #include "system.h"
 
diff --git a/testsuites/tmtests/tm17/task1.c b/testsuites/tmtests/tm17/task1.c
index 123d165..15c51a1 100644
--- a/testsuites/tmtests/tm17/task1.c
+++ b/testsuites/tmtests/tm17/task1.c
@@ -11,8 +11,6 @@
 #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #define CONFIGURE_INIT
 #include "system.h"
 
diff --git a/testsuites/tmtests/tm18/task1.c b/testsuites/tmtests/tm18/task1.c
index 9267ff9..ca607f5 100644
--- a/testsuites/tmtests/tm18/task1.c
+++ b/testsuites/tmtests/tm18/task1.c
@@ -11,8 +11,6 @@
 #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #define CONFIGURE_INIT
 #include "system.h"
 
diff --git a/testsuites/tmtests/tm19/task1.c b/testsuites/tmtests/tm19/task1.c
index cf909fb..8f07df1 100644
--- a/testsuites/tmtests/tm19/task1.c
+++ b/testsuites/tmtests/tm19/task1.c
@@ -11,8 +11,6 @@
 #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #define CONFIGURE_INIT
 #include "system.h"
 
diff --git a/testsuites/tmtests/tm20/task1.c b/testsuites/tmtests/tm20/task1.c
index b30cb82..ed9c204 100644
--- a/testsuites/tmtests/tm20/task1.c
+++ b/testsuites/tmtests/tm20/task1.c
@@ -11,8 +11,6 @@
 #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #define CONFIGURE_INIT
 #include "system.h"
 
diff --git a/testsuites/tmtests/tm21/task1.c b/testsuites/tmtests/tm21/task1.c
index 464ac4b..d7d6163 100644
--- a/testsuites/tmtests/tm21/task1.c
+++ b/testsuites/tmtests/tm21/task1.c
@@ -11,8 +11,6 @@
 #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #define CONFIGURE_INIT
 #include "system.h"
 
diff --git a/testsuites/tmtests/tm22/task1.c b/testsuites/tmtests/tm22/task1.c
index 999963a..eb45486 100644
--- a/testsuites/tmtests/tm22/task1.c
+++ b/testsuites/tmtests/tm22/task1.c
@@ -12,8 +12,6 @@
 #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #define CONFIGURE_INIT
 #include "system.h"
 
diff --git a/testsuites/tmtests/tm23/task1.c b/testsuites/tmtests/tm23/task1.c
index 5e9dc5c..249d627 100644
--- a/testsuites/tmtests/tm23/task1.c
+++ b/testsuites/tmtests/tm23/task1.c
@@ -11,8 +11,6 @@
 #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #define CONFIGURE_INIT
 #include "system.h"
 
diff --git a/testsuites/tmtests/tm24/task1.c b/testsuites/tmtests/tm24/task1.c
index 1360ba9..21de600 100644
--- a/testsuites/tmtests/tm24/task1.c
+++ b/testsuites/tmtests/tm24/task1.c
@@ -11,8 +11,6 @@
 #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #define CONFIGURE_INIT
 #include "system.h"
 
diff --git a/testsuites/tmtests/tm25/task1.c b/testsuites/tmtests/tm25/task1.c
index c9f781b..7777b51 100644
--- a/testsuites/tmtests/tm25/task1.c
+++ b/testsuites/tmtests/tm25/task1.c
@@ -11,8 +11,6 @@
 #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #define CONFIGURE_INIT
 #include "system.h"
 
diff --git a/testsuites/tmtests/tm26/task1.c b/testsuites/tmtests/tm26/task1.c
index e0b09b8..9d157e9 100644
--- a/testsuites/tmtests/tm26/task1.c
+++ b/testsuites/tmtests/tm26/task1.c
@@ -11,8 +11,6 @@
 #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #define CONFIGURE_INIT
 #include <rtems.h>
 #include "system.h"
diff --git a/testsuites/tmtests/tm27/task1.c b/testsuites/tmtests/tm27/task1.c
index 7f50030..c89c095 100644
--- a/testsuites/tmtests/tm27/task1.c
+++ b/testsuites/tmtests/tm27/task1.c
@@ -17,8 +17,6 @@
 #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #define CONFIGURE_INIT
 #include "system.h"
 
diff --git a/testsuites/tmtests/tm28/task1.c b/testsuites/tmtests/tm28/task1.c
index ec09c0b..f157209 100644
--- a/testsuites/tmtests/tm28/task1.c
+++ b/testsuites/tmtests/tm28/task1.c
@@ -11,8 +11,6 @@
 #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #define CONFIGURE_INIT
 #include "system.h"
 
diff --git a/testsuites/tmtests/tm29/task1.c b/testsuites/tmtests/tm29/task1.c
index 5176a06..ef889cb 100644
--- a/testsuites/tmtests/tm29/task1.c
+++ b/testsuites/tmtests/tm29/task1.c
@@ -11,8 +11,6 @@
 #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #define CONFIGURE_INIT
 #include "system.h"
 
diff --git a/testsuites/tmtests/tm30/init.c b/testsuites/tmtests/tm30/init.c
index d7ff99a..022cdaf 100644
--- a/testsuites/tmtests/tm30/init.c
+++ b/testsuites/tmtests/tm30/init.c
@@ -11,8 +11,6 @@
 #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #include <bsp.h>
 #include <coverhd.h>
 #include <tmacros.h>
diff --git a/testsuites/tmtests/tmck/task1.c b/testsuites/tmtests/tmck/task1.c
index 6476de5..e13181f 100644
--- a/testsuites/tmtests/tmck/task1.c
+++ b/testsuites/tmtests/tmck/task1.c
@@ -12,8 +12,6 @@
 #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #define CONFIGURE_INIT
 #include "system.h"
 
diff --git a/testsuites/tmtests/tmcontext01/init.c b/testsuites/tmtests/tmcontext01/init.c
index 9b76921..2651847 100644
--- a/testsuites/tmtests/tmcontext01/init.c
+++ b/testsuites/tmtests/tmcontext01/init.c
@@ -16,8 +16,6 @@
   #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #include <rtems/counter.h>
 #include <rtems.h>
 
diff --git a/testsuites/tmtests/tmfine01/init.c b/testsuites/tmtests/tmfine01/init.c
index 29f983c..7a0cf8f 100644
--- a/testsuites/tmtests/tmfine01/init.c
+++ b/testsuites/tmtests/tmfine01/init.c
@@ -16,8 +16,6 @@
   #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #include "tmacros.h"
 
 #include <sys/lock.h>
diff --git a/testsuites/tmtests/tmoverhd/testtask.c b/testsuites/tmtests/tmoverhd/testtask.c
index 0137bee..bc73f8b 100644
--- a/testsuites/tmtests/tmoverhd/testtask.c
+++ b/testsuites/tmtests/tmoverhd/testtask.c
@@ -11,8 +11,6 @@
 #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #define CONFIGURE_INIT
 #include "system.h"
 
diff --git a/testsuites/tmtests/tmtimer01/init.c b/testsuites/tmtests/tmtimer01/init.c
index 2189707..6b94304 100644
--- a/testsuites/tmtests/tmtimer01/init.c
+++ b/testsuites/tmtests/tmtimer01/init.c
@@ -16,8 +16,6 @@
   #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #include "tmacros.h"
 
 #include <stdio.h>



More information about the vc mailing list