[PATCH 9/9] tests: Remove TEST_INIT

Sebastian Huber sebastian.huber at embedded-brains.de
Thu Oct 26 11:59:13 UTC 2017 

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/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/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            | 2 --
 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 --
 547 files changed, 1 insertion(+), 1093 deletions(-)

diff --git a/testsuites/benchmarks/dhrystone/init.c b/testsuites/benchmarks/dhrystone/init.c
index a109f4e5a4..3e6245c743 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 38bfbaf642..c94314b41d 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 572b6ccccf..b1661186b1 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 ec0b3f6c7d..f339255469 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 9e8a51e43c..77df082036 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 d84a80b195..b7df74883a 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 ab01296291..f272945d89 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 bfb3bd315a..0496ca00a4 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 2b27408438..c53d2ccc7b 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 b787e3c37f..525a882d48 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 ca6ce47381..dd073ce86a 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 ed0e804e04..5ba3f1f24c 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 07df21668f..35f9c83b58 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 47f1fefc26..4905697b19 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 fff59e4ebf..45d6d1cc2d 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 623f6bc085..fc69879b53 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 323e275cb5..45aae88df9 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 53271fe94f..966b01f121 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 18dbe20360..da80de6304 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 b233a3374a..1a07edf46f 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 efcd5c4dcd..7760ff7426 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 85e1217044..11053505e5 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 c1a20693bd..b7eaa2b91f 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 361475da05..51a286e230 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 3a5e110ede..41f773067a 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 cf39ea9c3c..372b62b503 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 4003c34373..bbe2bf6a7d 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 ea4bc4df68..1f91f45a7f 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 727bb6f89d..0d467e8132 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 e712b07f42..83eaf6d534 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 ca6efd210b..1a7b02a173 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 98277444e2..c7aff4214e 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 68f962f5e7..4d19d1917b 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 c7a409d6a6..5b749773dc 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 c936e0c26b..82c9b3a4a9 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 d7cd640e25..ab5ba57703 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 fa2f1dd83f..19d30d17bf 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 0c83f05b28..c7d41480a9 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 43dcde066e..384cb95a48 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 64d70bce07..bea50211e2 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 4791c5a1c0..a7a8e0c45a 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 899b7db262..11fb273733 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 7c9dca0f8d..545c533feb 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 1bb28d4992..9fb85007de 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 66bb9d39a1..21c326dcbd 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 c727cb34ba..44b55e171c 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 16121a52f5..b9de92a2a5 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 34d488b892..147deeb424 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 1c3ea05544..ea952d8585 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 6271463407..519719d546 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 d511c198d1..ec7ae1a413 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 b796b9ed95..bf2d1a9717 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 ddfda7a767..ae8272294c 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 d8655a6607..eb3018e393 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 a224f9a216..0c58204139 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 4d03ffcf78..e9671cd144 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 75da2dfecd..c73738db3b 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 95eba4f077..b9874a8196 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 276ba5d728..ea1b583895 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 af8dd0773a..ad166c3f77 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 c73e2b236e..a0debcdc91 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 7d221aa811..3bd6c91ce4 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 9994a9cf70..0d6fc839f3 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 9324aa9d58..a13fc82021 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 d3937ca721..c333b22862 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 51d1c132aa..3b23a07c79 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 3fc690651b..dabbf98e61 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 59aa1a105b..6be6c1c25d 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 f743454fdf..124c2d7b9b 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 31f0972ff5..39071a8dfb 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 e579d3c01d..15112285d9 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 105f1fd7c8..22818cc441 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 24d6a2e0cc..d0a127d423 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 00f0bd4351..f22b3328b1 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 bbe260e117..24dad1c4c5 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 a71ed42144..0c2ca664e5 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 af04cc8085..bc373672e5 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 15939cdf8c..ebc8d0b3fc 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 c97f6771fd..a85d107510 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 f6cb347b3e..a3f2ee10ca 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 c53f2f8f24..797eec7794 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 bf3b50dfae..b7ec2d1601 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 6d3a648029..7c556cd4cf 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 e478d7b249..990d3ec2b4 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 a88d01a418..72e3c23731 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 cb72c9483e..be0d494e08 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 fd1c262fd6..d36a4e543f 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 b58f73c748..253b91fd47 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 8f3d69094c..858c94104f 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 6d0c9a7fbe..23c1187034 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 9a79222e4a..72e95ecd2f 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 deb6a88d47..558f095449 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 865b55c6ce..a892762b03 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 eead771b5d..fe16150513 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 d18c1c3f28..ab33ac82fd 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 ed76962dad..dd9f653a7b 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 d359165ee6..72c9e81a37 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 c1e04eb6d8..acdcc33956 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 d6a91ef8db..bda570d706 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 7c290981da..317ce7203d 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 46b4c76181..6feb521244 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 ed33d8288a..8a824ae194 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 263bd8e25b..88799f5849 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 90490fa48c..aae4b4b442 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 142af2b748..fda1444a37 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 33e81103ce..9e1a1a7375 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 6197f40b3a..9607a447f4 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 9d5bfc78a9..5fbcaf81a0 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 b93c81a8c1..9ecac0eac8 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 12e57a1fef..3907517655 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 7cdf38632b..4bf3d57718 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 8ce0c9a7e7..a4e1ad4753 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 7cc24a631a..8f64a3a323 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 b235600993..b5c5a200f4 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 527f187052..e44b151597 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 7d1e23df0f..7486e664c6 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 3889796e3f..e82a1d12e1 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 47ad3121db..68359bcd3a 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 7b7a4ef87c..2b2fafd0cd 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 7ea8b9870d..0d2ab06c7e 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 a78c72d0d2..5c5383ccfc 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 b35fb68cc8..76c76af55b 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 17249ee6b3..70e8d4a67d 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 e10a7f5096..e077a28597 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 b41e77e8b0..be5208b32f 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 b5839eae81..781ac1ed30 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 db10206f34..d9226c9abb 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 d58024a382..ad4e60e385 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 8a4c0c45c5..9adde6e25b 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 90f1e5c7c9..471fe73500 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 2d9111191d..2045de3af3 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 94a43fdb6c..070501f065 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 36eadf4b77..654f0c87fb 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 c9ddfeb88b..55f652679f 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 32479d41f6..283507f9cd 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 781f01b916..3c75a365b5 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 e0da0ee16e..d8a13fa8e4 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 d8ef47568b..e4ab9b4f4a 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 630fa1d17d..9001de2306 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 e281746eef..5d652f7467 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 a9c98cae11..5788078631 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 0e92db6dd4..c4c442b668 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 5f4b1f84e7..fce188ed39 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 0c1e6a690d..5e8bedbc0b 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 e9bca2a227..1acc14142a 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 f3f5de2fc6..2af4aaf78d 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 15f18e25f0..f38b48ee93 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 7891e620d9..88ecfee47e 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 4aedd3e141..669f4bb0c4 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 9178e893c4..6be85d2b70 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/psxconcurrency01/init.c b/testsuites/psxtests/psxconcurrency01/init.c
index f93fda0e93..60aef9230d 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 2e4da67573..574769659a 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 c458cfc672..6314762285 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 45bc168f72..a1dc4c618f 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 664f82cc16..d74fb6b102 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 935047d367..f0810b50a5 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 ef9a1baa0e..e0927446f9 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 79434975ab..38caa3f36a 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 dc6d537d43..89a0d06033 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 7b1ea9a827..bba7a58b2c 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 80e5d86897..d66815203a 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 74533174d8..d64d1a185f 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 33735cc144..19981573d1 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 8723386366..590bc20e77 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 f531410424..d4855261be 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 44a3c1ab5a..c5f09b0d52 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 2ffb84eb10..5aa03999df 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 380ece7b60..5c826fb381 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 07e55c42d9..047a4fcff5 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 72686cc9a2..a6a64bad60 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 915c445dc3..dc32f34825 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 c1ce6cb269..6b8f57eccc 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 e36c586edb..23a392b004 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 e0c2f7d8d2..b133e50739 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 2540dd9d7f..4dcc342451 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 e848fa337c..6ebe49fe01 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 fa3f2cfa60..28236c2adc 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 b7616c5101..91cc7ea4ea 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 95da493e3d..1e6d53a34e 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 9e1b494202..2f7e92a741 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 1e773e3731..1c6ebd8c63 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 7efb36ef5e..e3e8b9ac60 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 140057e4dc..74de986b20 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 8cab81628b..3f34d39cef 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 e9f2e92b53..290663d22d 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 127bb72c69..14644420c8 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 815cb02ff3..f1e1c968c0 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 8ee67745d4..1ea1ab58c0 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 3a983b57e9..c3b3f49aa0 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 9f7f76b95d..1c90769d38 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 947478bbb1..eb96e280c5 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 f299d1ee54..7090c9430f 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 50ebeef7bb..7066f6cf52 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 701f99ac37..67ee25e5b3 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 ac421c1065..9ed55fc84d 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 1386ad43e9..7e2eda4806 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 d4ea8cb374..ae0b390a7c 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 176933354d..4636f9a0af 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 ff356ce529..071f4c4da8 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 7ce2a7207f..511dd2d637 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 eda7ef743a..6ae68d6e5b 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 07fd69a1bb..f3fc26672b 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 196082e90e..0bc8d7f01f 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 20277be204..cb34bb6bc8 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 e6462101cd..5f7e7c0e1d 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 be3617a702..7a010c8c6c 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 43fca98411..df65ee3393 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 14a4b423ae..5b788529b3 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 8f3129f04d..9614fb99aa 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 d95fdd3710..2dd9018722 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 2af3ba7e64..16fdec6958 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 a1653ffa2c..7f36c11546 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 d869374d0c..032e9f8e6c 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 59f1697149..e4d6d7d332 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 e6150b076e..30cecd427a 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 a5ba5bf270..7a4fb21b99 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 d9d0e71f4a..383943e1fe 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 0148e1c1bd..cfbca8d975 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 d7e8f08026..6705125ac6 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 05372f5fc5..27feac1fe8 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 61675b1975..baf1bf1032 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 484ddbacee..5bc800f709 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 89836f4959..3f458efb31 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 8feef4e43d..999cce24b4 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 ce7be62b21..7ec876b9a0 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 8f8d16e0ab..1e8e00ce94 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 1a56a5b206..4a829bd55e 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 529139bd5c..1a40f23e53 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 fce8862c06..fcfad14b5f 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 75a00c4aab..ec87ccd45c 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 611af66aa3..218fccccd4 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 636ecb6e8d..377b09948d 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 18122479b5..b58c8d571a 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 3381d41243..fafb8f62bf 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 e023be08bf..a5ed4fcf39 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 558d8e6c9f..7a020f917d 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 44d74cace4..b71e21f35f 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 9751b87e3f..13ad5fae83 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 cb6d1f4a39..6513c59223 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 6ed38c2c8c..d274fc5257 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 01cea4686e..c2bd0011c7 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 46ca01c47c..de69fcca9c 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 8dc2890a6b..f445af587c 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 5c8139bc9e..9e227e5291 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 49f8e567e4..5bdfb5601c 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 0b37e0fd21..f2462b235b 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 e4fc6c5f37..10c7aee4cc 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 53df5fa3a5..dd2d7357f1 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 cf7ed6ad96..f6668c370d 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 b68f716ad0..93a49be1f5 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 4c7128c238..303c3015c5 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 031124b441..4223a02b3b 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 79557ab2ce..3c2f34a20b 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 90378821ee..687c8c6343 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 b8130a92ed..540f0a3b97 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 fca2e0339e..07b96b2024 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 5f3b8deea8..f2ee0af231 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 8948c943d6..1e909a2633 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 35b9cbb89a..60f94cfa56 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 52e0ad3868..c468f0335e 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 30e1b64c46..938a8c62e0 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 12f53370cb..4ae0b574f1 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 682afc0c84..10d90369a4 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 d7c92fcce4..603190932d 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 438bff1575..a8977273c2 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 87ca136e7a..0a7741bf28 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 3682dc89a1..11a29c0e2c 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 6aaf38d80d..6800926fec 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 0218c6d028..c396e742fe 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 972eed8914..520de3374a 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 9986d3c57c..901dc83a9b 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 48dbf79d1e..b1cb4d90a6 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 2bf21c8acc..3f2bc848b1 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 b5ea093a51..1cf2b20f77 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 7158ab1f42..433266a99f 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 7e4e2090e1..59995f1da8 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 1ee4db0b84..c5110e2722 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 1a9ddeee21..1661e558ba 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 1b9ae9678d..3f3cbd8359 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 0466e3dd88..002a9736e4 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 ef9d6b8180..c77a192071 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 48d614810c..e70eca3182 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 63383c4ff8..03eddb0eaa 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 854c8febba..7211e8ca88 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 9bf0529fc2..0dbf70b001 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 fb58d70d12..85003929f5 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 4cb89de8ef..66290641fd 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 c5a24c058b..eae6d708db 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 a780c69b34..394cc3f865 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 ee752c78bd..73e30a13f2 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 2650f24fa0..2818b91cf1 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 efcb236522..9926fbb493 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 a4128e436c..5972959b66 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 e225aa466f..a49cb34bdf 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 b6a538f9dd..94a9829529 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 0030afe374..3b83034261 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 0b76f8137f..939bf9f3a3 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 431b7b10b3..21c7a66aca 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 f99cdd566d..8c89bdb814 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 f641278b55..2b8fa1cf56 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 b2f232eb68..cc85388f7c 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 778c3dc0f1..0e102354d4 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 e8e22c61f1..c53da3bf79 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 72033501e7..6cde34b234 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 15e5d6e6ab..4180f5387f 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 92991c3f57..aa974e29c9 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 ead95cfe7d..c7059e8e14 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 f902d8843d..1604bb7cf8 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 0178071f77..58e1db5435 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 1b4bd59240..21a723d41b 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 67ff99c45f..aeed75c6d1 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 2c4687dfbb..367615838c 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 d25d7e0c21..778fda7ba0 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 6e40c8e29d..9a8cfed7dd 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 4036217fef..a53b30caa7 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 8b62ae0edc..5dbd2eadae 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 7de8763442..b89a6e29d8 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 b162196c4c..4613ebd61e 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 17976fbb3f..e0c5182f2e 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 3a1f2708e3..33029532c6 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 75173e3142..cae5d6e84a 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 9f0b5c1ed2..5df3281e25 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 1107fad759..5cd378315a 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/smpscheduler04/init.c b/testsuites/smptests/smpscheduler04/init.c
index 2515e17a2f..a4e9da1289 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 af66c26fd7..52f2edbddd 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 d59714fda7..75ac79bc54 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 c415863373..3fad1d927c 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 f224dd9223..5c2d106d0f 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 56212a49d6..a5ccaae271 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 d6770590eb..3d091f59c0 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 a726a02461..4d73804dbb 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 ffd330e77f..d7ff317497 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 a5b6d8038a..1f02eb666d 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 31925795e8..e7bc79393d 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 52db2eaa03..7d95ee9775 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 60e7a41137..e8379ae8f9 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 bfae5eb487..d5b606d12a 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 88c1445627..2364c70287 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 5b52ba9760..ee3f2e82e7 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 fb7a5f8d07..0b9200440b 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 ed244bcb1e..ffa2d1285d 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 5e3ef2360b..b0cedc264e 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 e867a913d1..dcf8f95ace 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 f9e5d0a97b..3b8543b7c0 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 0ee99c105e..4f7cba8142 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 4c9448fcee..5f39794318 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 9d8fea373d..f1b75c406a 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 8b831ba339..bf8afc7684 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 28c8cb1375..da7c23ef5d 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 9a2fec5b72..0eb453c974 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 78e415d74e..23956e6c30 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 a6b52c6ec6..e0ee2f97a0 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 8c50c3a9e7..b0e7f15628 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 ba4f65b932..e744e5cfb6 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 6df979c352..0ac7157e7c 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 a5459140f4..bb4630d2de 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 6f68275626..e65fbe3d45 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 deb1873843..616e4cd2a4 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 34a96519cc..020ec255be 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 86068a35c9..71cd46c001 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 d45d860899..d8e3c50ae3 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 d2bdd65ace..5000f693d3 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 69f3ca399b..a6d252a84d 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 d49ee74248..db270caf41 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 13e9a33cd3..08d6285d3d 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 49c74c2e6d..d77d5d2a1c 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 b923d9f194..44e8d45a03 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 e08019aea2..04b855b352 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 9260b7af39..f4be2a5ca2 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 56c3985995..a0025353ec 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 39b2f50392..5b11eadda5 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 20b6119fc2..b8b43b4df4 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 d66108aa2e..55653e0b3a 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 2c2b637c38..5d28303f19 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 a6bfa9da19..53d8245c23 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 0edbc4a558..64db98e11f 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 abc5a75745..58a7be7501 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 51fa0064ab..1e8f9e5ceb 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 3069e24d4e..f7629a5d11 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 e39999c6b6..3b0d4589a9 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 ebc1264d4d..ee06e84d76 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 c383420126..c0ce3c007c 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 8e0be12c52..3003c2fa9c 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 b5fd843586..b61120320e 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 100b5408fb..4120761acd 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 baa8f2cc4b..b015ac1244 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 cbe6c92bef..7df64df0d6 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 a4d66391a0..6f1c837d84 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 76961f71f9..153a9f25f4 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 f1fed6e4f0..09c64b9d0b 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 fe05da224f..154e836f41 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 9aa8dd2091..5642203b74 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 83f93cde26..c604c2de06 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 eafdde5c40..721e3b91a1 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 999a2e8626..eff6ba72d0 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 b8561e0b22..5e2c8ab91d 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 261bf8bad2..8db5024fc5 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 a1f9e5647c..346c67662c 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 667e4616f2..e699e766c6 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 f414080155..daf55f1ede 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 f645209194..c6ccacc3bc 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 959cd40e6c..ba3873ac0e 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 e034fcc423..b5fa6c4a7a 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 28cf8c00c3..52fa860b93 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 eb8a808d2a..be85bce85c 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 3d92de2d68..acaf7a723d 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 7b219054ca..55549151b8 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 aa5f91d2d1..8fa7ea087d 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 7e02e5e277..087c8d4a05 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 d87da5c2c3..7912ab8b21 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 6d2adce685..e093c50618 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 31fdb4bd62..a80acec7fe 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 1a582fa615..92f2e15c72 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 39518e279b..b13be4913d 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 303cdebc80..04fc5ca79c 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 0e7f54dbf0..aa2798c251 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 6163f9a43f..0c2425a37c 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 42b2b15cb6..bcaced994c 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 3f7bd6a490..d2ccf0c9c7 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 0c4c9f447d..abbe1c384f 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 48c0ae6e78..e0369518e9 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 1a1d33d0f4..b13960e16d 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 6a02b85384..7fb2429bc2 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 1473ea67c9..91d6ecfc18 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 377e4c3985..58000839c4 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 ade4f0e173..1848659d6a 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 9cf50a38a9..a02bf062f4 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 0dce6719b1..5aab6630dc 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 b6de0d6401..f9b2ed37c1 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 3c8dc480ee..0e0f67815b 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 671e6ff5fe..64724016a3 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 7d940951dd..5aa48004ec 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 b7966d12f1..157b45c786 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 522a45b428..ab3ed66f96 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 e741a9b058..6efcd93762 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 d17bb9a105..114abebc20 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 230e4cd699..4ee70b94fa 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 b1a34680a4..2ed4c955d8 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 afc195e7ed..9bc39bf4dc 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 255f827484..b7cfee42f8 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 9015810a35..423e4b5fa7 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 efe30c2c9e..1a7ed2d2e5 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 bb495f6073..87c1c1aab3 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 b22b93849a..f7e372a46b 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 ee37bacfe7..2a3f83a315 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 cd278542df..7069938191 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 5c8e46ff0a..72e4832769 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 c34828ac45..3657c0607f 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 fa2ee6c120..f621d21280 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 8c1f3760ac..1697df426a 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 d5cf8e1aab..faa48f717c 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 c95929e2e8..7412bdef7e 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 019446d029..f71de71099 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 6303f9e91c..8f60c1ce70 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 90d44d6afb..4e19c6e846 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 debe9881ef..6b016e3f1c 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 798838ecba..2330ca82ba 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 2c01c2c91e..bf144a9775 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 80a0c54f7a..24537725dc 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 e64660ebe2..2ed5057007 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 fd490e47b0..b9d4a05f73 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 4ff2067592..1a10736611 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 25ea1145e6..620185c1f3 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 010c1c4a5d..04d735b84b 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 f53ebd2955..39ee700daa 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 a6c95fca7d..20e66737b9 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 637ffe9d57..e956c76ff3 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 509d05ff19..88cf5e07af 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 a70343b21f..7a3b0e1736 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 2db540c9bc..d00b623043 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 92bf1f70b9..ccc2361295 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 6cb6ea0fdf..746b36ee3a 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 27fc3266a9..6dd8db63cf 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 2bdc44db6c..f806605ec8 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 235e91636b..4ee58ab5ec 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 0fc1a891fe..9840a3ebc4 100644
--- a/testsuites/sptests/spscheduler01/init.c
+++ b/testsuites/sptests/spscheduler01/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/spsem01/init.c b/testsuites/sptests/spsem01/init.c
index e0a7b93db4..924f4c052d 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 f41f1ef74a..d5fb47b255 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 90f116ee43..859f996629 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 a1ed0e851f..39a366b41a 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 48894dd5d8..4c0acb9039 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 6a8e6d0692..6f8cd3ef60 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 87d801097c..6bac9c367a 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 4e78ab5eb7..884a3abf6f 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 e0773647dc..2f352af88b 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 569594ce6d..c26ba06c70 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 9f147daca6..4a9953cf8a 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 9df45095f1..4a26fdb9a6 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 cd818f2020..ae78b41480 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 337740dc28..d0d3042a44 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 63d18dca1e..815579a0d9 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 52e601017a..b57e751aa6 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 84687928ae..dfdaf396d0 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 203bb1da4c..d28a601418 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 a9e4ef766d..c9af611d27 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 159e21bc0e..4bd49b1d82 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 04712c9f45..8bf26b9b72 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 13fb36c76f..0b307542cf 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 7c5274b91c..f56e8cf796 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 3d24ff4a2e..4f8de6a034 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 d6303ba62f..3b57d95a12 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 481f556520..72f2a138d5 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 1350bc9df3..35a6d7a1dd 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 a385ab98fd..ad25a16926 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 0690012f01..88f1fb3cf3 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 7115b8babb..945bd217ed 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 9bbf97693d..ba662aa832 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 fbdf53ec70..86e3158dc9 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 71f2bea799..1487595981 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 5ab6958d46..0c7d41fd33 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 8386daad2d..5131ebc189 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 86dceb9e00..354d4cf60f 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 84aa206a0d..98f9f053f2 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 827baba99f..b3761502be 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 f364292e78..42126ac8a5 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 8df101069e..7be2afd7c1 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 19b94e2742..d1485e25bd 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 3f68d5f309..a784f9cfac 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 f79dfe55df..a14f1a8f23 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 acf65d4cdb..a86322c61f 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 3d8ab1986d..ff81571b5f 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 42615ab6bb..f7e4d27af4 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 5ba13f7ae2..01beb797e7 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 ea499c56cd..dcd84c6216 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 00a5a0eef7..eac1b8bd7c 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 69faff3248..8a7a5d7e59 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 d91f67d73b..c3afd68e6c 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 0c63b26fc4..c4aa255564 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 123d165acf..15c51a1f2b 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 9267ff927e..ca607f59f0 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 cf909fb4ef..8f07df17f5 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 b30cb82fbf..ed9c204154 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 464ac4b45e..d7d6163d01 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 999963a343..eb4548648d 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 5e9dc5c2e6..249d62760a 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 1360ba9acf..21de600e94 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 c9f781bd22..7777b51df9 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 e0b09b81ac..9d157e9fcf 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 7f50030853..c89c0956f1 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 ec09c0b488..f157209eb5 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 5176a068a2..ef889cbf42 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 d7ff99a4ca..022cdafb4f 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 6476de5cc0..e13181f912 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 9b76921bbf..2651847de4 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 29f983ca03..7a0cf8f486 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 0137beea63..bc73f8bc5d 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 2189707d99..6b9430481f 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>
-- 
2.12.3

More information about the devel mailing list