diff --git a/GNUmakefile b/GNUmakefile
index bf9dd6f..f8e1bb2 100644
--- a/GNUmakefile
+++ b/GNUmakefile
@@ -4,19 +4,7 @@ include $(GNUSTEP_MAKEFILES)/common.make
 
 PACKAGE_NAME = SQLClient
 
-TEST_TOOL_NAME = testPostgres testMySQL testECPG
-testPostgres_OBJC_FILES = testPostgres.m
-testPostgres_LIB_DIRS += -L./obj
-testPostgres_TOOL_LIBS += -lSQLClient -lpq
-
-testMySQL_OBJC_FILES = testMySQL.m
-testMySQL_LIB_DIRS += -L./obj
-testMySQL_TOOL_LIBS += -lSQLClient
-
-testECPG_OBJC_FILES = testECPG.m
-testECPG_TOOL_LIBS += -lSQLClient
-testECPG_LIB_DIRS += -L./obj
-
+TEST_TOOL_NAME=
 
 LIBRARY_NAME=SQLClient
 
@@ -43,6 +31,10 @@ ECPG_OBJC_FILES = ECPG.m
 ECPG_LIB_DIRS = -L./obj
 ECPG_BUNDLE_LIBS += -lSQLClient -lgnustep-base -lobjc -lecpg
 ECPG_PRINCIPAL_CLASS = SQLClientECPG
+TEST_TOOL_NAME += testECPG
+testECPG_OBJC_FILES = testECPG.m
+testECPG_TOOL_LIBS += -lSQLClient
+testECPG_LIB_DIRS += -L./obj
 endif
 
 ifneq ($(POSTGRES),)
@@ -51,6 +43,10 @@ Postgres_OBJC_FILES = Postgres.m
 Postgres_LIB_DIRS = -L./obj
 Postgres_BUNDLE_LIBS += -lSQLClient -lgnustep-base -lobjc -lpq
 Postgres_PRINCIPAL_CLASS = SQLClientPostgres
+TEST_TOOL_NAME += testPostgres
+testPostgres_OBJC_FILES = testPostgres.m
+testPostgres_LIB_DIRS += -L./obj
+testPostgres_TOOL_LIBS += -lSQLClient -lpq
 endif
 
 ifneq ($(MYSQL),)
@@ -59,6 +55,10 @@ MySQL_OBJC_FILES = MySQL.m
 MySQL_LIB_DIRS = -L./obj
 MySQL_BUNDLE_LIBS += -lSQLClient -lgnustep-base -lobjc -lmysqlclient
 MySQL_PRINCIPAL_CLASS = SQLClientMySQL
+TEST_TOOL_NAME += testMySQL
+testMySQL_OBJC_FILES = testMySQL.m
+testMySQL_LIB_DIRS += -L./obj
+testMySQL_TOOL_LIBS += -lSQLClient
 endif
 
 ifneq ($(ORACLE_HOME),)