diff --git a/tests/Makefile b/tests/Makefile
index 84bd0583c6..73f488c9c6 100644
--- a/tests/Makefile
+++ b/tests/Makefile
@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2002/02/28]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2002/02/27]
 #
 default: allexectests
 MAKEFILETARGETS=linux go32v2 win32 os2 freebsd beos netbsd amiga atari sunos qnx
@@ -108,7 +108,7 @@ ifndef FPC_VERSION
 FPC_VERSION:=$(shell $(FPC) -iV)
 endif
 export FPC FPC_VERSION
-unexport CHECKDEPEND ALLDEPENDENCIES
+unexport CHECKDEPEND ALL_DEPENDENCIES
 ifeq ($(findstring 1.0.,$(FPC_VERSION)),)
 COMPILERINFO:=$(shell $(FPC) -iSP -iTP -iSO -iTO)
 ifndef CPU_SOURCE
@@ -247,7 +247,6 @@ endif
 endif
 endif
 export INSTALL_PREFIX
-export INSTALL_SOURCESUBDIR
 ifndef DIST_DESTDIR
 DIST_DESTDIR:=$(BASEDIR)
 endif
@@ -309,7 +308,7 @@ endif
 endif
 else
 ifdef INSTALL_FPCPACKAGE
-INSTALL_SOURCEDIR:=$(INSTALL_BASEDIR)/source/$(INSTALL_SOURCESUBDIR)/$(PACKAGE_NAME)
+INSTALL_SOURCEDIR:=$(INSTALL_BASEDIR)/source/$(PACKAGE_NAME)
 else
 INSTALL_SOURCEDIR:=$(INSTALL_BASEDIR)/source
 endif
@@ -992,7 +991,7 @@ makefiles: fpc_makefiles
 ifneq ($(wildcard fpcmake.loc),)
 include fpcmake.loc
 endif
-TESTSUBDIRS=cg units/system units/dos units/crt
+TESTSUBDIRS=cg units/system units/dos units/crt units/objects
 TESTDIRS:=test $(addprefix test/,$(TESTSUBDIRS))
 ifeq ($(OS_TARGET),linux)
 INUNIX=1
@@ -1028,7 +1027,7 @@ endif
 ifdef INTERACTIVE
 override DOTESTOPT+=-i
 endif
-DIRS=webtbs webtbf tbs tbf test
+DIRS=webtbs webtbf tbs tbf test test/cg test/units/system test/units/objects
 %.log : %.pp
 	$(DOTEST) $(DOTESTOPT) $<
 %.elg : %.pp
diff --git a/tests/Makefile.fpc b/tests/Makefile.fpc
index 99a8b01ac8..057530ebae 100644
--- a/tests/Makefile.fpc
+++ b/tests/Makefile.fpc
@@ -12,7 +12,7 @@ rule=allexectests
 
 [rules]
 # Subdirs available in the test subdir
-TESTSUBDIRS=cg units/system units/dos units/crt
+TESTSUBDIRS=cg units/system units/dos units/crt units/objects
 
 # All full dirnames in the test/ dir including the subdir self
 TESTDIRS:=test $(addprefix test/,$(TESTSUBDIRS))
@@ -77,7 +77,7 @@ endif
 # Test run targets
 #
 
-DIRS=webtbs webtbf tbs tbf test
+DIRS=webtbs webtbf tbs tbf test test/cg test/units/system test/units/objects
 
 %.log : %.pp
         $(DOTEST) $(DOTESTOPT) $<