diff --git a/tests/test/units/system/tabs.pp b/tests/test/units/system/tabs.pp
index d328a043fb..5e13247423 100644
--- a/tests/test/units/system/tabs.pp
+++ b/tests/test/units/system/tabs.pp
@@ -5,7 +5,13 @@ program tabs;
 {$ifdef VER1_0}
   {$define SKIP_CURRENCY_TEST}
 {$endif }
+
+{$ifndef MACOS}
 {$APPTYPE CONSOLE}
+{$else}
+{$APPTYPE TOOL}
+{$endif}
+
 {$R+}
 {$Q+}
 
@@ -276,7 +282,10 @@ end.
 
 {
  $Log$
- Revision 1.2  2002-10-15 10:26:36  pierre
+ Revision 1.3  2004-04-25 13:42:11  olle
+   * changed to $APPTYPE TOOL on MacOS
+
+ Revision 1.2  2002/10/15 10:26:36  pierre
   * add code to remember that currency is only implemented in 1.1 compiler
 
  Revision 1.1  2002/09/18 18:30:30  carl
diff --git a/tests/test/units/system/tround.pp b/tests/test/units/system/tround.pp
index 0710aa5cd7..0f84d1c37b 100644
--- a/tests/test/units/system/tround.pp
+++ b/tests/test/units/system/tround.pp
@@ -5,7 +5,11 @@ program tround;
   {$define SKIP_CURRENCY_TEST}
 {$endif }
 
+{$ifndef MACOS}
 {$APPTYPE CONSOLE}
+{$else}
+{$APPTYPE TOOL}
+{$endif}
 
 const
   RESULT_ONE = 1235;
@@ -229,7 +233,10 @@ end.
 
 {
   $Log$
-  Revision 1.3  2002-10-15 10:26:36  pierre
+  Revision 1.4  2004-04-25 13:42:11  olle
+    * changed to $APPTYPE TOOL on MacOS
+
+  Revision 1.3  2002/10/15 10:26:36  pierre
    * add code to remember that currency is only implemented in 1.1 compiler
 
   Revision 1.2  2002/09/18 18:30:30  carl
diff --git a/tests/test/units/system/tsetstr.pp b/tests/test/units/system/tsetstr.pp
index fdf5d19fad..af06c12007 100644
--- a/tests/test/units/system/tsetstr.pp
+++ b/tests/test/units/system/tsetstr.pp
@@ -6,7 +6,12 @@
 program tsetstr;
 {$R+}
 {$Q+}
+
+{$ifndef MACOS}
 {$APPTYPE CONSOLE}
+{$else}
+{$APPTYPE TOOL}
+{$endif}
 
 {$ifdef fpc}
   {$ifndef ver1_0}
@@ -168,7 +173,10 @@ end.
 
 {
   $Log$
-  Revision 1.3  2003-03-04 18:19:48  jonas
+  Revision 1.4  2004-04-25 13:42:11  olle
+    * changed to $APPTYPE TOOL on MacOS
+
+  Revision 1.3  2003/03/04 18:19:48  jonas
     * adapted tests to fixed implementation
 
   Revision 1.2  2002/12/16 20:40:36  peter
diff --git a/tests/test/units/system/tsetstr2.pp b/tests/test/units/system/tsetstr2.pp
index 935616d7bb..03ffea1568 100644
--- a/tests/test/units/system/tsetstr2.pp
+++ b/tests/test/units/system/tsetstr2.pp
@@ -9,7 +9,13 @@
 program tsetstr;
 {$R+}
 {$Q+}
+
+{$ifndef MACOS}
 {$APPTYPE CONSOLE}
+{$else}
+{$APPTYPE TOOL}
+{$endif}
+
 {$H+}
 
 {$ifdef fpc}
@@ -172,7 +178,10 @@ end.
 
 {
   $Log$
-  Revision 1.2  2003-03-04 18:19:48  jonas
+  Revision 1.3  2004-04-25 13:42:11  olle
+    * changed to $APPTYPE TOOL on MacOS
+
+  Revision 1.2  2003/03/04 18:19:48  jonas
     * adapted tests to fixed implementation
 
   Revision 1.1  2002/10/21 09:02:25  pierre
diff --git a/tests/test/units/system/tstring.pp b/tests/test/units/system/tstring.pp
index 153f78ee42..b8f947ec0e 100644
--- a/tests/test/units/system/tstring.pp
+++ b/tests/test/units/system/tstring.pp
@@ -5,7 +5,12 @@
 program tstring;
 {$R+}
 {$Q+}
+
+{$ifndef MACOS}
 {$APPTYPE CONSOLE}
+{$else}
+{$APPTYPE TOOL}
+{$endif}
 
 {$ifdef fpc}
   {$ifndef ver1_0}
diff --git a/tests/test/units/system/ttrunc.pp b/tests/test/units/system/ttrunc.pp
index b64e7e7570..497acce578 100644
--- a/tests/test/units/system/ttrunc.pp
+++ b/tests/test/units/system/ttrunc.pp
@@ -5,7 +5,11 @@ program ttrunc;
   {$define SKIP_CURRENCY_TEST}
 {$endif }
 
+{$ifndef MACOS}
 {$APPTYPE CONSOLE}
+{$else}
+{$APPTYPE TOOL}
+{$endif}
 
 const
   RESULT_ONE = 1234;
@@ -228,7 +232,10 @@ end.
 
 {
   $Log$
-  Revision 1.3  2002-10-15 10:26:36  pierre
+  Revision 1.4  2004-04-25 13:42:11  olle
+    * changed to $APPTYPE TOOL on MacOS
+
+  Revision 1.3  2002/10/15 10:26:36  pierre
    * add code to remember that currency is only implemented in 1.1 compiler
 
   Revision 1.2  2002/09/18 18:30:30  carl
diff --git a/tests/webtbs/tw2065.pp b/tests/webtbs/tw2065.pp
index 976000b7f6..893563c6be 100644
--- a/tests/webtbs/tw2065.pp
+++ b/tests/webtbs/tw2065.pp
@@ -3,7 +3,12 @@
 { e-mail: thomas.lavergne@laposte.net }
 program test;
 
+{$ifndef MACOS}
 {$APPTYPE CONSOLE}
+{$else}
+{$APPTYPE TOOL}
+{$endif}
+
 {$LONGSTRINGS ON}
 
 type
diff --git a/tests/webtbs/tw2594.pp b/tests/webtbs/tw2594.pp
index 3a365e2c9c..d4e5149bf7 100644
--- a/tests/webtbs/tw2594.pp
+++ b/tests/webtbs/tw2594.pp
@@ -1,7 +1,13 @@
 { Source provided for Free Pascal Bug Report 2594 }
 { Submitted by "Pavel V. Ozerski" on  2003-07-24 }
 { e-mail: ozerski@list.ru }
-{$apptype console}
+
+{$ifndef MACOS}
+{$APPTYPE CONSOLE}
+{$else}
+{$APPTYPE TOOL}
+{$endif}
+
 {$ifdef fpc}
 {$mode delphi}
 {$endif}