diff --git a/Data/ODBC/testsuite/Makefile b/Data/ODBC/testsuite/Makefile
index 5c3fac557..bcc54fbfa 100644
--- a/Data/ODBC/testsuite/Makefile
+++ b/Data/ODBC/testsuite/Makefile
@@ -42,6 +42,5 @@ endif
 target           = testrunner
 target_version   = 1
 target_libs      = PocoDataODBC PocoDataTest PocoData PocoFoundation CppUnit
-target_includes += $(POCO_BASE)/Data/DataTest/include
 
 include $(POCO_BASE)/build/rules/exec
diff --git a/Data/ODBC/testsuite/dependencies b/Data/ODBC/testsuite/dependencies
new file mode 100644
index 000000000..3fae56a64
--- /dev/null
+++ b/Data/ODBC/testsuite/dependencies
@@ -0,0 +1 @@
+Data/DataTest
diff --git a/Data/PostgreSQL/testsuite/Makefile b/Data/PostgreSQL/testsuite/Makefile
index e4190d664..1c0d5817a 100644
--- a/Data/PostgreSQL/testsuite/Makefile
+++ b/Data/PostgreSQL/testsuite/Makefile
@@ -20,6 +20,5 @@ endif
 target         = testrunner
 target_version = 1
 target_libs    = PocoDataPostgreSQL PocoDataTest PocoData PocoFoundation CppUnit
-target_includes += $(POCO_BASE)/Data/DataTest/include
 
 include $(POCO_BASE)/build/rules/exec
diff --git a/Data/PostgreSQL/testsuite/dependencies b/Data/PostgreSQL/testsuite/dependencies
new file mode 100644
index 000000000..3fae56a64
--- /dev/null
+++ b/Data/PostgreSQL/testsuite/dependencies
@@ -0,0 +1 @@
+Data/DataTest
diff --git a/components b/components
index c8f4d61ac..811018f99 100644
--- a/components
+++ b/components
@@ -13,6 +13,7 @@ Data/SQLite
 Data/ODBC
 Data/MySQL
 Data/PostgreSQL
+Data/DataTest
 Zip
 PageCompiler
 PageCompiler/File2Page
diff --git a/release/script/mkrelease b/release/script/mkrelease
index 1e8868c75..fe3f9c7fa 100755
--- a/release/script/mkrelease
+++ b/release/script/mkrelease
@@ -348,9 +348,18 @@ ${comp}-libexec: $dependencies
 ENDOFSCRIPT
 
 	if [ -d "${POCO_BASE}/${comp}/testsuite" ] ; then
+		tdependencies=""
+		if [ -f "${POCO_BASE}/${comp}/testsuite/dependencies" ] ; then
+			for dep in `cat "${POCO_BASE}/${comp}/testsuite/dependencies"` ;
+			do
+				# get rid of surrounding whitespace (trailing \r on Cygwin)
+				read dep <<< ${dep}
+				tdependencies="$tdependencies ${dep}-libexec"
+			done
+		fi
 		cat >>${target}/Makefile <<ENDOFSCRIPT
 
-${comp}-tests: ${comp}-libexec cppunit
+${comp}-tests: ${comp}-libexec $tdependencies cppunit
 	\$(MAKE) -C \$(POCO_BASE)/${comp}/testsuite
 ENDOFSCRIPT
 	fi
diff --git a/release/spec/all.release b/release/spec/all.release
index 2181ff321..ab9b0223f 100644
--- a/release/spec/all.release
+++ b/release/spec/all.release
@@ -6,6 +6,7 @@ Data/SQLite
 Data/ODBC
 Data/MySQL
 Data/PostgreSQL
+Data/DataTest
 Zip
 PageCompiler
 PageCompiler/File2Page