diff --git a/ChangeLog b/ChangeLog
index e0e637717..ddb7d5b2b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2011-04-08  Nicola Pero  <nicola.pero@meta-innovation.com>
+
+	* GNUmakefile (SUBPROJECTS): Added Tests, so that 'make check'
+	top-level does run the tests.
+	* Tests/GNUmakefile: Use rules.make instead of test-tool.make.
+	(TEST_TOOL_NAMES): Variable removed.
+
 2011-03-31 Riccardo Mottola <rm@gnu.org>
 
 	* Source/NSWorkspace.m
diff --git a/GNUmakefile b/GNUmakefile
index 5c401dfc6..7214d43a6 100644
--- a/GNUmakefile
+++ b/GNUmakefile
@@ -64,7 +64,8 @@ ColorPickers \
 KeyBindings \
 Resources \
 Printing \
-Themes
+Themes \
+Tests
 
 # Build and install sounds, if sound support is present.
 SUBPROJECTS += $(BUILD_SOUNDS)
diff --git a/Tests/GNUmakefile b/Tests/GNUmakefile
index a3ace6f64..14de9833a 100644
--- a/Tests/GNUmakefile
+++ b/Tests/GNUmakefile
@@ -42,8 +42,6 @@ endif
 
 include $(GNUSTEP_MAKEFILES)/common.make
 
-TEST_APP_NAMES=
-
 all::
 	@(echo If you want to run the gnustep-gui testsuite, please type \'make check\')
 
@@ -53,5 +51,4 @@ check::
 clean::
 	gnustep-tests --clean
 
-include $(GNUSTEP_MAKEFILES)/test-application.make
-
+include $(GNUSTEP_MAKEFILES)/rules.make