ada-tests: Move to testsuites/ada

This solves a build dependency issue, e.g. building tests before
librtemsbsp.a exists.

Close #3079.

522 files changed, 259 insertions, 259 deletions

diff --git a/c/src/ada-tests/Makefile.am b/c/src/ada-tests/Makefile.am
deleted file mode 100644
index f097f9fa0c..0000000000
--- a/c/src/ada-tests/Makefile.am
+++ /dev/null
@@ -1,13 +0,0 @@
-ACLOCAL_AMFLAGS = -I aclocal -I ../../../testsuites/aclocal
-
-_SUBDIRS = support samples sptests tmtests
-if HAS_MP
-_SUBDIRS += mptests
-endif
-
-DIST_SUBDIRS = support samples sptests tmtests mptests
-
-EXTRA_DIST = ada.am
-
-include $(top_srcdir)/../../../testsuites/automake/subdirs.am
-include $(top_srcdir)/../../../testsuites/automake/local.am
diff --git a/c/src/ada-tests/mptests/mp01/Makefile.am b/c/src/ada-tests/mptests/mp01/Makefile.am
deleted file mode 100644
index 43bba78abb..0000000000
--- a/c/src/ada-tests/mptests/mp01/Makefile.am
+++ /dev/null
@@ -1,4 +0,0 @@
-_SUBDIRS = node1 node2
-
-include $(top_srcdir)/../../../testsuites/automake/subdirs.am
-include $(top_srcdir)/../../../testsuites/automake/local.am
diff --git a/c/src/ada-tests/mptests/mp03/Makefile.am b/c/src/ada-tests/mptests/mp03/Makefile.am
deleted file mode 100644
index 43bba78abb..0000000000
--- a/c/src/ada-tests/mptests/mp03/Makefile.am
+++ /dev/null
@@ -1,4 +0,0 @@
-_SUBDIRS = node1 node2
-
-include $(top_srcdir)/../../../testsuites/automake/subdirs.am
-include $(top_srcdir)/../../../testsuites/automake/local.am
diff --git a/c/src/ada-tests/mptests/mp04/Makefile.am b/c/src/ada-tests/mptests/mp04/Makefile.am
deleted file mode 100644
index 43bba78abb..0000000000
--- a/c/src/ada-tests/mptests/mp04/Makefile.am
+++ /dev/null
@@ -1,4 +0,0 @@
-_SUBDIRS = node1 node2
-
-include $(top_srcdir)/../../../testsuites/automake/subdirs.am
-include $(top_srcdir)/../../../testsuites/automake/local.am
diff --git a/c/src/ada-tests/mptests/mp05/Makefile.am b/c/src/ada-tests/mptests/mp05/Makefile.am
deleted file mode 100644
index 43bba78abb..0000000000
--- a/c/src/ada-tests/mptests/mp05/Makefile.am
+++ /dev/null
@@ -1,4 +0,0 @@
-_SUBDIRS = node1 node2
-
-include $(top_srcdir)/../../../testsuites/automake/subdirs.am
-include $(top_srcdir)/../../../testsuites/automake/local.am
diff --git a/c/src/ada-tests/mptests/mp06/Makefile.am b/c/src/ada-tests/mptests/mp06/Makefile.am
deleted file mode 100644
index 43bba78abb..0000000000
--- a/c/src/ada-tests/mptests/mp06/Makefile.am
+++ /dev/null
@@ -1,4 +0,0 @@
-_SUBDIRS = node1 node2
-
-include $(top_srcdir)/../../../testsuites/automake/subdirs.am
-include $(top_srcdir)/../../../testsuites/automake/local.am
diff --git a/c/src/ada-tests/mptests/mp07/Makefile.am b/c/src/ada-tests/mptests/mp07/Makefile.am
deleted file mode 100644
index 43bba78abb..0000000000
--- a/c/src/ada-tests/mptests/mp07/Makefile.am
+++ /dev/null
@@ -1,4 +0,0 @@
-_SUBDIRS = node1 node2
-
-include $(top_srcdir)/../../../testsuites/automake/subdirs.am
-include $(top_srcdir)/../../../testsuites/automake/local.am
diff --git a/c/src/ada-tests/mptests/mp08/Makefile.am b/c/src/ada-tests/mptests/mp08/Makefile.am
deleted file mode 100644
index 43bba78abb..0000000000
--- a/c/src/ada-tests/mptests/mp08/Makefile.am
+++ /dev/null
@@ -1,4 +0,0 @@
-_SUBDIRS = node1 node2
-
-include $(top_srcdir)/../../../testsuites/automake/subdirs.am
-include $(top_srcdir)/../../../testsuites/automake/local.am
diff --git a/c/src/ada-tests/mptests/mp09/Makefile.am b/c/src/ada-tests/mptests/mp09/Makefile.am
deleted file mode 100644
index 43bba78abb..0000000000
--- a/c/src/ada-tests/mptests/mp09/Makefile.am
+++ /dev/null
@@ -1,4 +0,0 @@
-_SUBDIRS = node1 node2
-
-include $(top_srcdir)/../../../testsuites/automake/subdirs.am
-include $(top_srcdir)/../../../testsuites/automake/local.am
diff --git a/c/src/ada-tests/mptests/mp10/Makefile.am b/c/src/ada-tests/mptests/mp10/Makefile.am
deleted file mode 100644
index 43bba78abb..0000000000
--- a/c/src/ada-tests/mptests/mp10/Makefile.am
+++ /dev/null
@@ -1,4 +0,0 @@
-_SUBDIRS = node1 node2
-
-include $(top_srcdir)/../../../testsuites/automake/subdirs.am
-include $(top_srcdir)/../../../testsuites/automake/local.am
diff --git a/c/src/ada-tests/mptests/mp11/Makefile.am b/c/src/ada-tests/mptests/mp11/Makefile.am
deleted file mode 100644
index 43bba78abb..0000000000
--- a/c/src/ada-tests/mptests/mp11/Makefile.am
+++ /dev/null
@@ -1,4 +0,0 @@
-_SUBDIRS = node1 node2
-
-include $(top_srcdir)/../../../testsuites/automake/subdirs.am
-include $(top_srcdir)/../../../testsuites/automake/local.am
diff --git a/c/src/ada-tests/mptests/mp12/Makefile.am b/c/src/ada-tests/mptests/mp12/Makefile.am
deleted file mode 100644
index 43bba78abb..0000000000
--- a/c/src/ada-tests/mptests/mp12/Makefile.am
+++ /dev/null
@@ -1,4 +0,0 @@
-_SUBDIRS = node1 node2
-
-include $(top_srcdir)/../../../testsuites/automake/subdirs.am
-include $(top_srcdir)/../../../testsuites/automake/local.am
diff --git a/c/src/ada-tests/mptests/mp13/Makefile.am b/c/src/ada-tests/mptests/mp13/Makefile.am
deleted file mode 100644
index 43bba78abb..0000000000
--- a/c/src/ada-tests/mptests/mp13/Makefile.am
+++ /dev/null
@@ -1,4 +0,0 @@
-_SUBDIRS = node1 node2
-
-include $(top_srcdir)/../../../testsuites/automake/subdirs.am
-include $(top_srcdir)/../../../testsuites/automake/local.am
diff --git a/c/src/ada-tests/mptests/mp14/Makefile.am b/c/src/ada-tests/mptests/mp14/Makefile.am
deleted file mode 100644
index 43bba78abb..0000000000
--- a/c/src/ada-tests/mptests/mp14/Makefile.am
+++ /dev/null
@@ -1,4 +0,0 @@
-_SUBDIRS = node1 node2
-
-include $(top_srcdir)/../../../testsuites/automake/subdirs.am
-include $(top_srcdir)/../../../testsuites/automake/local.am
diff --git a/c/src/configure.ac b/c/src/configure.ac
index d228b5efe2..0ef63ce80b 100644
--- a/c/src/configure.ac
+++ b/c/src/configure.ac
@@ -153,15 +153,6 @@ AC_ARG_ENABLE([ada],
   *)  AC_MSG_ERROR(bad value ${enable_ada} for --enable-ada) ;;
 esac],[enable_ada=no])
 
-RTEMS_BSP_CONFIG_SUBDIR(
-  [ada-tests],[ada-tests],
-  ['--enable-rtems-root=../' \
-   '--enable-project-root=${with_project_root}../$RTEMS_BSP' \
-   '--with-project-top=${with_project_top}../' \
-   '--enable-rtemsbsp=$RTEMS_BSP' \
-  ],
-  [test x"$enable_tests" = xyes && test x"$enable_ada" = xyes])
-
 # HACK ALERT!
 
 # FIXME: Assume multilib implies in-source-tree multilibs
diff --git a/testsuites/ada/Makefile.am b/testsuites/ada/Makefile.am
new file mode 100644
index 0000000000..4fdae0c211
--- /dev/null
+++ b/testsuites/ada/Makefile.am
@@ -0,0 +1,13 @@
+ACLOCAL_AMFLAGS = -I aclocal -I ../aclocal
+
+_SUBDIRS = support samples sptests tmtests
+if HAS_MP
+_SUBDIRS += mptests
+endif
+
+DIST_SUBDIRS = support samples sptests tmtests mptests
+
+EXTRA_DIST = ada.am
+
+include $(top_srcdir)/../automake/subdirs.am
+include $(top_srcdir)/../automake/local.am
diff --git a/c/src/ada-tests/aclocal/prog-gnat.m4 b/testsuites/ada/aclocal/prog-gnat.m4
index a2b2879c7d..a2b2879c7d 100644
--- a/c/src/ada-tests/aclocal/prog-gnat.m4
+++ b/testsuites/ada/aclocal/prog-gnat.m4
diff --git a/c/src/ada-tests/ada.am b/testsuites/ada/ada.am
index 17084fb753..17084fb753 100644
--- a/c/src/ada-tests/ada.am
+++ b/testsuites/ada/ada.am
diff --git a/c/src/ada-tests/ada_mvscn b/testsuites/ada/ada_mvscn
index 8c6a5b0a5b..8c6a5b0a5b 100644
--- a/c/src/ada-tests/ada_mvscn
+++ b/testsuites/ada/ada_mvscn
diff --git a/c/src/ada-tests/configure.ac b/testsuites/ada/configure.ac
index 2f402ebd38..a9293842b9 100644
--- a/c/src/ada-tests/configure.ac
+++ b/testsuites/ada/configure.ac
@@ -3,7 +3,7 @@
 AC_PREREQ([2.69])
 AC_INIT([rtems-ada-tests],[_RTEMS_VERSION],[https://devel.rtems.org/newticket])
 AC_CONFIG_SRCDIR([support])
-RTEMS_TOP([../../..],[])
+RTEMS_TOP([../..],[..])
 
 RTEMS_CANONICAL_TARGET_CPU
 
@@ -32,8 +32,6 @@ RTEMS_CHECK_TOOL([GNATPREP],[gnatprep],[])
 AM_CONDITIONAL([EXPADA],
   [test x"$enable_expada" = xyes && test x"$HAVE_GNAT" = xyes])
 
-RTEMS_PROJECT_ROOT
-
 AC_SUBST([rtems_ada_testsdir],["\$(libdir)/rtems-][_RTEMS_API][/ada-tests"])
 
 # Explicitly list all Makefiles here
diff --git a/c/src/ada-tests/mptests/Makefile.am b/testsuites/ada/mptests/Makefile.am
index 17999ae43f..733c9edb94 100644
--- a/c/src/ada-tests/mptests/Makefile.am
+++ b/testsuites/ada/mptests/Makefile.am
@@ -13,5 +13,5 @@ _SUBDIRS += mp12
 _SUBDIRS += mp13
 _SUBDIRS += mp14
 
-include $(top_srcdir)/../../../testsuites/automake/subdirs.am
-include $(top_srcdir)/../../../testsuites/automake/local.am
+include $(top_srcdir)/../automake/subdirs.am
+include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/ada/mptests/mp01/Makefile.am b/testsuites/ada/mptests/mp01/Makefile.am
new file mode 100644
index 0000000000..d1dad5313a
--- /dev/null
+++ b/testsuites/ada/mptests/mp01/Makefile.am
@@ -0,0 +1,4 @@
+_SUBDIRS = node1 node2
+
+include $(top_srcdir)/../automake/subdirs.am
+include $(top_srcdir)/../automake/local.am
diff --git a/c/src/ada-tests/mptests/mp01/config_base.h b/testsuites/ada/mptests/mp01/config_base.h
index c1b8f24e86..c1b8f24e86 100644
--- a/c/src/ada-tests/mptests/mp01/config_base.h
+++ b/testsuites/ada/mptests/mp01/config_base.h
diff --git a/c/src/ada-tests/mptests/mp01/mp01.adb b/testsuites/ada/mptests/mp01/mp01.adb
index 6e89f9306d..6e89f9306d 100644
--- a/c/src/ada-tests/mptests/mp01/mp01.adb
+++ b/testsuites/ada/mptests/mp01/mp01.adb
diff --git a/c/src/ada-tests/mptests/mp01/mptest.adb b/testsuites/ada/mptests/mp01/mptest.adb
index b76a1af8dc..b76a1af8dc 100644
--- a/c/src/ada-tests/mptests/mp01/mptest.adb
+++ b/testsuites/ada/mptests/mp01/mptest.adb
diff --git a/c/src/ada-tests/mptests/mp01/mptest.ads b/testsuites/ada/mptests/mp01/mptest.ads
index 81f004a8e3..81f004a8e3 100644
--- a/c/src/ada-tests/mptests/mp01/mptest.ads
+++ b/testsuites/ada/mptests/mp01/mptest.ads
diff --git a/c/src/ada-tests/mptests/mp01/node1/Makefile.am b/testsuites/ada/mptests/mp01/node1/Makefile.am
index 9a8744105d..154504ae33 100644
--- a/c/src/ada-tests/mptests/mp01/node1/Makefile.am
+++ b/testsuites/ada/mptests/mp01/node1/Makefile.am
@@ -1,5 +1,5 @@
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-include $(top_srcdir)/../../../testsuites/automake/compile.am
+include $(top_srcdir)/../automake/compile.am
 
 include $(top_srcdir)/ada.am
 
@@ -16,4 +16,4 @@ mp01_ada_mp01_node1$(EXEEXT): mp01_node1.adb ../mptest.adb init.$(OBJEXT)
 scndir = $(rtems_ada_testsdir)
 dist_scn_DATA = ada_mp01-node1.scn
 
-include $(top_srcdir)/../../../testsuites/automake/local.am
+include $(top_srcdir)/../automake/local.am
diff --git a/c/src/ada-tests/mptests/mp01/node1/ada_mp01-node1.scn b/testsuites/ada/mptests/mp01/node1/ada_mp01-node1.scn
index d7495bfa0d..d7495bfa0d 100644
--- a/c/src/ada-tests/mptests/mp01/node1/ada_mp01-node1.scn
+++ b/testsuites/ada/mptests/mp01/node1/ada_mp01-node1.scn
diff --git a/c/src/ada-tests/mptests/mp01/node1/config.h b/testsuites/ada/mptests/mp01/node1/config.h
index 36c9d133e8..36c9d133e8 100644
--- a/c/src/ada-tests/mptests/mp01/node1/config.h
+++ b/testsuites/ada/mptests/mp01/node1/config.h
diff --git a/c/src/ada-tests/mptests/mp01/node1/mp01_node1.adb b/testsuites/ada/mptests/mp01/node1/mp01_node1.adb
index c1f54ccd32..c1f54ccd32 100644
--- a/c/src/ada-tests/mptests/mp01/node1/mp01_node1.adb
+++ b/testsuites/ada/mptests/mp01/node1/mp01_node1.adb
diff --git a/c/src/ada-tests/mptests/mp01/node2/Makefile.am b/testsuites/ada/mptests/mp01/node2/Makefile.am
index 1f25556519..a58a210b0c 100644
--- a/c/src/ada-tests/mptests/mp01/node2/Makefile.am
+++ b/testsuites/ada/mptests/mp01/node2/Makefile.am
@@ -1,5 +1,5 @@
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-include $(top_srcdir)/../../../testsuites/automake/compile.am
+include $(top_srcdir)/../automake/compile.am
 
 include $(top_srcdir)/ada.am
 
@@ -16,4 +16,4 @@ mp01_ada_mp01_node2$(EXEEXT): mp01_node2.adb ../mptest.adb init.$(OBJEXT)
 scndir = $(rtems_ada_testsdir)
 dist_scn_DATA = ada_mp01-node2.scn
 
-include $(top_srcdir)/../../../testsuites/automake/local.am
+include $(top_srcdir)/../automake/local.am
diff --git a/c/src/ada-tests/mptests/mp01/node2/ada_mp01-node2.scn b/testsuites/ada/mptests/mp01/node2/ada_mp01-node2.scn
index 98047240f3..98047240f3 100644
--- a/c/src/ada-tests/mptests/mp01/node2/ada_mp01-node2.scn
+++ b/testsuites/ada/mptests/mp01/node2/ada_mp01-node2.scn
diff --git a/c/src/ada-tests/mptests/mp01/node2/config.h b/testsuites/ada/mptests/mp01/node2/config.h
index 47edf66149..47edf66149 100644
--- a/c/src/ada-tests/mptests/mp01/node2/config.h
+++ b/testsuites/ada/mptests/mp01/node2/config.h
diff --git a/c/src/ada-tests/mptests/mp01/node2/mp01_node2.adb b/testsuites/ada/mptests/mp01/node2/mp01_node2.adb
index 380df6c5fd..380df6c5fd 100644
--- a/c/src/ada-tests/mptests/mp01/node2/mp01_node2.adb
+++ b/testsuites/ada/mptests/mp01/node2/mp01_node2.adb
diff --git a/testsuites/ada/mptests/mp03/Makefile.am b/testsuites/ada/mptests/mp03/Makefile.am
new file mode 100644
index 0000000000..d1dad5313a
--- /dev/null
+++ b/testsuites/ada/mptests/mp03/Makefile.am
@@ -0,0 +1,4 @@
+_SUBDIRS = node1 node2
+
+include $(top_srcdir)/../automake/subdirs.am
+include $(top_srcdir)/../automake/local.am
diff --git a/c/src/ada-tests/mptests/mp03/config_base.h b/testsuites/ada/mptests/mp03/config_base.h
index c1b8f24e86..c1b8f24e86 100644
--- a/c/src/ada-tests/mptests/mp03/config_base.h
+++ b/testsuites/ada/mptests/mp03/config_base.h
diff --git a/c/src/ada-tests/mptests/mp03/mptest.adb b/testsuites/ada/mptests/mp03/mptest.adb
index 170b62fd5d..170b62fd5d 100644
--- a/c/src/ada-tests/mptests/mp03/mptest.adb
+++ b/testsuites/ada/mptests/mp03/mptest.adb
diff --git a/c/src/ada-tests/mptests/mp03/mptest.ads b/testsuites/ada/mptests/mp03/mptest.ads
index 6e7f59947e..6e7f59947e 100644
--- a/c/src/ada-tests/mptests/mp03/mptest.ads
+++ b/testsuites/ada/mptests/mp03/mptest.ads
diff --git a/c/src/ada-tests/mptests/mp03/node1/Makefile.am b/testsuites/ada/mptests/mp03/node1/Makefile.am
index 859fdb3702..5c9b6f67ac 100644
--- a/c/src/ada-tests/mptests/mp03/node1/Makefile.am
+++ b/testsuites/ada/mptests/mp03/node1/Makefile.am
@@ -1,5 +1,5 @@
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-include $(top_srcdir)/../../../testsuites/automake/compile.am
+include $(top_srcdir)/../automake/compile.am
 
 include $(top_srcdir)/ada.am
 
@@ -16,4 +16,4 @@ mp03_ada_mp03_node1$(EXEEXT): mp03_node1.adb ../mptest.adb init.$(OBJEXT)
 scndir = $(rtems_ada_testsdir)
 dist_scn_DATA = ada_mp03-node1.scn
 
-include $(top_srcdir)/../../../testsuites/automake/local.am
+include $(top_srcdir)/../automake/local.am
diff --git a/c/src/ada-tests/mptests/mp03/node1/ada_mp03-node1.scn b/testsuites/ada/mptests/mp03/node1/ada_mp03-node1.scn
index d749db49e2..d749db49e2 100644
--- a/c/src/ada-tests/mptests/mp03/node1/ada_mp03-node1.scn
+++ b/testsuites/ada/mptests/mp03/node1/ada_mp03-node1.scn
diff --git a/c/src/ada-tests/mptests/mp03/node1/config.h b/testsuites/ada/mptests/mp03/node1/config.h
index 36c9d133e8..36c9d133e8 100644
--- a/c/src/ada-tests/mptests/mp03/node1/config.h
+++ b/testsuites/ada/mptests/mp03/node1/config.h
diff --git a/c/src/ada-tests/mptests/mp03/node1/mp03_node1.adb b/testsuites/ada/mptests/mp03/node1/mp03_node1.adb
index 80a67ffc94..80a67ffc94 100644
--- a/c/src/ada-tests/mptests/mp03/node1/mp03_node1.adb
+++ b/testsuites/ada/mptests/mp03/node1/mp03_node1.adb
diff --git a/c/src/ada-tests/mptests/mp03/node2/Makefile.am b/testsuites/ada/mptests/mp03/node2/Makefile.am
index b7088eb4a7..bf8b5446d6 100644
--- a/c/src/ada-tests/mptests/mp03/node2/Makefile.am
+++ b/testsuites/ada/mptests/mp03/node2/Makefile.am
@@ -1,5 +1,5 @@
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-include $(top_srcdir)/../../../testsuites/automake/compile.am
+include $(top_srcdir)/../automake/compile.am
 
 include $(top_srcdir)/ada.am
 
@@ -16,4 +16,4 @@ mp03_ada_mp03_node2$(EXEEXT): mp03_node2.adb ../mptest.adb init.$(OBJEXT)
 scndir = $(rtems_ada_testsdir)
 dist_scn_DATA = ada_mp03-node2.scn
 
-include $(top_srcdir)/../../../testsuites/automake/local.am
+include $(top_srcdir)/../automake/local.am
diff --git a/c/src/ada-tests/mptests/mp03/node2/ada_mp03-node2.scn b/testsuites/ada/mptests/mp03/node2/ada_mp03-node2.scn
index 56298f5b8d..56298f5b8d 100644
--- a/c/src/ada-tests/mptests/mp03/node2/ada_mp03-node2.scn
+++ b/testsuites/ada/mptests/mp03/node2/ada_mp03-node2.scn
diff --git a/c/src/ada-tests/mptests/mp03/node2/config.h b/testsuites/ada/mptests/mp03/node2/config.h
index 47edf66149..47edf66149 100644
--- a/c/src/ada-tests/mptests/mp03/node2/config.h
+++ b/testsuites/ada/mptests/mp03/node2/config.h
diff --git a/c/src/ada-tests/mptests/mp03/node2/mp03_node2.adb b/testsuites/ada/mptests/mp03/node2/mp03_node2.adb
index aec5b91edd..aec5b91edd 100644
--- a/c/src/ada-tests/mptests/mp03/node2/mp03_node2.adb
+++ b/testsuites/ada/mptests/mp03/node2/mp03_node2.adb
diff --git a/testsuites/ada/mptests/mp04/Makefile.am b/testsuites/ada/mptests/mp04/Makefile.am
new file mode 100644
index 0000000000..d1dad5313a
--- /dev/null
+++ b/testsuites/ada/mptests/mp04/Makefile.am
@@ -0,0 +1,4 @@
+_SUBDIRS = node1 node2
+
+include $(top_srcdir)/../automake/subdirs.am
+include $(top_srcdir)/../automake/local.am
diff --git a/c/src/ada-tests/mptests/mp04/config_base.h b/testsuites/ada/mptests/mp04/config_base.h
index c1b8f24e86..c1b8f24e86 100644
--- a/c/src/ada-tests/mptests/mp04/config_base.h
+++ b/testsuites/ada/mptests/mp04/config_base.h
diff --git a/c/src/ada-tests/mptests/mp04/mptest.adb b/testsuites/ada/mptests/mp04/mptest.adb
index a7a2bdd3ea..a7a2bdd3ea 100644
--- a/c/src/ada-tests/mptests/mp04/mptest.adb
+++ b/testsuites/ada/mptests/mp04/mptest.adb
diff --git a/c/src/ada-tests/mptests/mp04/mptest.ads b/testsuites/ada/mptests/mp04/mptest.ads
index ddf2c82878..ddf2c82878 100644
--- a/c/src/ada-tests/mptests/mp04/mptest.ads
+++ b/testsuites/ada/mptests/mp04/mptest.ads
diff --git a/c/src/ada-tests/mptests/mp04/node1/Makefile.am b/testsuites/ada/mptests/mp04/node1/Makefile.am
index 221ec1a2b8..633209a092 100644
--- a/c/src/ada-tests/mptests/mp04/node1/Makefile.am
+++ b/testsuites/ada/mptests/mp04/node1/Makefile.am
@@ -1,5 +1,5 @@
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-include $(top_srcdir)/../../../testsuites/automake/compile.am
+include $(top_srcdir)/../automake/compile.am
 
 include $(top_srcdir)/ada.am
 
@@ -16,4 +16,4 @@ mp04_ada_mp04_node1$(EXEEXT): mp04_node1.adb ../mptest.adb init.$(OBJEXT)
 scndir = $(rtems_ada_testsdir)
 dist_scn_DATA = ada_mp04-node1.scn
 
-include $(top_srcdir)/../../../testsuites/automake/local.am
+include $(top_srcdir)/../automake/local.am
diff --git a/c/src/ada-tests/mptests/mp04/node1/ada_mp04-node1.scn b/testsuites/ada/mptests/mp04/node1/ada_mp04-node1.scn
index e9518f3ac2..e9518f3ac2 100644
--- a/c/src/ada-tests/mptests/mp04/node1/ada_mp04-node1.scn
+++ b/testsuites/ada/mptests/mp04/node1/ada_mp04-node1.scn
diff --git a/c/src/ada-tests/mptests/mp04/node1/config.h b/testsuites/ada/mptests/mp04/node1/config.h
index 36c9d133e8..36c9d133e8 100644
--- a/c/src/ada-tests/mptests/mp04/node1/config.h
+++ b/testsuites/ada/mptests/mp04/node1/config.h
diff --git a/c/src/ada-tests/mptests/mp04/node1/mp04_node1.adb b/testsuites/ada/mptests/mp04/node1/mp04_node1.adb
index c88c019992..c88c019992 100644
--- a/c/src/ada-tests/mptests/mp04/node1/mp04_node1.adb
+++ b/testsuites/ada/mptests/mp04/node1/mp04_node1.adb
diff --git a/c/src/ada-tests/mptests/mp04/node2/Makefile.am b/testsuites/ada/mptests/mp04/node2/Makefile.am
index 377564a460..cce97cd2a2 100644
--- a/c/src/ada-tests/mptests/mp04/node2/Makefile.am
+++ b/testsuites/ada/mptests/mp04/node2/Makefile.am
@@ -1,5 +1,5 @@
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-include $(top_srcdir)/../../../testsuites/automake/compile.am
+include $(top_srcdir)/../automake/compile.am
 
 include $(top_srcdir)/ada.am
 
@@ -16,4 +16,4 @@ mp04_ada_mp04_node2$(EXEEXT): mp04_node2.adb ../mptest.adb init.$(OBJEXT)
 scndir = $(rtems_ada_testsdir)
 dist_scn_DATA = ada_mp04-node2.scn
 
-include $(top_srcdir)/../../../testsuites/automake/local.am
+include $(top_srcdir)/../automake/local.am
diff --git a/c/src/ada-tests/mptests/mp04/node2/ada_mp04-node2.scn b/testsuites/ada/mptests/mp04/node2/ada_mp04-node2.scn
index 8ccfcfef79..8ccfcfef79 100644
--- a/c/src/ada-tests/mptests/mp04/node2/ada_mp04-node2.scn
+++ b/testsuites/ada/mptests/mp04/node2/ada_mp04-node2.scn
diff --git a/c/src/ada-tests/mptests/mp04/node2/config.h b/testsuites/ada/mptests/mp04/node2/config.h
index 47edf66149..47edf66149 100644
--- a/c/src/ada-tests/mptests/mp04/node2/config.h
+++ b/testsuites/ada/mptests/mp04/node2/config.h
diff --git a/c/src/ada-tests/mptests/mp04/node2/mp04_node2.adb b/testsuites/ada/mptests/mp04/node2/mp04_node2.adb
index 4cd9f0e3b3..4cd9f0e3b3 100644
--- a/c/src/ada-tests/mptests/mp04/node2/mp04_node2.adb
+++ b/testsuites/ada/mptests/mp04/node2/mp04_node2.adb
diff --git a/testsuites/ada/mptests/mp05/Makefile.am b/testsuites/ada/mptests/mp05/Makefile.am
new file mode 100644
index 0000000000..d1dad5313a
--- /dev/null
+++ b/testsuites/ada/mptests/mp05/Makefile.am
@@ -0,0 +1,4 @@
+_SUBDIRS = node1 node2
+
+include $(top_srcdir)/../automake/subdirs.am
+include $(top_srcdir)/../automake/local.am
diff --git a/c/src/ada-tests/mptests/mp05/config_base.h b/testsuites/ada/mptests/mp05/config_base.h
index c1b8f24e86..c1b8f24e86 100644
--- a/c/src/ada-tests/mptests/mp05/config_base.h
+++ b/testsuites/ada/mptests/mp05/config_base.h
diff --git a/c/src/ada-tests/mptests/mp05/mptest.adb b/testsuites/ada/mptests/mp05/mptest.adb
index a206b80b85..a206b80b85 100644
--- a/c/src/ada-tests/mptests/mp05/mptest.adb
+++ b/testsuites/ada/mptests/mp05/mptest.adb
diff --git a/c/src/ada-tests/mptests/mp05/mptest.ads b/testsuites/ada/mptests/mp05/mptest.ads
index 13d5ced1d6..13d5ced1d6 100644
--- a/c/src/ada-tests/mptests/mp05/mptest.ads
+++ b/testsuites/ada/mptests/mp05/mptest.ads
diff --git a/c/src/ada-tests/mptests/mp05/node1/Makefile.am b/testsuites/ada/mptests/mp05/node1/Makefile.am
index be025c259b..669235ea2d 100644
--- a/c/src/ada-tests/mptests/mp05/node1/Makefile.am
+++ b/testsuites/ada/mptests/mp05/node1/Makefile.am
@@ -1,5 +1,5 @@
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-include $(top_srcdir)/../../../testsuites/automake/compile.am
+include $(top_srcdir)/../automake/compile.am
 
 include $(top_srcdir)/ada.am
 
@@ -16,4 +16,4 @@ mp05_ada_mp05_node1$(EXEEXT): mp05_node1.adb ../mptest.adb init.$(OBJEXT)
 scndir = $(rtems_ada_testsdir)
 dist_scn_DATA = ada_mp05-node1.scn
 
-include $(top_srcdir)/../../../testsuites/automake/local.am
+include $(top_srcdir)/../automake/local.am
diff --git a/c/src/ada-tests/mptests/mp05/node1/ada_mp05-node1.scn b/testsuites/ada/mptests/mp05/node1/ada_mp05-node1.scn
index 6f0ea4b639..6f0ea4b639 100644
--- a/c/src/ada-tests/mptests/mp05/node1/ada_mp05-node1.scn
+++ b/testsuites/ada/mptests/mp05/node1/ada_mp05-node1.scn
diff --git a/c/src/ada-tests/mptests/mp05/node1/config.h b/testsuites/ada/mptests/mp05/node1/config.h
index 36c9d133e8..36c9d133e8 100644
--- a/c/src/ada-tests/mptests/mp05/node1/config.h
+++ b/testsuites/ada/mptests/mp05/node1/config.h
diff --git a/c/src/ada-tests/mptests/mp05/node1/mp05_node1.adb b/testsuites/ada/mptests/mp05/node1/mp05_node1.adb
index 529406450b..529406450b 100644
--- a/c/src/ada-tests/mptests/mp05/node1/mp05_node1.adb
+++ b/testsuites/ada/mptests/mp05/node1/mp05_node1.adb
diff --git a/c/src/ada-tests/mptests/mp05/node2/Makefile.am b/testsuites/ada/mptests/mp05/node2/Makefile.am
index 8f4be962ff..15de8d5810 100644
--- a/c/src/ada-tests/mptests/mp05/node2/Makefile.am
+++ b/testsuites/ada/mptests/mp05/node2/Makefile.am
@@ -1,5 +1,5 @@
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-include $(top_srcdir)/../../../testsuites/automake/compile.am
+include $(top_srcdir)/../automake/compile.am
 
 include $(top_srcdir)/ada.am
 
@@ -16,4 +16,4 @@ mp05_ada_mp05_node2$(EXEEXT): mp05_node2.adb ../mptest.adb init.$(OBJEXT)
 scndir = $(rtems_ada_testsdir)
 dist_scn_DATA = ada_mp05-node2.scn
 
-include $(top_srcdir)/../../../testsuites/automake/local.am
+include $(top_srcdir)/../automake/local.am
diff --git a/c/src/ada-tests/mptests/mp05/node2/ada_mp05-node2.scn b/testsuites/ada/mptests/mp05/node2/ada_mp05-node2.scn
index 1fb18c132b..1fb18c132b 100644
--- a/c/src/ada-tests/mptests/mp05/node2/ada_mp05-node2.scn
+++ b/testsuites/ada/mptests/mp05/node2/ada_mp05-node2.scn
diff --git a/c/src/ada-tests/mptests/mp05/node2/config.h b/testsuites/ada/mptests/mp05/node2/config.h
index 47edf66149..47edf66149 100644
--- a/c/src/ada-tests/mptests/mp05/node2/config.h
+++ b/testsuites/ada/mptests/mp05/node2/config.h
diff --git a/c/src/ada-tests/mptests/mp05/node2/mp05_node2.adb b/testsuites/ada/mptests/mp05/node2/mp05_node2.adb
index faa4aa2266..faa4aa2266 100644
--- a/c/src/ada-tests/mptests/mp05/node2/mp05_node2.adb
+++ b/testsuites/ada/mptests/mp05/node2/mp05_node2.adb
diff --git a/testsuites/ada/mptests/mp06/Makefile.am b/testsuites/ada/mptests/mp06/Makefile.am
new file mode 100644
index 0000000000..d1dad5313a
--- /dev/null
+++ b/testsuites/ada/mptests/mp06/Makefile.am
@@ -0,0 +1,4 @@
+_SUBDIRS = node1 node2
+
+include $(top_srcdir)/../automake/subdirs.am
+include $(top_srcdir)/../automake/local.am
diff --git a/c/src/ada-tests/mptests/mp06/config_base.h b/testsuites/ada/mptests/mp06/config_base.h
index c1b8f24e86..c1b8f24e86 100644
--- a/c/src/ada-tests/mptests/mp06/config_base.h
+++ b/testsuites/ada/mptests/mp06/config_base.h
diff --git a/c/src/ada-tests/mptests/mp06/mptest.adb b/testsuites/ada/mptests/mp06/mptest.adb
index d4522e653b..d4522e653b 100644
--- a/c/src/ada-tests/mptests/mp06/mptest.adb
+++ b/testsuites/ada/mptests/mp06/mptest.adb
diff --git a/c/src/ada-tests/mptests/mp06/mptest.ads b/testsuites/ada/mptests/mp06/mptest.ads
index 5c3668d3ac..5c3668d3ac 100644
--- a/c/src/ada-tests/mptests/mp06/mptest.ads
+++ b/testsuites/ada/mptests/mp06/mptest.ads
diff --git a/c/src/ada-tests/mptests/mp06/node1/Makefile.am b/testsuites/ada/mptests/mp06/node1/Makefile.am
index d5e2cd3671..45bde9a044 100644
--- a/c/src/ada-tests/mptests/mp06/node1/Makefile.am
+++ b/testsuites/ada/mptests/mp06/node1/Makefile.am
@@ -1,5 +1,5 @@
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-include $(top_srcdir)/../../../testsuites/automake/compile.am
+include $(top_srcdir)/../automake/compile.am
 
 include $(top_srcdir)/ada.am
 
@@ -16,4 +16,4 @@ mp06_ada_mp06_node1$(EXEEXT): mp06_node1.adb ../mptest.adb init.$(OBJEXT)
 scndir = $(rtems_ada_testsdir)
 dist_scn_DATA = ada_mp06-node1.scn
 
-include $(top_srcdir)/../../../testsuites/automake/local.am
+include $(top_srcdir)/../automake/local.am
diff --git a/c/src/ada-tests/mptests/mp06/node1/ada_mp06-node1.scn b/testsuites/ada/mptests/mp06/node1/ada_mp06-node1.scn
index 71da651eca..71da651eca 100644
--- a/c/src/ada-tests/mptests/mp06/node1/ada_mp06-node1.scn
+++ b/testsuites/ada/mptests/mp06/node1/ada_mp06-node1.scn
diff --git a/c/src/ada-tests/mptests/mp06/node1/config.h b/testsuites/ada/mptests/mp06/node1/config.h
index 36c9d133e8..36c9d133e8 100644
--- a/c/src/ada-tests/mptests/mp06/node1/config.h
+++ b/testsuites/ada/mptests/mp06/node1/config.h
diff --git a/c/src/ada-tests/mptests/mp06/node1/mp06_node1.adb b/testsuites/ada/mptests/mp06/node1/mp06_node1.adb
index ebde32ca1c..ebde32ca1c 100644
--- a/c/src/ada-tests/mptests/mp06/node1/mp06_node1.adb
+++ b/testsuites/ada/mptests/mp06/node1/mp06_node1.adb
diff --git a/c/src/ada-tests/mptests/mp06/node2/Makefile.am b/testsuites/ada/mptests/mp06/node2/Makefile.am
index 47c3d13d67..e16512e279 100644
--- a/c/src/ada-tests/mptests/mp06/node2/Makefile.am
+++ b/testsuites/ada/mptests/mp06/node2/Makefile.am
@@ -1,5 +1,5 @@
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-include $(top_srcdir)/../../../testsuites/automake/compile.am
+include $(top_srcdir)/../automake/compile.am
 
 include $(top_srcdir)/ada.am
 
@@ -16,4 +16,4 @@ mp06_ada_mp06_node2$(EXEEXT): mp06_node2.adb ../mptest.adb init.$(OBJEXT)
 scndir = $(rtems_ada_testsdir)
 dist_scn_DATA = ada_mp06-node2.scn
 
-include $(top_srcdir)/../../../testsuites/automake/local.am
+include $(top_srcdir)/../automake/local.am
diff --git a/c/src/ada-tests/mptests/mp06/node2/ada_mp06-node2.scn b/testsuites/ada/mptests/mp06/node2/ada_mp06-node2.scn
index da449041b4..da449041b4 100644
--- a/c/src/ada-tests/mptests/mp06/node2/ada_mp06-node2.scn
+++ b/testsuites/ada/mptests/mp06/node2/ada_mp06-node2.scn
diff --git a/c/src/ada-tests/mptests/mp06/node2/config.h b/testsuites/ada/mptests/mp06/node2/config.h
index 47edf66149..47edf66149 100644
--- a/c/src/ada-tests/mptests/mp06/node2/config.h
+++ b/testsuites/ada/mptests/mp06/node2/config.h
diff --git a/c/src/ada-tests/mptests/mp06/node2/mp06_node2.adb b/testsuites/ada/mptests/mp06/node2/mp06_node2.adb
index 3637d8827e..3637d8827e 100644
--- a/c/src/ada-tests/mptests/mp06/node2/mp06_node2.adb
+++ b/testsuites/ada/mptests/mp06/node2/mp06_node2.adb
diff --git a/testsuites/ada/mptests/mp07/Makefile.am b/testsuites/ada/mptests/mp07/Makefile.am
new file mode 100644
index 0000000000..d1dad5313a
--- /dev/null
+++ b/testsuites/ada/mptests/mp07/Makefile.am
@@ -0,0 +1,4 @@
+_SUBDIRS = node1 node2
+
+include $(top_srcdir)/../automake/subdirs.am
+include $(top_srcdir)/../automake/local.am
diff --git a/c/src/ada-tests/mptests/mp07/config_base.h b/testsuites/ada/mptests/mp07/config_base.h
index c1b8f24e86..c1b8f24e86 100644
--- a/c/src/ada-tests/mptests/mp07/config_base.h
+++ b/testsuites/ada/mptests/mp07/config_base.h
diff --git a/c/src/ada-tests/mptests/mp07/mptest.adb b/testsuites/ada/mptests/mp07/mptest.adb
index 20dbc9cd84..20dbc9cd84 100644
--- a/c/src/ada-tests/mptests/mp07/mptest.adb
+++ b/testsuites/ada/mptests/mp07/mptest.adb
diff --git a/c/src/ada-tests/mptests/mp07/mptest.ads b/testsuites/ada/mptests/mp07/mptest.ads
index 499628b5d0..499628b5d0 100644
--- a/c/src/ada-tests/mptests/mp07/mptest.ads
+++ b/testsuites/ada/mptests/mp07/mptest.ads
diff --git a/c/src/ada-tests/mptests/mp07/node1/Makefile.am b/testsuites/ada/mptests/mp07/node1/Makefile.am
index 540e28f956..c6b77cd1e3 100644
--- a/c/src/ada-tests/mptests/mp07/node1/Makefile.am
+++ b/testsuites/ada/mptests/mp07/node1/Makefile.am
@@ -1,5 +1,5 @@
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-include $(top_srcdir)/../../../testsuites/automake/compile.am
+include $(top_srcdir)/../automake/compile.am
 
 include $(top_srcdir)/ada.am
 
@@ -16,4 +16,4 @@ mp07_ada_mp07_node1$(EXEEXT): mp07_node1.adb ../mptest.adb init.$(OBJEXT)
 scndir = $(rtems_ada_testsdir)
 dist_scn_DATA = ada_mp07-node1.scn
 
-include $(top_srcdir)/../../../testsuites/automake/local.am
+include $(top_srcdir)/../automake/local.am
diff --git a/c/src/ada-tests/mptests/mp07/node1/ada_mp07-node1.scn b/testsuites/ada/mptests/mp07/node1/ada_mp07-node1.scn
index 71e0956329..71e0956329 100644
--- a/c/src/ada-tests/mptests/mp07/node1/ada_mp07-node1.scn
+++ b/testsuites/ada/mptests/mp07/node1/ada_mp07-node1.scn
diff --git a/c/src/ada-tests/mptests/mp07/node1/config.h b/testsuites/ada/mptests/mp07/node1/config.h
index 36c9d133e8..36c9d133e8 100644
--- a/c/src/ada-tests/mptests/mp07/node1/config.h
+++ b/testsuites/ada/mptests/mp07/node1/config.h
diff --git a/c/src/ada-tests/mptests/mp07/node1/mp07_node1.adb b/testsuites/ada/mptests/mp07/node1/mp07_node1.adb
index a6d9ef4db0..a6d9ef4db0 100644
--- a/c/src/ada-tests/mptests/mp07/node1/mp07_node1.adb
+++ b/testsuites/ada/mptests/mp07/node1/mp07_node1.adb
diff --git a/c/src/ada-tests/mptests/mp07/node2/Makefile.am b/testsuites/ada/mptests/mp07/node2/Makefile.am
index 9ef989f01f..95e310850d 100644
--- a/c/src/ada-tests/mptests/mp07/node2/Makefile.am
+++ b/testsuites/ada/mptests/mp07/node2/Makefile.am
@@ -1,5 +1,5 @@
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-include $(top_srcdir)/../../../testsuites/automake/compile.am
+include $(top_srcdir)/../automake/compile.am
 
 include $(top_srcdir)/ada.am
 
@@ -16,4 +16,4 @@ mp07_ada_mp07_node2$(EXEEXT): mp07_node2.adb ../mptest.adb init.$(OBJEXT)
 scndir = $(rtems_ada_testsdir)
 dist_scn_DATA = ada_mp07-node2.scn
 
-include $(top_srcdir)/../../../testsuites/automake/local.am
+include $(top_srcdir)/../automake/local.am
diff --git a/c/src/ada-tests/mptests/mp07/node2/ada_mp07-node2.scn b/testsuites/ada/mptests/mp07/node2/ada_mp07-node2.scn
index c31011e85c..c31011e85c 100644
--- a/c/src/ada-tests/mptests/mp07/node2/ada_mp07-node2.scn
+++ b/testsuites/ada/mptests/mp07/node2/ada_mp07-node2.scn
diff --git a/c/src/ada-tests/mptests/mp07/node2/config.h b/testsuites/ada/mptests/mp07/node2/config.h
index 47edf66149..47edf66149 100644
--- a/c/src/ada-tests/mptests/mp07/node2/config.h
+++ b/testsuites/ada/mptests/mp07/node2/config.h
diff --git a/c/src/ada-tests/mptests/mp07/node2/mp07_node2.adb b/testsuites/ada/mptests/mp07/node2/mp07_node2.adb
index 0e0db0bbdd..0e0db0bbdd 100644
--- a/c/src/ada-tests/mptests/mp07/node2/mp07_node2.adb
+++ b/testsuites/ada/mptests/mp07/node2/mp07_node2.adb
diff --git a/testsuites/ada/mptests/mp08/Makefile.am b/testsuites/ada/mptests/mp08/Makefile.am
new file mode 100644
index 0000000000..d1dad5313a
--- /dev/null
+++ b/testsuites/ada/mptests/mp08/Makefile.am
@@ -0,0 +1,4 @@
+_SUBDIRS = node1 node2
+
+include $(top_srcdir)/../automake/subdirs.am
+include $(top_srcdir)/../automake/local.am
diff --git a/c/src/ada-tests/mptests/mp08/config_base.h b/testsuites/ada/mptests/mp08/config_base.h
index c1b8f24e86..c1b8f24e86 100644
--- a/c/src/ada-tests/mptests/mp08/config_base.h
+++ b/testsuites/ada/mptests/mp08/config_base.h
diff --git a/c/src/ada-tests/mptests/mp08/mptest.adb b/testsuites/ada/mptests/mp08/mptest.adb
index 2910ec83e7..2910ec83e7 100644
--- a/c/src/ada-tests/mptests/mp08/mptest.adb
+++ b/testsuites/ada/mptests/mp08/mptest.adb
diff --git a/c/src/ada-tests/mptests/mp08/mptest.ads b/testsuites/ada/mptests/mp08/mptest.ads
index 07df76322e..07df76322e 100644
--- a/c/src/ada-tests/mptests/mp08/mptest.ads
+++ b/testsuites/ada/mptests/mp08/mptest.ads
diff --git a/c/src/ada-tests/mptests/mp08/node1/Makefile.am b/testsuites/ada/mptests/mp08/node1/Makefile.am
index 4e007f25a9..be1b6ce643 100644
--- a/c/src/ada-tests/mptests/mp08/node1/Makefile.am
+++ b/testsuites/ada/mptests/mp08/node1/Makefile.am
@@ -1,5 +1,5 @@
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-include $(top_srcdir)/../../../testsuites/automake/compile.am
+include $(top_srcdir)/../automake/compile.am
 
 include $(top_srcdir)/ada.am
 
@@ -16,4 +16,4 @@ mp08_ada_mp08_node1$(EXEEXT): mp08_node1.adb ../mptest.adb init.$(OBJEXT)
 scndir = $(rtems_ada_testsdir)
 dist_scn_DATA = ada_mp08-node1.scn
 
-include $(top_srcdir)/../../../testsuites/automake/local.am
+include $(top_srcdir)/../automake/local.am
diff --git a/c/src/ada-tests/mptests/mp08/node1/ada_mp08-node1.scn b/testsuites/ada/mptests/mp08/node1/ada_mp08-node1.scn
index ba9f089e96..ba9f089e96 100644
--- a/c/src/ada-tests/mptests/mp08/node1/ada_mp08-node1.scn
+++ b/testsuites/ada/mptests/mp08/node1/ada_mp08-node1.scn
diff --git a/c/src/ada-tests/mptests/mp08/node1/config.h b/testsuites/ada/mptests/mp08/node1/config.h
index 36c9d133e8..36c9d133e8 100644
--- a/c/src/ada-tests/mptests/mp08/node1/config.h
+++ b/testsuites/ada/mptests/mp08/node1/config.h
diff --git a/c/src/ada-tests/mptests/mp08/node1/mp08_node1.adb b/testsuites/ada/mptests/mp08/node1/mp08_node1.adb
index 75a1a985be..75a1a985be 100644
--- a/c/src/ada-tests/mptests/mp08/node1/mp08_node1.adb
+++ b/testsuites/ada/mptests/mp08/node1/mp08_node1.adb
diff --git a/c/src/ada-tests/mptests/mp08/node2/Makefile.am b/testsuites/ada/mptests/mp08/node2/Makefile.am
index 5a804c32e4..1a3271d713 100644
--- a/c/src/ada-tests/mptests/mp08/node2/Makefile.am
+++ b/testsuites/ada/mptests/mp08/node2/Makefile.am
@@ -1,5 +1,5 @@
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-include $(top_srcdir)/../../../testsuites/automake/compile.am
+include $(top_srcdir)/../automake/compile.am
 
 include $(top_srcdir)/ada.am
 
@@ -16,4 +16,4 @@ mp08_ada_mp08_node2$(EXEEXT): mp08_node2.adb ../mptest.adb init.$(OBJEXT)
 scndir = $(rtems_ada_testsdir)
 dist_scn_DATA = ada_mp08-node2.scn
 
-include $(top_srcdir)/../../../testsuites/automake/local.am
+include $(top_srcdir)/../automake/local.am
diff --git a/c/src/ada-tests/mptests/mp08/node2/ada_mp08-node2.scn b/testsuites/ada/mptests/mp08/node2/ada_mp08-node2.scn
index 8ac712ae93..8ac712ae93 100644
--- a/c/src/ada-tests/mptests/mp08/node2/ada_mp08-node2.scn
+++ b/testsuites/ada/mptests/mp08/node2/ada_mp08-node2.scn
diff --git a/c/src/ada-tests/mptests/mp08/node2/config.h b/testsuites/ada/mptests/mp08/node2/config.h
index 47edf66149..47edf66149 100644
--- a/c/src/ada-tests/mptests/mp08/node2/config.h
+++ b/testsuites/ada/mptests/mp08/node2/config.h
diff --git a/c/src/ada-tests/mptests/mp08/node2/mp08_node2.adb b/testsuites/ada/mptests/mp08/node2/mp08_node2.adb
index 84dd6b5371..84dd6b5371 100644
--- a/c/src/ada-tests/mptests/mp08/node2/mp08_node2.adb
+++ b/testsuites/ada/mptests/mp08/node2/mp08_node2.adb
diff --git a/testsuites/ada/mptests/mp09/Makefile.am b/testsuites/ada/mptests/mp09/Makefile.am
new file mode 100644
index 0000000000..d1dad5313a
--- /dev/null
+++ b/testsuites/ada/mptests/mp09/Makefile.am
@@ -0,0 +1,4 @@
+_SUBDIRS = node1 node2
+
+include $(top_srcdir)/../automake/subdirs.am
+include $(top_srcdir)/../automake/local.am
diff --git a/c/src/ada-tests/mptests/mp09/config_base.h b/testsuites/ada/mptests/mp09/config_base.h
index c1b8f24e86..c1b8f24e86 100644
--- a/c/src/ada-tests/mptests/mp09/config_base.h
+++ b/testsuites/ada/mptests/mp09/config_base.h
diff --git a/c/src/ada-tests/mptests/mp09/mptest.adb b/testsuites/ada/mptests/mp09/mptest.adb
index f68268788d..f68268788d 100644
--- a/c/src/ada-tests/mptests/mp09/mptest.adb
+++ b/testsuites/ada/mptests/mp09/mptest.adb
diff --git a/c/src/ada-tests/mptests/mp09/mptest.ads b/testsuites/ada/mptests/mp09/mptest.ads
index 360aebb491..360aebb491 100644
--- a/c/src/ada-tests/mptests/mp09/mptest.ads
+++ b/testsuites/ada/mptests/mp09/mptest.ads
diff --git a/c/src/ada-tests/mptests/mp09/node1/Makefile.am b/testsuites/ada/mptests/mp09/node1/Makefile.am
index bf40a63d59..54e44188f9 100644
--- a/c/src/ada-tests/mptests/mp09/node1/Makefile.am
+++ b/testsuites/ada/mptests/mp09/node1/Makefile.am
@@ -1,5 +1,5 @@
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-include $(top_srcdir)/../../../testsuites/automake/compile.am
+include $(top_srcdir)/../automake/compile.am
 
 include $(top_srcdir)/ada.am
 
@@ -16,4 +16,4 @@ mp09_ada_mp09_node1$(EXEEXT): mp09_node1.adb ../mptest.adb init.$(OBJEXT)
 scndir = $(rtems_ada_testsdir)
 dist_scn_DATA = ada_mp09-node1.scn
 
-include $(top_srcdir)/../../../testsuites/automake/local.am
+include $(top_srcdir)/../automake/local.am
diff --git a/c/src/ada-tests/mptests/mp09/node1/ada_mp09-node1.scn b/testsuites/ada/mptests/mp09/node1/ada_mp09-node1.scn
index 167d6e18a5..167d6e18a5 100644
--- a/c/src/ada-tests/mptests/mp09/node1/ada_mp09-node1.scn
+++ b/testsuites/ada/mptests/mp09/node1/ada_mp09-node1.scn
diff --git a/c/src/ada-tests/mptests/mp09/node1/config.h b/testsuites/ada/mptests/mp09/node1/config.h
index 36c9d133e8..36c9d133e8 100644
--- a/c/src/ada-tests/mptests/mp09/node1/config.h
+++ b/testsuites/ada/mptests/mp09/node1/config.h
diff --git a/c/src/ada-tests/mptests/mp09/node1/mp09_node1.adb b/testsuites/ada/mptests/mp09/node1/mp09_node1.adb
index df2a6ab344..df2a6ab344 100644
--- a/c/src/ada-tests/mptests/mp09/node1/mp09_node1.adb
+++ b/testsuites/ada/mptests/mp09/node1/mp09_node1.adb
diff --git a/c/src/ada-tests/mptests/mp09/node2/Makefile.am b/testsuites/ada/mptests/mp09/node2/Makefile.am
index b4b631cda2..e2ec626ab1 100644
--- a/c/src/ada-tests/mptests/mp09/node2/Makefile.am
+++ b/testsuites/ada/mptests/mp09/node2/Makefile.am
@@ -1,5 +1,5 @@
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-include $(top_srcdir)/../../../testsuites/automake/compile.am
+include $(top_srcdir)/../automake/compile.am
 
 include $(top_srcdir)/ada.am
 
@@ -16,4 +16,4 @@ mp09_ada_mp09_node2$(EXEEXT): mp09_node2.adb ../mptest.adb init.$(OBJEXT)
 scndir = $(rtems_ada_testsdir)
 dist_scn_DATA = ada_mp09-node2.scn
 
-include $(top_srcdir)/../../../testsuites/automake/local.am
+include $(top_srcdir)/../automake/local.am
diff --git a/c/src/ada-tests/mptests/mp09/node2/ada_mp09-node2.scn b/testsuites/ada/mptests/mp09/node2/ada_mp09-node2.scn
index 4cd8a7bff7..4cd8a7bff7 100644
--- a/c/src/ada-tests/mptests/mp09/node2/ada_mp09-node2.scn
+++ b/testsuites/ada/mptests/mp09/node2/ada_mp09-node2.scn
diff --git a/c/src/ada-tests/mptests/mp09/node2/config.h b/testsuites/ada/mptests/mp09/node2/config.h
index 47edf66149..47edf66149 100644
--- a/c/src/ada-tests/mptests/mp09/node2/config.h
+++ b/testsuites/ada/mptests/mp09/node2/config.h
diff --git a/c/src/ada-tests/mptests/mp09/node2/mp09_node2.adb b/testsuites/ada/mptests/mp09/node2/mp09_node2.adb
index adedcd20c6..adedcd20c6 100644
--- a/c/src/ada-tests/mptests/mp09/node2/mp09_node2.adb
+++ b/testsuites/ada/mptests/mp09/node2/mp09_node2.adb
diff --git a/testsuites/ada/mptests/mp10/Makefile.am b/testsuites/ada/mptests/mp10/Makefile.am
new file mode 100644
index 0000000000..d1dad5313a
--- /dev/null
+++ b/testsuites/ada/mptests/mp10/Makefile.am
@@ -0,0 +1,4 @@
+_SUBDIRS = node1 node2
+
+include $(top_srcdir)/../automake/subdirs.am
+include $(top_srcdir)/../automake/local.am
diff --git a/c/src/ada-tests/mptests/mp10/config_base.h b/testsuites/ada/mptests/mp10/config_base.h
index c1b8f24e86..c1b8f24e86 100644
--- a/c/src/ada-tests/mptests/mp10/config_base.h
+++ b/testsuites/ada/mptests/mp10/config_base.h
diff --git a/c/src/ada-tests/mptests/mp10/mptest.adb b/testsuites/ada/mptests/mp10/mptest.adb
index d773976a3e..d773976a3e 100644
--- a/c/src/ada-tests/mptests/mp10/mptest.adb
+++ b/testsuites/ada/mptests/mp10/mptest.adb
diff --git a/c/src/ada-tests/mptests/mp10/mptest.ads b/testsuites/ada/mptests/mp10/mptest.ads
index 05764ebf0b..05764ebf0b 100644
--- a/c/src/ada-tests/mptests/mp10/mptest.ads
+++ b/testsuites/ada/mptests/mp10/mptest.ads
diff --git a/c/src/ada-tests/mptests/mp10/node1/Makefile.am b/testsuites/ada/mptests/mp10/node1/Makefile.am
index 49a7eadab7..f682f3275e 100644
--- a/c/src/ada-tests/mptests/mp10/node1/Makefile.am
+++ b/testsuites/ada/mptests/mp10/node1/Makefile.am
@@ -1,5 +1,5 @@
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-include $(top_srcdir)/../../../testsuites/automake/compile.am
+include $(top_srcdir)/../automake/compile.am
 
 include $(top_srcdir)/ada.am
 
@@ -16,4 +16,4 @@ mp10_ada_mp10_node1$(EXEEXT): mp10_node1.adb ../mptest.adb init.$(OBJEXT)
 scndir = $(rtems_ada_testsdir)
 dist_scn_DATA = ada_mp10-node1.scn
 
-include $(top_srcdir)/../../../testsuites/automake/local.am
+include $(top_srcdir)/../automake/local.am
diff --git a/c/src/ada-tests/mptests/mp10/node1/ada_mp10-node1.scn b/testsuites/ada/mptests/mp10/node1/ada_mp10-node1.scn
index deeafc0a9a..deeafc0a9a 100644
--- a/c/src/ada-tests/mptests/mp10/node1/ada_mp10-node1.scn
+++ b/testsuites/ada/mptests/mp10/node1/ada_mp10-node1.scn
diff --git a/c/src/ada-tests/mptests/mp10/node1/config.h b/testsuites/ada/mptests/mp10/node1/config.h
index 36c9d133e8..36c9d133e8 100644
--- a/c/src/ada-tests/mptests/mp10/node1/config.h
+++ b/testsuites/ada/mptests/mp10/node1/config.h
diff --git a/c/src/ada-tests/mptests/mp10/node1/mp10_node1.adb b/testsuites/ada/mptests/mp10/node1/mp10_node1.adb
index 9174d74a7d..9174d74a7d 100644
--- a/c/src/ada-tests/mptests/mp10/node1/mp10_node1.adb
+++ b/testsuites/ada/mptests/mp10/node1/mp10_node1.adb
diff --git a/c/src/ada-tests/mptests/mp10/node2/Makefile.am b/testsuites/ada/mptests/mp10/node2/Makefile.am
index 11e8f53b29..cc6335b4e7 100644
--- a/c/src/ada-tests/mptests/mp10/node2/Makefile.am
+++ b/testsuites/ada/mptests/mp10/node2/Makefile.am
@@ -1,5 +1,5 @@
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-include $(top_srcdir)/../../../testsuites/automake/compile.am
+include $(top_srcdir)/../automake/compile.am
 
 include $(top_srcdir)/ada.am
 
@@ -16,4 +16,4 @@ mp10_ada_mp10_node2$(EXEEXT): mp10_node2.adb ../mptest.adb init.$(OBJEXT)
 scndir = $(rtems_ada_testsdir)
 dist_scn_DATA = ada_mp10-node2.scn
 
-include $(top_srcdir)/../../../testsuites/automake/local.am
+include $(top_srcdir)/../automake/local.am
diff --git a/c/src/ada-tests/mptests/mp10/node2/ada_mp10-node2.scn b/testsuites/ada/mptests/mp10/node2/ada_mp10-node2.scn
index c0337fdacf..c0337fdacf 100644
--- a/c/src/ada-tests/mptests/mp10/node2/ada_mp10-node2.scn
+++ b/testsuites/ada/mptests/mp10/node2/ada_mp10-node2.scn
diff --git a/c/src/ada-tests/mptests/mp10/node2/config.h b/testsuites/ada/mptests/mp10/node2/config.h
index 47edf66149..47edf66149 100644
--- a/c/src/ada-tests/mptests/mp10/node2/config.h
+++ b/testsuites/ada/mptests/mp10/node2/config.h
diff --git a/c/src/ada-tests/mptests/mp10/node2/mp10_node2.adb b/testsuites/ada/mptests/mp10/node2/mp10_node2.adb
index ee7bb6bcc8..ee7bb6bcc8 100644
--- a/c/src/ada-tests/mptests/mp10/node2/mp10_node2.adb
+++ b/testsuites/ada/mptests/mp10/node2/mp10_node2.adb
diff --git a/testsuites/ada/mptests/mp11/Makefile.am b/testsuites/ada/mptests/mp11/Makefile.am
new file mode 100644
index 0000000000..d1dad5313a
--- /dev/null
+++ b/testsuites/ada/mptests/mp11/Makefile.am
@@ -0,0 +1,4 @@
+_SUBDIRS = node1 node2
+
+include $(top_srcdir)/../automake/subdirs.am
+include $(top_srcdir)/../automake/local.am
diff --git a/c/src/ada-tests/mptests/mp11/config_base.h b/testsuites/ada/mptests/mp11/config_base.h
index c1b8f24e86..c1b8f24e86 100644
--- a/c/src/ada-tests/mptests/mp11/config_base.h
+++ b/testsuites/ada/mptests/mp11/config_base.h
diff --git a/c/src/ada-tests/mptests/mp11/mptest.adb b/testsuites/ada/mptests/mp11/mptest.adb
index 9ad9f52fca..9ad9f52fca 100644
--- a/c/src/ada-tests/mptests/mp11/mptest.adb
+++ b/testsuites/ada/mptests/mp11/mptest.adb
diff --git a/c/src/ada-tests/mptests/mp11/mptest.ads b/testsuites/ada/mptests/mp11/mptest.ads
index 2899df8e34..2899df8e34 100644
--- a/c/src/ada-tests/mptests/mp11/mptest.ads
+++ b/testsuites/ada/mptests/mp11/mptest.ads
diff --git a/c/src/ada-tests/mptests/mp11/node1/Makefile.am b/testsuites/ada/mptests/mp11/node1/Makefile.am
index e791c4f219..0511699d9f 100644
--- a/c/src/ada-tests/mptests/mp11/node1/Makefile.am
+++ b/testsuites/ada/mptests/mp11/node1/Makefile.am
@@ -1,5 +1,5 @@
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-include $(top_srcdir)/../../../testsuites/automake/compile.am
+include $(top_srcdir)/../automake/compile.am
 
 include $(top_srcdir)/ada.am
 
@@ -16,4 +16,4 @@ mp11_ada_mp11_node1$(EXEEXT): mp11_node1.adb ../mptest.adb init.$(OBJEXT)
 scndir = $(rtems_ada_testsdir)
 dist_scn_DATA = ada_mp11-node1.scn
 
-include $(top_srcdir)/../../../testsuites/automake/local.am
+include $(top_srcdir)/../automake/local.am
diff --git a/c/src/ada-tests/mptests/mp11/node1/ada_mp11-node1.scn b/testsuites/ada/mptests/mp11/node1/ada_mp11-node1.scn
index 013426bf91..013426bf91 100644
--- a/c/src/ada-tests/mptests/mp11/node1/ada_mp11-node1.scn
+++ b/testsuites/ada/mptests/mp11/node1/ada_mp11-node1.scn
diff --git a/c/src/ada-tests/mptests/mp11/node1/config.h b/testsuites/ada/mptests/mp11/node1/config.h
index 36c9d133e8..36c9d133e8 100644
--- a/c/src/ada-tests/mptests/mp11/node1/config.h
+++ b/testsuites/ada/mptests/mp11/node1/config.h
diff --git a/c/src/ada-tests/mptests/mp11/node1/mp11_node1.adb b/testsuites/ada/mptests/mp11/node1/mp11_node1.adb
index 859cbc4ac8..859cbc4ac8 100644
--- a/c/src/ada-tests/mptests/mp11/node1/mp11_node1.adb
+++ b/testsuites/ada/mptests/mp11/node1/mp11_node1.adb
diff --git a/c/src/ada-tests/mptests/mp11/node2/Makefile.am b/testsuites/ada/mptests/mp11/node2/Makefile.am
index a216808867..7055fcc093 100644
--- a/c/src/ada-tests/mptests/mp11/node2/Makefile.am
+++ b/testsuites/ada/mptests/mp11/node2/Makefile.am
@@ -1,5 +1,5 @@
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-include $(top_srcdir)/../../../testsuites/automake/compile.am
+include $(top_srcdir)/../automake/compile.am
 
 include $(top_srcdir)/ada.am
 
@@ -16,4 +16,4 @@ mp11_ada_mp11_node2$(EXEEXT): mp11_node2.adb ../mptest.adb init.$(OBJEXT)
 scndir = $(rtems_ada_testsdir)
 dist_scn_DATA = ada_mp11-node2.scn
 
-include $(top_srcdir)/../../../testsuites/automake/local.am
+include $(top_srcdir)/../automake/local.am
diff --git a/c/src/ada-tests/mptests/mp11/node2/ada_mp11-node2.scn b/testsuites/ada/mptests/mp11/node2/ada_mp11-node2.scn
index 49bd8a3219..49bd8a3219 100644
--- a/c/src/ada-tests/mptests/mp11/node2/ada_mp11-node2.scn
+++ b/testsuites/ada/mptests/mp11/node2/ada_mp11-node2.scn
diff --git a/c/src/ada-tests/mptests/mp11/node2/config.h b/testsuites/ada/mptests/mp11/node2/config.h
index 47edf66149..47edf66149 100644
--- a/c/src/ada-tests/mptests/mp11/node2/config.h
+++ b/testsuites/ada/mptests/mp11/node2/config.h
diff --git a/c/src/ada-tests/mptests/mp11/node2/mp11_node2.adb b/testsuites/ada/mptests/mp11/node2/mp11_node2.adb
index 601b21574b..601b21574b 100644
--- a/c/src/ada-tests/mptests/mp11/node2/mp11_node2.adb
+++ b/testsuites/ada/mptests/mp11/node2/mp11_node2.adb
diff --git a/testsuites/ada/mptests/mp12/Makefile.am b/testsuites/ada/mptests/mp12/Makefile.am
new file mode 100644
index 0000000000..d1dad5313a
--- /dev/null
+++ b/testsuites/ada/mptests/mp12/Makefile.am
@@ -0,0 +1,4 @@
+_SUBDIRS = node1 node2
+
+include $(top_srcdir)/../automake/subdirs.am
+include $(top_srcdir)/../automake/local.am
diff --git a/c/src/ada-tests/mptests/mp12/config_base.h b/testsuites/ada/mptests/mp12/config_base.h
index c1b8f24e86..c1b8f24e86 100644
--- a/c/src/ada-tests/mptests/mp12/config_base.h
+++ b/testsuites/ada/mptests/mp12/config_base.h
diff --git a/c/src/ada-tests/mptests/mp12/mptest.adb b/testsuites/ada/mptests/mp12/mptest.adb
index 74dd2e86bd..74dd2e86bd 100644
--- a/c/src/ada-tests/mptests/mp12/mptest.adb
+++ b/testsuites/ada/mptests/mp12/mptest.adb
diff --git a/c/src/ada-tests/mptests/mp12/mptest.ads b/testsuites/ada/mptests/mp12/mptest.ads
index dd33b558bb..dd33b558bb 100644
--- a/c/src/ada-tests/mptests/mp12/mptest.ads
+++ b/testsuites/ada/mptests/mp12/mptest.ads
diff --git a/c/src/ada-tests/mptests/mp12/node1/Makefile.am b/testsuites/ada/mptests/mp12/node1/Makefile.am
index 22eb8b7ea6..9daa6a0c71 100644
--- a/c/src/ada-tests/mptests/mp12/node1/Makefile.am
+++ b/testsuites/ada/mptests/mp12/node1/Makefile.am
@@ -1,5 +1,5 @@
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-include $(top_srcdir)/../../../testsuites/automake/compile.am
+include $(top_srcdir)/../automake/compile.am
 
 include $(top_srcdir)/ada.am
 
@@ -16,4 +16,4 @@ mp12_ada_mp12_node1$(EXEEXT): mp12_node1.adb ../mptest.adb init.$(OBJEXT)
 scndir = $(rtems_ada_testsdir)
 dist_scn_DATA = ada_mp12-node1.scn
 
-include $(top_srcdir)/../../../testsuites/automake/local.am
+include $(top_srcdir)/../automake/local.am
diff --git a/c/src/ada-tests/mptests/mp12/node1/ada_mp12-node1.scn b/testsuites/ada/mptests/mp12/node1/ada_mp12-node1.scn
index 40646722eb..40646722eb 100644
--- a/c/src/ada-tests/mptests/mp12/node1/ada_mp12-node1.scn
+++ b/testsuites/ada/mptests/mp12/node1/ada_mp12-node1.scn
diff --git a/c/src/ada-tests/mptests/mp12/node1/config.h b/testsuites/ada/mptests/mp12/node1/config.h
index 36c9d133e8..36c9d133e8 100644
--- a/c/src/ada-tests/mptests/mp12/node1/config.h
+++ b/testsuites/ada/mptests/mp12/node1/config.h
diff --git a/c/src/ada-tests/mptests/mp12/node1/mp12_node1.adb b/testsuites/ada/mptests/mp12/node1/mp12_node1.adb
index 04c049cb5d..04c049cb5d 100644
--- a/c/src/ada-tests/mptests/mp12/node1/mp12_node1.adb
+++ b/testsuites/ada/mptests/mp12/node1/mp12_node1.adb
diff --git a/c/src/ada-tests/mptests/mp12/node2/Makefile.am b/testsuites/ada/mptests/mp12/node2/Makefile.am
index 889f100010..b3e8df357c 100644
--- a/c/src/ada-tests/mptests/mp12/node2/Makefile.am
+++ b/testsuites/ada/mptests/mp12/node2/Makefile.am
@@ -1,5 +1,5 @@
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-include $(top_srcdir)/../../../testsuites/automake/compile.am
+include $(top_srcdir)/../automake/compile.am
 
 include $(top_srcdir)/ada.am
 
@@ -16,4 +16,4 @@ mp12_ada_mp12_node2$(EXEEXT): mp12_node2.adb ../mptest.adb init.$(OBJEXT)
 scndir = $(rtems_ada_testsdir)
 dist_scn_DATA = ada_mp12-node2.scn
 
-include $(top_srcdir)/../../../testsuites/automake/local.am
+include $(top_srcdir)/../automake/local.am
diff --git a/c/src/ada-tests/mptests/mp12/node2/ada_mp12-node2.scn b/testsuites/ada/mptests/mp12/node2/ada_mp12-node2.scn
index 2189ae9959..2189ae9959 100644
--- a/c/src/ada-tests/mptests/mp12/node2/ada_mp12-node2.scn
+++ b/testsuites/ada/mptests/mp12/node2/ada_mp12-node2.scn
diff --git a/c/src/ada-tests/mptests/mp12/node2/config.h b/testsuites/ada/mptests/mp12/node2/config.h
index 47edf66149..47edf66149 100644
--- a/c/src/ada-tests/mptests/mp12/node2/config.h
+++ b/testsuites/ada/mptests/mp12/node2/config.h
diff --git a/c/src/ada-tests/mptests/mp12/node2/mp12_node2.adb b/testsuites/ada/mptests/mp12/node2/mp12_node2.adb
index 0f046593d6..0f046593d6 100644
--- a/c/src/ada-tests/mptests/mp12/node2/mp12_node2.adb
+++ b/testsuites/ada/mptests/mp12/node2/mp12_node2.adb
diff --git a/testsuites/ada/mptests/mp13/Makefile.am b/testsuites/ada/mptests/mp13/Makefile.am
new file mode 100644
index 0000000000..d1dad5313a
--- /dev/null
+++ b/testsuites/ada/mptests/mp13/Makefile.am
@@ -0,0 +1,4 @@
+_SUBDIRS = node1 node2
+
+include $(top_srcdir)/../automake/subdirs.am
+include $(top_srcdir)/../automake/local.am
diff --git a/c/src/ada-tests/mptests/mp13/config_base.h b/testsuites/ada/mptests/mp13/config_base.h
index c1b8f24e86..c1b8f24e86 100644
--- a/c/src/ada-tests/mptests/mp13/config_base.h
+++ b/testsuites/ada/mptests/mp13/config_base.h
diff --git a/c/src/ada-tests/mptests/mp13/mptest.adb b/testsuites/ada/mptests/mp13/mptest.adb
index 6dc79ab486..6dc79ab486 100644
--- a/c/src/ada-tests/mptests/mp13/mptest.adb
+++ b/testsuites/ada/mptests/mp13/mptest.adb
diff --git a/c/src/ada-tests/mptests/mp13/mptest.ads b/testsuites/ada/mptests/mp13/mptest.ads
index 8caa2347c9..8caa2347c9 100644
--- a/c/src/ada-tests/mptests/mp13/mptest.ads
+++ b/testsuites/ada/mptests/mp13/mptest.ads
diff --git a/c/src/ada-tests/mptests/mp13/node1/Makefile.am b/testsuites/ada/mptests/mp13/node1/Makefile.am
index aa80acd467..bf641cec25 100644
--- a/c/src/ada-tests/mptests/mp13/node1/Makefile.am
+++ b/testsuites/ada/mptests/mp13/node1/Makefile.am
@@ -1,5 +1,5 @@
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-include $(top_srcdir)/../../../testsuites/automake/compile.am
+include $(top_srcdir)/../automake/compile.am
 
 include $(top_srcdir)/ada.am
 
@@ -16,4 +16,4 @@ mp13_ada_mp13_node1$(EXEEXT): mp13_node1.adb ../mptest.adb init.$(OBJEXT)
 scndir = $(rtems_ada_testsdir)
 dist_scn_DATA = ada_mp13-node1.scn
 
-include $(top_srcdir)/../../../testsuites/automake/local.am
+include $(top_srcdir)/../automake/local.am
diff --git a/c/src/ada-tests/mptests/mp13/node1/ada_mp13-node1.scn b/testsuites/ada/mptests/mp13/node1/ada_mp13-node1.scn
index d3bd11f65e..d3bd11f65e 100644
--- a/c/src/ada-tests/mptests/mp13/node1/ada_mp13-node1.scn
+++ b/testsuites/ada/mptests/mp13/node1/ada_mp13-node1.scn
diff --git a/c/src/ada-tests/mptests/mp13/node1/config.h b/testsuites/ada/mptests/mp13/node1/config.h
index 36c9d133e8..36c9d133e8 100644
--- a/c/src/ada-tests/mptests/mp13/node1/config.h
+++ b/testsuites/ada/mptests/mp13/node1/config.h
diff --git a/c/src/ada-tests/mptests/mp13/node1/mp13_node1.adb b/testsuites/ada/mptests/mp13/node1/mp13_node1.adb
index 561bc67ba5..561bc67ba5 100644
--- a/c/src/ada-tests/mptests/mp13/node1/mp13_node1.adb
+++ b/testsuites/ada/mptests/mp13/node1/mp13_node1.adb
diff --git a/c/src/ada-tests/mptests/mp13/node2/Makefile.am b/testsuites/ada/mptests/mp13/node2/Makefile.am
index c28ec60bb2..95e9798ad7 100644
--- a/c/src/ada-tests/mptests/mp13/node2/Makefile.am
+++ b/testsuites/ada/mptests/mp13/node2/Makefile.am
@@ -1,5 +1,5 @@
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-include $(top_srcdir)/../../../testsuites/automake/compile.am
+include $(top_srcdir)/../automake/compile.am
 
 include $(top_srcdir)/ada.am
 
@@ -16,4 +16,4 @@ mp13_ada_mp13_node2$(EXEEXT): mp13_node2.adb ../mptest.adb init.$(OBJEXT)
 scndir = $(rtems_ada_testsdir)
 dist_scn_DATA = ada_mp13-node2.scn
 
-include $(top_srcdir)/../../../testsuites/automake/local.am
+include $(top_srcdir)/../automake/local.am
diff --git a/c/src/ada-tests/mptests/mp13/node2/ada_mp13-node2.scn b/testsuites/ada/mptests/mp13/node2/ada_mp13-node2.scn
index 3254046292..3254046292 100644
--- a/c/src/ada-tests/mptests/mp13/node2/ada_mp13-node2.scn
+++ b/testsuites/ada/mptests/mp13/node2/ada_mp13-node2.scn
diff --git a/c/src/ada-tests/mptests/mp13/node2/config.h b/testsuites/ada/mptests/mp13/node2/config.h
index 47edf66149..47edf66149 100644
--- a/c/src/ada-tests/mptests/mp13/node2/config.h
+++ b/testsuites/ada/mptests/mp13/node2/config.h
diff --git a/c/src/ada-tests/mptests/mp13/node2/mp13_node2.adb b/testsuites/ada/mptests/mp13/node2/mp13_node2.adb
index e197f5aa12..e197f5aa12 100644
--- a/c/src/ada-tests/mptests/mp13/node2/mp13_node2.adb
+++ b/testsuites/ada/mptests/mp13/node2/mp13_node2.adb
diff --git a/testsuites/ada/mptests/mp14/Makefile.am b/testsuites/ada/mptests/mp14/Makefile.am
new file mode 100644
index 0000000000..d1dad5313a
--- /dev/null
+++ b/testsuites/ada/mptests/mp14/Makefile.am
@@ -0,0 +1,4 @@
+_SUBDIRS = node1 node2
+
+include $(top_srcdir)/../automake/subdirs.am
+include $(top_srcdir)/../automake/local.am
diff --git a/c/src/ada-tests/mptests/mp14/config_base.h b/testsuites/ada/mptests/mp14/config_base.h
index c1b8f24e86..c1b8f24e86 100644
--- a/c/src/ada-tests/mptests/mp14/config_base.h
+++ b/testsuites/ada/mptests/mp14/config_base.h
diff --git a/c/src/ada-tests/mptests/mp14/mptest.adb b/testsuites/ada/mptests/mp14/mptest.adb
index c795dc28bd..c795dc28bd 100644
--- a/c/src/ada-tests/mptests/mp14/mptest.adb
+++ b/testsuites/ada/mptests/mp14/mptest.adb
diff --git a/c/src/ada-tests/mptests/mp14/mptest.ads b/testsuites/ada/mptests/mp14/mptest.ads
index 1cf0b80942..1cf0b80942 100644
--- a/c/src/ada-tests/mptests/mp14/mptest.ads
+++ b/testsuites/ada/mptests/mp14/mptest.ads
diff --git a/c/src/ada-tests/mptests/mp14/node1/Makefile.am b/testsuites/ada/mptests/mp14/node1/Makefile.am
index 0dc8f8be52..6e2a21263f 100644
--- a/c/src/ada-tests/mptests/mp14/node1/Makefile.am
+++ b/testsuites/ada/mptests/mp14/node1/Makefile.am
@@ -1,5 +1,5 @@
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-include $(top_srcdir)/../../../testsuites/automake/compile.am
+include $(top_srcdir)/../automake/compile.am
 
 include $(top_srcdir)/ada.am
 
@@ -16,4 +16,4 @@ mp14_ada_mp14_node1$(EXEEXT): mp14_node1.adb ../mptest.adb init.$(OBJEXT)
 scndir = $(rtems_ada_testsdir)
 dist_scn_DATA = ada_mp14-node1.scn
 
-include $(top_srcdir)/../../../testsuites/automake/local.am
+include $(top_srcdir)/../automake/local.am
diff --git a/c/src/ada-tests/mptests/mp14/node1/ada_mp14-node1.scn b/testsuites/ada/mptests/mp14/node1/ada_mp14-node1.scn
index d1b6feefe9..d1b6feefe9 100644
--- a/c/src/ada-tests/mptests/mp14/node1/ada_mp14-node1.scn
+++ b/testsuites/ada/mptests/mp14/node1/ada_mp14-node1.scn
diff --git a/c/src/ada-tests/mptests/mp14/node1/config.h b/testsuites/ada/mptests/mp14/node1/config.h
index 36c9d133e8..36c9d133e8 100644
--- a/c/src/ada-tests/mptests/mp14/node1/config.h
+++ b/testsuites/ada/mptests/mp14/node1/config.h
diff --git a/c/src/ada-tests/mptests/mp14/node1/mp14_node1.adb b/testsuites/ada/mptests/mp14/node1/mp14_node1.adb
index 766fc5d816..766fc5d816 100644
--- a/c/src/ada-tests/mptests/mp14/node1/mp14_node1.adb
+++ b/testsuites/ada/mptests/mp14/node1/mp14_node1.adb
diff --git a/c/src/ada-tests/mptests/mp14/node2/Makefile.am b/testsuites/ada/mptests/mp14/node2/Makefile.am
index 30d2cf8c3f..b694774c46 100644
--- a/c/src/ada-tests/mptests/mp14/node2/Makefile.am
+++ b/testsuites/ada/mptests/mp14/node2/Makefile.am
@@ -1,5 +1,5 @@
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-include $(top_srcdir)/../../../testsuites/automake/compile.am
+include $(top_srcdir)/../automake/compile.am
 
 include $(top_srcdir)/ada.am
 
@@ -16,4 +16,4 @@ mp14_ada_mp14_node2$(EXEEXT): mp14_node2.adb ../mptest.adb init.$(OBJEXT)
 scndir = $(rtems_ada_testsdir)
 dist_scn_DATA = ada_mp14-node2.scn
 
-include $(top_srcdir)/../../../testsuites/automake/local.am
+include $(top_srcdir)/../automake/local.am
diff --git a/c/src/ada-tests/mptests/mp14/node2/ada_mp14-node2.scn b/testsuites/ada/mptests/mp14/node2/ada_mp14-node2.scn
index a245b11faa..a245b11faa 100644
--- a/c/src/ada-tests/mptests/mp14/node2/ada_mp14-node2.scn
+++ b/testsuites/ada/mptests/mp14/node2/ada_mp14-node2.scn
diff --git a/c/src/ada-tests/mptests/mp14/node2/config.h b/testsuites/ada/mptests/mp14/node2/config.h
index 47edf66149..47edf66149 100644
--- a/c/src/ada-tests/mptests/mp14/node2/config.h
+++ b/testsuites/ada/mptests/mp14/node2/config.h
diff --git a/c/src/ada-tests/mptests/mp14/node2/mp14_node2.adb b/testsuites/ada/mptests/mp14/node2/mp14_node2.adb
index fb92b69554..fb92b69554 100644
--- a/c/src/ada-tests/mptests/mp14/node2/mp14_node2.adb
+++ b/testsuites/ada/mptests/mp14/node2/mp14_node2.adb
diff --git a/c/src/ada-tests/samples/Makefile.am b/testsuites/ada/samples/Makefile.am
index c41a4b4af8..0aa25affad 100644
--- a/c/src/ada-tests/samples/Makefile.am
+++ b/testsuites/ada/samples/Makefile.am
@@ -5,5 +5,5 @@ _SUBDIRS += base_mp
 endif
 DIST_SUBDIRS = hello ticker base_sp base_mp nsecs
 
-include $(top_srcdir)/../../../testsuites/automake/subdirs.am
-include $(top_srcdir)/../../../testsuites/automake/local.am
+include $(top_srcdir)/../automake/subdirs.am
+include $(top_srcdir)/../automake/local.am
diff --git a/c/src/ada-tests/samples/base_mp/Makefile.am b/testsuites/ada/samples/base_mp/Makefile.am
index caf05e5fb0..ed05ebbd72 100644
--- a/c/src/ada-tests/samples/base_mp/Makefile.am
+++ b/testsuites/ada/samples/base_mp/Makefile.am
@@ -1,5 +1,5 @@
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-include $(top_srcdir)/../../../testsuites/automake/compile.am
+include $(top_srcdir)/../automake/compile.am
 
 _SUBDIRS = node1 node2
 #include $(top_srcdir)/ada.am
@@ -17,5 +17,5 @@ _SUBDIRS = node1 node2
 
 #EXTRA_DIST += node2/mptest-per_node_configuration.adb
 
-include $(top_srcdir)/../../../testsuites/automake/subdirs.am
-include $(top_srcdir)/../../../testsuites/automake/local.am
+include $(top_srcdir)/../automake/subdirs.am
+include $(top_srcdir)/../automake/local.am
diff --git a/c/src/ada-tests/samples/base_mp/config.h b/testsuites/ada/samples/base_mp/config.h
index 33c9288f4c..33c9288f4c 100644
--- a/c/src/ada-tests/samples/base_mp/config.h
+++ b/testsuites/ada/samples/base_mp/config.h
diff --git a/c/src/ada-tests/samples/base_mp/mptest.adb b/testsuites/ada/samples/base_mp/mptest.adb
index d4eef0a29f..d4eef0a29f 100644
--- a/c/src/ada-tests/samples/base_mp/mptest.adb
+++ b/testsuites/ada/samples/base_mp/mptest.adb
diff --git a/c/src/ada-tests/samples/base_mp/mptest.ads b/testsuites/ada/samples/base_mp/mptest.ads
index f246b4e0ed..f246b4e0ed 100644
--- a/c/src/ada-tests/samples/base_mp/mptest.ads
+++ b/testsuites/ada/samples/base_mp/mptest.ads
diff --git a/c/src/ada-tests/samples/base_mp/node1/Makefile.am b/testsuites/ada/samples/base_mp/node1/Makefile.am
index 530766541c..c6ec8cd42b 100644
--- a/c/src/ada-tests/samples/base_mp/node1/Makefile.am
+++ b/testsuites/ada/samples/base_mp/node1/Makefile.am
@@ -1,5 +1,5 @@
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-include $(top_srcdir)/../../../testsuites/automake/compile.am
+include $(top_srcdir)/../automake/compile.am
 
 include $(top_srcdir)/ada.am
 
@@ -19,4 +19,4 @@ init.o: ../../../support/init.c
 scndir = $(rtems_ada_testsdir)
 dist_scn_DATA = ada_base_mp-node1.scn
 
-include $(top_srcdir)/../../../testsuites/automake/local.am
+include $(top_srcdir)/../automake/local.am
diff --git a/c/src/ada-tests/samples/base_mp/node1/ada_base_mp-node1.scn b/testsuites/ada/samples/base_mp/node1/ada_base_mp-node1.scn
index a2d2f359be..a2d2f359be 100644
--- a/c/src/ada-tests/samples/base_mp/node1/ada_base_mp-node1.scn
+++ b/testsuites/ada/samples/base_mp/node1/ada_base_mp-node1.scn
diff --git a/c/src/ada-tests/samples/base_mp/node2/Makefile.am b/testsuites/ada/samples/base_mp/node2/Makefile.am
index efc208bf65..9095902a0b 100644
--- a/c/src/ada-tests/samples/base_mp/node2/Makefile.am
+++ b/testsuites/ada/samples/base_mp/node2/Makefile.am
@@ -1,5 +1,5 @@
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-include $(top_srcdir)/../../../testsuites/automake/compile.am
+include $(top_srcdir)/../automake/compile.am
 
 include $(top_srcdir)/ada.am
 
@@ -19,4 +19,4 @@ init.o: ../../../support/init.c
 scndir = $(rtems_ada_testsdir)
 dist_scn_DATA = ada_base_mp-node2.scn
 
-include $(top_srcdir)/../../../testsuites/automake/local.am
+include $(top_srcdir)/../automake/local.am
diff --git a/c/src/ada-tests/samples/base_mp/node2/ada_base_mp-node2.scn b/testsuites/ada/samples/base_mp/node2/ada_base_mp-node2.scn
index 95bc96a808..95bc96a808 100644
--- a/c/src/ada-tests/samples/base_mp/node2/ada_base_mp-node2.scn
+++ b/testsuites/ada/samples/base_mp/node2/ada_base_mp-node2.scn
diff --git a/c/src/ada-tests/samples/base_sp/Makefile.am b/testsuites/ada/samples/base_sp/Makefile.am
index 6575f06ccc..c6b2628735 100644
--- a/c/src/ada-tests/samples/base_sp/Makefile.am
+++ b/testsuites/ada/samples/base_sp/Makefile.am
@@ -1,5 +1,5 @@
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-include $(top_srcdir)/../../../testsuites/automake/compile.am
+include $(top_srcdir)/../automake/compile.am
 
 include $(top_srcdir)/ada.am
 
@@ -16,4 +16,4 @@ ada_base_sp_SOURCES = base_sp.adb config.h sptest.adb sptest.ads
 scndir = $(rtems_ada_testsdir)
 dist_scn_DATA = ada_base_sp.scn
 
-include $(top_srcdir)/../../../testsuites/automake/local.am
+include $(top_srcdir)/../automake/local.am
diff --git a/c/src/ada-tests/samples/base_sp/ada_base_sp.scn b/testsuites/ada/samples/base_sp/ada_base_sp.scn
index 7b8867dc85..7b8867dc85 100644
--- a/c/src/ada-tests/samples/base_sp/ada_base_sp.scn
+++ b/testsuites/ada/samples/base_sp/ada_base_sp.scn
diff --git a/c/src/ada-tests/samples/base_sp/base_sp.adb b/testsuites/ada/samples/base_sp/base_sp.adb
index aaa1ab3bca..aaa1ab3bca 100644
--- a/c/src/ada-tests/samples/base_sp/base_sp.adb
+++ b/testsuites/ada/samples/base_sp/base_sp.adb
diff --git a/c/src/ada-tests/samples/base_sp/config.h b/testsuites/ada/samples/base_sp/config.h
index 083d52515e..083d52515e 100644
--- a/c/src/ada-tests/samples/base_sp/config.h
+++ b/testsuites/ada/samples/base_sp/config.h
diff --git a/c/src/ada-tests/samples/base_sp/sptest.adb b/testsuites/ada/samples/base_sp/sptest.adb
index 85a847f281..85a847f281 100644
--- a/c/src/ada-tests/samples/base_sp/sptest.adb
+++ b/testsuites/ada/samples/base_sp/sptest.adb
diff --git a/c/src/ada-tests/samples/base_sp/sptest.ads b/testsuites/ada/samples/base_sp/sptest.ads
index e35751cd32..e35751cd32 100644
--- a/c/src/ada-tests/samples/base_sp/sptest.ads
+++ b/testsuites/ada/samples/base_sp/sptest.ads
diff --git a/c/src/ada-tests/samples/hello/Makefile.am b/testsuites/ada/samples/hello/Makefile.am
index ff4b51c232..9a6aa5eeb6 100644
--- a/c/src/ada-tests/samples/hello/Makefile.am
+++ b/testsuites/ada/samples/hello/Makefile.am
@@ -1,5 +1,5 @@
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-include $(top_srcdir)/../../../testsuites/automake/compile.am
+include $(top_srcdir)/../automake/compile.am
 
 include $(top_srcdir)/ada.am
 
@@ -16,4 +16,4 @@ ada_hello_SOURCES = hello.adb config.h sptest.adb sptest.ads
 scndir = $(rtems_ada_testsdir)
 dist_scn_DATA = ada_hello.scn
 
-include $(top_srcdir)/../../../testsuites/automake/local.am
+include $(top_srcdir)/../automake/local.am
diff --git a/c/src/ada-tests/samples/hello/ada_hello.scn b/testsuites/ada/samples/hello/ada_hello.scn
index d9e92d81d5..d9e92d81d5 100644
--- a/c/src/ada-tests/samples/hello/ada_hello.scn
+++ b/testsuites/ada/samples/hello/ada_hello.scn
diff --git a/c/src/ada-tests/samples/hello/config.h b/testsuites/ada/samples/hello/config.h
index 2be186cc2a..2be186cc2a 100644
--- a/c/src/ada-tests/samples/hello/config.h
+++ b/testsuites/ada/samples/hello/config.h
diff --git a/c/src/ada-tests/samples/hello/hello.adb b/testsuites/ada/samples/hello/hello.adb
index f7748f3607..f7748f3607 100644
--- a/c/src/ada-tests/samples/hello/hello.adb
+++ b/testsuites/ada/samples/hello/hello.adb
diff --git a/c/src/ada-tests/samples/hello/sptest.adb b/testsuites/ada/samples/hello/sptest.adb
index 8c29155eba..8c29155eba 100644
--- a/c/src/ada-tests/samples/hello/sptest.adb
+++ b/testsuites/ada/samples/hello/sptest.adb
diff --git a/c/src/ada-tests/samples/hello/sptest.ads b/testsuites/ada/samples/hello/sptest.ads
index 62993b0220..62993b0220 100644
--- a/c/src/ada-tests/samples/hello/sptest.ads
+++ b/testsuites/ada/samples/hello/sptest.ads
diff --git a/c/src/ada-tests/samples/nsecs/Makefile.am b/testsuites/ada/samples/nsecs/Makefile.am
index bc8dd2a87b..64a8145818 100644
--- a/c/src/ada-tests/samples/nsecs/Makefile.am
+++ b/testsuites/ada/samples/nsecs/Makefile.am
@@ -1,5 +1,5 @@
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-include $(top_srcdir)/../../../testsuites/automake/compile.am
+include $(top_srcdir)/../automake/compile.am
 
 include $(top_srcdir)/ada.am
 
@@ -16,4 +16,4 @@ ada_nsecs_SOURCES = nsecs.adb config.h sptest.adb sptest.ads
 scndir = $(rtems_ada_testsdir)
 dist_scn_DATA = ada_nsecs.scn
 
-include $(top_srcdir)/../../../testsuites/automake/local.am
+include $(top_srcdir)/../automake/local.am
diff --git a/c/src/ada-tests/samples/nsecs/ada_nsecs.scn b/testsuites/ada/samples/nsecs/ada_nsecs.scn
index 458f12c874..458f12c874 100644
--- a/c/src/ada-tests/samples/nsecs/ada_nsecs.scn
+++ b/testsuites/ada/samples/nsecs/ada_nsecs.scn
diff --git a/c/src/ada-tests/samples/nsecs/config.h b/testsuites/ada/samples/nsecs/config.h
index 7703e721f0..7703e721f0 100644
--- a/c/src/ada-tests/samples/nsecs/config.h
+++ b/testsuites/ada/samples/nsecs/config.h
diff --git a/c/src/ada-tests/samples/nsecs/nsecs.adb b/testsuites/ada/samples/nsecs/nsecs.adb
index 0a8f84a606..0a8f84a606 100644
--- a/c/src/ada-tests/samples/nsecs/nsecs.adb
+++ b/testsuites/ada/samples/nsecs/nsecs.adb
diff --git a/c/src/ada-tests/samples/nsecs/sptest.adb b/testsuites/ada/samples/nsecs/sptest.adb
index 193fa09a45..193fa09a45 100644
--- a/c/src/ada-tests/samples/nsecs/sptest.adb
+++ b/testsuites/ada/samples/nsecs/sptest.adb
diff --git a/c/src/ada-tests/samples/nsecs/sptest.ads b/testsuites/ada/samples/nsecs/sptest.ads
index 97fa00ac2c..97fa00ac2c 100644
--- a/c/src/ada-tests/samples/nsecs/sptest.ads
+++ b/testsuites/ada/samples/nsecs/sptest.ads
diff --git a/c/src/ada-tests/samples/ticker/Makefile.am b/testsuites/ada/samples/ticker/Makefile.am
index b21d6c464f..12594586b3 100644
--- a/c/src/ada-tests/samples/ticker/Makefile.am
+++ b/testsuites/ada/samples/ticker/Makefile.am
@@ -1,5 +1,5 @@
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-include $(top_srcdir)/../../../testsuites/automake/compile.am
+include $(top_srcdir)/../automake/compile.am
 
 include $(top_srcdir)/ada.am
 
@@ -16,4 +16,4 @@ ada_ticker_SOURCES = ticker.adb config.h sptest.adb sptest.ads
 scndir = $(rtems_ada_testsdir)
 dist_scn_DATA = ada_ticker.scn
 
-include $(top_srcdir)/../../../testsuites/automake/local.am
+include $(top_srcdir)/../automake/local.am
diff --git a/c/src/ada-tests/samples/ticker/ada_ticker.scn b/testsuites/ada/samples/ticker/ada_ticker.scn
index 89cd8b3204..89cd8b3204 100644
--- a/c/src/ada-tests/samples/ticker/ada_ticker.scn
+++ b/testsuites/ada/samples/ticker/ada_ticker.scn
diff --git a/c/src/ada-tests/samples/ticker/config.h b/testsuites/ada/samples/ticker/config.h
index 17d957c94a..17d957c94a 100644
--- a/c/src/ada-tests/samples/ticker/config.h
+++ b/testsuites/ada/samples/ticker/config.h
diff --git a/c/src/ada-tests/samples/ticker/sptest.adb b/testsuites/ada/samples/ticker/sptest.adb
index 2de8b35b79..2de8b35b79 100644
--- a/c/src/ada-tests/samples/ticker/sptest.adb
+++ b/testsuites/ada/samples/ticker/sptest.adb
diff --git a/c/src/ada-tests/samples/ticker/sptest.ads b/testsuites/ada/samples/ticker/sptest.ads
index 8753d3edad..8753d3edad 100644
--- a/c/src/ada-tests/samples/ticker/sptest.ads
+++ b/testsuites/ada/samples/ticker/sptest.ads
diff --git a/c/src/ada-tests/samples/ticker/ticker.adb b/testsuites/ada/samples/ticker/ticker.adb
index 08a1fb9e31..08a1fb9e31 100644
--- a/c/src/ada-tests/samples/ticker/ticker.adb
+++ b/testsuites/ada/samples/ticker/ticker.adb
diff --git a/c/src/ada-tests/sptests/Makefile.am b/testsuites/ada/sptests/Makefile.am
index 7edeb6fa4e..fda256fe4c 100644
--- a/c/src/ada-tests/sptests/Makefile.am
+++ b/testsuites/ada/sptests/Makefile.am
@@ -24,5 +24,5 @@ _SUBDIRS += sp25
 _SUBDIRS += spname01
 _SUBDIRS += spatcb01
 
-include $(top_srcdir)/../../../testsuites/automake/subdirs.am
-include $(top_srcdir)/../../../testsuites/automake/local.am
+include $(top_srcdir)/../automake/subdirs.am
+include $(top_srcdir)/../automake/local.am
diff --git a/c/src/ada-tests/sptests/sp01/Makefile.am b/testsuites/ada/sptests/sp01/Makefile.am
index fbbc8374c0..0fc6a6d6d6 100644
--- a/c/src/ada-tests/sptests/sp01/Makefile.am
+++ b/testsuites/ada/sptests/sp01/Makefile.am
@@ -1,5 +1,5 @@
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-include $(top_srcdir)/../../../testsuites/automake/compile.am
+include $(top_srcdir)/../automake/compile.am
 
 include $(top_srcdir)/ada.am
 
@@ -13,4 +13,4 @@ ada_sp01$(EXEEXT): sp01.adb init.$(OBJEXT)
 scndir = $(rtems_ada_testsdir)
 dist_scn_DATA = ada_sp01.scn
 
-include $(top_srcdir)/../../../testsuites/automake/local.am
+include $(top_srcdir)/../automake/local.am
diff --git a/c/src/ada-tests/sptests/sp01/ada_sp01.scn b/testsuites/ada/sptests/sp01/ada_sp01.scn
index 7ba3bea626..7ba3bea626 100644
--- a/c/src/ada-tests/sptests/sp01/ada_sp01.scn
+++ b/testsuites/ada/sptests/sp01/ada_sp01.scn
diff --git a/c/src/ada-tests/sptests/sp01/config.h b/testsuites/ada/sptests/sp01/config.h
index 3a11342306..3a11342306 100644
--- a/c/src/ada-tests/sptests/sp01/config.h
+++ b/testsuites/ada/sptests/sp01/config.h
diff --git a/c/src/ada-tests/sptests/sp01/sp01.adb b/testsuites/ada/sptests/sp01/sp01.adb
index 656a6ff009..656a6ff009 100644
--- a/c/src/ada-tests/sptests/sp01/sp01.adb
+++ b/testsuites/ada/sptests/sp01/sp01.adb
diff --git a/c/src/ada-tests/sptests/sp01/sptest.adb b/testsuites/ada/sptests/sp01/sptest.adb
index 46e48e9b04..46e48e9b04 100644
--- a/c/src/ada-tests/sptests/sp01/sptest.adb
+++ b/testsuites/ada/sptests/sp01/sptest.adb
diff --git a/c/src/ada-tests/sptests/sp01/sptest.ads b/testsuites/ada/sptests/sp01/sptest.ads
index 8753d3edad..8753d3edad 100644
--- a/c/src/ada-tests/sptests/sp01/sptest.ads
+++ b/testsuites/ada/sptests/sp01/sptest.ads
diff --git a/c/src/ada-tests/sptests/sp02/Makefile.am b/testsuites/ada/sptests/sp02/Makefile.am
index d23a4e6fdb..7e681207ef 100644
--- a/c/src/ada-tests/sptests/sp02/Makefile.am
+++ b/testsuites/ada/sptests/sp02/Makefile.am
@@ -1,5 +1,5 @@
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-include $(top_srcdir)/../../../testsuites/automake/compile.am
+include $(top_srcdir)/../automake/compile.am
 
 include $(top_srcdir)/ada.am
 
@@ -13,4 +13,4 @@ ada_sp02$(EXEEXT): sp02.adb init.$(OBJEXT)
 scndir = $(rtems_ada_testsdir)
 dist_scn_DATA = ada_sp02.scn
 
-include $(top_srcdir)/../../../testsuites/automake/local.am
+include $(top_srcdir)/../automake/local.am
diff --git a/c/src/ada-tests/sptests/sp02/ada_sp02.scn b/testsuites/ada/sptests/sp02/ada_sp02.scn
index 722dfff1de..722dfff1de 100644
--- a/c/src/ada-tests/sptests/sp02/ada_sp02.scn
+++ b/testsuites/ada/sptests/sp02/ada_sp02.scn
diff --git a/c/src/ada-tests/sptests/sp02/config.h b/testsuites/ada/sptests/sp02/config.h
index 17d957c94a..17d957c94a 100644
--- a/c/src/ada-tests/sptests/sp02/config.h
+++ b/testsuites/ada/sptests/sp02/config.h
diff --git a/c/src/ada-tests/sptests/sp02/sp02.adb b/testsuites/ada/sptests/sp02/sp02.adb
index adbc97f66c..adbc97f66c 100644
--- a/c/src/ada-tests/sptests/sp02/sp02.adb
+++ b/testsuites/ada/sptests/sp02/sp02.adb
diff --git a/c/src/ada-tests/sptests/sp02/sptest.adb b/testsuites/ada/sptests/sp02/sptest.adb
index 45fb4ac5c2..45fb4ac5c2 100644
--- a/c/src/ada-tests/sptests/sp02/sptest.adb
+++ b/testsuites/ada/sptests/sp02/sptest.adb
diff --git a/c/src/ada-tests/sptests/sp02/sptest.ads b/testsuites/ada/sptests/sp02/sptest.ads
index 20122e3cbd..20122e3cbd 100644
--- a/c/src/ada-tests/sptests/sp02/sptest.ads
+++ b/testsuites/ada/sptests/sp02/sptest.ads
diff --git a/c/src/ada-tests/sptests/sp03/Makefile.am b/testsuites/ada/sptests/sp03/Makefile.am
index cdb256c07f..9a7ccfa1b8 100644
--- a/c/src/ada-tests/sptests/sp03/Makefile.am
+++ b/testsuites/ada/sptests/sp03/Makefile.am
@@ -1,5 +1,5 @@
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-include $(top_srcdir)/../../../testsuites/automake/compile.am
+include $(top_srcdir)/../automake/compile.am
 
 include $(top_srcdir)/ada.am
 
@@ -13,4 +13,4 @@ ada_sp03$(EXEEXT): sp03.adb init.$(OBJEXT)
 scndir = $(rtems_ada_testsdir)
 dist_scn_DATA = ada_sp03.scn
 
-include $(top_srcdir)/../../../testsuites/automake/local.am
+include $(top_srcdir)/../automake/local.am
diff --git a/c/src/ada-tests/sptests/sp03/ada_sp03.scn b/testsuites/ada/sptests/sp03/ada_sp03.scn
index a2a04c6951..a2a04c6951 100644
--- a/c/src/ada-tests/sptests/sp03/ada_sp03.scn
+++ b/testsuites/ada/sptests/sp03/ada_sp03.scn
diff --git a/c/src/ada-tests/sptests/sp03/config.h b/testsuites/ada/sptests/sp03/config.h
index 393afc4b28..393afc4b28 100644
--- a/c/src/ada-tests/sptests/sp03/config.h
+++ b/testsuites/ada/sptests/sp03/config.h
diff --git a/c/src/ada-tests/sptests/sp03/sp03.adb b/testsuites/ada/sptests/sp03/sp03.adb
index 5f081d4879..5f081d4879 100644
--- a/c/src/ada-tests/sptests/sp03/sp03.adb
+++ b/testsuites/ada/sptests/sp03/sp03.adb
diff --git a/c/src/ada-tests/sptests/sp03/sptest.adb b/testsuites/ada/sptests/sp03/sptest.adb
index 24be47eb1c..24be47eb1c 100644
--- a/c/src/ada-tests/sptests/sp03/sptest.adb
+++ b/testsuites/ada/sptests/sp03/sptest.adb
diff --git a/c/src/ada-tests/sptests/sp03/sptest.ads b/testsuites/ada/sptests/sp03/sptest.ads
index 60a2531ba1..60a2531ba1 100644
--- a/c/src/ada-tests/sptests/sp03/sptest.ads
+++ b/testsuites/ada/sptests/sp03/sptest.ads
diff --git a/c/src/ada-tests/sptests/sp04/Makefile.am b/testsuites/ada/sptests/sp04/Makefile.am
index cbc8cf294b..fc5d2be018 100644
--- a/c/src/ada-tests/sptests/sp04/Makefile.am
+++ b/testsuites/ada/sptests/sp04/Makefile.am
@@ -1,5 +1,5 @@
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-include $(top_srcdir)/../../../testsuites/automake/compile.am
+include $(top_srcdir)/../automake/compile.am
 
 include $(top_srcdir)/ada.am
 
@@ -13,4 +13,4 @@ ada_sp04$(EXEEXT): sp04.adb init.$(OBJEXT)
 scndir = $(rtems_ada_testsdir)
 dist_scn_DATA = ada_sp04.scn
 
-include $(top_srcdir)/../../../testsuites/automake/local.am
+include $(top_srcdir)/../automake/local.am
diff --git a/c/src/ada-tests/sptests/sp04/README b/testsuites/ada/sptests/sp04/README
index 43ff165261..43ff165261 100644
--- a/c/src/ada-tests/sptests/sp04/README
+++ b/testsuites/ada/sptests/sp04/README
diff --git a/c/src/ada-tests/sptests/sp04/ada_sp04.scn b/testsuites/ada/sptests/sp04/ada_sp04.scn
index 76d9f0c665..76d9f0c665 100644
--- a/c/src/ada-tests/sptests/sp04/ada_sp04.scn
+++ b/testsuites/ada/sptests/sp04/ada_sp04.scn
diff --git a/c/src/ada-tests/sptests/sp04/config.h b/testsuites/ada/sptests/sp04/config.h
index 45fc324df8..45fc324df8 100644
--- a/c/src/ada-tests/sptests/sp04/config.h
+++ b/testsuites/ada/sptests/sp04/config.h
diff --git a/c/src/ada-tests/sptests/sp04/sp04.adb b/testsuites/ada/sptests/sp04/sp04.adb
index 9d91593b36..9d91593b36 100644
--- a/c/src/ada-tests/sptests/sp04/sp04.adb
+++ b/testsuites/ada/sptests/sp04/sp04.adb
diff --git a/c/src/ada-tests/sptests/sp04/sptest.adb b/testsuites/ada/sptests/sp04/sptest.adb
index 01283d3fec..01283d3fec 100644
--- a/c/src/ada-tests/sptests/sp04/sptest.adb
+++ b/testsuites/ada/sptests/sp04/sptest.adb
diff --git a/c/src/ada-tests/sptests/sp04/sptest.ads b/testsuites/ada/sptests/sp04/sptest.ads
index 36f1202118..36f1202118 100644
--- a/c/src/ada-tests/sptests/sp04/sptest.ads
+++ b/testsuites/ada/sptests/sp04/sptest.ads
diff --git a/c/src/ada-tests/sptests/sp05/Makefile.am b/testsuites/ada/sptests/sp05/Makefile.am
index c66d419a14..d206e1b5da 100644
--- a/c/src/ada-tests/sptests/sp05/Makefile.am
+++ b/testsuites/ada/sptests/sp05/Makefile.am
@@ -1,5 +1,5 @@
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-include $(top_srcdir)/../../../testsuites/automake/compile.am
+include $(top_srcdir)/../automake/compile.am
 
 include $(top_srcdir)/ada.am
 
@@ -13,4 +13,4 @@ ada_sp05$(EXEEXT): sp05.adb init.$(OBJEXT)
 scndir = $(rtems_ada_testsdir)
 dist_scn_DATA = ada_sp05.scn
 
-include $(top_srcdir)/../../../testsuites/automake/local.am
+include $(top_srcdir)/../automake/local.am
diff --git a/c/src/ada-tests/sptests/sp05/ada_sp05.scn b/testsuites/ada/sptests/sp05/ada_sp05.scn
index 591397f760..591397f760 100644
--- a/c/src/ada-tests/sptests/sp05/ada_sp05.scn
+++ b/testsuites/ada/sptests/sp05/ada_sp05.scn
diff --git a/c/src/ada-tests/sptests/sp05/config.h b/testsuites/ada/sptests/sp05/config.h
index d85c77e62b..d85c77e62b 100644
--- a/c/src/ada-tests/sptests/sp05/config.h
+++ b/testsuites/ada/sptests/sp05/config.h
diff --git a/c/src/ada-tests/sptests/sp05/sp05.adb b/testsuites/ada/sptests/sp05/sp05.adb
index 842657a699..842657a699 100644
--- a/c/src/ada-tests/sptests/sp05/sp05.adb
+++ b/testsuites/ada/sptests/sp05/sp05.adb
diff --git a/c/src/ada-tests/sptests/sp05/sptest.adb b/testsuites/ada/sptests/sp05/sptest.adb
index 1a9b974419..1a9b974419 100644
--- a/c/src/ada-tests/sptests/sp05/sptest.adb
+++ b/testsuites/ada/sptests/sp05/sptest.adb
diff --git a/c/src/ada-tests/sptests/sp05/sptest.ads b/testsuites/ada/sptests/sp05/sptest.ads
index 9fe136ec8b..9fe136ec8b 100644
--- a/c/src/ada-tests/sptests/sp05/sptest.ads
+++ b/testsuites/ada/sptests/sp05/sptest.ads
diff --git a/c/src/ada-tests/sptests/sp06/Makefile.am b/testsuites/ada/sptests/sp06/Makefile.am
index 538e0939f8..145423b0b4 100644
--- a/c/src/ada-tests/sptests/sp06/Makefile.am
+++ b/testsuites/ada/sptests/sp06/Makefile.am
@@ -1,5 +1,5 @@
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-include $(top_srcdir)/../../../testsuites/automake/compile.am
+include $(top_srcdir)/../automake/compile.am
 
 include $(top_srcdir)/ada.am
 
@@ -13,4 +13,4 @@ ada_sp06$(EXEEXT): sp06.adb init.$(OBJEXT)
 scndir = $(rtems_ada_testsdir)
 dist_scn_DATA = ada_sp06.scn
 
-include $(top_srcdir)/../../../testsuites/automake/local.am
+include $(top_srcdir)/../automake/local.am
diff --git a/c/src/ada-tests/sptests/sp06/ada_sp06.scn b/testsuites/ada/sptests/sp06/ada_sp06.scn
index 8dc6c6afae..8dc6c6afae 100644
--- a/c/src/ada-tests/sptests/sp06/ada_sp06.scn
+++ b/testsuites/ada/sptests/sp06/ada_sp06.scn
diff --git a/c/src/ada-tests/sptests/sp06/config.h b/testsuites/ada/sptests/sp06/config.h
index d85c77e62b..d85c77e62b 100644
--- a/c/src/ada-tests/sptests/sp06/config.h
+++ b/testsuites/ada/sptests/sp06/config.h
diff --git a/c/src/ada-tests/sptests/sp06/sp06.adb b/testsuites/ada/sptests/sp06/sp06.adb
index 4caba9ae73..4caba9ae73 100644
--- a/c/src/ada-tests/sptests/sp06/sp06.adb
+++ b/testsuites/ada/sptests/sp06/sp06.adb
diff --git a/c/src/ada-tests/sptests/sp06/sptest.adb b/testsuites/ada/sptests/sp06/sptest.adb
index f19fd068ee..f19fd068ee 100644
--- a/c/src/ada-tests/sptests/sp06/sptest.adb
+++ b/testsuites/ada/sptests/sp06/sptest.adb
diff --git a/c/src/ada-tests/sptests/sp06/sptest.ads b/testsuites/ada/sptests/sp06/sptest.ads
index 29fa897210..29fa897210 100644
--- a/c/src/ada-tests/sptests/sp06/sptest.ads
+++ b/testsuites/ada/sptests/sp06/sptest.ads
diff --git a/c/src/ada-tests/sptests/sp07/Makefile.am b/testsuites/ada/sptests/sp07/Makefile.am
index 52c93798c0..076b97d64c 100644
--- a/c/src/ada-tests/sptests/sp07/Makefile.am
+++ b/testsuites/ada/sptests/sp07/Makefile.am
@@ -1,5 +1,5 @@
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-include $(top_srcdir)/../../../testsuites/automake/compile.am
+include $(top_srcdir)/../automake/compile.am
 
 include $(top_srcdir)/ada.am
 
@@ -14,4 +14,4 @@ ada_sp07$(EXEEXT): sp07.adb init.$(OBJEXT)
 scndir = $(rtems_ada_testsdir)
 dist_scn_DATA = ada_sp07.scn
 
-include $(top_srcdir)/../../../testsuites/automake/local.am
+include $(top_srcdir)/../automake/local.am
diff --git a/c/src/ada-tests/sptests/sp07/ada_sp07.scn b/testsuites/ada/sptests/sp07/ada_sp07.scn
index 9748dda74c..9748dda74c 100644
--- a/c/src/ada-tests/sptests/sp07/ada_sp07.scn
+++ b/testsuites/ada/sptests/sp07/ada_sp07.scn
diff --git a/c/src/ada-tests/sptests/sp07/config.h b/testsuites/ada/sptests/sp07/config.h
index 2aa307a46c..2aa307a46c 100644
--- a/c/src/ada-tests/sptests/sp07/config.h
+++ b/testsuites/ada/sptests/sp07/config.h
diff --git a/c/src/ada-tests/sptests/sp07/sp07.adb b/testsuites/ada/sptests/sp07/sp07.adb
index 177de946b8..177de946b8 100644
--- a/c/src/ada-tests/sptests/sp07/sp07.adb
+++ b/testsuites/ada/sptests/sp07/sp07.adb
diff --git a/c/src/ada-tests/sptests/sp07/sptest.adb b/testsuites/ada/sptests/sp07/sptest.adb
index d55aa73bf8..d55aa73bf8 100644
--- a/c/src/ada-tests/sptests/sp07/sptest.adb
+++ b/testsuites/ada/sptests/sp07/sptest.adb
diff --git a/c/src/ada-tests/sptests/sp07/sptest.ads b/testsuites/ada/sptests/sp07/sptest.ads
index 3984c64ee1..3984c64ee1 100644
--- a/c/src/ada-tests/sptests/sp07/sptest.ads
+++ b/testsuites/ada/sptests/sp07/sptest.ads
diff --git a/c/src/ada-tests/sptests/sp08/Makefile.am b/testsuites/ada/sptests/sp08/Makefile.am
index 1514bd39a0..5c6fc3e74e 100644
--- a/c/src/ada-tests/sptests/sp08/Makefile.am
+++ b/testsuites/ada/sptests/sp08/Makefile.am
@@ -1,5 +1,5 @@
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-include $(top_srcdir)/../../../testsuites/automake/compile.am
+include $(top_srcdir)/../automake/compile.am
 
 include $(top_srcdir)/ada.am
 
@@ -13,4 +13,4 @@ ada_sp08$(EXEEXT): sp08.adb init.$(OBJEXT)
 scndir = $(rtems_ada_testsdir)
 dist_scn_DATA = ada_sp08.scn
 
-include $(top_srcdir)/../../../testsuites/automake/local.am
+include $(top_srcdir)/../automake/local.am
diff --git a/c/src/ada-tests/sptests/sp08/ada_sp08.scn b/testsuites/ada/sptests/sp08/ada_sp08.scn
index d0081437fe..d0081437fe 100644
--- a/c/src/ada-tests/sptests/sp08/ada_sp08.scn
+++ b/testsuites/ada/sptests/sp08/ada_sp08.scn
diff --git a/c/src/ada-tests/sptests/sp08/config.h b/testsuites/ada/sptests/sp08/config.h
index 6ada011600..6ada011600 100644
--- a/c/src/ada-tests/sptests/sp08/config.h
+++ b/testsuites/ada/sptests/sp08/config.h
diff --git a/c/src/ada-tests/sptests/sp08/sp08.adb b/testsuites/ada/sptests/sp08/sp08.adb
index f881ad4e71..f881ad4e71 100644
--- a/c/src/ada-tests/sptests/sp08/sp08.adb
+++ b/testsuites/ada/sptests/sp08/sp08.adb
diff --git a/c/src/ada-tests/sptests/sp08/sptest.adb b/testsuites/ada/sptests/sp08/sptest.adb
index 2bec479285..2bec479285 100644
--- a/c/src/ada-tests/sptests/sp08/sptest.adb
+++ b/testsuites/ada/sptests/sp08/sptest.adb
diff --git a/c/src/ada-tests/sptests/sp08/sptest.ads b/testsuites/ada/sptests/sp08/sptest.ads
index 09e9f8383f..09e9f8383f 100644
--- a/c/src/ada-tests/sptests/sp08/sptest.ads
+++ b/testsuites/ada/sptests/sp08/sptest.ads
diff --git a/c/src/ada-tests/sptests/sp09/Makefile.am b/testsuites/ada/sptests/sp09/Makefile.am
index ba4edebc84..8956a388d5 100644
--- a/c/src/ada-tests/sptests/sp09/Makefile.am
+++ b/testsuites/ada/sptests/sp09/Makefile.am
@@ -1,5 +1,5 @@
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-include $(top_srcdir)/../../../testsuites/automake/compile.am
+include $(top_srcdir)/../automake/compile.am
 
 include $(top_srcdir)/ada.am
 
@@ -18,4 +18,4 @@ ada_sp09$(EXEEXT): sp09.adb init.$(OBJEXT)
 scndir = $(rtems_ada_testsdir)
 dist_scn_DATA = ada_sp09.scn
 
-include $(top_srcdir)/../../../testsuites/automake/local.am
+include $(top_srcdir)/../automake/local.am
diff --git a/c/src/ada-tests/sptests/sp09/ada_sp09.scn b/testsuites/ada/sptests/sp09/ada_sp09.scn
index de199d7dd5..de199d7dd5 100644
--- a/c/src/ada-tests/sptests/sp09/ada_sp09.scn
+++ b/testsuites/ada/sptests/sp09/ada_sp09.scn
diff --git a/c/src/ada-tests/sptests/sp09/config.h b/testsuites/ada/sptests/sp09/config.h
index a94c222fa1..a94c222fa1 100644
--- a/c/src/ada-tests/sptests/sp09/config.h
+++ b/testsuites/ada/sptests/sp09/config.h
diff --git a/c/src/ada-tests/sptests/sp09/sp09.adb b/testsuites/ada/sptests/sp09/sp09.adb
index de3a8a91a0..de3a8a91a0 100644
--- a/c/src/ada-tests/sptests/sp09/sp09.adb
+++ b/testsuites/ada/sptests/sp09/sp09.adb
diff --git a/c/src/ada-tests/sptests/sp09/sptest.adb b/testsuites/ada/sptests/sp09/sptest.adb
index 218fbaed49..218fbaed49 100644
--- a/c/src/ada-tests/sptests/sp09/sptest.adb
+++ b/testsuites/ada/sptests/sp09/sptest.adb
diff --git a/c/src/ada-tests/sptests/sp09/sptest.ads b/testsuites/ada/sptests/sp09/sptest.ads
index 9fdad75c3a..9fdad75c3a 100644
--- a/c/src/ada-tests/sptests/sp09/sptest.ads
+++ b/testsuites/ada/sptests/sp09/sptest.ads
diff --git a/c/src/ada-tests/sptests/sp11/Makefile.am b/testsuites/ada/sptests/sp11/Makefile.am
index 5c7cd28809..ec4ded6183 100644
--- a/c/src/ada-tests/sptests/sp11/Makefile.am
+++ b/testsuites/ada/sptests/sp11/Makefile.am
@@ -1,5 +1,5 @@
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-include $(top_srcdir)/../../../testsuites/automake/compile.am
+include $(top_srcdir)/../automake/compile.am
 
 include $(top_srcdir)/ada.am
 
@@ -13,4 +13,4 @@ ada_sp11$(EXEEXT): sp11.adb init.$(OBJEXT)
 scndir = $(rtems_ada_testsdir)
 dist_scn_DATA = ada_sp11.scn
 
-include $(top_srcdir)/../../../testsuites/automake/local.am
+include $(top_srcdir)/../automake/local.am
diff --git a/c/src/ada-tests/sptests/sp11/ada_sp11.scn b/testsuites/ada/sptests/sp11/ada_sp11.scn
index cbb6c4ab88..cbb6c4ab88 100644
--- a/c/src/ada-tests/sptests/sp11/ada_sp11.scn
+++ b/testsuites/ada/sptests/sp11/ada_sp11.scn
diff --git a/c/src/ada-tests/sptests/sp11/config.h b/testsuites/ada/sptests/sp11/config.h
index 41506d08ee..41506d08ee 100644
--- a/c/src/ada-tests/sptests/sp11/config.h
+++ b/testsuites/ada/sptests/sp11/config.h
diff --git a/c/src/ada-tests/sptests/sp11/sp11.adb b/testsuites/ada/sptests/sp11/sp11.adb
index b39fd4b2be..b39fd4b2be 100644
--- a/c/src/ada-tests/sptests/sp11/sp11.adb
+++ b/testsuites/ada/sptests/sp11/sp11.adb
diff --git a/c/src/ada-tests/sptests/sp11/sptest.adb b/testsuites/ada/sptests/sp11/sptest.adb
index 95dd17846b..95dd17846b 100644
--- a/c/src/ada-tests/sptests/sp11/sptest.adb
+++ b/testsuites/ada/sptests/sp11/sptest.adb
diff --git a/c/src/ada-tests/sptests/sp11/sptest.ads b/testsuites/ada/sptests/sp11/sptest.ads
index b7f03b8f4c..b7f03b8f4c 100644
--- a/c/src/ada-tests/sptests/sp11/sptest.ads
+++ b/testsuites/ada/sptests/sp11/sptest.ads
diff --git a/c/src/ada-tests/sptests/sp12/Makefile.am b/testsuites/ada/sptests/sp12/Makefile.am
index 33c5e080e3..0a99682f1a 100644
--- a/c/src/ada-tests/sptests/sp12/Makefile.am
+++ b/testsuites/ada/sptests/sp12/Makefile.am
@@ -1,5 +1,5 @@
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-include $(top_srcdir)/../../../testsuites/automake/compile.am
+include $(top_srcdir)/../automake/compile.am
 
 include $(top_srcdir)/ada.am
 
@@ -13,4 +13,4 @@ ada_sp12$(EXEEXT): sp12.adb init.$(OBJEXT)
 scndir = $(rtems_ada_testsdir)
 dist_scn_DATA = ada_sp12.scn
 
-include $(top_srcdir)/../../../testsuites/automake/local.am
+include $(top_srcdir)/../automake/local.am
diff --git a/c/src/ada-tests/sptests/sp12/ada_sp12.scn b/testsuites/ada/sptests/sp12/ada_sp12.scn
index d1753e5ace..d1753e5ace 100644
--- a/c/src/ada-tests/sptests/sp12/ada_sp12.scn
+++ b/testsuites/ada/sptests/sp12/ada_sp12.scn
diff --git a/c/src/ada-tests/sptests/sp12/config.h b/testsuites/ada/sptests/sp12/config.h
index cd574e737f..cd574e737f 100644
--- a/c/src/ada-tests/sptests/sp12/config.h
+++ b/testsuites/ada/sptests/sp12/config.h
diff --git a/c/src/ada-tests/sptests/sp12/sp12.adb b/testsuites/ada/sptests/sp12/sp12.adb
index 62a5761e51..62a5761e51 100644
--- a/c/src/ada-tests/sptests/sp12/sp12.adb
+++ b/testsuites/ada/sptests/sp12/sp12.adb
diff --git a/c/src/ada-tests/sptests/sp12/sptest.adb b/testsuites/ada/sptests/sp12/sptest.adb
index c1d9f627f8..c1d9f627f8 100644
--- a/c/src/ada-tests/sptests/sp12/sptest.adb
+++ b/testsuites/ada/sptests/sp12/sptest.adb
diff --git a/c/src/ada-tests/sptests/sp12/sptest.ads b/testsuites/ada/sptests/sp12/sptest.ads
index 663faa7686..663faa7686 100644
--- a/c/src/ada-tests/sptests/sp12/sptest.ads
+++ b/testsuites/ada/sptests/sp12/sptest.ads
diff --git a/c/src/ada-tests/sptests/sp13/Makefile.am b/testsuites/ada/sptests/sp13/Makefile.am
index f54587f3a7..19a8ed23ff 100644
--- a/c/src/ada-tests/sptests/sp13/Makefile.am
+++ b/testsuites/ada/sptests/sp13/Makefile.am
@@ -1,5 +1,5 @@
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-include $(top_srcdir)/../../../testsuites/automake/compile.am
+include $(top_srcdir)/../automake/compile.am
 
 include $(top_srcdir)/ada.am
 
@@ -13,4 +13,4 @@ ada_sp13$(EXEEXT): sp13.adb init.$(OBJEXT)
 scndir = $(rtems_ada_testsdir)
 dist_scn_DATA = ada_sp13.scn
 
-include $(top_srcdir)/../../../testsuites/automake/local.am
+include $(top_srcdir)/../automake/local.am
diff --git a/c/src/ada-tests/sptests/sp13/ada_sp13.scn b/testsuites/ada/sptests/sp13/ada_sp13.scn
index f54a497a58..f54a497a58 100644
--- a/c/src/ada-tests/sptests/sp13/ada_sp13.scn
+++ b/testsuites/ada/sptests/sp13/ada_sp13.scn
diff --git a/c/src/ada-tests/sptests/sp13/config.h b/testsuites/ada/sptests/sp13/config.h
index 8e7821e061..8e7821e061 100644
--- a/c/src/ada-tests/sptests/sp13/config.h
+++ b/testsuites/ada/sptests/sp13/config.h
diff --git a/c/src/ada-tests/sptests/sp13/sp13.adb b/testsuites/ada/sptests/sp13/sp13.adb
index 503e8fb989..503e8fb989 100644
--- a/c/src/ada-tests/sptests/sp13/sp13.adb
+++ b/testsuites/ada/sptests/sp13/sp13.adb
diff --git a/c/src/ada-tests/sptests/sp13/sptest.adb b/testsuites/ada/sptests/sp13/sptest.adb
index 7b61b9e7ba..7b61b9e7ba 100644
--- a/c/src/ada-tests/sptests/sp13/sptest.adb
+++ b/testsuites/ada/sptests/sp13/sptest.adb
diff --git a/c/src/ada-tests/sptests/sp13/sptest.ads b/testsuites/ada/sptests/sp13/sptest.ads
index 9b92b3ba61..9b92b3ba61 100644
--- a/c/src/ada-tests/sptests/sp13/sptest.ads
+++ b/testsuites/ada/sptests/sp13/sptest.ads
diff --git a/c/src/ada-tests/sptests/sp14/Makefile.am b/testsuites/ada/sptests/sp14/Makefile.am
index dbe01f5915..501cd32ea1 100644
--- a/c/src/ada-tests/sptests/sp14/Makefile.am
+++ b/testsuites/ada/sptests/sp14/Makefile.am
@@ -1,5 +1,5 @@
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-include $(top_srcdir)/../../../testsuites/automake/compile.am
+include $(top_srcdir)/../automake/compile.am
 
 include $(top_srcdir)/ada.am
 
@@ -13,4 +13,4 @@ ada_sp14$(EXEEXT): sp14.adb init.$(OBJEXT)
 scndir = $(rtems_ada_testsdir)
 dist_scn_DATA = ada_sp14.scn
 
-include $(top_srcdir)/../../../testsuites/automake/local.am
+include $(top_srcdir)/../automake/local.am
diff --git a/c/src/ada-tests/sptests/sp14/ada_sp14.scn b/testsuites/ada/sptests/sp14/ada_sp14.scn
index 09b33721ef..09b33721ef 100644
--- a/c/src/ada-tests/sptests/sp14/ada_sp14.scn
+++ b/testsuites/ada/sptests/sp14/ada_sp14.scn
diff --git a/c/src/ada-tests/sptests/sp14/config.h b/testsuites/ada/sptests/sp14/config.h
index 2c046d6db3..2c046d6db3 100644
--- a/c/src/ada-tests/sptests/sp14/config.h
+++ b/testsuites/ada/sptests/sp14/config.h
diff --git a/c/src/ada-tests/sptests/sp14/sp14.adb b/testsuites/ada/sptests/sp14/sp14.adb
index 2149694ecc..2149694ecc 100644
--- a/c/src/ada-tests/sptests/sp14/sp14.adb
+++ b/testsuites/ada/sptests/sp14/sp14.adb
diff --git a/c/src/ada-tests/sptests/sp14/sptest.adb b/testsuites/ada/sptests/sp14/sptest.adb
index 3b74c9f256..3b74c9f256 100644
--- a/c/src/ada-tests/sptests/sp14/sptest.adb
+++ b/testsuites/ada/sptests/sp14/sptest.adb
diff --git a/c/src/ada-tests/sptests/sp14/sptest.ads b/testsuites/ada/sptests/sp14/sptest.ads
index ecf6f93dff..ecf6f93dff 100644
--- a/c/src/ada-tests/sptests/sp14/sptest.ads
+++ b/testsuites/ada/sptests/sp14/sptest.ads
diff --git a/c/src/ada-tests/sptests/sp15/Makefile.am b/testsuites/ada/sptests/sp15/Makefile.am
index 5804cda188..e1fe83bcd5 100644
--- a/c/src/ada-tests/sptests/sp15/Makefile.am
+++ b/testsuites/ada/sptests/sp15/Makefile.am
@@ -1,5 +1,5 @@
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-include $(top_srcdir)/../../../testsuites/automake/compile.am
+include $(top_srcdir)/../automake/compile.am
 
 include $(top_srcdir)/ada.am
 
@@ -13,4 +13,4 @@ ada_sp15$(EXEEXT): sp15.adb init.$(OBJEXT)
 scndir = $(rtems_ada_testsdir)
 dist_scn_DATA = ada_sp15.scn
 
-include $(top_srcdir)/../../../testsuites/automake/local.am
+include $(top_srcdir)/../automake/local.am
diff --git a/c/src/ada-tests/sptests/sp15/ada_sp15.scn b/testsuites/ada/sptests/sp15/ada_sp15.scn
index 9c9e68f3d7..9c9e68f3d7 100644
--- a/c/src/ada-tests/sptests/sp15/ada_sp15.scn
+++ b/testsuites/ada/sptests/sp15/ada_sp15.scn
diff --git a/c/src/ada-tests/sptests/sp15/config.h b/testsuites/ada/sptests/sp15/config.h
index 7774f3563c..7774f3563c 100644
--- a/c/src/ada-tests/sptests/sp15/config.h
+++ b/testsuites/ada/sptests/sp15/config.h
diff --git a/c/src/ada-tests/sptests/sp15/sp15.adb b/testsuites/ada/sptests/sp15/sp15.adb
index 77e8f27144..77e8f27144 100644
--- a/c/src/ada-tests/sptests/sp15/sp15.adb
+++ b/testsuites/ada/sptests/sp15/sp15.adb
diff --git a/c/src/ada-tests/sptests/sp15/sptest.adb b/testsuites/ada/sptests/sp15/sptest.adb
index 39e887dd2f..39e887dd2f 100644
--- a/c/src/ada-tests/sptests/sp15/sptest.adb
+++ b/testsuites/ada/sptests/sp15/sptest.adb
diff --git a/c/src/ada-tests/sptests/sp15/sptest.ads b/testsuites/ada/sptests/sp15/sptest.ads
index 5af0e61503..5af0e61503 100644
--- a/c/src/ada-tests/sptests/sp15/sptest.ads
+++ b/testsuites/ada/sptests/sp15/sptest.ads
diff --git a/c/src/ada-tests/sptests/sp16/Makefile.am b/testsuites/ada/sptests/sp16/Makefile.am
index fc5d075d2c..4959ca2d62 100644
--- a/c/src/ada-tests/sptests/sp16/Makefile.am
+++ b/testsuites/ada/sptests/sp16/Makefile.am
@@ -1,5 +1,5 @@
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-include $(top_srcdir)/../../../testsuites/automake/compile.am
+include $(top_srcdir)/../automake/compile.am
 
 include $(top_srcdir)/ada.am
 
@@ -13,4 +13,4 @@ ada_sp16$(EXEEXT): sp16.adb init.$(OBJEXT)
 scndir = $(rtems_ada_testsdir)
 dist_scn_DATA = ada_sp16.scn
 
-include $(top_srcdir)/../../../testsuites/automake/local.am
+include $(top_srcdir)/../automake/local.am
diff --git a/c/src/ada-tests/sptests/sp16/ada_sp16.scn b/testsuites/ada/sptests/sp16/ada_sp16.scn
index 928dc4a9cf..928dc4a9cf 100644
--- a/c/src/ada-tests/sptests/sp16/ada_sp16.scn
+++ b/testsuites/ada/sptests/sp16/ada_sp16.scn
diff --git a/c/src/ada-tests/sptests/sp16/config.h b/testsuites/ada/sptests/sp16/config.h
index 087a4c5a49..087a4c5a49 100644
--- a/c/src/ada-tests/sptests/sp16/config.h
+++ b/testsuites/ada/sptests/sp16/config.h
diff --git a/c/src/ada-tests/sptests/sp16/sp16.adb b/testsuites/ada/sptests/sp16/sp16.adb
index 4280c67665..4280c67665 100644
--- a/c/src/ada-tests/sptests/sp16/sp16.adb
+++ b/testsuites/ada/sptests/sp16/sp16.adb
diff --git a/c/src/ada-tests/sptests/sp16/sptest.adb b/testsuites/ada/sptests/sp16/sptest.adb
index a62eedd104..a62eedd104 100644
--- a/c/src/ada-tests/sptests/sp16/sptest.adb
+++ b/testsuites/ada/sptests/sp16/sptest.adb
diff --git a/c/src/ada-tests/sptests/sp16/sptest.ads b/testsuites/ada/sptests/sp16/sptest.ads
index 7f028a0274..7f028a0274 100644
--- a/c/src/ada-tests/sptests/sp16/sptest.ads
+++ b/testsuites/ada/sptests/sp16/sptest.ads
diff --git a/c/src/ada-tests/sptests/sp17/Makefile.am b/testsuites/ada/sptests/sp17/Makefile.am
index 7b20338c06..9a5b2a3505 100644
--- a/c/src/ada-tests/sptests/sp17/Makefile.am
+++ b/testsuites/ada/sptests/sp17/Makefile.am
@@ -1,5 +1,5 @@
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-include $(top_srcdir)/../../../testsuites/automake/compile.am
+include $(top_srcdir)/../automake/compile.am
 
 include $(top_srcdir)/ada.am
 
@@ -13,4 +13,4 @@ ada_sp17$(EXEEXT): sp17.adb init.$(OBJEXT)
 scndir = $(rtems_ada_testsdir)
 dist_scn_DATA = ada_sp17.scn
 
-include $(top_srcdir)/../../../testsuites/automake/local.am
+include $(top_srcdir)/../automake/local.am
diff --git a/c/src/ada-tests/sptests/sp17/ada_sp17.scn b/testsuites/ada/sptests/sp17/ada_sp17.scn
index 887284d877..887284d877 100644
--- a/c/src/ada-tests/sptests/sp17/ada_sp17.scn
+++ b/testsuites/ada/sptests/sp17/ada_sp17.scn
diff --git a/c/src/ada-tests/sptests/sp17/config.h b/testsuites/ada/sptests/sp17/config.h
index 0ceab6f736..0ceab6f736 100644
--- a/c/src/ada-tests/sptests/sp17/config.h
+++ b/testsuites/ada/sptests/sp17/config.h
diff --git a/c/src/ada-tests/sptests/sp17/sp17.adb b/testsuites/ada/sptests/sp17/sp17.adb
index 5c06ef0b44..5c06ef0b44 100644
--- a/c/src/ada-tests/sptests/sp17/sp17.adb
+++ b/testsuites/ada/sptests/sp17/sp17.adb
diff --git a/c/src/ada-tests/sptests/sp17/sptest.adb b/testsuites/ada/sptests/sp17/sptest.adb
index e2402a50cf..e2402a50cf 100644
--- a/c/src/ada-tests/sptests/sp17/sptest.adb
+++ b/testsuites/ada/sptests/sp17/sptest.adb
diff --git a/c/src/ada-tests/sptests/sp17/sptest.ads b/testsuites/ada/sptests/sp17/sptest.ads
index 428114c9a0..428114c9a0 100644
--- a/c/src/ada-tests/sptests/sp17/sptest.ads
+++ b/testsuites/ada/sptests/sp17/sptest.ads
diff --git a/c/src/ada-tests/sptests/sp19/Makefile.am b/testsuites/ada/sptests/sp19/Makefile.am
index 726b07c82d..27e7d7ca28 100644
--- a/c/src/ada-tests/sptests/sp19/Makefile.am
+++ b/testsuites/ada/sptests/sp19/Makefile.am
@@ -1,5 +1,5 @@
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-include $(top_srcdir)/../../../testsuites/automake/compile.am
+include $(top_srcdir)/../automake/compile.am
 
 include $(top_srcdir)/ada.am
 
@@ -17,4 +17,4 @@ ada_sp19$(EXEEXT): sp19.adb sptest.adb sptest.ads init.$(OBJEXT)
 scndir = $(rtems_ada_testsdir)
 dist_scn_DATA = ada_sp19.scn
 
-include $(top_srcdir)/../../../testsuites/automake/local.am
+include $(top_srcdir)/../automake/local.am
diff --git a/c/src/ada-tests/sptests/sp19/README b/testsuites/ada/sptests/sp19/README
index 4fd698381e..4fd698381e 100644
--- a/c/src/ada-tests/sptests/sp19/README
+++ b/testsuites/ada/sptests/sp19/README
diff --git a/c/src/ada-tests/sptests/sp19/ada_sp19.scn b/testsuites/ada/sptests/sp19/ada_sp19.scn
index 573860bb59..573860bb59 100644
--- a/c/src/ada-tests/sptests/sp19/ada_sp19.scn
+++ b/testsuites/ada/sptests/sp19/ada_sp19.scn
diff --git a/c/src/ada-tests/sptests/sp19/config.h b/testsuites/ada/sptests/sp19/config.h
index 278aaf69b0..278aaf69b0 100644
--- a/c/src/ada-tests/sptests/sp19/config.h
+++ b/testsuites/ada/sptests/sp19/config.h
diff --git a/c/src/ada-tests/sptests/sp19/sp19.adb b/testsuites/ada/sptests/sp19/sp19.adb
index f2cfddb97a..f2cfddb97a 100644
--- a/c/src/ada-tests/sptests/sp19/sp19.adb
+++ b/testsuites/ada/sptests/sp19/sp19.adb
diff --git a/c/src/ada-tests/sptests/sp19/sptest.adp b/testsuites/ada/sptests/sp19/sptest.adp
index d49bf41aac..d49bf41aac 100644
--- a/c/src/ada-tests/sptests/sp19/sptest.adp
+++ b/testsuites/ada/sptests/sp19/sptest.adp
diff --git a/c/src/ada-tests/sptests/sp19/sptest.ads b/testsuites/ada/sptests/sp19/sptest.ads
index 3befd7cc3a..3befd7cc3a 100644
--- a/c/src/ada-tests/sptests/sp19/sptest.ads
+++ b/testsuites/ada/sptests/sp19/sptest.ads
diff --git a/c/src/ada-tests/sptests/sp20/Makefile.am b/testsuites/ada/sptests/sp20/Makefile.am
index 24628b8122..de7b240d5c 100644
--- a/c/src/ada-tests/sptests/sp20/Makefile.am
+++ b/testsuites/ada/sptests/sp20/Makefile.am
@@ -1,5 +1,5 @@
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-include $(top_srcdir)/../../../testsuites/automake/compile.am
+include $(top_srcdir)/../automake/compile.am
 
 include $(top_srcdir)/ada.am
 
@@ -13,4 +13,4 @@ ada_sp20$(EXEEXT): sp20.adb init.$(OBJEXT)
 scndir = $(rtems_ada_testsdir)
 dist_scn_DATA = ada_sp20.scn
 
-include $(top_srcdir)/../../../testsuites/automake/local.am
+include $(top_srcdir)/../automake/local.am
diff --git a/c/src/ada-tests/sptests/sp20/ada_sp20.scn b/testsuites/ada/sptests/sp20/ada_sp20.scn
index 5411361d76..5411361d76 100644
--- a/c/src/ada-tests/sptests/sp20/ada_sp20.scn
+++ b/testsuites/ada/sptests/sp20/ada_sp20.scn
diff --git a/c/src/ada-tests/sptests/sp20/config.h b/testsuites/ada/sptests/sp20/config.h
index daf598bf4c..daf598bf4c 100644
--- a/c/src/ada-tests/sptests/sp20/config.h
+++ b/testsuites/ada/sptests/sp20/config.h
diff --git a/c/src/ada-tests/sptests/sp20/sp20.adb b/testsuites/ada/sptests/sp20/sp20.adb
index 898b96c119..898b96c119 100644
--- a/c/src/ada-tests/sptests/sp20/sp20.adb
+++ b/testsuites/ada/sptests/sp20/sp20.adb
diff --git a/c/src/ada-tests/sptests/sp20/sptest.adb b/testsuites/ada/sptests/sp20/sptest.adb
index 1929fd958f..1929fd958f 100644
--- a/c/src/ada-tests/sptests/sp20/sptest.adb
+++ b/testsuites/ada/sptests/sp20/sptest.adb
diff --git a/c/src/ada-tests/sptests/sp20/sptest.ads b/testsuites/ada/sptests/sp20/sptest.ads
index 384cc1dac5..384cc1dac5 100644
--- a/c/src/ada-tests/sptests/sp20/sptest.ads
+++ b/testsuites/ada/sptests/sp20/sptest.ads
diff --git a/c/src/ada-tests/sptests/sp22/Makefile.am b/testsuites/ada/sptests/sp22/Makefile.am
index 168d23befb..8b24be6768 100644
--- a/c/src/ada-tests/sptests/sp22/Makefile.am
+++ b/testsuites/ada/sptests/sp22/Makefile.am
@@ -1,5 +1,5 @@
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-include $(top_srcdir)/../../../testsuites/automake/compile.am
+include $(top_srcdir)/../automake/compile.am
 
 include $(top_srcdir)/ada.am
 
@@ -13,4 +13,4 @@ ada_sp22$(EXEEXT): sp22.adb init.$(OBJEXT)
 scndir = $(rtems_ada_testsdir)
 dist_scn_DATA = ada_sp22.scn
 
-include $(top_srcdir)/../../../testsuites/automake/local.am
+include $(top_srcdir)/../automake/local.am
diff --git a/c/src/ada-tests/sptests/sp22/ada_sp22.scn b/testsuites/ada/sptests/sp22/ada_sp22.scn
index 3e96936e24..3e96936e24 100644
--- a/c/src/ada-tests/sptests/sp22/ada_sp22.scn
+++ b/testsuites/ada/sptests/sp22/ada_sp22.scn
diff --git a/c/src/ada-tests/sptests/sp22/config.h b/testsuites/ada/sptests/sp22/config.h
index b8ed5c97d0..b8ed5c97d0 100644
--- a/c/src/ada-tests/sptests/sp22/config.h
+++ b/testsuites/ada/sptests/sp22/config.h
diff --git a/c/src/ada-tests/sptests/sp22/sp22.adb b/testsuites/ada/sptests/sp22/sp22.adb
index 842bc7338e..842bc7338e 100644
--- a/c/src/ada-tests/sptests/sp22/sp22.adb
+++ b/testsuites/ada/sptests/sp22/sp22.adb
diff --git a/c/src/ada-tests/sptests/sp22/sptest.adb b/testsuites/ada/sptests/sp22/sptest.adb
index a947628db5..a947628db5 100644
--- a/c/src/ada-tests/sptests/sp22/sptest.adb
+++ b/testsuites/ada/sptests/sp22/sptest.adb
diff --git a/c/src/ada-tests/sptests/sp22/sptest.ads b/testsuites/ada/sptests/sp22/sptest.ads
index af312fafb8..af312fafb8 100644
--- a/c/src/ada-tests/sptests/sp22/sptest.ads
+++ b/testsuites/ada/sptests/sp22/sptest.ads
diff --git a/c/src/ada-tests/sptests/sp23/Makefile.am b/testsuites/ada/sptests/sp23/Makefile.am
index c4823a817d..ccd4bfe4ec 100644
--- a/c/src/ada-tests/sptests/sp23/Makefile.am
+++ b/testsuites/ada/sptests/sp23/Makefile.am
@@ -1,5 +1,5 @@
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-include $(top_srcdir)/../../../testsuites/automake/compile.am
+include $(top_srcdir)/../automake/compile.am
 
 include $(top_srcdir)/ada.am
 
@@ -13,4 +13,4 @@ ada_sp23$(EXEEXT): sp23.adb init.$(OBJEXT)
 scndir = $(rtems_ada_testsdir)
 dist_scn_DATA = ada_sp23.scn
 
-include $(top_srcdir)/../../../testsuites/automake/local.am
+include $(top_srcdir)/../automake/local.am
diff --git a/c/src/ada-tests/sptests/sp23/ada_sp23.scn b/testsuites/ada/sptests/sp23/ada_sp23.scn
index 2fc1e74582..2fc1e74582 100644
--- a/c/src/ada-tests/sptests/sp23/ada_sp23.scn
+++ b/testsuites/ada/sptests/sp23/ada_sp23.scn
diff --git a/c/src/ada-tests/sptests/sp23/config.h b/testsuites/ada/sptests/sp23/config.h
index 277e38b708..277e38b708 100644
--- a/c/src/ada-tests/sptests/sp23/config.h
+++ b/testsuites/ada/sptests/sp23/config.h
diff --git a/c/src/ada-tests/sptests/sp23/sp23.adb b/testsuites/ada/sptests/sp23/sp23.adb
index 5a6a728e1d..5a6a728e1d 100644
--- a/c/src/ada-tests/sptests/sp23/sp23.adb
+++ b/testsuites/ada/sptests/sp23/sp23.adb
diff --git a/c/src/ada-tests/sptests/sp23/sptest.adb b/testsuites/ada/sptests/sp23/sptest.adb
index e3a2871ab6..e3a2871ab6 100644
--- a/c/src/ada-tests/sptests/sp23/sptest.adb
+++ b/testsuites/ada/sptests/sp23/sptest.adb
diff --git a/c/src/ada-tests/sptests/sp23/sptest.ads b/testsuites/ada/sptests/sp23/sptest.ads
index b5faf7b87a..b5faf7b87a 100644
--- a/c/src/ada-tests/sptests/sp23/sptest.ads
+++ b/testsuites/ada/sptests/sp23/sptest.ads
diff --git a/c/src/ada-tests/sptests/sp24/Makefile.am b/testsuites/ada/sptests/sp24/Makefile.am
index 044faae303..a8ebaecb52 100644
--- a/c/src/ada-tests/sptests/sp24/Makefile.am
+++ b/testsuites/ada/sptests/sp24/Makefile.am
@@ -1,5 +1,5 @@
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-include $(top_srcdir)/../../../testsuites/automake/compile.am
+include $(top_srcdir)/../automake/compile.am
 
 include $(top_srcdir)/ada.am
 
@@ -13,4 +13,4 @@ ada_sp24$(EXEEXT): sp24.adb init.$(OBJEXT)
 scndir = $(rtems_ada_testsdir)
 dist_scn_DATA = ada_sp24.scn
 
-include $(top_srcdir)/../../../testsuites/automake/local.am
+include $(top_srcdir)/../automake/local.am
diff --git a/c/src/ada-tests/sptests/sp24/ada_sp24.scn b/testsuites/ada/sptests/sp24/ada_sp24.scn
index eb626eb6b2..eb626eb6b2 100644
--- a/c/src/ada-tests/sptests/sp24/ada_sp24.scn
+++ b/testsuites/ada/sptests/sp24/ada_sp24.scn
diff --git a/c/src/ada-tests/sptests/sp24/config.h b/testsuites/ada/sptests/sp24/config.h
index a72dd35dac..a72dd35dac 100644
--- a/c/src/ada-tests/sptests/sp24/config.h
+++ b/testsuites/ada/sptests/sp24/config.h
diff --git a/c/src/ada-tests/sptests/sp24/sp24.adb b/testsuites/ada/sptests/sp24/sp24.adb
index e56802640b..e56802640b 100644
--- a/c/src/ada-tests/sptests/sp24/sp24.adb
+++ b/testsuites/ada/sptests/sp24/sp24.adb
diff --git a/c/src/ada-tests/sptests/sp24/sptest.adb b/testsuites/ada/sptests/sp24/sptest.adb
index 4245036995..4245036995 100644
--- a/c/src/ada-tests/sptests/sp24/sptest.adb
+++ b/testsuites/ada/sptests/sp24/sptest.adb
diff --git a/c/src/ada-tests/sptests/sp24/sptest.ads b/testsuites/ada/sptests/sp24/sptest.ads
index 166ee812b3..166ee812b3 100644
--- a/c/src/ada-tests/sptests/sp24/sptest.ads
+++ b/testsuites/ada/sptests/sp24/sptest.ads
diff --git a/c/src/ada-tests/sptests/sp25/Makefile.am b/testsuites/ada/sptests/sp25/Makefile.am
index e5a25e495c..b4b864d8d7 100644
--- a/c/src/ada-tests/sptests/sp25/Makefile.am
+++ b/testsuites/ada/sptests/sp25/Makefile.am
@@ -1,5 +1,5 @@
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-include $(top_srcdir)/../../../testsuites/automake/compile.am
+include $(top_srcdir)/../automake/compile.am
 
 include $(top_srcdir)/ada.am
 
@@ -13,4 +13,4 @@ ada_sp25$(EXEEXT): sp25.adb init.$(OBJEXT)
 scndir = $(rtems_ada_testsdir)
 dist_scn_DATA = ada_sp25.scn
 
-include $(top_srcdir)/../../../testsuites/automake/local.am
+include $(top_srcdir)/../automake/local.am
diff --git a/c/src/ada-tests/sptests/sp25/ada_sp25.scn b/testsuites/ada/sptests/sp25/ada_sp25.scn
index bb568001ac..bb568001ac 100644
--- a/c/src/ada-tests/sptests/sp25/ada_sp25.scn
+++ b/testsuites/ada/sptests/sp25/ada_sp25.scn
diff --git a/c/src/ada-tests/sptests/sp25/config.h b/testsuites/ada/sptests/sp25/config.h
index aa74afdd45..aa74afdd45 100644
--- a/c/src/ada-tests/sptests/sp25/config.h
+++ b/testsuites/ada/sptests/sp25/config.h
diff --git a/c/src/ada-tests/sptests/sp25/sp25.adb b/testsuites/ada/sptests/sp25/sp25.adb
index 00db138fa9..00db138fa9 100644
--- a/c/src/ada-tests/sptests/sp25/sp25.adb
+++ b/testsuites/ada/sptests/sp25/sp25.adb
diff --git a/c/src/ada-tests/sptests/sp25/sptest.adb b/testsuites/ada/sptests/sp25/sptest.adb
index 1fb103e966..1fb103e966 100644
--- a/c/src/ada-tests/sptests/sp25/sptest.adb
+++ b/testsuites/ada/sptests/sp25/sptest.adb
diff --git a/c/src/ada-tests/sptests/sp25/sptest.ads b/testsuites/ada/sptests/sp25/sptest.ads
index 21c27a38db..21c27a38db 100644
--- a/c/src/ada-tests/sptests/sp25/sptest.ads
+++ b/testsuites/ada/sptests/sp25/sptest.ads
diff --git a/c/src/ada-tests/sptests/spatcb01/Makefile.am b/testsuites/ada/sptests/spatcb01/Makefile.am
index 59e99eab98..0e5dbaf652 100644
--- a/c/src/ada-tests/sptests/spatcb01/Makefile.am
+++ b/testsuites/ada/sptests/spatcb01/Makefile.am
@@ -1,5 +1,5 @@
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-include $(top_srcdir)/../../../testsuites/automake/compile.am
+include $(top_srcdir)/../automake/compile.am
 
 include $(top_srcdir)/ada.am
 
@@ -13,4 +13,4 @@ ada_spatcb01$(EXEEXT): spatcb01.adb init.$(OBJEXT)
 scndir = $(rtems_ada_testsdir)
 dist_scn_DATA = ada_spatcb01.scn
 
-include $(top_srcdir)/../../../testsuites/automake/local.am
+include $(top_srcdir)/../automake/local.am
diff --git a/c/src/ada-tests/sptests/spatcb01/ada_spatcb01.scn b/testsuites/ada/sptests/spatcb01/ada_spatcb01.scn
index 7738ff8a0e..7738ff8a0e 100644
--- a/c/src/ada-tests/sptests/spatcb01/ada_spatcb01.scn
+++ b/testsuites/ada/sptests/spatcb01/ada_spatcb01.scn
diff --git a/c/src/ada-tests/sptests/spatcb01/config.h b/testsuites/ada/sptests/spatcb01/config.h
index 405b536c82..405b536c82 100644
--- a/c/src/ada-tests/sptests/spatcb01/config.h
+++ b/testsuites/ada/sptests/spatcb01/config.h
diff --git a/c/src/ada-tests/sptests/spatcb01/spatcb01.adb b/testsuites/ada/sptests/spatcb01/spatcb01.adb
index 19aaa8031f..19aaa8031f 100644
--- a/c/src/ada-tests/sptests/spatcb01/spatcb01.adb
+++ b/testsuites/ada/sptests/spatcb01/spatcb01.adb
diff --git a/c/src/ada-tests/sptests/spname01/Makefile.am b/testsuites/ada/sptests/spname01/Makefile.am
index ab5d8a6bdf..fccab37289 100644
--- a/c/src/ada-tests/sptests/spname01/Makefile.am
+++ b/testsuites/ada/sptests/spname01/Makefile.am
@@ -1,5 +1,5 @@
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-include $(top_srcdir)/../../../testsuites/automake/compile.am
+include $(top_srcdir)/../automake/compile.am
 
 include $(top_srcdir)/ada.am
 
@@ -15,4 +15,4 @@ init.$(OBJEXT): ../../support/init.c
 scndir = $(rtems_ada_testsdir)
 dist_scn_DATA = ada_spname01.scn
 
-include $(top_srcdir)/../../../testsuites/automake/local.am
+include $(top_srcdir)/../automake/local.am
diff --git a/c/src/ada-tests/sptests/spname01/ada_spname01.scn b/testsuites/ada/sptests/spname01/ada_spname01.scn
index 825cd14437..825cd14437 100644
--- a/c/src/ada-tests/sptests/spname01/ada_spname01.scn
+++ b/testsuites/ada/sptests/spname01/ada_spname01.scn
diff --git a/c/src/ada-tests/sptests/spname01/config.h b/testsuites/ada/sptests/spname01/config.h
index 2be186cc2a..2be186cc2a 100644
--- a/c/src/ada-tests/sptests/spname01/config.h
+++ b/testsuites/ada/sptests/spname01/config.h
diff --git a/c/src/ada-tests/sptests/spname01/spname01.adb b/testsuites/ada/sptests/spname01/spname01.adb
index 863e64f24e..863e64f24e 100644
--- a/c/src/ada-tests/sptests/spname01/spname01.adb
+++ b/testsuites/ada/sptests/spname01/spname01.adb
diff --git a/c/src/ada-tests/sptests/spname01/sptest.adb b/testsuites/ada/sptests/spname01/sptest.adb
index 5dd78d8e4a..5dd78d8e4a 100644
--- a/c/src/ada-tests/sptests/spname01/sptest.adb
+++ b/testsuites/ada/sptests/spname01/sptest.adb
diff --git a/c/src/ada-tests/sptests/spname01/sptest.ads b/testsuites/ada/sptests/spname01/sptest.ads
index 5e4f682221..5e4f682221 100644
--- a/c/src/ada-tests/sptests/spname01/sptest.ads
+++ b/testsuites/ada/sptests/spname01/sptest.ads
diff --git a/c/src/ada-tests/support/Makefile.am b/testsuites/ada/support/Makefile.am
index 88a4014be7..2bd719349f 100644
--- a/c/src/ada-tests/support/Makefile.am
+++ b/testsuites/ada/support/Makefile.am
@@ -15,4 +15,4 @@ EXTRA_DIST += timer_driver.adb
 EXTRA_DIST += timer_driver.ads
 EXTRA_DIST += unsigned32_io.ads
 
-include $(top_srcdir)/../../../testsuites/automake/local.am
+include $(top_srcdir)/../automake/local.am
diff --git a/c/src/ada-tests/support/address_io.adb b/testsuites/ada/support/address_io.adb
index f549f57ffe..f549f57ffe 100644
--- a/c/src/ada-tests/support/address_io.adb
+++ b/testsuites/ada/support/address_io.adb
diff --git a/c/src/ada-tests/support/address_io.ads b/testsuites/ada/support/address_io.ads
index 8a4fce98d3..8a4fce98d3 100644
--- a/c/src/ada-tests/support/address_io.ads
+++ b/testsuites/ada/support/address_io.ads
diff --git a/c/src/ada-tests/support/float_io.ads b/testsuites/ada/support/float_io.ads
index 5e1a90bf92..5e1a90bf92 100644
--- a/c/src/ada-tests/support/float_io.ads
+++ b/testsuites/ada/support/float_io.ads
diff --git a/c/src/ada-tests/support/fp.inc b/testsuites/ada/support/fp.inc
index eb6f5528a9..eb6f5528a9 100644
--- a/c/src/ada-tests/support/fp.inc
+++ b/testsuites/ada/support/fp.inc
diff --git a/c/src/ada-tests/support/init.c b/testsuites/ada/support/init.c
index 968b17b3a4..968b17b3a4 100644
--- a/c/src/ada-tests/support/init.c
+++ b/testsuites/ada/support/init.c
diff --git a/c/src/ada-tests/support/integer.inc b/testsuites/ada/support/integer.inc
index c47f68efd4..c47f68efd4 100644
--- a/c/src/ada-tests/support/integer.inc
+++ b/testsuites/ada/support/integer.inc
diff --git a/c/src/ada-tests/support/rtems_calling_overhead.ads b/testsuites/ada/support/rtems_calling_overhead.ads
index 5f94e0505a..5f94e0505a 100644
--- a/c/src/ada-tests/support/rtems_calling_overhead.ads
+++ b/testsuites/ada/support/rtems_calling_overhead.ads
diff --git a/c/src/ada-tests/support/status_io.ads b/testsuites/ada/support/status_io.ads
index 301e7a2ba1..301e7a2ba1 100644
--- a/c/src/ada-tests/support/status_io.ads
+++ b/testsuites/ada/support/status_io.ads
diff --git a/c/src/ada-tests/support/test_support.adb b/testsuites/ada/support/test_support.adb
index bc636cee11..bc636cee11 100644
--- a/c/src/ada-tests/support/test_support.adb
+++ b/testsuites/ada/support/test_support.adb
diff --git a/c/src/ada-tests/support/test_support.ads b/testsuites/ada/support/test_support.ads
index e41bf834ed..e41bf834ed 100644
--- a/c/src/ada-tests/support/test_support.ads
+++ b/testsuites/ada/support/test_support.ads
diff --git a/c/src/ada-tests/support/time_test_support.adb b/testsuites/ada/support/time_test_support.adb
index aab0c75dfe..aab0c75dfe 100644
--- a/c/src/ada-tests/support/time_test_support.adb
+++ b/testsuites/ada/support/time_test_support.adb
diff --git a/c/src/ada-tests/support/time_test_support.ads b/testsuites/ada/support/time_test_support.ads
index aeed677ba2..aeed677ba2 100644
--- a/c/src/ada-tests/support/time_test_support.ads
+++ b/testsuites/ada/support/time_test_support.ads
diff --git a/c/src/ada-tests/support/timer_driver.adb b/testsuites/ada/support/timer_driver.adb
index 389499ccc8..389499ccc8 100644
--- a/c/src/ada-tests/support/timer_driver.adb
+++ b/testsuites/ada/support/timer_driver.adb
diff --git a/c/src/ada-tests/support/timer_driver.ads b/testsuites/ada/support/timer_driver.ads
index 00642dfe90..00642dfe90 100644
--- a/c/src/ada-tests/support/timer_driver.ads
+++ b/testsuites/ada/support/timer_driver.ads
diff --git a/c/src/ada-tests/support/unsigned32_io.ads b/testsuites/ada/support/unsigned32_io.ads
index 4d1a7e6e87..4d1a7e6e87 100644
--- a/c/src/ada-tests/support/unsigned32_io.ads
+++ b/testsuites/ada/support/unsigned32_io.ads
diff --git a/c/src/ada-tests/tmtests/Makefile.am b/testsuites/ada/tmtests/Makefile.am
index 64b5f6fe48..4cf9517425 100644
--- a/c/src/ada-tests/tmtests/Makefile.am
+++ b/testsuites/ada/tmtests/Makefile.am
@@ -29,5 +29,5 @@ _SUBDIRS += tm29
 _SUBDIRS += tmck
 _SUBDIRS += tmoverhd
 
-include $(top_srcdir)/../../../testsuites/automake/subdirs.am
-include $(top_srcdir)/../../../testsuites/automake/local.am
+include $(top_srcdir)/../automake/subdirs.am
+include $(top_srcdir)/../automake/local.am
diff --git a/c/src/ada-tests/tmtests/tm01/Makefile.am b/testsuites/ada/tmtests/tm01/Makefile.am
index 18932e9c15..4fb8798b24 100644
--- a/c/src/ada-tests/tmtests/tm01/Makefile.am
+++ b/testsuites/ada/tmtests/tm01/Makefile.am
@@ -1,5 +1,5 @@
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-include $(top_srcdir)/../../../testsuites/automake/compile.am
+include $(top_srcdir)/../automake/compile.am
 
 include $(top_srcdir)/ada.am
 
@@ -10,4 +10,4 @@ ada_tm01_SOURCES += ../../support/init.c
 ada_tm01$(EXEEXT): tm01.adb init.$(OBJEXT)
 	$(GNATCOMPILE) -margs -a $< -o $@
 
-include $(top_srcdir)/../../../testsuites/automake/local.am
+include $(top_srcdir)/../automake/local.am
diff --git a/c/src/ada-tests/tmtests/tm01/config.h b/testsuites/ada/tmtests/tm01/config.h
index 7730385b3c..7730385b3c 100644
--- a/c/src/ada-tests/tmtests/tm01/config.h
+++ b/testsuites/ada/tmtests/tm01/config.h
diff --git a/c/src/ada-tests/tmtests/tm01/tm01.adb b/testsuites/ada/tmtests/tm01/tm01.adb
index 47c83a17e0..47c83a17e0 100644
--- a/c/src/ada-tests/tmtests/tm01/tm01.adb
+++ b/testsuites/ada/tmtests/tm01/tm01.adb
diff --git a/c/src/ada-tests/tmtests/tm01/tmtest.adb b/testsuites/ada/tmtests/tm01/tmtest.adb
index 31e54aa40f..31e54aa40f 100644
--- a/c/src/ada-tests/tmtests/tm01/tmtest.adb
+++ b/testsuites/ada/tmtests/tm01/tmtest.adb
diff --git a/c/src/ada-tests/tmtests/tm01/tmtest.ads b/testsuites/ada/tmtests/tm01/tmtest.ads
index 6d00d05715..6d00d05715 100644
--- a/c/src/ada-tests/tmtests/tm01/tmtest.ads
+++ b/testsuites/ada/tmtests/tm01/tmtest.ads
diff --git a/c/src/ada-tests/tmtests/tm02/Makefile.am b/testsuites/ada/tmtests/tm02/Makefile.am
index c8d86e77ba..a35c09450d 100644
--- a/c/src/ada-tests/tmtests/tm02/Makefile.am
+++ b/testsuites/ada/tmtests/tm02/Makefile.am
@@ -1,5 +1,5 @@
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-include $(top_srcdir)/../../../testsuites/automake/compile.am
+include $(top_srcdir)/../automake/compile.am
 
 include $(top_srcdir)/ada.am
 
@@ -10,4 +10,4 @@ ada_tm02_SOURCES += ../../support/init.c
 ada_tm02$(EXEEXT): tm02.adb init.$(OBJEXT)
 	$(GNATCOMPILE) -margs -a $< -o $@
 
-include $(top_srcdir)/../../../testsuites/automake/local.am
+include $(top_srcdir)/../automake/local.am
diff --git a/c/src/ada-tests/tmtests/tm02/config.h b/testsuites/ada/tmtests/tm02/config.h
index b03802dcc5..b03802dcc5 100644
--- a/c/src/ada-tests/tmtests/tm02/config.h
+++ b/testsuites/ada/tmtests/tm02/config.h
diff --git a/c/src/ada-tests/tmtests/tm02/tm02.adb b/testsuites/ada/tmtests/tm02/tm02.adb
index 9476c87878..9476c87878 100644
--- a/c/src/ada-tests/tmtests/tm02/tm02.adb
+++ b/testsuites/ada/tmtests/tm02/tm02.adb
diff --git a/c/src/ada-tests/tmtests/tm02/tmtest.adb b/testsuites/ada/tmtests/tm02/tmtest.adb
index 8fc9df5b18..8fc9df5b18 100644
--- a/c/src/ada-tests/tmtests/tm02/tmtest.adb
+++ b/testsuites/ada/tmtests/tm02/tmtest.adb
diff --git a/c/src/ada-tests/tmtests/tm02/tmtest.ads b/testsuites/ada/tmtests/tm02/tmtest.ads
index 0857c93313..0857c93313 100644
--- a/c/src/ada-tests/tmtests/tm02/tmtest.ads
+++ b/testsuites/ada/tmtests/tm02/tmtest.ads
diff --git a/c/src/ada-tests/tmtests/tm03/Makefile.am b/testsuites/ada/tmtests/tm03/Makefile.am
index ea61d4b209..81aa66358f 100644
--- a/c/src/ada-tests/tmtests/tm03/Makefile.am
+++ b/testsuites/ada/tmtests/tm03/Makefile.am
@@ -1,5 +1,5 @@
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-include $(top_srcdir)/../../../testsuites/automake/compile.am
+include $(top_srcdir)/../automake/compile.am
 
 include $(top_srcdir)/ada.am
 
@@ -10,4 +10,4 @@ ada_tm03_SOURCES += ../../support/init.c
 ada_tm03$(EXEEXT): tm03.adb init.$(OBJEXT)
 	$(GNATCOMPILE) -margs -a $< -o $@
 
-include $(top_srcdir)/../../../testsuites/automake/local.am
+include $(top_srcdir)/../automake/local.am
diff --git a/c/src/ada-tests/tmtests/tm03/config.h b/testsuites/ada/tmtests/tm03/config.h
index b03802dcc5..b03802dcc5 100644
--- a/c/src/ada-tests/tmtests/tm03/config.h
+++ b/testsuites/ada/tmtests/tm03/config.h
diff --git a/c/src/ada-tests/tmtests/tm03/tm03.adb b/testsuites/ada/tmtests/tm03/tm03.adb
index 9a95e5e1d0..9a95e5e1d0 100644
--- a/c/src/ada-tests/tmtests/tm03/tm03.adb
+++ b/testsuites/ada/tmtests/tm03/tm03.adb
diff --git a/c/src/ada-tests/tmtests/tm03/tmtest.adb b/testsuites/ada/tmtests/tm03/tmtest.adb
index a6e7606920..a6e7606920 100644
--- a/c/src/ada-tests/tmtests/tm03/tmtest.adb
+++ b/testsuites/ada/tmtests/tm03/tmtest.adb
diff --git a/c/src/ada-tests/tmtests/tm03/tmtest.ads b/testsuites/ada/tmtests/tm03/tmtest.ads
index 4acd5f7a77..4acd5f7a77 100644
--- a/c/src/ada-tests/tmtests/tm03/tmtest.ads
+++ b/testsuites/ada/tmtests/tm03/tmtest.ads
diff --git a/c/src/ada-tests/tmtests/tm04/Makefile.am b/testsuites/ada/tmtests/tm04/Makefile.am
index 744e383ce7..2aa62a790f 100644
--- a/c/src/ada-tests/tmtests/tm04/Makefile.am
+++ b/testsuites/ada/tmtests/tm04/Makefile.am
@@ -1,5 +1,5 @@
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-include $(top_srcdir)/../../../testsuites/automake/compile.am
+include $(top_srcdir)/../automake/compile.am
 
 include $(top_srcdir)/ada.am
 
@@ -10,4 +10,4 @@ ada_tm04_SOURCES += ../../support/init.c
 ada_tm04$(EXEEXT): tm04.adb init.$(OBJEXT)
 	$(GNATCOMPILE) -margs -a $< -o $@
 
-include $(top_srcdir)/../../../testsuites/automake/local.am
+include $(top_srcdir)/../automake/local.am
diff --git a/c/src/ada-tests/tmtests/tm04/config.h b/testsuites/ada/tmtests/tm04/config.h
index 700438ceae..700438ceae 100644
--- a/c/src/ada-tests/tmtests/tm04/config.h
+++ b/testsuites/ada/tmtests/tm04/config.h
diff --git a/c/src/ada-tests/tmtests/tm04/tm04.adb b/testsuites/ada/tmtests/tm04/tm04.adb
index 28e75c7db5..28e75c7db5 100644
--- a/c/src/ada-tests/tmtests/tm04/tm04.adb
+++ b/testsuites/ada/tmtests/tm04/tm04.adb
diff --git a/c/src/ada-tests/tmtests/tm04/tmtest.adb b/testsuites/ada/tmtests/tm04/tmtest.adb
index 7278bf2432..7278bf2432 100644
--- a/c/src/ada-tests/tmtests/tm04/tmtest.adb
+++ b/testsuites/ada/tmtests/tm04/tmtest.adb
diff --git a/c/src/ada-tests/tmtests/tm04/tmtest.ads b/testsuites/ada/tmtests/tm04/tmtest.ads
index e1f303ee2f..e1f303ee2f 100644
--- a/c/src/ada-tests/tmtests/tm04/tmtest.ads
+++ b/testsuites/ada/tmtests/tm04/tmtest.ads
diff --git a/c/src/ada-tests/tmtests/tm05/Makefile.am b/testsuites/ada/tmtests/tm05/Makefile.am
index 9398956ee6..1d723e1f85 100644
--- a/c/src/ada-tests/tmtests/tm05/Makefile.am
+++ b/testsuites/ada/tmtests/tm05/Makefile.am
@@ -1,5 +1,5 @@
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-include $(top_srcdir)/../../../testsuites/automake/compile.am
+include $(top_srcdir)/../automake/compile.am
 
 include $(top_srcdir)/ada.am
 
@@ -10,4 +10,4 @@ ada_tm05_SOURCES += ../../support/init.c
 ada_tm05$(EXEEXT): tm05.adb init.$(OBJEXT)
 	$(GNATCOMPILE) -margs -a $< -o $@
 
-include $(top_srcdir)/../../../testsuites/automake/local.am
+include $(top_srcdir)/../automake/local.am
diff --git a/c/src/ada-tests/tmtests/tm05/config.h b/testsuites/ada/tmtests/tm05/config.h
index b03802dcc5..b03802dcc5 100644
--- a/c/src/ada-tests/tmtests/tm05/config.h
+++ b/testsuites/ada/tmtests/tm05/config.h
diff --git a/c/src/ada-tests/tmtests/tm05/tm05.adb b/testsuites/ada/tmtests/tm05/tm05.adb
index eaa0741592..eaa0741592 100644
--- a/c/src/ada-tests/tmtests/tm05/tm05.adb
+++ b/testsuites/ada/tmtests/tm05/tm05.adb
diff --git a/c/src/ada-tests/tmtests/tm05/tmtest.adb b/testsuites/ada/tmtests/tm05/tmtest.adb
index c334acd526..c334acd526 100644
--- a/c/src/ada-tests/tmtests/tm05/tmtest.adb
+++ b/testsuites/ada/tmtests/tm05/tmtest.adb
diff --git a/c/src/ada-tests/tmtests/tm05/tmtest.ads b/testsuites/ada/tmtests/tm05/tmtest.ads
index f705c936df..f705c936df 100644
--- a/c/src/ada-tests/tmtests/tm05/tmtest.ads
+++ b/testsuites/ada/tmtests/tm05/tmtest.ads
diff --git a/c/src/ada-tests/tmtests/tm06/Makefile.am b/testsuites/ada/tmtests/tm06/Makefile.am
index 881effa4fe..a1e5edfc1c 100644
--- a/c/src/ada-tests/tmtests/tm06/Makefile.am
+++ b/testsuites/ada/tmtests/tm06/Makefile.am
@@ -1,5 +1,5 @@
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-include $(top_srcdir)/../../../testsuites/automake/compile.am
+include $(top_srcdir)/../automake/compile.am
 
 include $(top_srcdir)/ada.am
 
@@ -10,4 +10,4 @@ ada_tm06_SOURCES += ../../support/init.c
 ada_tm06$(EXEEXT): tm06.adb init.$(OBJEXT)
 	$(GNATCOMPILE) -margs -a $< -o $@
 
-include $(top_srcdir)/../../../testsuites/automake/local.am
+include $(top_srcdir)/../automake/local.am
diff --git a/c/src/ada-tests/tmtests/tm06/config.h b/testsuites/ada/tmtests/tm06/config.h
index b03802dcc5..b03802dcc5 100644
--- a/c/src/ada-tests/tmtests/tm06/config.h
+++ b/testsuites/ada/tmtests/tm06/config.h
diff --git a/c/src/ada-tests/tmtests/tm06/tm06.adb b/testsuites/ada/tmtests/tm06/tm06.adb
index db064adb4d..db064adb4d 100644
--- a/c/src/ada-tests/tmtests/tm06/tm06.adb
+++ b/testsuites/ada/tmtests/tm06/tm06.adb
diff --git a/c/src/ada-tests/tmtests/tm06/tmtest.adb b/testsuites/ada/tmtests/tm06/tmtest.adb
index 2f0f8b1a26..2f0f8b1a26 100644
--- a/c/src/ada-tests/tmtests/tm06/tmtest.adb
+++ b/testsuites/ada/tmtests/tm06/tmtest.adb
diff --git a/c/src/ada-tests/tmtests/tm06/tmtest.ads b/testsuites/ada/tmtests/tm06/tmtest.ads
index a6eb2b2df8..a6eb2b2df8 100644
--- a/c/src/ada-tests/tmtests/tm06/tmtest.ads
+++ b/testsuites/ada/tmtests/tm06/tmtest.ads
diff --git a/c/src/ada-tests/tmtests/tm07/Makefile.am b/testsuites/ada/tmtests/tm07/Makefile.am
index d4bbd23128..446c47dee1 100644
--- a/c/src/ada-tests/tmtests/tm07/Makefile.am
+++ b/testsuites/ada/tmtests/tm07/Makefile.am
@@ -1,5 +1,5 @@
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-include $(top_srcdir)/../../../testsuites/automake/compile.am
+include $(top_srcdir)/../automake/compile.am
 
 include $(top_srcdir)/ada.am
 
@@ -10,4 +10,4 @@ ada_tm07_SOURCES += ../../support/init.c
 ada_tm07$(EXEEXT): tm07.adb init.$(OBJEXT)
 	$(GNATCOMPILE) -margs -a $< -o $@
 
-include $(top_srcdir)/../../../testsuites/automake/local.am
+include $(top_srcdir)/../automake/local.am
diff --git a/c/src/ada-tests/tmtests/tm07/config.h b/testsuites/ada/tmtests/tm07/config.h
index b03802dcc5..b03802dcc5 100644
--- a/c/src/ada-tests/tmtests/tm07/config.h
+++ b/testsuites/ada/tmtests/tm07/config.h
diff --git a/c/src/ada-tests/tmtests/tm07/tm07.adb b/testsuites/ada/tmtests/tm07/tm07.adb
index 342406b38f..342406b38f 100644
--- a/c/src/ada-tests/tmtests/tm07/tm07.adb
+++ b/testsuites/ada/tmtests/tm07/tm07.adb
diff --git a/c/src/ada-tests/tmtests/tm07/tmtest.adb b/testsuites/ada/tmtests/tm07/tmtest.adb
index c3a2c62b96..c3a2c62b96 100644
--- a/c/src/ada-tests/tmtests/tm07/tmtest.adb
+++ b/testsuites/ada/tmtests/tm07/tmtest.adb
diff --git a/c/src/ada-tests/tmtests/tm07/tmtest.ads b/testsuites/ada/tmtests/tm07/tmtest.ads
index 3abc539505..3abc539505 100644
--- a/c/src/ada-tests/tmtests/tm07/tmtest.ads
+++ b/testsuites/ada/tmtests/tm07/tmtest.ads
diff --git a/c/src/ada-tests/tmtests/tm08/Makefile.am b/testsuites/ada/tmtests/tm08/Makefile.am
index b37d09d337..1b796066b0 100644
--- a/c/src/ada-tests/tmtests/tm08/Makefile.am
+++ b/testsuites/ada/tmtests/tm08/Makefile.am
@@ -1,5 +1,5 @@
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-include $(top_srcdir)/../../../testsuites/automake/compile.am
+include $(top_srcdir)/../automake/compile.am
 
 include $(top_srcdir)/ada.am
 
@@ -10,4 +10,4 @@ ada_tm08_SOURCES += ../../support/init.c
 ada_tm08$(EXEEXT): tm08.adb init.$(OBJEXT)
 	$(GNATCOMPILE) -margs -a $< -o $@
 
-include $(top_srcdir)/../../../testsuites/automake/local.am
+include $(top_srcdir)/../automake/local.am
diff --git a/c/src/ada-tests/tmtests/tm08/config.h b/testsuites/ada/tmtests/tm08/config.h
index b03802dcc5..b03802dcc5 100644
--- a/c/src/ada-tests/tmtests/tm08/config.h
+++ b/testsuites/ada/tmtests/tm08/config.h
diff --git a/c/src/ada-tests/tmtests/tm08/tm08.adb b/testsuites/ada/tmtests/tm08/tm08.adb
index d927a18d63..d927a18d63 100644
--- a/c/src/ada-tests/tmtests/tm08/tm08.adb
+++ b/testsuites/ada/tmtests/tm08/tm08.adb
diff --git a/c/src/ada-tests/tmtests/tm08/tmtest.adb b/testsuites/ada/tmtests/tm08/tmtest.adb
index c1dbcb3e30..c1dbcb3e30 100644
--- a/c/src/ada-tests/tmtests/tm08/tmtest.adb
+++ b/testsuites/ada/tmtests/tm08/tmtest.adb
diff --git a/c/src/ada-tests/tmtests/tm08/tmtest.ads b/testsuites/ada/tmtests/tm08/tmtest.ads
index 695235f479..695235f479 100644
--- a/c/src/ada-tests/tmtests/tm08/tmtest.ads
+++ b/testsuites/ada/tmtests/tm08/tmtest.ads
diff --git a/c/src/ada-tests/tmtests/tm09/Makefile.am b/testsuites/ada/tmtests/tm09/Makefile.am
index e0be06a650..02a2317d34 100644
--- a/c/src/ada-tests/tmtests/tm09/Makefile.am
+++ b/testsuites/ada/tmtests/tm09/Makefile.am
@@ -1,5 +1,5 @@
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-include $(top_srcdir)/../../../testsuites/automake/compile.am
+include $(top_srcdir)/../automake/compile.am
 
 include $(top_srcdir)/ada.am
 
@@ -10,4 +10,4 @@ ada_tm09_SOURCES += ../../support/init.c
 ada_tm09$(EXEEXT): tm09.adb init.$(OBJEXT)
 	$(GNATCOMPILE) -margs -a $< -o $@
 
-include $(top_srcdir)/../../../testsuites/automake/local.am
+include $(top_srcdir)/../automake/local.am
diff --git a/c/src/ada-tests/tmtests/tm09/config.h b/testsuites/ada/tmtests/tm09/config.h
index 56b5b2848e..56b5b2848e 100644
--- a/c/src/ada-tests/tmtests/tm09/config.h
+++ b/testsuites/ada/tmtests/tm09/config.h
diff --git a/c/src/ada-tests/tmtests/tm09/tm09.adb b/testsuites/ada/tmtests/tm09/tm09.adb
index 6fe1971d44..6fe1971d44 100644
--- a/c/src/ada-tests/tmtests/tm09/tm09.adb
+++ b/testsuites/ada/tmtests/tm09/tm09.adb
diff --git a/c/src/ada-tests/tmtests/tm09/tmtest.adb b/testsuites/ada/tmtests/tm09/tmtest.adb
index 432a7b50a8..432a7b50a8 100644
--- a/c/src/ada-tests/tmtests/tm09/tmtest.adb
+++ b/testsuites/ada/tmtests/tm09/tmtest.adb
diff --git a/c/src/ada-tests/tmtests/tm09/tmtest.ads b/testsuites/ada/tmtests/tm09/tmtest.ads
index ca02e74a51..ca02e74a51 100644
--- a/c/src/ada-tests/tmtests/tm09/tmtest.ads
+++ b/testsuites/ada/tmtests/tm09/tmtest.ads
diff --git a/c/src/ada-tests/tmtests/tm10/Makefile.am b/testsuites/ada/tmtests/tm10/Makefile.am
index 43b039dd38..8becdcbfbd 100644
--- a/c/src/ada-tests/tmtests/tm10/Makefile.am
+++ b/testsuites/ada/tmtests/tm10/Makefile.am
@@ -1,5 +1,5 @@
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-include $(top_srcdir)/../../../testsuites/automake/compile.am
+include $(top_srcdir)/../automake/compile.am
 
 include $(top_srcdir)/ada.am
 
@@ -10,4 +10,4 @@ ada_tm10_SOURCES += ../../support/init.c
 ada_tm10$(EXEEXT): tm10.adb init.$(OBJEXT)
 	$(GNATCOMPILE) -margs -a $< -o $@
 
-include $(top_srcdir)/../../../testsuites/automake/local.am
+include $(top_srcdir)/../automake/local.am
diff --git a/c/src/ada-tests/tmtests/tm10/config.h b/testsuites/ada/tmtests/tm10/config.h
index ee201258aa..ee201258aa 100644
--- a/c/src/ada-tests/tmtests/tm10/config.h
+++ b/testsuites/ada/tmtests/tm10/config.h
diff --git a/c/src/ada-tests/tmtests/tm10/tm10.adb b/testsuites/ada/tmtests/tm10/tm10.adb
index 4117d7a01a..4117d7a01a 100644
--- a/c/src/ada-tests/tmtests/tm10/tm10.adb
+++ b/testsuites/ada/tmtests/tm10/tm10.adb
diff --git a/c/src/ada-tests/tmtests/tm10/tmtest.adb b/testsuites/ada/tmtests/tm10/tmtest.adb
index 9a92266cf5..9a92266cf5 100644
--- a/c/src/ada-tests/tmtests/tm10/tmtest.adb
+++ b/testsuites/ada/tmtests/tm10/tmtest.adb
diff --git a/c/src/ada-tests/tmtests/tm10/tmtest.ads b/testsuites/ada/tmtests/tm10/tmtest.ads
index 224630e1d5..224630e1d5 100644
--- a/c/src/ada-tests/tmtests/tm10/tmtest.ads
+++ b/testsuites/ada/tmtests/tm10/tmtest.ads
diff --git a/c/src/ada-tests/tmtests/tm11/Makefile.am b/testsuites/ada/tmtests/tm11/Makefile.am
index a5532f2301..8779d31500 100644
--- a/c/src/ada-tests/tmtests/tm11/Makefile.am
+++ b/testsuites/ada/tmtests/tm11/Makefile.am
@@ -1,5 +1,5 @@
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-include $(top_srcdir)/../../../testsuites/automake/compile.am
+include $(top_srcdir)/../automake/compile.am
 
 include $(top_srcdir)/ada.am
 
@@ -10,4 +10,4 @@ ada_tm11_SOURCES += ../../support/init.c
 ada_tm11$(EXEEXT): tm11.adb init.$(OBJEXT)
 	$(GNATCOMPILE) -margs -a $< -o $@
 
-include $(top_srcdir)/../../../testsuites/automake/local.am
+include $(top_srcdir)/../automake/local.am
diff --git a/c/src/ada-tests/tmtests/tm11/config.h b/testsuites/ada/tmtests/tm11/config.h
index a5064b6e92..a5064b6e92 100644
--- a/c/src/ada-tests/tmtests/tm11/config.h
+++ b/testsuites/ada/tmtests/tm11/config.h
diff --git a/c/src/ada-tests/tmtests/tm11/tm11.adb b/testsuites/ada/tmtests/tm11/tm11.adb
index bcc91aa905..bcc91aa905 100644
--- a/c/src/ada-tests/tmtests/tm11/tm11.adb
+++ b/testsuites/ada/tmtests/tm11/tm11.adb
diff --git a/c/src/ada-tests/tmtests/tm11/tmtest.adb b/testsuites/ada/tmtests/tm11/tmtest.adb
index 610c248d57..610c248d57 100644
--- a/c/src/ada-tests/tmtests/tm11/tmtest.adb
+++ b/testsuites/ada/tmtests/tm11/tmtest.adb
diff --git a/c/src/ada-tests/tmtests/tm11/tmtest.ads b/testsuites/ada/tmtests/tm11/tmtest.ads
index 6718933b04..6718933b04 100644
--- a/c/src/ada-tests/tmtests/tm11/tmtest.ads
+++ b/testsuites/ada/tmtests/tm11/tmtest.ads
diff --git a/c/src/ada-tests/tmtests/tm12/Makefile.am b/testsuites/ada/tmtests/tm12/Makefile.am
index 925aa17a5f..477ee54495 100644
--- a/c/src/ada-tests/tmtests/tm12/Makefile.am
+++ b/testsuites/ada/tmtests/tm12/Makefile.am
@@ -1,5 +1,5 @@
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-include $(top_srcdir)/../../../testsuites/automake/compile.am
+include $(top_srcdir)/../automake/compile.am
 
 include $(top_srcdir)/ada.am
 
@@ -10,4 +10,4 @@ ada_tm12_SOURCES += ../../support/init.c
 ada_tm12$(EXEEXT): tm12.adb init.$(OBJEXT)
 	$(GNATCOMPILE) -margs -a $< -o $@
 
-include $(top_srcdir)/../../../testsuites/automake/local.am
+include $(top_srcdir)/../automake/local.am
diff --git a/c/src/ada-tests/tmtests/tm12/config.h b/testsuites/ada/tmtests/tm12/config.h
index a5064b6e92..a5064b6e92 100644
--- a/c/src/ada-tests/tmtests/tm12/config.h
+++ b/testsuites/ada/tmtests/tm12/config.h
diff --git a/c/src/ada-tests/tmtests/tm12/tm12.adb b/testsuites/ada/tmtests/tm12/tm12.adb
index bea5e83b79..bea5e83b79 100644
--- a/c/src/ada-tests/tmtests/tm12/tm12.adb
+++ b/testsuites/ada/tmtests/tm12/tm12.adb
diff --git a/c/src/ada-tests/tmtests/tm12/tmtest.adb b/testsuites/ada/tmtests/tm12/tmtest.adb
index a97330f7bf..a97330f7bf 100644
--- a/c/src/ada-tests/tmtests/tm12/tmtest.adb
+++ b/testsuites/ada/tmtests/tm12/tmtest.adb
diff --git a/c/src/ada-tests/tmtests/tm12/tmtest.ads b/testsuites/ada/tmtests/tm12/tmtest.ads
index 15ff276c7c..15ff276c7c 100644
--- a/c/src/ada-tests/tmtests/tm12/tmtest.ads
+++ b/testsuites/ada/tmtests/tm12/tmtest.ads
diff --git a/c/src/ada-tests/tmtests/tm13/Makefile.am b/testsuites/ada/tmtests/tm13/Makefile.am
index cc8bb32e16..9fc59619a0 100644
--- a/c/src/ada-tests/tmtests/tm13/Makefile.am
+++ b/testsuites/ada/tmtests/tm13/Makefile.am
@@ -1,5 +1,5 @@
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-include $(top_srcdir)/../../../testsuites/automake/compile.am
+include $(top_srcdir)/../automake/compile.am
 
 include $(top_srcdir)/ada.am
 
@@ -10,4 +10,4 @@ ada_tm13_SOURCES += ../../support/init.c
 ada_tm13$(EXEEXT): tm13.adb init.$(OBJEXT)
 	$(GNATCOMPILE) -margs -a $< -o $@
 
-include $(top_srcdir)/../../../testsuites/automake/local.am
+include $(top_srcdir)/../automake/local.am
diff --git a/c/src/ada-tests/tmtests/tm13/config.h b/testsuites/ada/tmtests/tm13/config.h
index a5064b6e92..a5064b6e92 100644
--- a/c/src/ada-tests/tmtests/tm13/config.h
+++ b/testsuites/ada/tmtests/tm13/config.h
diff --git a/c/src/ada-tests/tmtests/tm13/tm13.adb b/testsuites/ada/tmtests/tm13/tm13.adb
index ba2ab58065..ba2ab58065 100644
--- a/c/src/ada-tests/tmtests/tm13/tm13.adb
+++ b/testsuites/ada/tmtests/tm13/tm13.adb
diff --git a/c/src/ada-tests/tmtests/tm13/tmtest.adb b/testsuites/ada/tmtests/tm13/tmtest.adb
index aa9a760f82..aa9a760f82 100644
--- a/c/src/ada-tests/tmtests/tm13/tmtest.adb
+++ b/testsuites/ada/tmtests/tm13/tmtest.adb
diff --git a/c/src/ada-tests/tmtests/tm13/tmtest.ads b/testsuites/ada/tmtests/tm13/tmtest.ads
index 270bcda7e2..270bcda7e2 100644
--- a/c/src/ada-tests/tmtests/tm13/tmtest.ads
+++ b/testsuites/ada/tmtests/tm13/tmtest.ads
diff --git a/c/src/ada-tests/tmtests/tm14/Makefile.am b/testsuites/ada/tmtests/tm14/Makefile.am
index 0577c8a26c..bc5e7d0377 100644
--- a/c/src/ada-tests/tmtests/tm14/Makefile.am
+++ b/testsuites/ada/tmtests/tm14/Makefile.am
@@ -1,5 +1,5 @@
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-include $(top_srcdir)/../../../testsuites/automake/compile.am
+include $(top_srcdir)/../automake/compile.am
 
 include $(top_srcdir)/ada.am
 
@@ -10,4 +10,4 @@ ada_tm14_SOURCES += ../../support/init.c
 ada_tm14$(EXEEXT): tm14.adb init.$(OBJEXT)
 	$(GNATCOMPILE) -margs -a $< -o $@
 
-include $(top_srcdir)/../../../testsuites/automake/local.am
+include $(top_srcdir)/../automake/local.am
diff --git a/c/src/ada-tests/tmtests/tm14/config.h b/testsuites/ada/tmtests/tm14/config.h
index a5064b6e92..a5064b6e92 100644
--- a/c/src/ada-tests/tmtests/tm14/config.h
+++ b/testsuites/ada/tmtests/tm14/config.h
diff --git a/c/src/ada-tests/tmtests/tm14/tm14.adb b/testsuites/ada/tmtests/tm14/tm14.adb
index 3835813b60..3835813b60 100644
--- a/c/src/ada-tests/tmtests/tm14/tm14.adb
+++ b/testsuites/ada/tmtests/tm14/tm14.adb
diff --git a/c/src/ada-tests/tmtests/tm14/tmtest.adb b/testsuites/ada/tmtests/tm14/tmtest.adb
index adde5deb77..adde5deb77 100644
--- a/c/src/ada-tests/tmtests/tm14/tmtest.adb
+++ b/testsuites/ada/tmtests/tm14/tmtest.adb
diff --git a/c/src/ada-tests/tmtests/tm14/tmtest.ads b/testsuites/ada/tmtests/tm14/tmtest.ads
index c90b1cadc3..c90b1cadc3 100644
--- a/c/src/ada-tests/tmtests/tm14/tmtest.ads
+++ b/testsuites/ada/tmtests/tm14/tmtest.ads
diff --git a/c/src/ada-tests/tmtests/tm15/Makefile.am b/testsuites/ada/tmtests/tm15/Makefile.am
index 09713d4b66..e792c9be21 100644
--- a/c/src/ada-tests/tmtests/tm15/Makefile.am
+++ b/testsuites/ada/tmtests/tm15/Makefile.am
@@ -1,5 +1,5 @@
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-include $(top_srcdir)/../../../testsuites/automake/compile.am
+include $(top_srcdir)/../automake/compile.am
 
 include $(top_srcdir)/ada.am
 
@@ -10,4 +10,4 @@ ada_tm15_SOURCES += ../../support/init.c
 ada_tm15$(EXEEXT): tm15.adb init.$(OBJEXT)
 	$(GNATCOMPILE) -margs -a $< -o $@
 
-include $(top_srcdir)/../../../testsuites/automake/local.am
+include $(top_srcdir)/../automake/local.am
diff --git a/c/src/ada-tests/tmtests/tm15/config.h b/testsuites/ada/tmtests/tm15/config.h
index a5064b6e92..a5064b6e92 100644
--- a/c/src/ada-tests/tmtests/tm15/config.h
+++ b/testsuites/ada/tmtests/tm15/config.h
diff --git a/c/src/ada-tests/tmtests/tm15/tm15.adb b/testsuites/ada/tmtests/tm15/tm15.adb
index 31e40968da..31e40968da 100644
--- a/c/src/ada-tests/tmtests/tm15/tm15.adb
+++ b/testsuites/ada/tmtests/tm15/tm15.adb
diff --git a/c/src/ada-tests/tmtests/tm15/tmtest.adb b/testsuites/ada/tmtests/tm15/tmtest.adb
index 2a7efedcf9..2a7efedcf9 100644
--- a/c/src/ada-tests/tmtests/tm15/tmtest.adb
+++ b/testsuites/ada/tmtests/tm15/tmtest.adb
diff --git a/c/src/ada-tests/tmtests/tm15/tmtest.ads b/testsuites/ada/tmtests/tm15/tmtest.ads
index b8ab38d6cd..b8ab38d6cd 100644
--- a/c/src/ada-tests/tmtests/tm15/tmtest.ads
+++ b/testsuites/ada/tmtests/tm15/tmtest.ads
diff --git a/c/src/ada-tests/tmtests/tm16/Makefile.am b/testsuites/ada/tmtests/tm16/Makefile.am
index e3a598b83d..95257974f5 100644
--- a/c/src/ada-tests/tmtests/tm16/Makefile.am
+++ b/testsuites/ada/tmtests/tm16/Makefile.am
@@ -1,5 +1,5 @@
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-include $(top_srcdir)/../../../testsuites/automake/compile.am
+include $(top_srcdir)/../automake/compile.am
 
 include $(top_srcdir)/ada.am
 
@@ -10,4 +10,4 @@ ada_tm16_SOURCES += ../../support/init.c
 ada_tm16$(EXEEXT): tm16.adb init.$(OBJEXT)
 	$(GNATCOMPILE) -margs -a $< -o $@
 
-include $(top_srcdir)/../../../testsuites/automake/local.am
+include $(top_srcdir)/../automake/local.am
diff --git a/c/src/ada-tests/tmtests/tm16/config.h b/testsuites/ada/tmtests/tm16/config.h
index a5064b6e92..a5064b6e92 100644
--- a/c/src/ada-tests/tmtests/tm16/config.h
+++ b/testsuites/ada/tmtests/tm16/config.h
diff --git a/c/src/ada-tests/tmtests/tm16/tm16.adb b/testsuites/ada/tmtests/tm16/tm16.adb
index a6d67d93ce..a6d67d93ce 100644
--- a/c/src/ada-tests/tmtests/tm16/tm16.adb
+++ b/testsuites/ada/tmtests/tm16/tm16.adb
diff --git a/c/src/ada-tests/tmtests/tm16/tmtest.adb b/testsuites/ada/tmtests/tm16/tmtest.adb
index 4be7a6bbd6..4be7a6bbd6 100644
--- a/c/src/ada-tests/tmtests/tm16/tmtest.adb
+++ b/testsuites/ada/tmtests/tm16/tmtest.adb
diff --git a/c/src/ada-tests/tmtests/tm16/tmtest.ads b/testsuites/ada/tmtests/tm16/tmtest.ads
index ab42eb259c..ab42eb259c 100644
--- a/c/src/ada-tests/tmtests/tm16/tmtest.ads
+++ b/testsuites/ada/tmtests/tm16/tmtest.ads
diff --git a/c/src/ada-tests/tmtests/tm17/Makefile.am b/testsuites/ada/tmtests/tm17/Makefile.am
index b46cc74a21..d8715ded65 100644
--- a/c/src/ada-tests/tmtests/tm17/Makefile.am
+++ b/testsuites/ada/tmtests/tm17/Makefile.am
@@ -1,5 +1,5 @@
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-include $(top_srcdir)/../../../testsuites/automake/compile.am
+include $(top_srcdir)/../automake/compile.am
 
 include $(top_srcdir)/ada.am
 
@@ -10,4 +10,4 @@ ada_tm17_SOURCES += ../../support/init.c
 ada_tm17$(EXEEXT): tm17.adb init.$(OBJEXT)
 	$(GNATCOMPILE) -margs -a $< -o $@
 
-include $(top_srcdir)/../../../testsuites/automake/local.am
+include $(top_srcdir)/../automake/local.am
diff --git a/c/src/ada-tests/tmtests/tm17/config.h b/testsuites/ada/tmtests/tm17/config.h
index a5064b6e92..a5064b6e92 100644
--- a/c/src/ada-tests/tmtests/tm17/config.h
+++ b/testsuites/ada/tmtests/tm17/config.h
diff --git a/c/src/ada-tests/tmtests/tm17/tm17.adb b/testsuites/ada/tmtests/tm17/tm17.adb
index efc2766479..efc2766479 100644
--- a/c/src/ada-tests/tmtests/tm17/tm17.adb
+++ b/testsuites/ada/tmtests/tm17/tm17.adb
diff --git a/c/src/ada-tests/tmtests/tm17/tmtest.adb b/testsuites/ada/tmtests/tm17/tmtest.adb
index 5e645581d4..5e645581d4 100644
--- a/c/src/ada-tests/tmtests/tm17/tmtest.adb
+++ b/testsuites/ada/tmtests/tm17/tmtest.adb
diff --git a/c/src/ada-tests/tmtests/tm17/tmtest.ads b/testsuites/ada/tmtests/tm17/tmtest.ads
index b2c9369e26..b2c9369e26 100644
--- a/c/src/ada-tests/tmtests/tm17/tmtest.ads
+++ b/testsuites/ada/tmtests/tm17/tmtest.ads
diff --git a/c/src/ada-tests/tmtests/tm18/Makefile.am b/testsuites/ada/tmtests/tm18/Makefile.am
index e1c08d484c..62820c5a4d 100644
--- a/c/src/ada-tests/tmtests/tm18/Makefile.am
+++ b/testsuites/ada/tmtests/tm18/Makefile.am
@@ -1,5 +1,5 @@
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-include $(top_srcdir)/../../../testsuites/automake/compile.am
+include $(top_srcdir)/../automake/compile.am
 
 include $(top_srcdir)/ada.am
 
@@ -10,4 +10,4 @@ ada_tm18_SOURCES += ../../support/init.c
 ada_tm18$(EXEEXT): tm18.adb init.$(OBJEXT)
 	$(GNATCOMPILE) -margs -a $< -o $@
 
-include $(top_srcdir)/../../../testsuites/automake/local.am
+include $(top_srcdir)/../automake/local.am
diff --git a/c/src/ada-tests/tmtests/tm18/config.h b/testsuites/ada/tmtests/tm18/config.h
index a5064b6e92..a5064b6e92 100644
--- a/c/src/ada-tests/tmtests/tm18/config.h
+++ b/testsuites/ada/tmtests/tm18/config.h
diff --git a/c/src/ada-tests/tmtests/tm18/tm18.adb b/testsuites/ada/tmtests/tm18/tm18.adb
index 856b6f1127..856b6f1127 100644
--- a/c/src/ada-tests/tmtests/tm18/tm18.adb
+++ b/testsuites/ada/tmtests/tm18/tm18.adb
diff --git a/c/src/ada-tests/tmtests/tm18/tmtest.adb b/testsuites/ada/tmtests/tm18/tmtest.adb
index e86b24cd4a..e86b24cd4a 100644
--- a/c/src/ada-tests/tmtests/tm18/tmtest.adb
+++ b/testsuites/ada/tmtests/tm18/tmtest.adb
diff --git a/c/src/ada-tests/tmtests/tm18/tmtest.ads b/testsuites/ada/tmtests/tm18/tmtest.ads
index 0b919d44a4..0b919d44a4 100644
--- a/c/src/ada-tests/tmtests/tm18/tmtest.ads
+++ b/testsuites/ada/tmtests/tm18/tmtest.ads
diff --git a/c/src/ada-tests/tmtests/tm19/Makefile.am b/testsuites/ada/tmtests/tm19/Makefile.am
index 3ce11ecde0..c21692b9f5 100644
--- a/c/src/ada-tests/tmtests/tm19/Makefile.am
+++ b/testsuites/ada/tmtests/tm19/Makefile.am
@@ -1,5 +1,5 @@
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-include $(top_srcdir)/../../../testsuites/automake/compile.am
+include $(top_srcdir)/../automake/compile.am
 
 include $(top_srcdir)/ada.am
 
@@ -10,4 +10,4 @@ ada_tm19_SOURCES += ../../support/init.c
 ada_tm19$(EXEEXT): tm19.adb init.$(OBJEXT)
 	$(GNATCOMPILE) -margs -a $< -o $@
 
-include $(top_srcdir)/../../../testsuites/automake/local.am
+include $(top_srcdir)/../automake/local.am
diff --git a/c/src/ada-tests/tmtests/tm19/config.h b/testsuites/ada/tmtests/tm19/config.h
index a5064b6e92..a5064b6e92 100644
--- a/c/src/ada-tests/tmtests/tm19/config.h
+++ b/testsuites/ada/tmtests/tm19/config.h
diff --git a/c/src/ada-tests/tmtests/tm19/tm19.adb b/testsuites/ada/tmtests/tm19/tm19.adb
index 0b232d833a..0b232d833a 100644
--- a/c/src/ada-tests/tmtests/tm19/tm19.adb
+++ b/testsuites/ada/tmtests/tm19/tm19.adb
diff --git a/c/src/ada-tests/tmtests/tm19/tmtest.adb b/testsuites/ada/tmtests/tm19/tmtest.adb
index 288a6a799d..288a6a799d 100644
--- a/c/src/ada-tests/tmtests/tm19/tmtest.adb
+++ b/testsuites/ada/tmtests/tm19/tmtest.adb
diff --git a/c/src/ada-tests/tmtests/tm19/tmtest.ads b/testsuites/ada/tmtests/tm19/tmtest.ads
index 7776b41b35..7776b41b35 100644
--- a/c/src/ada-tests/tmtests/tm19/tmtest.ads
+++ b/testsuites/ada/tmtests/tm19/tmtest.ads
diff --git a/c/src/ada-tests/tmtests/tm20/Makefile.am b/testsuites/ada/tmtests/tm20/Makefile.am
index 03ff046510..d4ca51dca4 100644
--- a/c/src/ada-tests/tmtests/tm20/Makefile.am
+++ b/testsuites/ada/tmtests/tm20/Makefile.am
@@ -1,5 +1,5 @@
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-include $(top_srcdir)/../../../testsuites/automake/compile.am
+include $(top_srcdir)/../automake/compile.am
 
 include $(top_srcdir)/ada.am
 
@@ -10,4 +10,4 @@ ada_tm20_SOURCES += ../../support/init.c
 ada_tm20$(EXEEXT): tm20.adb init.$(OBJEXT)
 	$(GNATCOMPILE) -margs -a $< -o $@
 
-include $(top_srcdir)/../../../testsuites/automake/local.am
+include $(top_srcdir)/../automake/local.am
diff --git a/c/src/ada-tests/tmtests/tm20/config.h b/testsuites/ada/tmtests/tm20/config.h
index 30b26944d9..30b26944d9 100644
--- a/c/src/ada-tests/tmtests/tm20/config.h
+++ b/testsuites/ada/tmtests/tm20/config.h
diff --git a/c/src/ada-tests/tmtests/tm20/tm20.adb b/testsuites/ada/tmtests/tm20/tm20.adb
index 47ef899495..47ef899495 100644
--- a/c/src/ada-tests/tmtests/tm20/tm20.adb
+++ b/testsuites/ada/tmtests/tm20/tm20.adb
diff --git a/c/src/ada-tests/tmtests/tm20/tmtest.adb b/testsuites/ada/tmtests/tm20/tmtest.adb
index 4a997f3ff4..4a997f3ff4 100644
--- a/c/src/ada-tests/tmtests/tm20/tmtest.adb
+++ b/testsuites/ada/tmtests/tm20/tmtest.adb
diff --git a/c/src/ada-tests/tmtests/tm20/tmtest.ads b/testsuites/ada/tmtests/tm20/tmtest.ads
index 8afc25ac2c..8afc25ac2c 100644
--- a/c/src/ada-tests/tmtests/tm20/tmtest.ads
+++ b/testsuites/ada/tmtests/tm20/tmtest.ads
diff --git a/c/src/ada-tests/tmtests/tm21/Makefile.am b/testsuites/ada/tmtests/tm21/Makefile.am
index 7adced3f74..37f4c6b9b5 100644
--- a/c/src/ada-tests/tmtests/tm21/Makefile.am
+++ b/testsuites/ada/tmtests/tm21/Makefile.am
@@ -1,5 +1,5 @@
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-include $(top_srcdir)/../../../testsuites/automake/compile.am
+include $(top_srcdir)/../automake/compile.am
 
 include $(top_srcdir)/ada.am
 
@@ -10,4 +10,4 @@ ada_tm21_SOURCES += ../../support/init.c
 ada_tm21$(EXEEXT): tm21.adb init.$(OBJEXT)
 	$(GNATCOMPILE) -margs -a $< -o $@
 
-include $(top_srcdir)/../../../testsuites/automake/local.am
+include $(top_srcdir)/../automake/local.am
diff --git a/c/src/ada-tests/tmtests/tm21/config.h b/testsuites/ada/tmtests/tm21/config.h
index d4b8bc5054..d4b8bc5054 100644
--- a/c/src/ada-tests/tmtests/tm21/config.h
+++ b/testsuites/ada/tmtests/tm21/config.h
diff --git a/c/src/ada-tests/tmtests/tm21/tm21.adb b/testsuites/ada/tmtests/tm21/tm21.adb
index 45381ece6c..45381ece6c 100644
--- a/c/src/ada-tests/tmtests/tm21/tm21.adb
+++ b/testsuites/ada/tmtests/tm21/tm21.adb
diff --git a/c/src/ada-tests/tmtests/tm21/tmtest.adb b/testsuites/ada/tmtests/tm21/tmtest.adb
index 245376953d..245376953d 100644
--- a/c/src/ada-tests/tmtests/tm21/tmtest.adb
+++ b/testsuites/ada/tmtests/tm21/tmtest.adb
diff --git a/c/src/ada-tests/tmtests/tm21/tmtest.ads b/testsuites/ada/tmtests/tm21/tmtest.ads
index 538ffad4d0..538ffad4d0 100644
--- a/c/src/ada-tests/tmtests/tm21/tmtest.ads
+++ b/testsuites/ada/tmtests/tm21/tmtest.ads
diff --git a/c/src/ada-tests/tmtests/tm22/Makefile.am b/testsuites/ada/tmtests/tm22/Makefile.am
index bbed77ec88..a477b99cd7 100644
--- a/c/src/ada-tests/tmtests/tm22/Makefile.am
+++ b/testsuites/ada/tmtests/tm22/Makefile.am
@@ -1,5 +1,5 @@
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-include $(top_srcdir)/../../../testsuites/automake/compile.am
+include $(top_srcdir)/../automake/compile.am
 
 include $(top_srcdir)/ada.am
 
@@ -10,4 +10,4 @@ ada_tm22_SOURCES += ../../support/init.c
 ada_tm22$(EXEEXT): tm22.adb init.$(OBJEXT)
 	$(GNATCOMPILE) -margs -a $< -o $@
 
-include $(top_srcdir)/../../../testsuites/automake/local.am
+include $(top_srcdir)/../automake/local.am
diff --git a/c/src/ada-tests/tmtests/tm22/config.h b/testsuites/ada/tmtests/tm22/config.h
index c1585c7ef4..c1585c7ef4 100644
--- a/c/src/ada-tests/tmtests/tm22/config.h
+++ b/testsuites/ada/tmtests/tm22/config.h
diff --git a/c/src/ada-tests/tmtests/tm22/tm22.adb b/testsuites/ada/tmtests/tm22/tm22.adb
index ce755dd517..ce755dd517 100644
--- a/c/src/ada-tests/tmtests/tm22/tm22.adb
+++ b/testsuites/ada/tmtests/tm22/tm22.adb
diff --git a/c/src/ada-tests/tmtests/tm22/tmtest.adb b/testsuites/ada/tmtests/tm22/tmtest.adb
index ea1afc84c9..ea1afc84c9 100644
--- a/c/src/ada-tests/tmtests/tm22/tmtest.adb
+++ b/testsuites/ada/tmtests/tm22/tmtest.adb
diff --git a/c/src/ada-tests/tmtests/tm22/tmtest.ads b/testsuites/ada/tmtests/tm22/tmtest.ads
index f5dce6c3a0..f5dce6c3a0 100644
--- a/c/src/ada-tests/tmtests/tm22/tmtest.ads
+++ b/testsuites/ada/tmtests/tm22/tmtest.ads
diff --git a/c/src/ada-tests/tmtests/tm23/Makefile.am b/testsuites/ada/tmtests/tm23/Makefile.am
index 04800ceb24..6ee7aa44b9 100644
--- a/c/src/ada-tests/tmtests/tm23/Makefile.am
+++ b/testsuites/ada/tmtests/tm23/Makefile.am
@@ -1,5 +1,5 @@
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-include $(top_srcdir)/../../../testsuites/automake/compile.am
+include $(top_srcdir)/../automake/compile.am
 
 include $(top_srcdir)/ada.am
 
@@ -10,4 +10,4 @@ ada_tm23_SOURCES += ../../support/init.c
 ada_tm23$(EXEEXT): tm23.adb init.$(OBJEXT)
 	$(GNATCOMPILE) -margs -a $< -o $@
 
-include $(top_srcdir)/../../../testsuites/automake/local.am
+include $(top_srcdir)/../automake/local.am
diff --git a/c/src/ada-tests/tmtests/tm23/config.h b/testsuites/ada/tmtests/tm23/config.h
index 15e3e1ccf6..15e3e1ccf6 100644
--- a/c/src/ada-tests/tmtests/tm23/config.h
+++ b/testsuites/ada/tmtests/tm23/config.h
diff --git a/c/src/ada-tests/tmtests/tm23/tm23.adb b/testsuites/ada/tmtests/tm23/tm23.adb
index 5e345c958a..5e345c958a 100644
--- a/c/src/ada-tests/tmtests/tm23/tm23.adb
+++ b/testsuites/ada/tmtests/tm23/tm23.adb
diff --git a/c/src/ada-tests/tmtests/tm23/tmtest.adb b/testsuites/ada/tmtests/tm23/tmtest.adb
index 4b5a26f777..4b5a26f777 100644
--- a/c/src/ada-tests/tmtests/tm23/tmtest.adb
+++ b/testsuites/ada/tmtests/tm23/tmtest.adb
diff --git a/c/src/ada-tests/tmtests/tm23/tmtest.ads b/testsuites/ada/tmtests/tm23/tmtest.ads
index 6e567007ca..6e567007ca 100644
--- a/c/src/ada-tests/tmtests/tm23/tmtest.ads
+++ b/testsuites/ada/tmtests/tm23/tmtest.ads
diff --git a/c/src/ada-tests/tmtests/tm24/Makefile.am b/testsuites/ada/tmtests/tm24/Makefile.am
index cb0fdcbb9a..9c7ec2e996 100644
--- a/c/src/ada-tests/tmtests/tm24/Makefile.am
+++ b/testsuites/ada/tmtests/tm24/Makefile.am
@@ -1,5 +1,5 @@
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-include $(top_srcdir)/../../../testsuites/automake/compile.am
+include $(top_srcdir)/../automake/compile.am
 
 include $(top_srcdir)/ada.am
 
@@ -10,4 +10,4 @@ ada_tm24_SOURCES += ../../support/init.c
 ada_tm24$(EXEEXT): tm24.adb init.$(OBJEXT)
 	$(GNATCOMPILE) -margs -a $< -o $@
 
-include $(top_srcdir)/../../../testsuites/automake/local.am
+include $(top_srcdir)/../automake/local.am
diff --git a/c/src/ada-tests/tmtests/tm24/config.h b/testsuites/ada/tmtests/tm24/config.h
index 85640d92a9..85640d92a9 100644
--- a/c/src/ada-tests/tmtests/tm24/config.h
+++ b/testsuites/ada/tmtests/tm24/config.h
diff --git a/c/src/ada-tests/tmtests/tm24/tm24.adb b/testsuites/ada/tmtests/tm24/tm24.adb
index a5ca5d4f7f..a5ca5d4f7f 100644
--- a/c/src/ada-tests/tmtests/tm24/tm24.adb
+++ b/testsuites/ada/tmtests/tm24/tm24.adb
diff --git a/c/src/ada-tests/tmtests/tm24/tmtest.adb b/testsuites/ada/tmtests/tm24/tmtest.adb
index 2bcd220516..2bcd220516 100644
--- a/c/src/ada-tests/tmtests/tm24/tmtest.adb
+++ b/testsuites/ada/tmtests/tm24/tmtest.adb
diff --git a/c/src/ada-tests/tmtests/tm24/tmtest.ads b/testsuites/ada/tmtests/tm24/tmtest.ads
index fb6203d5c1..fb6203d5c1 100644
--- a/c/src/ada-tests/tmtests/tm24/tmtest.ads
+++ b/testsuites/ada/tmtests/tm24/tmtest.ads
diff --git a/c/src/ada-tests/tmtests/tm25/Makefile.am b/testsuites/ada/tmtests/tm25/Makefile.am
index d50089bb75..db67df9aff 100644
--- a/c/src/ada-tests/tmtests/tm25/Makefile.am
+++ b/testsuites/ada/tmtests/tm25/Makefile.am
@@ -1,5 +1,5 @@
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-include $(top_srcdir)/../../../testsuites/automake/compile.am
+include $(top_srcdir)/../automake/compile.am
 
 include $(top_srcdir)/ada.am
 
@@ -10,4 +10,4 @@ ada_tm25_SOURCES += ../../support/init.c
 ada_tm25$(EXEEXT): tm25.adb init.$(OBJEXT)
 	$(GNATCOMPILE) -margs -a $< -o $@
 
-include $(top_srcdir)/../../../testsuites/automake/local.am
+include $(top_srcdir)/../automake/local.am
diff --git a/c/src/ada-tests/tmtests/tm25/config.h b/testsuites/ada/tmtests/tm25/config.h
index 700438ceae..700438ceae 100644
--- a/c/src/ada-tests/tmtests/tm25/config.h
+++ b/testsuites/ada/tmtests/tm25/config.h
diff --git a/c/src/ada-tests/tmtests/tm25/tm25.adb b/testsuites/ada/tmtests/tm25/tm25.adb
index 44bda5893f..44bda5893f 100644
--- a/c/src/ada-tests/tmtests/tm25/tm25.adb
+++ b/testsuites/ada/tmtests/tm25/tm25.adb
diff --git a/c/src/ada-tests/tmtests/tm25/tmtest.adb b/testsuites/ada/tmtests/tm25/tmtest.adb
index 8710052bfb..8710052bfb 100644
--- a/c/src/ada-tests/tmtests/tm25/tmtest.adb
+++ b/testsuites/ada/tmtests/tm25/tmtest.adb
diff --git a/c/src/ada-tests/tmtests/tm25/tmtest.ads b/testsuites/ada/tmtests/tm25/tmtest.ads
index 45a671af81..45a671af81 100644
--- a/c/src/ada-tests/tmtests/tm25/tmtest.ads
+++ b/testsuites/ada/tmtests/tm25/tmtest.ads
diff --git a/c/src/ada-tests/tmtests/tm28/Makefile.am b/testsuites/ada/tmtests/tm28/Makefile.am
index e59b303823..eca1e00d55 100644
--- a/c/src/ada-tests/tmtests/tm28/Makefile.am
+++ b/testsuites/ada/tmtests/tm28/Makefile.am
@@ -1,5 +1,5 @@
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-include $(top_srcdir)/../../../testsuites/automake/compile.am
+include $(top_srcdir)/../automake/compile.am
 
 include $(top_srcdir)/ada.am
 
@@ -10,4 +10,4 @@ ada_tm28_SOURCES += ../../support/init.c
 ada_tm28$(EXEEXT): tm28.adb init.$(OBJEXT)
 	$(GNATCOMPILE) -margs -a $< -o $@
 
-include $(top_srcdir)/../../../testsuites/automake/local.am
+include $(top_srcdir)/../automake/local.am
diff --git a/c/src/ada-tests/tmtests/tm28/config.h b/testsuites/ada/tmtests/tm28/config.h
index 2f73cd5acb..2f73cd5acb 100644
--- a/c/src/ada-tests/tmtests/tm28/config.h
+++ b/testsuites/ada/tmtests/tm28/config.h
diff --git a/c/src/ada-tests/tmtests/tm28/tm28.adb b/testsuites/ada/tmtests/tm28/tm28.adb
index 93d0f3cf02..93d0f3cf02 100644
--- a/c/src/ada-tests/tmtests/tm28/tm28.adb
+++ b/testsuites/ada/tmtests/tm28/tm28.adb
diff --git a/c/src/ada-tests/tmtests/tm28/tmtest.adb b/testsuites/ada/tmtests/tm28/tmtest.adb
index 189090e39f..189090e39f 100644
--- a/c/src/ada-tests/tmtests/tm28/tmtest.adb
+++ b/testsuites/ada/tmtests/tm28/tmtest.adb
diff --git a/c/src/ada-tests/tmtests/tm28/tmtest.ads b/testsuites/ada/tmtests/tm28/tmtest.ads
index 39ceeb0ad2..39ceeb0ad2 100644
--- a/c/src/ada-tests/tmtests/tm28/tmtest.ads
+++ b/testsuites/ada/tmtests/tm28/tmtest.ads
diff --git a/c/src/ada-tests/tmtests/tm29/Makefile.am b/testsuites/ada/tmtests/tm29/Makefile.am
index d28cd2447a..d34b097da4 100644
--- a/c/src/ada-tests/tmtests/tm29/Makefile.am
+++ b/testsuites/ada/tmtests/tm29/Makefile.am
@@ -1,5 +1,5 @@
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-include $(top_srcdir)/../../../testsuites/automake/compile.am
+include $(top_srcdir)/../automake/compile.am
 
 include $(top_srcdir)/ada.am
 
@@ -10,4 +10,4 @@ ada_tm29_SOURCES += ../../support/init.c
 ada_tm29$(EXEEXT): tm29.adb init.$(OBJEXT)
 	$(GNATCOMPILE) -margs -a $< -o $@
 
-include $(top_srcdir)/../../../testsuites/automake/local.am
+include $(top_srcdir)/../automake/local.am
diff --git a/c/src/ada-tests/tmtests/tm29/config.h b/testsuites/ada/tmtests/tm29/config.h
index e9165e59c8..e9165e59c8 100644
--- a/c/src/ada-tests/tmtests/tm29/config.h
+++ b/testsuites/ada/tmtests/tm29/config.h
diff --git a/c/src/ada-tests/tmtests/tm29/tm29.adb b/testsuites/ada/tmtests/tm29/tm29.adb
index 4853fbf2c7..4853fbf2c7 100644
--- a/c/src/ada-tests/tmtests/tm29/tm29.adb
+++ b/testsuites/ada/tmtests/tm29/tm29.adb
diff --git a/c/src/ada-tests/tmtests/tm29/tmtest.adb b/testsuites/ada/tmtests/tm29/tmtest.adb
index 0a6a31b713..0a6a31b713 100644
--- a/c/src/ada-tests/tmtests/tm29/tmtest.adb
+++ b/testsuites/ada/tmtests/tm29/tmtest.adb
diff --git a/c/src/ada-tests/tmtests/tm29/tmtest.ads b/testsuites/ada/tmtests/tm29/tmtest.ads
index 8661fc28b6..8661fc28b6 100644
--- a/c/src/ada-tests/tmtests/tm29/tmtest.ads
+++ b/testsuites/ada/tmtests/tm29/tmtest.ads
diff --git a/c/src/ada-tests/tmtests/tmck/Makefile.am b/testsuites/ada/tmtests/tmck/Makefile.am
index 7bbe2d7765..a2fa2956e0 100644
--- a/c/src/ada-tests/tmtests/tmck/Makefile.am
+++ b/testsuites/ada/tmtests/tmck/Makefile.am
@@ -1,5 +1,5 @@
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-include $(top_srcdir)/../../../testsuites/automake/compile.am
+include $(top_srcdir)/../automake/compile.am
 
 include $(top_srcdir)/ada.am
 
@@ -10,4 +10,4 @@ ada_tmck_SOURCES += ../../support/init.c
 ada_tmck$(EXEEXT): tmck.adb init.$(OBJEXT)
 	$(GNATCOMPILE) -margs -a $< -o $@
 
-include $(top_srcdir)/../../../testsuites/automake/local.am
+include $(top_srcdir)/../automake/local.am
diff --git a/c/src/ada-tests/tmtests/tmck/config.h b/testsuites/ada/tmtests/tmck/config.h
index 7730385b3c..7730385b3c 100644
--- a/c/src/ada-tests/tmtests/tmck/config.h
+++ b/testsuites/ada/tmtests/tmck/config.h
diff --git a/c/src/ada-tests/tmtests/tmck/tmck.adb b/testsuites/ada/tmtests/tmck/tmck.adb
index c35d786517..c35d786517 100644
--- a/c/src/ada-tests/tmtests/tmck/tmck.adb
+++ b/testsuites/ada/tmtests/tmck/tmck.adb
diff --git a/c/src/ada-tests/tmtests/tmck/tmtest.adb b/testsuites/ada/tmtests/tmck/tmtest.adb
index 8da1ff220a..8da1ff220a 100644
--- a/c/src/ada-tests/tmtests/tmck/tmtest.adb
+++ b/testsuites/ada/tmtests/tmck/tmtest.adb
diff --git a/c/src/ada-tests/tmtests/tmck/tmtest.ads b/testsuites/ada/tmtests/tmck/tmtest.ads
index 6eef577910..6eef577910 100644
--- a/c/src/ada-tests/tmtests/tmck/tmtest.ads
+++ b/testsuites/ada/tmtests/tmck/tmtest.ads
diff --git a/c/src/ada-tests/tmtests/tmoverhd/Makefile.am b/testsuites/ada/tmtests/tmoverhd/Makefile.am
index 316117f789..8bc56dd537 100644
--- a/c/src/ada-tests/tmtests/tmoverhd/Makefile.am
+++ b/testsuites/ada/tmtests/tmoverhd/Makefile.am
@@ -1,5 +1,5 @@
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-include $(top_srcdir)/../../../testsuites/automake/compile.am
+include $(top_srcdir)/../automake/compile.am
 
 include $(top_srcdir)/ada.am
 
@@ -11,4 +11,4 @@ ada_tmoverhd_SOURCES += ../../support/init.c
 ada_tmoverhd$(EXEEXT): tmoverhd.adb init.$(OBJEXT)
 	$(GNATCOMPILE) -margs -a $< -o $@
 
-include $(top_srcdir)/../../../testsuites/automake/local.am
+include $(top_srcdir)/../automake/local.am
diff --git a/c/src/ada-tests/tmtests/tmoverhd/README b/testsuites/ada/tmtests/tmoverhd/README
index 4e66647830..4e66647830 100644
--- a/c/src/ada-tests/tmtests/tmoverhd/README
+++ b/testsuites/ada/tmtests/tmoverhd/README
diff --git a/c/src/ada-tests/tmtests/tmoverhd/config.h b/testsuites/ada/tmtests/tmoverhd/config.h
index 7730385b3c..7730385b3c 100644
--- a/c/src/ada-tests/tmtests/tmoverhd/config.h
+++ b/testsuites/ada/tmtests/tmoverhd/config.h
diff --git a/c/src/ada-tests/tmtests/tmoverhd/dummy_rtems.adb b/testsuites/ada/tmtests/tmoverhd/dummy_rtems.adb
index 62986dc465..62986dc465 100644
--- a/c/src/ada-tests/tmtests/tmoverhd/dummy_rtems.adb
+++ b/testsuites/ada/tmtests/tmoverhd/dummy_rtems.adb
diff --git a/c/src/ada-tests/tmtests/tmoverhd/dummy_rtems.ads b/testsuites/ada/tmtests/tmoverhd/dummy_rtems.ads
index ea4f129893..ea4f129893 100644
--- a/c/src/ada-tests/tmtests/tmoverhd/dummy_rtems.ads
+++ b/testsuites/ada/tmtests/tmoverhd/dummy_rtems.ads
diff --git a/c/src/ada-tests/tmtests/tmoverhd/tmoverhd.adb b/testsuites/ada/tmtests/tmoverhd/tmoverhd.adb
index bfe6de4f88..bfe6de4f88 100644
--- a/c/src/ada-tests/tmtests/tmoverhd/tmoverhd.adb
+++ b/testsuites/ada/tmtests/tmoverhd/tmoverhd.adb
diff --git a/c/src/ada-tests/tmtests/tmoverhd/tmtest.adb b/testsuites/ada/tmtests/tmoverhd/tmtest.adb
index 58c5ad09c6..58c5ad09c6 100644
--- a/c/src/ada-tests/tmtests/tmoverhd/tmtest.adb
+++ b/testsuites/ada/tmtests/tmoverhd/tmtest.adb
diff --git a/c/src/ada-tests/tmtests/tmoverhd/tmtest.ads b/testsuites/ada/tmtests/tmoverhd/tmtest.ads
index 48944077de..48944077de 100644
--- a/c/src/ada-tests/tmtests/tmoverhd/tmtest.ads
+++ b/testsuites/ada/tmtests/tmoverhd/tmtest.ads
diff --git a/testsuites/configure.ac b/testsuites/configure.ac
index ab8aab8ea7..ae01a97079 100644
--- a/testsuites/configure.ac
+++ b/testsuites/configure.ac
@@ -22,6 +22,14 @@ RTEMS_PROG_CXX_FOR_TARGET
 RTEMS_CANONICALIZE_TOOLS
 AM_PROG_CC_C_O
 
+AC_ARG_ENABLE([ada],
+[AS_HELP_STRING(--enable-ada,enable Ada support)],
+[case "${enable_ada}" in
+  yes) ;;
+  no) ;;
+  *)  AC_MSG_ERROR(bad value ${enable_ada} for --enable-ada) ;;
+esac],[enable_ada=no])
+
 RTEMS_CHECK_CUSTOM_BSP(RTEMS_BSP)
 
 RTEMS_CHECK_CPUOPTS([RTEMS_POSIX_API])
@@ -44,6 +52,9 @@ if test "$enable_tests" = "yes"; then
   if test "$rtems_cv_RTEMS_SMP" = "yes"; then
     AC_CONFIG_SUBDIRS(smptests)
   fi
+  if test "$enable_ada" = "yes"; then
+    AC_CONFIG_SUBDIRS(ada)
+  fi
   # Now do performance tests
   AC_CONFIG_SUBDIRS(tmtests psxtmtests benchmarks rhealstone)
 fi