diff --git a/test/bugs/bug8432.pas b/test/bugs/bug8432.pas
index 944f2ade17..fa8c888e4c 100644
--- a/test/bugs/bug8432.pas
+++ b/test/bugs/bug8432.pas
@@ -40,22 +40,25 @@ end;
 
 procedure TTestBug8432.Test_itu4_1;
 var
+  Key: Integer;
   AInt: Integer;
 begin
   FMap:=TMap.Create(itu4,SizeOf(Integer));
   with FMap do
   begin
-    AInt:=10;
-    Add(1,AInt);
-    AInt:=20;
-    Add(2,AInt);
-    AInt:=30;
-    Add(3,AInt);
-    GetData(1,AInt);
+    for Key := 1 to 3 do
+    begin
+      AInt:=Key* 10;
+      Add(Key,AInt);
+    end;
+    Key := 1;
+    GetData(Key,AInt);
     AssertEquals('Wrong entry for 1', 10, AInt);
-    GetData(2,AInt);
+    Key := 2;
+    GetData(Key,AInt);
     AssertEquals('Wrong entry for 2', 20, AInt);
-    GetData(3,AInt);
+    Key := 3;
+    GetData(Key,AInt);
     AssertEquals('Wrong entry for 3', 30, AInt);
   end;
 end;
diff --git a/test/runtests.lpi b/test/runtests.lpi
index fd21c7a63f..6e7ff3fed6 100644
--- a/test/runtests.lpi
+++ b/test/runtests.lpi
@@ -2,7 +2,7 @@
 <CONFIG>
   <ProjectOptions>
     <PathDelim Value="\"/>
-    <Version Value="5"/>
+    <Version Value="6"/>
     <General>
       <SessionStorage Value="InIDEConfig"/>
       <MainUnit Value="0"/>
@@ -23,13 +23,13 @@
     </RunParams>
     <RequiredPackages Count="3">
       <Item1>
-        <PackageName Value="LCL"/>
+        <PackageName Value="FCL"/>
       </Item1>
       <Item2>
         <PackageName Value="fpcunitconsolerunner"/>
       </Item2>
       <Item3>
-        <PackageName Value="FCL"/>
+        <PackageName Value="LCL"/>
       </Item3>
     </RequiredPackages>
     <Units Count="4">