2003-11-11 Ralf Corsepius <corsepiu@faw.uni-ulm.de>

	* Makefile.am: Reflect having moved tests/.
	* mptests/Makefile.am: Reflect having moved tests/.
	* mptests/mp01/Makefile.am: Reflect having moved tests/.
	* mptests/mp01/node1/Makefile.am: Reflect having moved tests/.
	* mptests/mp01/node2/Makefile.am: Reflect having moved tests/.
	* samples/Makefile.am: Reflect having moved tests/.
	* samples/base_mp/Makefile.am: Reflect having moved tests/.
	* samples/base_mp/node1/Makefile.am: Reflect having moved tests/.
	* samples/base_mp/node2/Makefile.am: Reflect having moved tests/.
	* samples/base_sp/Makefile.am: Reflect having moved tests/.
	* samples/hello/Makefile.am: Reflect having moved tests/.
	* samples/ticker/Makefile.am: Reflect having moved tests/.
	* sptests/Makefile.am: Reflect having moved tests/.
	* sptests/sp01/Makefile.am: Reflect having moved tests/.
	* sptests/sp02/Makefile.am: Reflect having moved tests/.
	* sptests/sp03/Makefile.am: Reflect having moved tests/.
	* sptests/sp04/Makefile.am: Reflect having moved tests/.
	* sptests/sp05/Makefile.am: Reflect having moved tests/.
	* sptests/sp06/Makefile.am: Reflect having moved tests/.
	* sptests/sp07/Makefile.am: Reflect having moved tests/.
	* sptests/sp08/Makefile.am: Reflect having moved tests/.
	* sptests/sp09/Makefile.am: Reflect having moved tests/.
	* sptests/sp11/Makefile.am: Reflect having moved tests/.
	* sptests/sp12/Makefile.am: Reflect having moved tests/.
	* sptests/sp13/Makefile.am: Reflect having moved tests/.
	* sptests/sp14/Makefile.am: Reflect having moved tests/.
	* sptests/sp15/Makefile.am: Reflect having moved tests/.
	* sptests/sp16/Makefile.am: Reflect having moved tests/.
	* sptests/sp17/Makefile.am: Reflect having moved tests/.
	* sptests/sp19/Makefile.am: Reflect having moved tests/.
	* sptests/sp20/Makefile.am: Reflect having moved tests/.
	* sptests/sp21/Makefile.am: Reflect having moved tests/.
	* sptests/sp22/Makefile.am: Reflect having moved tests/.
	* sptests/sp23/Makefile.am: Reflect having moved tests/.
	* sptests/sp24/Makefile.am: Reflect having moved tests/.
	* sptests/sp25/Makefile.am: Reflect having moved tests/.
	* sptests/spsize/Makefile.am: Reflect having moved tests/.
	* support/Makefile.am: Reflect having moved tests/.
	* tmtests/Makefile.am: Reflect having moved tests/.
	* tmtests/tm01/Makefile.am: Reflect having moved tests/.
	* tmtests/tm02/Makefile.am: Reflect having moved tests/.
	* tmtests/tm03/Makefile.am: Reflect having moved tests/.
	* tmtests/tm04/Makefile.am: Reflect having moved tests/.
	* tmtests/tm05/Makefile.am: Reflect having moved tests/.
	* tmtests/tm06/Makefile.am: Reflect having moved tests/.
	* tmtests/tm07/Makefile.am: Reflect having moved tests/.
	* tmtests/tm08/Makefile.am: Reflect having moved tests/.
	* tmtests/tm09/Makefile.am: Reflect having moved tests/.
	* tmtests/tm10/Makefile.am: Reflect having moved tests/.
	* tmtests/tm11/Makefile.am: Reflect having moved tests/.
	* tmtests/tm12/Makefile.am: Reflect having moved tests/.
	* tmtests/tm13/Makefile.am: Reflect having moved tests/.
	* tmtests/tm14/Makefile.am: Reflect having moved tests/.
	* tmtests/tm15/Makefile.am: Reflect having moved tests/.
	* tmtests/tm16/Makefile.am: Reflect having moved tests/.
	* tmtests/tm17/Makefile.am: Reflect having moved tests/.
	* tmtests/tm18/Makefile.am: Reflect having moved tests/.
	* tmtests/tm19/Makefile.am: Reflect having moved tests/.
	* tmtests/tm20/Makefile.am: Reflect having moved tests/.
	* tmtests/tm21/Makefile.am: Reflect having moved tests/.
	* tmtests/tm22/Makefile.am: Reflect having moved tests/.
	* tmtests/tm23/Makefile.am: Reflect having moved tests/.
	* tmtests/tm24/Makefile.am: Reflect having moved tests/.
	* tmtests/tm25/Makefile.am: Reflect having moved tests/.
	* tmtests/tm28/Makefile.am: Reflect having moved tests/.
	* tmtests/tm29/Makefile.am: Reflect having moved tests/.
	* tmtests/tmck/Makefile.am: Reflect having moved tests/.
	* tmtests/tmoverhd/Makefile.am: Reflect having moved tests/.

69 files changed, 210 insertions, 139 deletions

diff --git a/c/src/ada-tests/ChangeLog b/c/src/ada-tests/ChangeLog
index d5fd38c921..30edf8f412 100644
--- a/c/src/ada-tests/ChangeLog
+++ b/c/src/ada-tests/ChangeLog
@@ -1,3 +1,74 @@
+2003-11-11	Ralf Corsepius <corsepiu@faw.uni-ulm.de>
+
+	* Makefile.am: Reflect having moved tests/.
+	* mptests/Makefile.am: Reflect having moved tests/.
+	* mptests/mp01/Makefile.am: Reflect having moved tests/.
+	* mptests/mp01/node1/Makefile.am: Reflect having moved tests/.
+	* mptests/mp01/node2/Makefile.am: Reflect having moved tests/.
+	* samples/Makefile.am: Reflect having moved tests/.
+	* samples/base_mp/Makefile.am: Reflect having moved tests/.
+	* samples/base_mp/node1/Makefile.am: Reflect having moved tests/.
+	* samples/base_mp/node2/Makefile.am: Reflect having moved tests/.
+	* samples/base_sp/Makefile.am: Reflect having moved tests/.
+	* samples/hello/Makefile.am: Reflect having moved tests/.
+	* samples/ticker/Makefile.am: Reflect having moved tests/.
+	* sptests/Makefile.am: Reflect having moved tests/.
+	* sptests/sp01/Makefile.am: Reflect having moved tests/.
+	* sptests/sp02/Makefile.am: Reflect having moved tests/.
+	* sptests/sp03/Makefile.am: Reflect having moved tests/.
+	* sptests/sp04/Makefile.am: Reflect having moved tests/.
+	* sptests/sp05/Makefile.am: Reflect having moved tests/.
+	* sptests/sp06/Makefile.am: Reflect having moved tests/.
+	* sptests/sp07/Makefile.am: Reflect having moved tests/.
+	* sptests/sp08/Makefile.am: Reflect having moved tests/.
+	* sptests/sp09/Makefile.am: Reflect having moved tests/.
+	* sptests/sp11/Makefile.am: Reflect having moved tests/.
+	* sptests/sp12/Makefile.am: Reflect having moved tests/.
+	* sptests/sp13/Makefile.am: Reflect having moved tests/.
+	* sptests/sp14/Makefile.am: Reflect having moved tests/.
+	* sptests/sp15/Makefile.am: Reflect having moved tests/.
+	* sptests/sp16/Makefile.am: Reflect having moved tests/.
+	* sptests/sp17/Makefile.am: Reflect having moved tests/.
+	* sptests/sp19/Makefile.am: Reflect having moved tests/.
+	* sptests/sp20/Makefile.am: Reflect having moved tests/.
+	* sptests/sp21/Makefile.am: Reflect having moved tests/.
+	* sptests/sp22/Makefile.am: Reflect having moved tests/.
+	* sptests/sp23/Makefile.am: Reflect having moved tests/.
+	* sptests/sp24/Makefile.am: Reflect having moved tests/.
+	* sptests/sp25/Makefile.am: Reflect having moved tests/.
+	* sptests/spsize/Makefile.am: Reflect having moved tests/.
+	* support/Makefile.am: Reflect having moved tests/.
+	* tmtests/Makefile.am: Reflect having moved tests/.
+	* tmtests/tm01/Makefile.am: Reflect having moved tests/.
+	* tmtests/tm02/Makefile.am: Reflect having moved tests/.
+	* tmtests/tm03/Makefile.am: Reflect having moved tests/.
+	* tmtests/tm04/Makefile.am: Reflect having moved tests/.
+	* tmtests/tm05/Makefile.am: Reflect having moved tests/.
+	* tmtests/tm06/Makefile.am: Reflect having moved tests/.
+	* tmtests/tm07/Makefile.am: Reflect having moved tests/.
+	* tmtests/tm08/Makefile.am: Reflect having moved tests/.
+	* tmtests/tm09/Makefile.am: Reflect having moved tests/.
+	* tmtests/tm10/Makefile.am: Reflect having moved tests/.
+	* tmtests/tm11/Makefile.am: Reflect having moved tests/.
+	* tmtests/tm12/Makefile.am: Reflect having moved tests/.
+	* tmtests/tm13/Makefile.am: Reflect having moved tests/.
+	* tmtests/tm14/Makefile.am: Reflect having moved tests/.
+	* tmtests/tm15/Makefile.am: Reflect having moved tests/.
+	* tmtests/tm16/Makefile.am: Reflect having moved tests/.
+	* tmtests/tm17/Makefile.am: Reflect having moved tests/.
+	* tmtests/tm18/Makefile.am: Reflect having moved tests/.
+	* tmtests/tm19/Makefile.am: Reflect having moved tests/.
+	* tmtests/tm20/Makefile.am: Reflect having moved tests/.
+	* tmtests/tm21/Makefile.am: Reflect having moved tests/.
+	* tmtests/tm22/Makefile.am: Reflect having moved tests/.
+	* tmtests/tm23/Makefile.am: Reflect having moved tests/.
+	* tmtests/tm24/Makefile.am: Reflect having moved tests/.
+	* tmtests/tm25/Makefile.am: Reflect having moved tests/.
+	* tmtests/tm28/Makefile.am: Reflect having moved tests/.
+	* tmtests/tm29/Makefile.am: Reflect having moved tests/.
+	* tmtests/tmck/Makefile.am: Reflect having moved tests/.
+	* tmtests/tmoverhd/Makefile.am: Reflect having moved tests/.
+
 2003-10-22	Ralf Corsepius <corsepiu@faw.uni-ulm.de>
 
 	* configure.ac: Remove RTEMS_CANONICAL_HOST.
diff --git a/c/src/ada-tests/Makefile.am b/c/src/ada-tests/Makefile.am
index fd65b769a8..6d2a6cbedf 100644
--- a/c/src/ada-tests/Makefile.am
+++ b/c/src/ada-tests/Makefile.am
@@ -1,9 +1,9 @@
 ## $Id$
 
-ACLOCAL_AMFLAGS = -I aclocal -I ../tests/aclocal
+ACLOCAL_AMFLAGS = -I aclocal -I ../../../testsuites/aclocal
 
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-include $(top_srcdir)/../tests/automake/compile.am
+include $(top_srcdir)/../../../testsuites/automake/compile.am
 
 SUBDIRS = support samples sptests tmtests
 
@@ -13,5 +13,5 @@ endif
 
 EXTRA_DIST = ada.am
 
-include $(top_srcdir)/../tests/automake/subdirs.am
-include $(top_srcdir)/../tests/automake/local.am
+include $(top_srcdir)/../../../testsuites/automake/subdirs.am
+include $(top_srcdir)/../../../testsuites//automake/local.am
diff --git a/c/src/ada-tests/mptests/Makefile.am b/c/src/ada-tests/mptests/Makefile.am
index df79d88aa7..8ef76fcd6f 100644
--- a/c/src/ada-tests/mptests/Makefile.am
+++ b/c/src/ada-tests/mptests/Makefile.am
@@ -16,5 +16,5 @@ SUBDIRS += mp01
 #SUBDIRS += mp13
 #SUBDIRS += mp14
 
-include $(top_srcdir)/../tests/automake/subdirs.am
-include $(top_srcdir)/../tests/automake/local.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
index 9f8aca91b1..ddb46b81b2 100644
--- a/c/src/ada-tests/mptests/mp01/Makefile.am
+++ b/c/src/ada-tests/mptests/mp01/Makefile.am
@@ -1,9 +1,9 @@
 ## $Id$
 
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-include $(top_srcdir)/../tests/automake/compile.am
-include $(top_srcdir)/../tests/automake/subdirs.am
+include $(top_srcdir)/../../../testsuites/automake/compile.am
+include $(top_srcdir)/../../../testsuites/automake/subdirs.am
 
 SUBDIRS = node1 node2
 
-include $(top_srcdir)/../tests/automake/local.am
+include $(top_srcdir)/../../../testsuites/automake/local.am
diff --git a/c/src/ada-tests/mptests/mp01/node1/Makefile.am b/c/src/ada-tests/mptests/mp01/node1/Makefile.am
index 72512d632f..5ecac0c111 100644
--- a/c/src/ada-tests/mptests/mp01/node1/Makefile.am
+++ b/c/src/ada-tests/mptests/mp01/node1/Makefile.am
@@ -1,7 +1,7 @@
 ## $Id$
 
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-include $(top_srcdir)/../tests/automake/compile.am
+include $(top_srcdir)/../../../testsuites/automake/compile.am
 
 include $(top_srcdir)/ada.am
 
@@ -18,4 +18,4 @@ node1_SOURCES = mptest-per_node_configuration.adb
 
 EXTRA_DIST = base_mp.scn
 
-include $(top_srcdir)/../tests/automake/local.am
+include $(top_srcdir)/../../../testsuites/automake/local.am
diff --git a/c/src/ada-tests/mptests/mp01/node2/Makefile.am b/c/src/ada-tests/mptests/mp01/node2/Makefile.am
index a2f387bd64..34a46cd5c8 100644
--- a/c/src/ada-tests/mptests/mp01/node2/Makefile.am
+++ b/c/src/ada-tests/mptests/mp01/node2/Makefile.am
@@ -1,7 +1,7 @@
 ## $Id$
 
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-include $(top_srcdir)/../tests/automake/compile.am
+include $(top_srcdir)/../../../testsuites/automake/compile.am
 
 include $(top_srcdir)/ada.am
 
@@ -18,4 +18,4 @@ node2_SOURCES = mptest-per_node_configuration.adb
 
 EXTRA_DIST = base_mp.scn
 
-include $(top_srcdir)/../tests/automake/local.am
+include $(top_srcdir)/../../../testsuites/automake/local.am
diff --git a/c/src/ada-tests/samples/Makefile.am b/c/src/ada-tests/samples/Makefile.am
index bf6bcb7a9e..409adf53d0 100644
--- a/c/src/ada-tests/samples/Makefile.am
+++ b/c/src/ada-tests/samples/Makefile.am
@@ -7,5 +7,5 @@ SUBDIRS += base_mp
 endif
 
 
-include $(top_srcdir)/../tests/automake/subdirs.am
-include $(top_srcdir)/../tests/automake/local.am
+include $(top_srcdir)/../../../testsuites/automake/subdirs.am
+include $(top_srcdir)/../../../testsuites/automake/local.am
diff --git a/c/src/ada-tests/samples/base_mp/Makefile.am b/c/src/ada-tests/samples/base_mp/Makefile.am
index 80536820a4..f3a3073209 100644
--- a/c/src/ada-tests/samples/base_mp/Makefile.am
+++ b/c/src/ada-tests/samples/base_mp/Makefile.am
@@ -1,8 +1,8 @@
 ## $Id$
 
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-include $(top_srcdir)/../tests/automake/compile.am
-include $(top_srcdir)/../tests/automake/subdirs.am
+include $(top_srcdir)/../../../testsuites/automake/compile.am
+include $(top_srcdir)/../../../testsuites/automake/subdirs.am
 
 SUBDIRS = node1 node2
 #include $(top_srcdir)/ada.am
@@ -22,4 +22,4 @@ SUBDIRS = node1 node2
 #EXTRA_DIST += node2/base_mp.scn
 #EXTRA_DIST += node2/mptest-per_node_configuration.adb
 
-include $(top_srcdir)/../tests/automake/local.am
+include $(top_srcdir)/../../../testsuites/automake/local.am
diff --git a/c/src/ada-tests/samples/base_mp/node1/Makefile.am b/c/src/ada-tests/samples/base_mp/node1/Makefile.am
index bb4968f8f4..7a0b0fd0bb 100644
--- a/c/src/ada-tests/samples/base_mp/node1/Makefile.am
+++ b/c/src/ada-tests/samples/base_mp/node1/Makefile.am
@@ -3,7 +3,7 @@
 NODE=1
 
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-include $(top_srcdir)/../tests/automake/compile.am
+include $(top_srcdir)/../../../testsuites/automake/compile.am
 
 include $(top_srcdir)/ada.am
 
@@ -21,4 +21,4 @@ endif
 
 EXTRA_DIST = base_mp.scn
 
-include $(top_srcdir)/../tests/automake/local.am
+include $(top_srcdir)/../../../testsuites/automake/local.am
diff --git a/c/src/ada-tests/samples/base_mp/node2/Makefile.am b/c/src/ada-tests/samples/base_mp/node2/Makefile.am
index af1adff162..3e89943e97 100644
--- a/c/src/ada-tests/samples/base_mp/node2/Makefile.am
+++ b/c/src/ada-tests/samples/base_mp/node2/Makefile.am
@@ -3,7 +3,7 @@
 NODE=2
 
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-include $(top_srcdir)/../tests/automake/compile.am
+include $(top_srcdir)/../../../testsuites/automake/compile.am
 
 include $(top_srcdir)/ada.am
 
@@ -23,4 +23,4 @@ node2_SOURCES = mptest-per_node_configuration.adb
 
 EXTRA_DIST = base_mp.scn
 
-include $(top_srcdir)/../tests/automake/local.am
+include $(top_srcdir)/../../../testsuites/automake/local.am
diff --git a/c/src/ada-tests/samples/base_sp/Makefile.am b/c/src/ada-tests/samples/base_sp/Makefile.am
index d1c6c85104..c34cc3cfa4 100644
--- a/c/src/ada-tests/samples/base_sp/Makefile.am
+++ b/c/src/ada-tests/samples/base_sp/Makefile.am
@@ -1,7 +1,7 @@
 ## $Id$
 
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-include $(top_srcdir)/../tests/automake/compile.am
+include $(top_srcdir)/../../../testsuites/automake/compile.am
 
 include $(top_srcdir)/ada.am
 
@@ -18,4 +18,4 @@ config.h sptest.adb sptest.ads
 
 EXTRA_DIST = base_sp.scn
 
-include $(top_srcdir)/../tests/automake/local.am
+include $(top_srcdir)/../../../testsuites/automake/local.am
diff --git a/c/src/ada-tests/samples/hello/Makefile.am b/c/src/ada-tests/samples/hello/Makefile.am
index 1aef31614a..d49ed60d1a 100644
--- a/c/src/ada-tests/samples/hello/Makefile.am
+++ b/c/src/ada-tests/samples/hello/Makefile.am
@@ -1,7 +1,7 @@
 ## $Id$
 
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-include $(top_srcdir)/../tests/automake/compile.am
+include $(top_srcdir)/../../../testsuites/automake/compile.am
 
 include $(top_srcdir)/ada.am
 
@@ -18,4 +18,4 @@ config.h sptest.adb sptest.ads
 
 EXTRA_DIST = hello.scn
 
-include $(top_srcdir)/../tests/automake/local.am
+include $(top_srcdir)/../../../testsuites/automake/local.am
diff --git a/c/src/ada-tests/samples/ticker/Makefile.am b/c/src/ada-tests/samples/ticker/Makefile.am
index 061dc6ad49..a9abc82fde 100644
--- a/c/src/ada-tests/samples/ticker/Makefile.am
+++ b/c/src/ada-tests/samples/ticker/Makefile.am
@@ -1,7 +1,7 @@
 ## $Id$
 
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-include $(top_srcdir)/../tests/automake/compile.am
+include $(top_srcdir)/../../../testsuites/automake/compile.am
 
 include $(top_srcdir)/ada.am
 
@@ -18,4 +18,4 @@ config.h sptest.adb sptest.ads
 
 EXTRA_DIST = ticker.scn
 
-include $(top_srcdir)/../tests/automake/local.am
+include $(top_srcdir)/../../../testsuites/automake/local.am
diff --git a/c/src/ada-tests/sptests/Makefile.am b/c/src/ada-tests/sptests/Makefile.am
index 08d7bbb81b..f479e56292 100644
--- a/c/src/ada-tests/sptests/Makefile.am
+++ b/c/src/ada-tests/sptests/Makefile.am
@@ -26,5 +26,5 @@ SUBDIRS += sp24
 SUBDIRS += sp25
 SUBDIRS += spsize
 
-include $(top_srcdir)/../tests/automake/subdirs.am
-include $(top_srcdir)/../tests/automake/local.am
+include $(top_srcdir)/../../../testsuites/automake/subdirs.am
+include $(top_srcdir)/../../../testsuites/automake/local.am
diff --git a/c/src/ada-tests/sptests/sp01/Makefile.am b/c/src/ada-tests/sptests/sp01/Makefile.am
index 768be60c04..7b924b2d40 100644
--- a/c/src/ada-tests/sptests/sp01/Makefile.am
+++ b/c/src/ada-tests/sptests/sp01/Makefile.am
@@ -1,7 +1,7 @@
 ## $Id$
 
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-include $(top_srcdir)/../tests/automake/compile.am
+include $(top_srcdir)/../../../testsuites/automake/compile.am
 
 include $(top_srcdir)/ada.am
 
@@ -14,4 +14,4 @@ sp01$(EXEEXT): sp01.adb init.$(OBJEXT)
 
 EXTRA_DIST = sp01.scn
 
-include $(top_srcdir)/../tests/automake/local.am
+include $(top_srcdir)/../../../testsuites/automake/local.am
diff --git a/c/src/ada-tests/sptests/sp02/Makefile.am b/c/src/ada-tests/sptests/sp02/Makefile.am
index e569612592..123d3d6c7f 100644
--- a/c/src/ada-tests/sptests/sp02/Makefile.am
+++ b/c/src/ada-tests/sptests/sp02/Makefile.am
@@ -1,7 +1,7 @@
 ## $Id$
 
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-include $(top_srcdir)/../tests/automake/compile.am
+include $(top_srcdir)/../../../testsuites/automake/compile.am
 
 include $(top_srcdir)/ada.am
 
@@ -14,4 +14,4 @@ sp02$(EXEEXT): sp02.adb init.$(OBJEXT)
 
 EXTRA_DIST = sp02.scn
 
-include $(top_srcdir)/../tests/automake/local.am
+include $(top_srcdir)/../../../testsuites/automake/local.am
diff --git a/c/src/ada-tests/sptests/sp03/Makefile.am b/c/src/ada-tests/sptests/sp03/Makefile.am
index 4dcb375ba6..385927b295 100644
--- a/c/src/ada-tests/sptests/sp03/Makefile.am
+++ b/c/src/ada-tests/sptests/sp03/Makefile.am
@@ -1,7 +1,7 @@
 ## $Id$
 
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-include $(top_srcdir)/../tests/automake/compile.am
+include $(top_srcdir)/../../../testsuites/automake/compile.am
 
 include $(top_srcdir)/ada.am
 
@@ -14,4 +14,4 @@ sp03$(EXEEXT): sp03.adb init.$(OBJEXT)
 
 EXTRA_DIST = sp03.scn
 
-include $(top_srcdir)/../tests/automake/local.am
+include $(top_srcdir)/../../../testsuites/automake/local.am
diff --git a/c/src/ada-tests/sptests/sp04/Makefile.am b/c/src/ada-tests/sptests/sp04/Makefile.am
index de3ca8e8ad..db00870cca 100644
--- a/c/src/ada-tests/sptests/sp04/Makefile.am
+++ b/c/src/ada-tests/sptests/sp04/Makefile.am
@@ -1,7 +1,7 @@
 ## $Id$
 
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-include $(top_srcdir)/../tests/automake/compile.am
+include $(top_srcdir)/../../../testsuites/automake/compile.am
 
 include $(top_srcdir)/ada.am
 
@@ -14,4 +14,4 @@ sp04$(EXEEXT): sp04.adb init.$(OBJEXT)
 
 EXTRA_DIST = sp04.scn
 
-include $(top_srcdir)/../tests/automake/local.am
+include $(top_srcdir)/../../../testsuites/automake/local.am
diff --git a/c/src/ada-tests/sptests/sp05/Makefile.am b/c/src/ada-tests/sptests/sp05/Makefile.am
index 18f9d42093..caf82e112e 100644
--- a/c/src/ada-tests/sptests/sp05/Makefile.am
+++ b/c/src/ada-tests/sptests/sp05/Makefile.am
@@ -1,7 +1,7 @@
 ## $Id$
 
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-include $(top_srcdir)/../tests/automake/compile.am
+include $(top_srcdir)/../../../testsuites/automake/compile.am
 
 include $(top_srcdir)/ada.am
 
@@ -14,4 +14,4 @@ sp05$(EXEEXT): sp05.adb init.$(OBJEXT)
 
 EXTRA_DIST = sp05.scn
 
-include $(top_srcdir)/../tests/automake/local.am
+include $(top_srcdir)/../../../testsuites/automake/local.am
diff --git a/c/src/ada-tests/sptests/sp06/Makefile.am b/c/src/ada-tests/sptests/sp06/Makefile.am
index 95b0f996a9..67c7077e91 100644
--- a/c/src/ada-tests/sptests/sp06/Makefile.am
+++ b/c/src/ada-tests/sptests/sp06/Makefile.am
@@ -1,7 +1,7 @@
 ## $Id$
 
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-include $(top_srcdir)/../tests/automake/compile.am
+include $(top_srcdir)/../../../testsuites/automake/compile.am
 
 include $(top_srcdir)/ada.am
 
@@ -14,4 +14,4 @@ sp06$(EXEEXT): sp06.adb init.$(OBJEXT)
 
 EXTRA_DIST = sp06.scn
 
-include $(top_srcdir)/../tests/automake/local.am
+include $(top_srcdir)/../../../testsuites/automake/local.am
diff --git a/c/src/ada-tests/sptests/sp07/Makefile.am b/c/src/ada-tests/sptests/sp07/Makefile.am
index 659cea25b8..222871fd9d 100644
--- a/c/src/ada-tests/sptests/sp07/Makefile.am
+++ b/c/src/ada-tests/sptests/sp07/Makefile.am
@@ -1,7 +1,7 @@
 ## $Id$
 
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-include $(top_srcdir)/../tests/automake/compile.am
+include $(top_srcdir)/../../../testsuites/automake/compile.am
 
 include $(top_srcdir)/ada.am
 
@@ -15,4 +15,4 @@ sp07$(EXEEXT): sp07.adb init.$(OBJEXT)
 
 EXTRA_DIST = sp07.scn
 
-include $(top_srcdir)/../tests/automake/local.am
+include $(top_srcdir)/../../../testsuites/automake/local.am
diff --git a/c/src/ada-tests/sptests/sp08/Makefile.am b/c/src/ada-tests/sptests/sp08/Makefile.am
index caa2710bf9..67ec0f2538 100644
--- a/c/src/ada-tests/sptests/sp08/Makefile.am
+++ b/c/src/ada-tests/sptests/sp08/Makefile.am
@@ -1,7 +1,7 @@
 ## $Id$
 
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-include $(top_srcdir)/../tests/automake/compile.am
+include $(top_srcdir)/../../../testsuites/automake/compile.am
 
 include $(top_srcdir)/ada.am
 
@@ -14,4 +14,4 @@ sp08$(EXEEXT): sp08.adb init.$(OBJEXT)
 
 EXTRA_DIST = sp08.scn
 
-include $(top_srcdir)/../tests/automake/local.am
+include $(top_srcdir)/../../../testsuites/automake/local.am
diff --git a/c/src/ada-tests/sptests/sp09/Makefile.am b/c/src/ada-tests/sptests/sp09/Makefile.am
index 5c03f0713b..9df3c78050 100644
--- a/c/src/ada-tests/sptests/sp09/Makefile.am
+++ b/c/src/ada-tests/sptests/sp09/Makefile.am
@@ -1,7 +1,7 @@
 ## $Id$
 
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-include $(top_srcdir)/../tests/automake/compile.am
+include $(top_srcdir)/../../../testsuites/automake/compile.am
 
 include $(top_srcdir)/ada.am
 
@@ -15,4 +15,4 @@ sp09$(EXEEXT): sp09.adb init.$(OBJEXT)
 
 EXTRA_DIST = sp09.scn
 
-include $(top_srcdir)/../tests/automake/local.am
+include $(top_srcdir)/../../../testsuites/automake/local.am
diff --git a/c/src/ada-tests/sptests/sp11/Makefile.am b/c/src/ada-tests/sptests/sp11/Makefile.am
index e2b6b4223a..7a72802fc2 100644
--- a/c/src/ada-tests/sptests/sp11/Makefile.am
+++ b/c/src/ada-tests/sptests/sp11/Makefile.am
@@ -1,7 +1,7 @@
 ## $Id$
 
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-include $(top_srcdir)/../tests/automake/compile.am
+include $(top_srcdir)/../../../testsuites/automake/compile.am
 
 include $(top_srcdir)/ada.am
 
@@ -14,4 +14,4 @@ sp11$(EXEEXT): sp11.adb init.$(OBJEXT)
 
 EXTRA_DIST = sp11.scn
 
-include $(top_srcdir)/../tests/automake/local.am
+include $(top_srcdir)/../../../testsuites/automake/local.am
diff --git a/c/src/ada-tests/sptests/sp12/Makefile.am b/c/src/ada-tests/sptests/sp12/Makefile.am
index a74d30a84a..985858c388 100644
--- a/c/src/ada-tests/sptests/sp12/Makefile.am
+++ b/c/src/ada-tests/sptests/sp12/Makefile.am
@@ -1,7 +1,7 @@
 ## $Id$
 
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-include $(top_srcdir)/../tests/automake/compile.am
+include $(top_srcdir)/../../../testsuites/automake/compile.am
 
 include $(top_srcdir)/ada.am
 
@@ -14,4 +14,4 @@ sp12$(EXEEXT): sp12.adb init.$(OBJEXT)
 
 EXTRA_DIST = sp12.scn
 
-include $(top_srcdir)/../tests/automake/local.am
+include $(top_srcdir)/../../../testsuites/automake/local.am
diff --git a/c/src/ada-tests/sptests/sp13/Makefile.am b/c/src/ada-tests/sptests/sp13/Makefile.am
index 657256c1bc..fff13aac70 100644
--- a/c/src/ada-tests/sptests/sp13/Makefile.am
+++ b/c/src/ada-tests/sptests/sp13/Makefile.am
@@ -1,7 +1,7 @@
 ## $Id$
 
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-include $(top_srcdir)/../tests/automake/compile.am
+include $(top_srcdir)/../../../testsuites/automake/compile.am
 
 include $(top_srcdir)/ada.am
 
@@ -14,4 +14,4 @@ sp13$(EXEEXT): sp13.adb init.$(OBJEXT)
 
 EXTRA_DIST = sp13.scn
 
-include $(top_srcdir)/../tests/automake/local.am
+include $(top_srcdir)/../../../testsuites/automake/local.am
diff --git a/c/src/ada-tests/sptests/sp14/Makefile.am b/c/src/ada-tests/sptests/sp14/Makefile.am
index 5381331b97..af1ac56e45 100644
--- a/c/src/ada-tests/sptests/sp14/Makefile.am
+++ b/c/src/ada-tests/sptests/sp14/Makefile.am
@@ -1,7 +1,7 @@
 ## $Id$
 
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-include $(top_srcdir)/../tests/automake/compile.am
+include $(top_srcdir)/../../../testsuites/automake/compile.am
 
 include $(top_srcdir)/ada.am
 
@@ -14,4 +14,4 @@ sp14$(EXEEXT): sp14.adb init.$(OBJEXT)
 
 EXTRA_DIST = sp14.scn
 
-include $(top_srcdir)/../tests/automake/local.am
+include $(top_srcdir)/../../../testsuites/automake/local.am
diff --git a/c/src/ada-tests/sptests/sp15/Makefile.am b/c/src/ada-tests/sptests/sp15/Makefile.am
index 8d8f4242d7..5d99a87f74 100644
--- a/c/src/ada-tests/sptests/sp15/Makefile.am
+++ b/c/src/ada-tests/sptests/sp15/Makefile.am
@@ -1,7 +1,7 @@
 ## $Id$
 
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-include $(top_srcdir)/../tests/automake/compile.am
+include $(top_srcdir)/../../../testsuites/automake/compile.am
 
 include $(top_srcdir)/ada.am
 
@@ -14,4 +14,4 @@ sp15$(EXEEXT): sp15.adb init.$(OBJEXT)
 
 EXTRA_DIST = sp15.scn
 
-include $(top_srcdir)/../tests/automake/local.am
+include $(top_srcdir)/../../../testsuites/automake/local.am
diff --git a/c/src/ada-tests/sptests/sp16/Makefile.am b/c/src/ada-tests/sptests/sp16/Makefile.am
index 52b9a74dc1..c796b20f04 100644
--- a/c/src/ada-tests/sptests/sp16/Makefile.am
+++ b/c/src/ada-tests/sptests/sp16/Makefile.am
@@ -1,7 +1,7 @@
 ## $Id$
 
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-include $(top_srcdir)/../tests/automake/compile.am
+include $(top_srcdir)/../../../testsuites/automake/compile.am
 
 include $(top_srcdir)/ada.am
 
@@ -14,4 +14,4 @@ sp16$(EXEEXT): sp16.adb init.$(OBJEXT)
 
 EXTRA_DIST = sp16.scn
 
-include $(top_srcdir)/../tests/automake/local.am
+include $(top_srcdir)/../../../testsuites/automake/local.am
diff --git a/c/src/ada-tests/sptests/sp17/Makefile.am b/c/src/ada-tests/sptests/sp17/Makefile.am
index 95a6e38fea..a8278bbf66 100644
--- a/c/src/ada-tests/sptests/sp17/Makefile.am
+++ b/c/src/ada-tests/sptests/sp17/Makefile.am
@@ -1,7 +1,7 @@
 ## $Id$
 
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-include $(top_srcdir)/../tests/automake/compile.am
+include $(top_srcdir)/../../../testsuites/automake/compile.am
 
 include $(top_srcdir)/ada.am
 
@@ -14,4 +14,4 @@ sp17$(EXEEXT): sp17.adb init.$(OBJEXT)
 
 EXTRA_DIST = sp17.scn
 
-include $(top_srcdir)/../tests/automake/local.am
+include $(top_srcdir)/../../../testsuites/automake/local.am
diff --git a/c/src/ada-tests/sptests/sp19/Makefile.am b/c/src/ada-tests/sptests/sp19/Makefile.am
index 8ee1f3a619..7aa8352b34 100644
--- a/c/src/ada-tests/sptests/sp19/Makefile.am
+++ b/c/src/ada-tests/sptests/sp19/Makefile.am
@@ -1,7 +1,7 @@
 ## $Id$
 
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-include $(top_srcdir)/../tests/automake/compile.am
+include $(top_srcdir)/../../../testsuites/automake/compile.am
 
 include $(top_srcdir)/ada.am
 
@@ -19,4 +19,4 @@ sp19$(EXEEXT): sp19.adb sptest.adb sptest.ads init.$(OBJEXT)
 
 EXTRA_DIST = sp19.scn
 
-include $(top_srcdir)/../tests/automake/local.am
+include $(top_srcdir)/../../../testsuites/automake/local.am
diff --git a/c/src/ada-tests/sptests/sp20/Makefile.am b/c/src/ada-tests/sptests/sp20/Makefile.am
index ad11793985..43936983ba 100644
--- a/c/src/ada-tests/sptests/sp20/Makefile.am
+++ b/c/src/ada-tests/sptests/sp20/Makefile.am
@@ -1,7 +1,7 @@
 ## $Id$
 
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-include $(top_srcdir)/../tests/automake/compile.am
+include $(top_srcdir)/../../../testsuites/automake/compile.am
 
 include $(top_srcdir)/ada.am
 
@@ -14,4 +14,4 @@ sp20$(EXEEXT): sp20.adb init.$(OBJEXT)
 
 EXTRA_DIST = sp20.scn
 
-include $(top_srcdir)/../tests/automake/local.am
+include $(top_srcdir)/../../../testsuites/automake/local.am
diff --git a/c/src/ada-tests/sptests/sp21/Makefile.am b/c/src/ada-tests/sptests/sp21/Makefile.am
index f0e0849092..d90bae3a6e 100644
--- a/c/src/ada-tests/sptests/sp21/Makefile.am
+++ b/c/src/ada-tests/sptests/sp21/Makefile.am
@@ -1,7 +1,7 @@
 ## $Id$
 
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-include $(top_srcdir)/../tests/automake/compile.am
+include $(top_srcdir)/../../../testsuites/automake/compile.am
 
 include $(top_srcdir)/ada.am
 
@@ -15,4 +15,4 @@ sp21$(EXEEXT): sp21.adb init.$(OBJEXT)
 
 EXTRA_DIST = sp21.scn
 
-include $(top_srcdir)/../tests/automake/local.am
+include $(top_srcdir)/../../../testsuites/automake/local.am
diff --git a/c/src/ada-tests/sptests/sp22/Makefile.am b/c/src/ada-tests/sptests/sp22/Makefile.am
index 839596b812..a8ea823807 100644
--- a/c/src/ada-tests/sptests/sp22/Makefile.am
+++ b/c/src/ada-tests/sptests/sp22/Makefile.am
@@ -1,7 +1,7 @@
 ## $Id$
 
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-include $(top_srcdir)/../tests/automake/compile.am
+include $(top_srcdir)/../../../testsuites/automake/compile.am
 
 include $(top_srcdir)/ada.am
 
@@ -14,4 +14,4 @@ sp22$(EXEEXT): sp22.adb init.$(OBJEXT)
 
 EXTRA_DIST = sp22.scn
 
-include $(top_srcdir)/../tests/automake/local.am
+include $(top_srcdir)/../../../testsuites/automake/local.am
diff --git a/c/src/ada-tests/sptests/sp23/Makefile.am b/c/src/ada-tests/sptests/sp23/Makefile.am
index 9ec3f6f4ec..e6e91661e1 100644
--- a/c/src/ada-tests/sptests/sp23/Makefile.am
+++ b/c/src/ada-tests/sptests/sp23/Makefile.am
@@ -1,7 +1,7 @@
 ## $Id$
 
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-include $(top_srcdir)/../tests/automake/compile.am
+include $(top_srcdir)/../../../testsuites/automake/compile.am
 
 include $(top_srcdir)/ada.am
 
@@ -14,4 +14,4 @@ sp23$(EXEEXT): sp23.adb init.$(OBJEXT)
 
 EXTRA_DIST = sp23.scn
 
-include $(top_srcdir)/../tests/automake/local.am
+include $(top_srcdir)/../../../testsuites/automake/local.am
diff --git a/c/src/ada-tests/sptests/sp24/Makefile.am b/c/src/ada-tests/sptests/sp24/Makefile.am
index 59b8fb7e61..a81297b296 100644
--- a/c/src/ada-tests/sptests/sp24/Makefile.am
+++ b/c/src/ada-tests/sptests/sp24/Makefile.am
@@ -1,7 +1,7 @@
 ## $Id$
 
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-include $(top_srcdir)/../tests/automake/compile.am
+include $(top_srcdir)/../../../testsuites/automake/compile.am
 
 include $(top_srcdir)/ada.am
 
@@ -14,4 +14,4 @@ sp24$(EXEEXT): sp24.adb init.$(OBJEXT)
 
 EXTRA_DIST = sp24.scn
 
-include $(top_srcdir)/../tests/automake/local.am
+include $(top_srcdir)/../../../testsuites/automake/local.am
diff --git a/c/src/ada-tests/sptests/sp25/Makefile.am b/c/src/ada-tests/sptests/sp25/Makefile.am
index f7a169f123..549a2167dc 100644
--- a/c/src/ada-tests/sptests/sp25/Makefile.am
+++ b/c/src/ada-tests/sptests/sp25/Makefile.am
@@ -1,7 +1,7 @@
 ## $Id$
 
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-include $(top_srcdir)/../tests/automake/compile.am
+include $(top_srcdir)/../../../testsuites/automake/compile.am
 
 include $(top_srcdir)/ada.am
 
@@ -14,4 +14,4 @@ sp25$(EXEEXT): sp25.adb init.$(OBJEXT)
 
 EXTRA_DIST = sp25.scn
 
-include $(top_srcdir)/../tests/automake/local.am
+include $(top_srcdir)/../../../testsuites/automake/local.am
diff --git a/c/src/ada-tests/sptests/spsize/Makefile.am b/c/src/ada-tests/sptests/spsize/Makefile.am
index b31de5f70e..337baffcbb 100644
--- a/c/src/ada-tests/sptests/spsize/Makefile.am
+++ b/c/src/ada-tests/sptests/spsize/Makefile.am
@@ -1,7 +1,7 @@
 ## $Id$
 
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-include $(top_srcdir)/../tests/automake/compile.am
+include $(top_srcdir)/../../../testsuites/automake/compile.am
 
 include $(top_srcdir)/ada.am
 
@@ -14,4 +14,4 @@ spsize_SOURCES = spsize.adb sptest.adb sptest.ads
 spsize$(EXEEXT): spsize.adb
 	$(GNATCOMPILE) -margs -a $< -o $@
 
-include $(top_srcdir)/../tests/automake/local.am
+include $(top_srcdir)/../../../testsuites/automake/local.am
diff --git a/c/src/ada-tests/support/Makefile.am b/c/src/ada-tests/support/Makefile.am
index 6fc6251737..0191a256ae 100644
--- a/c/src/ada-tests/support/Makefile.am
+++ b/c/src/ada-tests/support/Makefile.am
@@ -17,5 +17,5 @@ EXTRA_DIST += timer_driver.adb
 EXTRA_DIST += timer_driver.ads
 EXTRA_DIST += unsigned32_io.ads
 
-include $(top_srcdir)/../tests/automake/local.am
+include $(top_srcdir)/../../../testsuites/automake/local.am
 
diff --git a/c/src/ada-tests/tmtests/Makefile.am b/c/src/ada-tests/tmtests/Makefile.am
index 0c315df299..c83806638a 100644
--- a/c/src/ada-tests/tmtests/Makefile.am
+++ b/c/src/ada-tests/tmtests/Makefile.am
@@ -31,5 +31,5 @@ SUBDIRS += tm29
 SUBDIRS += tmck
 SUBDIRS += tmoverhd
 
-include $(top_srcdir)/../tests/automake/subdirs.am
-include $(top_srcdir)/../tests/automake/local.am
+include $(top_srcdir)/../../../testsuites/automake/subdirs.am
+include $(top_srcdir)/../../../testsuites/automake/local.am
diff --git a/c/src/ada-tests/tmtests/tm01/Makefile.am b/c/src/ada-tests/tmtests/tm01/Makefile.am
index 323bc19986..f76c19dfa5 100644
--- a/c/src/ada-tests/tmtests/tm01/Makefile.am
+++ b/c/src/ada-tests/tmtests/tm01/Makefile.am
@@ -1,7 +1,7 @@
 ## $Id$
 
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-include $(top_srcdir)/../tests/automake/compile.am
+include $(top_srcdir)/../../../testsuites/automake/compile.am
 
 include $(top_srcdir)/ada.am
 
@@ -12,4 +12,4 @@ tm01_SOURCES += ../../support/init.c
 tm01$(EXEEXT): tm01.adb init.$(OBJEXT)
 	$(GNATCOMPILE) -margs -a $< -o $@
 
-include $(top_srcdir)/../tests/automake/local.am
+include $(top_srcdir)/../../../testsuites/automake/local.am
diff --git a/c/src/ada-tests/tmtests/tm02/Makefile.am b/c/src/ada-tests/tmtests/tm02/Makefile.am
index c0a9d34e5c..f2c483e6b4 100644
--- a/c/src/ada-tests/tmtests/tm02/Makefile.am
+++ b/c/src/ada-tests/tmtests/tm02/Makefile.am
@@ -1,7 +1,7 @@
 ## $Id$
 
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-include $(top_srcdir)/../tests/automake/compile.am
+include $(top_srcdir)/../../../testsuites/automake/compile.am
 
 include $(top_srcdir)/ada.am
 
@@ -12,4 +12,4 @@ tm02_SOURCES += ../../support/init.c
 tm02$(EXEEXT): tm02.adb init.$(OBJEXT)
 	$(GNATCOMPILE) -margs -a $< -o $@
 
-include $(top_srcdir)/../tests/automake/local.am
+include $(top_srcdir)/../../../testsuites/automake/local.am
diff --git a/c/src/ada-tests/tmtests/tm03/Makefile.am b/c/src/ada-tests/tmtests/tm03/Makefile.am
index dc942cce02..d1df09b344 100644
--- a/c/src/ada-tests/tmtests/tm03/Makefile.am
+++ b/c/src/ada-tests/tmtests/tm03/Makefile.am
@@ -1,7 +1,7 @@
 ## $Id$
 
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-include $(top_srcdir)/../tests/automake/compile.am
+include $(top_srcdir)/../../../testsuites/automake/compile.am
 
 include $(top_srcdir)/ada.am
 
@@ -12,4 +12,4 @@ tm03_SOURCES += ../../support/init.c
 tm03$(EXEEXT): tm03.adb init.$(OBJEXT)
 	$(GNATCOMPILE) -margs -a $< -o $@
 
-include $(top_srcdir)/../tests/automake/local.am
+include $(top_srcdir)/../../../testsuites/automake/local.am
diff --git a/c/src/ada-tests/tmtests/tm04/Makefile.am b/c/src/ada-tests/tmtests/tm04/Makefile.am
index f1d947e21d..b58cc0c450 100644
--- a/c/src/ada-tests/tmtests/tm04/Makefile.am
+++ b/c/src/ada-tests/tmtests/tm04/Makefile.am
@@ -1,7 +1,7 @@
 ## $Id$
 
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-include $(top_srcdir)/../tests/automake/compile.am
+include $(top_srcdir)/../../../testsuites/automake/compile.am
 
 include $(top_srcdir)/ada.am
 
@@ -12,4 +12,4 @@ tm04_SOURCES += ../../support/init.c
 tm04$(EXEEXT): tm04.adb init.$(OBJEXT)
 	$(GNATCOMPILE) -margs -a $< -o $@
 
-include $(top_srcdir)/../tests/automake/local.am
+include $(top_srcdir)/../../../testsuites/automake/local.am
diff --git a/c/src/ada-tests/tmtests/tm05/Makefile.am b/c/src/ada-tests/tmtests/tm05/Makefile.am
index 1b1cdacc04..974a43bf62 100644
--- a/c/src/ada-tests/tmtests/tm05/Makefile.am
+++ b/c/src/ada-tests/tmtests/tm05/Makefile.am
@@ -1,7 +1,7 @@
 ## $Id$
 
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-include $(top_srcdir)/../tests/automake/compile.am
+include $(top_srcdir)/../../../testsuites/automake/compile.am
 
 include $(top_srcdir)/ada.am
 
@@ -12,4 +12,4 @@ tm05_SOURCES += ../../support/init.c
 tm05$(EXEEXT): tm05.adb init.$(OBJEXT)
 	$(GNATCOMPILE) -margs -a $< -o $@
 
-include $(top_srcdir)/../tests/automake/local.am
+include $(top_srcdir)/../../../testsuites/automake/local.am
diff --git a/c/src/ada-tests/tmtests/tm06/Makefile.am b/c/src/ada-tests/tmtests/tm06/Makefile.am
index 94a9b9a960..7f0323068d 100644
--- a/c/src/ada-tests/tmtests/tm06/Makefile.am
+++ b/c/src/ada-tests/tmtests/tm06/Makefile.am
@@ -1,7 +1,7 @@
 ## $Id$
 
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-include $(top_srcdir)/../tests/automake/compile.am
+include $(top_srcdir)/../../../testsuites/automake/compile.am
 
 include $(top_srcdir)/ada.am
 
@@ -12,4 +12,4 @@ tm06_SOURCES += ../../support/init.c
 tm06$(EXEEXT): tm06.adb init.$(OBJEXT)
 	$(GNATCOMPILE) -margs -a $< -o $@
 
-include $(top_srcdir)/../tests/automake/local.am
+include $(top_srcdir)/../../../testsuites/automake/local.am
diff --git a/c/src/ada-tests/tmtests/tm07/Makefile.am b/c/src/ada-tests/tmtests/tm07/Makefile.am
index 69160bb981..3621a55484 100644
--- a/c/src/ada-tests/tmtests/tm07/Makefile.am
+++ b/c/src/ada-tests/tmtests/tm07/Makefile.am
@@ -1,7 +1,7 @@
 ## $Id$
 
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-include $(top_srcdir)/../tests/automake/compile.am
+include $(top_srcdir)/../../../testsuites/automake/compile.am
 
 include $(top_srcdir)/ada.am
 
@@ -12,4 +12,4 @@ tm07_SOURCES += ../../support/init.c
 tm07$(EXEEXT): tm07.adb init.$(OBJEXT)
 	$(GNATCOMPILE) -margs -a $< -o $@
 
-include $(top_srcdir)/../tests/automake/local.am
+include $(top_srcdir)/../../../testsuites/automake/local.am
diff --git a/c/src/ada-tests/tmtests/tm08/Makefile.am b/c/src/ada-tests/tmtests/tm08/Makefile.am
index 8b12cb8aa0..6d44730f56 100644
--- a/c/src/ada-tests/tmtests/tm08/Makefile.am
+++ b/c/src/ada-tests/tmtests/tm08/Makefile.am
@@ -1,7 +1,7 @@
 ## $Id$
 
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-include $(top_srcdir)/../tests/automake/compile.am
+include $(top_srcdir)/../../../testsuites/automake/compile.am
 
 include $(top_srcdir)/ada.am
 
@@ -12,4 +12,4 @@ tm08_SOURCES += ../../support/init.c
 tm08$(EXEEXT): tm08.adb init.$(OBJEXT)
 	$(GNATCOMPILE) -margs -a $< -o $@
 
-include $(top_srcdir)/../tests/automake/local.am
+include $(top_srcdir)/../../../testsuites/automake/local.am
diff --git a/c/src/ada-tests/tmtests/tm09/Makefile.am b/c/src/ada-tests/tmtests/tm09/Makefile.am
index ff25546ff4..5a1b2a6043 100644
--- a/c/src/ada-tests/tmtests/tm09/Makefile.am
+++ b/c/src/ada-tests/tmtests/tm09/Makefile.am
@@ -1,7 +1,7 @@
 ## $Id$
 
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-include $(top_srcdir)/../tests/automake/compile.am
+include $(top_srcdir)/../../../testsuites/automake/compile.am
 
 include $(top_srcdir)/ada.am
 
@@ -12,4 +12,4 @@ tm09_SOURCES += ../../support/init.c
 tm09$(EXEEXT): tm09.adb init.$(OBJEXT)
 	$(GNATCOMPILE) -margs -a $< -o $@
 
-include $(top_srcdir)/../tests/automake/local.am
+include $(top_srcdir)/../../../testsuites/automake/local.am
diff --git a/c/src/ada-tests/tmtests/tm10/Makefile.am b/c/src/ada-tests/tmtests/tm10/Makefile.am
index 1bbdbfef52..9b61e9f22c 100644
--- a/c/src/ada-tests/tmtests/tm10/Makefile.am
+++ b/c/src/ada-tests/tmtests/tm10/Makefile.am
@@ -1,7 +1,7 @@
 ## $Id$
 
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-include $(top_srcdir)/../tests/automake/compile.am
+include $(top_srcdir)/../../../testsuites/automake/compile.am
 
 include $(top_srcdir)/ada.am
 
@@ -12,4 +12,4 @@ tm10_SOURCES += ../../support/init.c
 tm10$(EXEEXT): tm10.adb init.$(OBJEXT)
 	$(GNATCOMPILE) -margs -a $< -o $@
 
-include $(top_srcdir)/../tests/automake/local.am
+include $(top_srcdir)/../../../testsuites/automake/local.am
diff --git a/c/src/ada-tests/tmtests/tm11/Makefile.am b/c/src/ada-tests/tmtests/tm11/Makefile.am
index 91427de5f5..df8b468a59 100644
--- a/c/src/ada-tests/tmtests/tm11/Makefile.am
+++ b/c/src/ada-tests/tmtests/tm11/Makefile.am
@@ -1,7 +1,7 @@
 ## $Id$
 
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-include $(top_srcdir)/../tests/automake/compile.am
+include $(top_srcdir)/../../../testsuites/automake/compile.am
 
 include $(top_srcdir)/ada.am
 
@@ -12,4 +12,4 @@ tm11_SOURCES += ../../support/init.c
 tm11$(EXEEXT): tm11.adb init.$(OBJEXT)
 	$(GNATCOMPILE) -margs -a $< -o $@
 
-include $(top_srcdir)/../tests/automake/local.am
+include $(top_srcdir)/../../../testsuites/automake/local.am
diff --git a/c/src/ada-tests/tmtests/tm12/Makefile.am b/c/src/ada-tests/tmtests/tm12/Makefile.am
index 4b03277e18..f5e1bb9c32 100644
--- a/c/src/ada-tests/tmtests/tm12/Makefile.am
+++ b/c/src/ada-tests/tmtests/tm12/Makefile.am
@@ -1,7 +1,7 @@
 ## $Id$
 
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-include $(top_srcdir)/../tests/automake/compile.am
+include $(top_srcdir)/../../../testsuites/automake/compile.am
 
 include $(top_srcdir)/ada.am
 
@@ -12,4 +12,4 @@ tm12_SOURCES += ../../support/init.c
 tm12$(EXEEXT): tm12.adb init.$(OBJEXT)
 	$(GNATCOMPILE) -margs -a $< -o $@
 
-include $(top_srcdir)/../tests/automake/local.am
+include $(top_srcdir)/../../../testsuites/automake/local.am
diff --git a/c/src/ada-tests/tmtests/tm13/Makefile.am b/c/src/ada-tests/tmtests/tm13/Makefile.am
index a7213ea80d..3c6dab2a6c 100644
--- a/c/src/ada-tests/tmtests/tm13/Makefile.am
+++ b/c/src/ada-tests/tmtests/tm13/Makefile.am
@@ -1,7 +1,7 @@
 ## $Id$
 
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-include $(top_srcdir)/../tests/automake/compile.am
+include $(top_srcdir)/../../../testsuites/automake/compile.am
 
 include $(top_srcdir)/ada.am
 
@@ -12,4 +12,4 @@ tm13_SOURCES += ../../support/init.c
 tm13$(EXEEXT): tm13.adb init.$(OBJEXT)
 	$(GNATCOMPILE) -margs -a $< -o $@
 
-include $(top_srcdir)/../tests/automake/local.am
+include $(top_srcdir)/../../../testsuites/automake/local.am
diff --git a/c/src/ada-tests/tmtests/tm14/Makefile.am b/c/src/ada-tests/tmtests/tm14/Makefile.am
index 77d47bf676..2e45d1304b 100644
--- a/c/src/ada-tests/tmtests/tm14/Makefile.am
+++ b/c/src/ada-tests/tmtests/tm14/Makefile.am
@@ -1,7 +1,7 @@
 ## $Id$
 
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-include $(top_srcdir)/../tests/automake/compile.am
+include $(top_srcdir)/../../../testsuites/automake/compile.am
 
 include $(top_srcdir)/ada.am
 
@@ -12,4 +12,4 @@ tm14_SOURCES += ../../support/init.c
 tm14$(EXEEXT): tm14.adb init.$(OBJEXT)
 	$(GNATCOMPILE) -margs -a $< -o $@
 
-include $(top_srcdir)/../tests/automake/local.am
+include $(top_srcdir)/../../../testsuites/automake/local.am
diff --git a/c/src/ada-tests/tmtests/tm15/Makefile.am b/c/src/ada-tests/tmtests/tm15/Makefile.am
index 92ebfcd39c..a42552d807 100644
--- a/c/src/ada-tests/tmtests/tm15/Makefile.am
+++ b/c/src/ada-tests/tmtests/tm15/Makefile.am
@@ -1,7 +1,7 @@
 ## $Id$
 
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-include $(top_srcdir)/../tests/automake/compile.am
+include $(top_srcdir)/../../../testsuites/automake/compile.am
 
 include $(top_srcdir)/ada.am
 
@@ -12,4 +12,4 @@ tm15_SOURCES += ../../support/init.c
 tm15$(EXEEXT): tm15.adb init.$(OBJEXT)
 	$(GNATCOMPILE) -margs -a $< -o $@
 
-include $(top_srcdir)/../tests/automake/local.am
+include $(top_srcdir)/../../../testsuites/automake/local.am
diff --git a/c/src/ada-tests/tmtests/tm16/Makefile.am b/c/src/ada-tests/tmtests/tm16/Makefile.am
index adcbb0ab83..30818ca958 100644
--- a/c/src/ada-tests/tmtests/tm16/Makefile.am
+++ b/c/src/ada-tests/tmtests/tm16/Makefile.am
@@ -1,7 +1,7 @@
 ## $Id$
 
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-include $(top_srcdir)/../tests/automake/compile.am
+include $(top_srcdir)/../../../testsuites/automake/compile.am
 
 include $(top_srcdir)/ada.am
 
@@ -12,4 +12,4 @@ tm16_SOURCES += ../../support/init.c
 tm16$(EXEEXT): tm16.adb init.$(OBJEXT)
 	$(GNATCOMPILE) -margs -a $< -o $@
 
-include $(top_srcdir)/../tests/automake/local.am
+include $(top_srcdir)/../../../testsuites/automake/local.am
diff --git a/c/src/ada-tests/tmtests/tm17/Makefile.am b/c/src/ada-tests/tmtests/tm17/Makefile.am
index 1bca03d067..68880f2659 100644
--- a/c/src/ada-tests/tmtests/tm17/Makefile.am
+++ b/c/src/ada-tests/tmtests/tm17/Makefile.am
@@ -1,7 +1,7 @@
 ## $Id$
 
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-include $(top_srcdir)/../tests/automake/compile.am
+include $(top_srcdir)/../../../testsuites/automake/compile.am
 
 include $(top_srcdir)/ada.am
 
@@ -12,4 +12,4 @@ tm17_SOURCES += ../../support/init.c
 tm17$(EXEEXT): tm17.adb init.$(OBJEXT)
 	$(GNATCOMPILE) -margs -a $< -o $@
 
-include $(top_srcdir)/../tests/automake/local.am
+include $(top_srcdir)/../../../testsuites/automake/local.am
diff --git a/c/src/ada-tests/tmtests/tm18/Makefile.am b/c/src/ada-tests/tmtests/tm18/Makefile.am
index 3cca33379c..c5ea4c75ba 100644
--- a/c/src/ada-tests/tmtests/tm18/Makefile.am
+++ b/c/src/ada-tests/tmtests/tm18/Makefile.am
@@ -1,7 +1,7 @@
 ## $Id$
 
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-include $(top_srcdir)/../tests/automake/compile.am
+include $(top_srcdir)/../../../testsuites/automake/compile.am
 
 include $(top_srcdir)/ada.am
 
@@ -12,4 +12,4 @@ tm18_SOURCES += ../../support/init.c
 tm18$(EXEEXT): tm18.adb init.$(OBJEXT)
 	$(GNATCOMPILE) -margs -a $< -o $@
 
-include $(top_srcdir)/../tests/automake/local.am
+include $(top_srcdir)/../../../testsuites/automake/local.am
diff --git a/c/src/ada-tests/tmtests/tm19/Makefile.am b/c/src/ada-tests/tmtests/tm19/Makefile.am
index 9939d0c981..9ee318d61a 100644
--- a/c/src/ada-tests/tmtests/tm19/Makefile.am
+++ b/c/src/ada-tests/tmtests/tm19/Makefile.am
@@ -1,7 +1,7 @@
 ## $Id$
 
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-include $(top_srcdir)/../tests/automake/compile.am
+include $(top_srcdir)/../../../testsuites/automake/compile.am
 
 include $(top_srcdir)/ada.am
 
@@ -12,4 +12,4 @@ tm19_SOURCES += ../../support/init.c
 tm19$(EXEEXT): tm19.adb init.$(OBJEXT)
 	$(GNATCOMPILE) -margs -a $< -o $@
 
-include $(top_srcdir)/../tests/automake/local.am
+include $(top_srcdir)/../../../testsuites/automake/local.am
diff --git a/c/src/ada-tests/tmtests/tm20/Makefile.am b/c/src/ada-tests/tmtests/tm20/Makefile.am
index f811c365f1..e49f6124d5 100644
--- a/c/src/ada-tests/tmtests/tm20/Makefile.am
+++ b/c/src/ada-tests/tmtests/tm20/Makefile.am
@@ -1,7 +1,7 @@
 ## $Id$
 
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-include $(top_srcdir)/../tests/automake/compile.am
+include $(top_srcdir)/../../../testsuites/automake/compile.am
 
 include $(top_srcdir)/ada.am
 
@@ -12,4 +12,4 @@ tm20_SOURCES += ../../support/init.c
 tm20$(EXEEXT): tm20.adb init.$(OBJEXT)
 	$(GNATCOMPILE) -margs -a $< -o $@
 
-include $(top_srcdir)/../tests/automake/local.am
+include $(top_srcdir)/../../../testsuites/automake/local.am
diff --git a/c/src/ada-tests/tmtests/tm21/Makefile.am b/c/src/ada-tests/tmtests/tm21/Makefile.am
index 592da7efab..f93867f5c1 100644
--- a/c/src/ada-tests/tmtests/tm21/Makefile.am
+++ b/c/src/ada-tests/tmtests/tm21/Makefile.am
@@ -1,7 +1,7 @@
 ## $Id$
 
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-include $(top_srcdir)/../tests/automake/compile.am
+include $(top_srcdir)/../../../testsuites/automake/compile.am
 
 include $(top_srcdir)/ada.am
 
@@ -12,4 +12,4 @@ tm21_SOURCES += ../../support/init.c
 tm21$(EXEEXT): tm21.adb init.$(OBJEXT)
 	$(GNATCOMPILE) -margs -a $< -o $@
 
-include $(top_srcdir)/../tests/automake/local.am
+include $(top_srcdir)/../../../testsuites/automake/local.am
diff --git a/c/src/ada-tests/tmtests/tm22/Makefile.am b/c/src/ada-tests/tmtests/tm22/Makefile.am
index bb05370d74..4ffade8352 100644
--- a/c/src/ada-tests/tmtests/tm22/Makefile.am
+++ b/c/src/ada-tests/tmtests/tm22/Makefile.am
@@ -1,7 +1,7 @@
 ## $Id$
 
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-include $(top_srcdir)/../tests/automake/compile.am
+include $(top_srcdir)/../../../testsuites/automake/compile.am
 
 include $(top_srcdir)/ada.am
 
@@ -12,4 +12,4 @@ tm22_SOURCES += ../../support/init.c
 tm22$(EXEEXT): tm22.adb init.$(OBJEXT)
 	$(GNATCOMPILE) -margs -a $< -o $@
 
-include $(top_srcdir)/../tests/automake/local.am
+include $(top_srcdir)/../../../testsuites/automake/local.am
diff --git a/c/src/ada-tests/tmtests/tm23/Makefile.am b/c/src/ada-tests/tmtests/tm23/Makefile.am
index af53d83be8..bcf6f6bb29 100644
--- a/c/src/ada-tests/tmtests/tm23/Makefile.am
+++ b/c/src/ada-tests/tmtests/tm23/Makefile.am
@@ -1,7 +1,7 @@
 ## $Id$
 
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-include $(top_srcdir)/../tests/automake/compile.am
+include $(top_srcdir)/../../../testsuites/automake/compile.am
 
 include $(top_srcdir)/ada.am
 
@@ -12,4 +12,4 @@ tm23_SOURCES += ../../support/init.c
 tm23$(EXEEXT): tm23.adb init.$(OBJEXT)
 	$(GNATCOMPILE) -margs -a $< -o $@
 
-include $(top_srcdir)/../tests/automake/local.am
+include $(top_srcdir)/../../../testsuites/automake/local.am
diff --git a/c/src/ada-tests/tmtests/tm24/Makefile.am b/c/src/ada-tests/tmtests/tm24/Makefile.am
index 062607db8b..b8ccda4c1d 100644
--- a/c/src/ada-tests/tmtests/tm24/Makefile.am
+++ b/c/src/ada-tests/tmtests/tm24/Makefile.am
@@ -1,7 +1,7 @@
 ## $Id$
 
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-include $(top_srcdir)/../tests/automake/compile.am
+include $(top_srcdir)/../../../testsuites/automake/compile.am
 
 include $(top_srcdir)/ada.am
 
@@ -12,4 +12,4 @@ tm24_SOURCES += ../../support/init.c
 tm24$(EXEEXT): tm24.adb init.$(OBJEXT)
 	$(GNATCOMPILE) -margs -a $< -o $@
 
-include $(top_srcdir)/../tests/automake/local.am
+include $(top_srcdir)/../../../testsuites/automake/local.am
diff --git a/c/src/ada-tests/tmtests/tm25/Makefile.am b/c/src/ada-tests/tmtests/tm25/Makefile.am
index d08b1e9a33..6eb7b8393d 100644
--- a/c/src/ada-tests/tmtests/tm25/Makefile.am
+++ b/c/src/ada-tests/tmtests/tm25/Makefile.am
@@ -1,7 +1,7 @@
 ## $Id$
 
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-include $(top_srcdir)/../tests/automake/compile.am
+include $(top_srcdir)/../../../testsuites/automake/compile.am
 
 include $(top_srcdir)/ada.am
 
@@ -12,4 +12,4 @@ tm25_SOURCES += ../../support/init.c
 tm25$(EXEEXT): tm25.adb init.$(OBJEXT)
 	$(GNATCOMPILE) -margs -a $< -o $@
 
-include $(top_srcdir)/../tests/automake/local.am
+include $(top_srcdir)/../../../testsuites/automake/local.am
diff --git a/c/src/ada-tests/tmtests/tm28/Makefile.am b/c/src/ada-tests/tmtests/tm28/Makefile.am
index 3742610ae9..14b557cf42 100644
--- a/c/src/ada-tests/tmtests/tm28/Makefile.am
+++ b/c/src/ada-tests/tmtests/tm28/Makefile.am
@@ -1,7 +1,7 @@
 ## $Id$
 
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-include $(top_srcdir)/../tests/automake/compile.am
+include $(top_srcdir)/../../../testsuites/automake/compile.am
 
 include $(top_srcdir)/ada.am
 
@@ -12,4 +12,4 @@ tm28_SOURCES += ../../support/init.c
 tm28$(EXEEXT): tm28.adb init.$(OBJEXT)
 	$(GNATCOMPILE) -margs -a $< -o $@
 
-include $(top_srcdir)/../tests/automake/local.am
+include $(top_srcdir)/../../../testsuites/automake/local.am
diff --git a/c/src/ada-tests/tmtests/tm29/Makefile.am b/c/src/ada-tests/tmtests/tm29/Makefile.am
index a393bb42f1..6879400000 100644
--- a/c/src/ada-tests/tmtests/tm29/Makefile.am
+++ b/c/src/ada-tests/tmtests/tm29/Makefile.am
@@ -1,7 +1,7 @@
 ## $Id$
 
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-include $(top_srcdir)/../tests/automake/compile.am
+include $(top_srcdir)/../../../testsuites/automake/compile.am
 
 include $(top_srcdir)/ada.am
 
@@ -12,4 +12,4 @@ tm29_SOURCES += ../../support/init.c
 tm29$(EXEEXT): tm29.adb init.$(OBJEXT)
 	$(GNATCOMPILE) -margs -a $< -o $@
 
-include $(top_srcdir)/../tests/automake/local.am
+include $(top_srcdir)/../../../testsuites/automake/local.am
diff --git a/c/src/ada-tests/tmtests/tmck/Makefile.am b/c/src/ada-tests/tmtests/tmck/Makefile.am
index 60f1be38c6..d5cde4e24d 100644
--- a/c/src/ada-tests/tmtests/tmck/Makefile.am
+++ b/c/src/ada-tests/tmtests/tmck/Makefile.am
@@ -1,7 +1,7 @@
 ## $Id$
 
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-include $(top_srcdir)/../tests/automake/compile.am
+include $(top_srcdir)/../../../testsuites/automake/compile.am
 
 include $(top_srcdir)/ada.am
 
@@ -12,4 +12,4 @@ tmck_SOURCES += ../../support/init.c
 tmck$(EXEEXT): tmck.adb init.$(OBJEXT)
 	$(GNATCOMPILE) -margs -a $< -o $@
 
-include $(top_srcdir)/../tests/automake/local.am
+include $(top_srcdir)/../../../testsuites/automake/local.am
diff --git a/c/src/ada-tests/tmtests/tmoverhd/Makefile.am b/c/src/ada-tests/tmtests/tmoverhd/Makefile.am
index 86aa9e32f4..d522442e4a 100644
--- a/c/src/ada-tests/tmtests/tmoverhd/Makefile.am
+++ b/c/src/ada-tests/tmtests/tmoverhd/Makefile.am
@@ -1,7 +1,7 @@
 ## $Id$
 
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-include $(top_srcdir)/../tests/automake/compile.am
+include $(top_srcdir)/../../../testsuites/automake/compile.am
 
 include $(top_srcdir)/ada.am
 
@@ -14,4 +14,4 @@ tmoverhd_SOURCES += ../../support/init.c
 tmoverhd$(EXEEXT): tmoverhd.adb init.$(OBJEXT)
 	$(GNATCOMPILE) -margs -a $< -o $@
 
-include $(top_srcdir)/../tests/automake/local.am
+include $(top_srcdir)/../../../testsuites/automake/local.am