Index: tests.gpr
==================================================================
--- tests.gpr
+++ tests.gpr
@@ -1,46 +1,17 @@
 with "natools";
 
 project Tests is
    for Source_Dirs use ("tests");
-   for Object_Dir use "obj";
-   for Exec_Dir use "bin";
    for Main use ("test_all.adb");
+
+   for Object_Dir use Natools'Object_Dir;
+   for Exec_Dir use Natools'Exec_Dir;
 
    package Compiler is
-      for Default_Switches ("Ada") use
-        ("-gnatafnovy",
-            --  a: assersions enabled
-            --  f: full errors (verbose details and all undefined references)
-            --  n: enable pragma Inline
-            --  o: overflow checking
-            --  v: verbose mode
-            --  y: enable default style checks, currently equivalent to:
-            --     3: 3-space indentation
-            --     a: attribute casing
-            --     b: no blanks at end of lines
-            --     c: comment format
-            --     e: end/exit labels
-            --     f: no form feed or vertical tab
-            --     h: no horizontal tab
-            --     i: if-then layout
-            --     k: casing rules for keywords
-            --     l: reference manual layout
-            --     m: line lgnth <= 79 characters
-            --     n: casing of package Standard identifiers
-            --     p: pragma casing
-            --     r: casing for identifier references
-            --     s: presence of subprogram specs
-            --     t: token separation rules
-         "-gnateE",
-            --  generate extra information in exception messages
-         "-gnatwae",
-            --  a: turn on most warnings
-            --  e: treat all warnings as errors
-         "-fstack-check",
-         "-O3");
+      for Default_Switches use Natools.Compiler'Default_Switches;
    end Compiler;
 
    package Linker is
-      for Default_Switches ("Ada") use ("-O3");
+      for Default_Switches use Natools.Linker'Default_Switches;
    end Linker;
 end Tests;