diff --git a/packages/fcl-db/tests/sqldbtoolsunit.pas b/packages/fcl-db/tests/sqldbtoolsunit.pas
index 0f927914f5..fe49066ea9 100644
--- a/packages/fcl-db/tests/sqldbtoolsunit.pas
+++ b/packages/fcl-db/tests/sqldbtoolsunit.pas
@@ -5,10 +5,24 @@ unit SQLDBToolsUnit;
 interface
 
 uses
-  Classes, SysUtils, toolsunit,
-  db, sqldb,
-  mysql40conn, mysql41conn, mysql50conn, mysql51conn, mysql55conn,
-  ibconnection, pqconnection, odbcconn, oracleconnection, sqlite3conn, mssqlconn;
+  Classes, SysUtils, toolsunit
+  ,db, sqldb
+  ,mysql40conn, mysql41conn, mysql50conn, mysql51conn, mysql55conn,ibconnection
+  {$IFNDEF WIN64}
+  {See packages\fcl-db\src\sqldb\postgres\fpmake.pp: postgres connector won't be present on Win64}
+  ,pqconnection
+  {$ENDIF WIN64}
+  ,odbcconn
+  {$IFNDEF WIN64}
+  {See packages\fcl-db\fpmake.pp: Oracle connector is not built if PostgreSQL connectoris not built}
+  ,oracleconnection
+  {$ENDIF WIN64}
+  ,sqlite3conn
+  {$IFNDEF WIN64}
+  {This won't be available on Windows 64, either; perhaps other systems as well}
+  ,mssqlconn
+  {$ENDIF WIN64}
+  ;
 
 type TSQLDBTypes = (mysql40,mysql41,mysql50,mysql51,mysql55,postgresql,interbase,odbc,oracle,sqlite3,mssql);
 
@@ -141,6 +155,7 @@ begin
     FieldtypeDefinitions[ftVarBytes] := 'VARBINARY(10)';
     FieldtypeDefinitions[ftMemo] := 'CLOB'; //or TEXT SQLite supports both, but CLOB is sql standard (TEXT not)
     end;
+  {$IFNDEF Win64}    
   if SQLDbType = POSTGRESQL then
     begin
     Fconnection := tPQConnection.Create(nil);
@@ -149,6 +164,7 @@ begin
     FieldtypeDefinitions[ftMemo] := 'TEXT';
     FieldtypeDefinitions[ftGraphic] := '';
     end;
+  {$ENDIF Win64}
   if SQLDbType = INTERBASE then
     begin
     Fconnection := tIBConnection.Create(nil);
@@ -156,7 +172,10 @@ begin
     FieldtypeDefinitions[ftMemo] := 'BLOB SUB_TYPE TEXT';
     end;
   if SQLDbType = ODBC then Fconnection := tODBCConnection.Create(nil);
+  {$IFNDEF Win64}
   if SQLDbType = ORACLE then Fconnection := TOracleConnection.Create(nil);
+  {$ENDIF Win64}
+  {$IFNDEF Win64}
   if SQLDbType = MSSQL then
     begin
     Fconnection := TMSSQLConnection.Create(nil);
@@ -171,6 +190,7 @@ begin
     FieldtypeDefinitions[ftMemo]    := 'TEXT';
     FieldtypeDefinitions[ftGraphic] := '';
     end;
+  {$ENDIF Win64}
 
   if SQLDbType in [mysql40,mysql41,mysql50,mysql51,mysql55,odbc,interbase] then
     begin
@@ -211,7 +231,7 @@ begin
       testValues[ftFixedChar,t] := PadRight(testValues[ftFixedChar,t], 10);
 
 
-  if not assigned(Fconnection) then writeln('Invalid database-type, check if a valid database-type was provided in the file ''database.ini''');
+  if not assigned(Fconnection) then writeln('Invalid database type, check if a valid database type for your achitecture was provided in the file ''database.ini''');
 
   with Fconnection do
     begin