diff --git a/wst/trunk/tests/test_suite/testformatter_unit.pas b/wst/trunk/tests/test_suite/testformatter_unit.pas
index d1afe677c..4e4ed484b 100644
--- a/wst/trunk/tests/test_suite/testformatter_unit.pas
+++ b/wst/trunk/tests/test_suite/testformatter_unit.pas
@@ -601,8 +601,6 @@ end;
 
 function CompareNodes(const A,B : PDataBuffer) : Boolean;overload;
 var
-  ca, cb : PObjectBufferItem;
-  i : PtrInt;
   ok : Boolean;
 begin
   if ( A = nil ) and ( B = nil ) then begin
@@ -1842,6 +1840,7 @@ var
   s : TMemoryStream;
   x : string;
 begin
+  s := nil;
   a := TArrayOfStringRemotable.Create();
   try
     CheckEquals(0,a.Length);
@@ -1893,6 +1892,7 @@ var
   s : TMemoryStream;
   x : string;
 begin
+  s := nil;
   b := nil;
   a := TArrayOfStringRemotable.Create();
   try
@@ -1966,6 +1966,7 @@ var
   s : TMemoryStream;
   x : string;
 begin
+  s := nil;
   a := TArrayOfStringRemotable.Create();
   try
     CheckEquals(0,a.Length);
@@ -2004,6 +2005,7 @@ var
   s : TMemoryStream;
   x : string;
 begin
+  s := nil;
   a := TArrayOfBooleanRemotable.Create();
   try
     CheckEquals(0,a.Length);
@@ -2054,6 +2056,7 @@ var
   s : TMemoryStream;
   x : string;
 begin
+  s := nil;
   a := TArrayOfInt8URemotable.Create();
   try
     CheckEquals(0,a.Length);
@@ -2104,6 +2107,7 @@ var
   s : TMemoryStream;
   x : string;
 begin
+  s := nil;
   a := TArrayOfInt8SRemotable.Create();
   try
     CheckEquals(0,a.Length);
@@ -2154,6 +2158,7 @@ var
   s : TMemoryStream;
   x : string;
 begin
+  s := nil;
   a := TArrayOfInt16SRemotable.Create();
   try
     CheckEquals(0,a.Length);
@@ -2204,6 +2209,7 @@ var
   s : TMemoryStream;
   x : string;
 begin
+  s := nil;
   a := TArrayOfInt16URemotable.Create();
   try
     CheckEquals(0,a.Length);
@@ -2254,6 +2260,7 @@ var
   s : TMemoryStream;
   x : string;
 begin
+  s := nil;
   a := TArrayOfInt32URemotable.Create();
   try
     CheckEquals(0,a.Length);
@@ -2304,6 +2311,7 @@ var
   s : TMemoryStream;
   x : string;
 begin
+  s := nil;
   a := TArrayOfInt32SRemotable.Create();
   try
     CheckEquals(0,a.Length);
@@ -2354,6 +2362,7 @@ var
   s : TMemoryStream;
   x : string;
 begin
+  s := nil;
   a := TArrayOfInt64SRemotable.Create();
   try
     CheckEquals(0,a.Length);
@@ -2404,6 +2413,7 @@ var
   s : TMemoryStream;
   x : string;
 begin
+  s := nil;
   a := TArrayOfInt64URemotable.Create();
   try
     CheckEquals(0,a.Length);
@@ -2454,6 +2464,7 @@ var
   s : TMemoryStream;
   x : string;
 begin
+  s := nil;
   a := TArrayOfFloatSingleRemotable.Create();
   try
     CheckEquals(0,a.Length);
@@ -2504,6 +2515,7 @@ var
   s : TMemoryStream;
   x : string;
 begin
+  s := nil;
   a := TArrayOfFloatDoubleRemotable.Create();
   try
     CheckEquals(0,a.Length);
@@ -2554,6 +2566,7 @@ var
   s : TMemoryStream;
   x : string;
 begin
+  s := nil;
   a := TArrayOfFloatExtendedRemotable.Create();
   try
     CheckEquals(0,a.Length);
@@ -2604,6 +2617,7 @@ var
   s : TMemoryStream;
   x : string;
 begin
+  s := nil;
   a := TArrayOfFloatCurrencyRemotable.Create();
   try
     CheckEquals(0,a.Length);
@@ -3680,7 +3694,7 @@ var
   strm : TMemoryStream;
 
   envNd : TDOMElement;
-  bdyNd, fltNd, hdrNd, tmpNode : TDOMNode;
+  bdyNd, fltNd, tmpNode : TDOMNode;
   nsShortName,eltName, msgBuff : string;
   doc : TXMLDocument;
 begin
@@ -3982,8 +3996,6 @@ var
   callNode : TDOMElement;
   faultNode, faultStruct, tmpNode : TDOMNode;
   doc : TXMLDocument;
-  eltName : string;
-  excpt_Obj : EXmlRpcException;
   excpt_code, excpt_msg : string;
 begin
   f := CreateFormatter();
@@ -4165,7 +4177,7 @@ const
 var
   f : IFormatterClient;
   strm : TMemoryStream;
-  root, bodyNode, faultNode, tmpNode : PDataBuffer;
+  root, bodyNode, faultNode : PDataBuffer;
   excpt_code, excpt_msg : string;
   locStore : IDataStore;
 begin
diff --git a/wst/trunk/tests/test_suite/wst_test_suite.lpi b/wst/trunk/tests/test_suite/wst_test_suite.lpi
index 23873548a..8e90c0678 100644
--- a/wst/trunk/tests/test_suite/wst_test_suite.lpi
+++ b/wst/trunk/tests/test_suite/wst_test_suite.lpi
@@ -26,7 +26,7 @@
         <PackageName Value="FPCUnitTestRunner"/>
       </Item1>
     </RequiredPackages>
-    <Units Count="38">
+    <Units Count="39">
       <Unit0>
         <Filename Value="wst_test_suite.lpr"/>
         <IsPartOfProject Value="True"/>
@@ -217,6 +217,11 @@
         <IsPartOfProject Value="True"/>
         <UnitName Value="test_wst_cursors"/>
       </Unit37>
+      <Unit38>
+        <Filename Value="test_generators_runtime.pas"/>
+        <IsPartOfProject Value="True"/>
+        <UnitName Value="test_generators_runtime"/>
+      </Unit38>
     </Units>
   </ProjectOptions>
   <CompilerOptions>
diff --git a/wst/trunk/tests/test_suite/wst_test_suite.lpr b/wst/trunk/tests/test_suite/wst_test_suite.lpr
index 45dc9b858..a110eb36a 100644
--- a/wst/trunk/tests/test_suite/wst_test_suite.lpr
+++ b/wst/trunk/tests/test_suite/wst_test_suite.lpr
@@ -19,7 +19,7 @@ uses
 xsd_consts, base_json_formatter, wsdl_parser, test_support, basex_encode,
 test_basex_encode, json_formatter, server_service_json, test_json,
 test_suite_utils, test_generators, test_std_cursors, test_rtti_filter,
-test_wst_cursors, test_registry;
+test_wst_cursors, test_registry, test_generators_runtime;
 
 Const
   ShortOpts = 'alh';
diff --git a/wst/trunk/tests/test_suite/wst_test_suite_gui.lpi b/wst/trunk/tests/test_suite/wst_test_suite_gui.lpi
index d20455479..b77d35c92 100644
--- a/wst/trunk/tests/test_suite/wst_test_suite_gui.lpi
+++ b/wst/trunk/tests/test_suite/wst_test_suite_gui.lpi
@@ -34,7 +34,7 @@
         <PackageName Value="fpcunittestrunner"/>
       </Item3>
     </RequiredPackages>
-    <Units Count="17">
+    <Units Count="18">
       <Unit0>
         <Filename Value="wst_test_suite_gui.lpr"/>
         <IsPartOfProject Value="True"/>
@@ -120,6 +120,11 @@
         <IsPartOfProject Value="True"/>
         <UnitName Value="test_soap_specific"/>
       </Unit16>
+      <Unit17>
+        <Filename Value="test_generators_runtime.pas"/>
+        <IsPartOfProject Value="True"/>
+        <UnitName Value="test_generators_runtime"/>
+      </Unit17>
     </Units>
   </ProjectOptions>
   <CompilerOptions>
@@ -144,6 +149,7 @@
       <Debugging>
         <GenerateDebugInfo Value="True"/>
       </Debugging>
+      <LinkSmart Value="True"/>
       <Options>
         <Win32>
           <GraphicApplication Value="True"/>
diff --git a/wst/trunk/tests/test_suite/wst_test_suite_gui.lpr b/wst/trunk/tests/test_suite/wst_test_suite_gui.lpr
index 0ffd64cb1..d27719a42 100644
--- a/wst/trunk/tests/test_suite/wst_test_suite_gui.lpr
+++ b/wst/trunk/tests/test_suite/wst_test_suite_gui.lpr
@@ -17,7 +17,8 @@ uses
   xsd_consts, base_json_formatter, wsdl_parser, test_support, basex_encode,
   test_basex_encode, json_formatter, server_service_json, test_json,
   test_suite_utils, test_generators, fpcunittestrunner, test_std_cursors,
-  test_rtti_filter, rtti_filters, wst_cursors, test_wst_cursors, test_registry, test_soap_specific;
+  test_rtti_filter, rtti_filters, wst_cursors, test_wst_cursors, test_registry, test_soap_specific,
+  test_generators_runtime;
 
 begin
   Application.Initialize;