diff --git a/test/runtestsgui.lpi b/test/runtestsgui.lpi
index 8c7b3512c8..0e5684c592 100644
--- a/test/runtestsgui.lpi
+++ b/test/runtestsgui.lpi
@@ -23,13 +23,13 @@
     </RunParams>
     <RequiredPackages Count="3">
       <Item1>
-        <PackageName Value="LCL"/>
+        <PackageName Value="FCL"/>
       </Item1>
       <Item2>
         <PackageName Value="FPCUnitTestRunner"/>
       </Item2>
       <Item3>
-        <PackageName Value="FCL"/>
+        <PackageName Value="LCL"/>
       </Item3>
     </RequiredPackages>
     <Units Count="6">
diff --git a/test/testlpi.pas b/test/testlpi.pas
index 992ca16135..394de88887 100644
--- a/test/testlpi.pas
+++ b/test/testlpi.pas
@@ -121,6 +121,13 @@ begin
   SearchDirectory('')
 end;
 
+class function TLpkTest.CreateSuiteFromFile(const AName,
+  APath: string): TTestSuite;
+begin
+  Result := TTestSuite.Create(AName);
+  Result.AddTest(Create(APath, 'TestCompile'));
+end;
+
 procedure TLpkTest.TestCompile;
 var
   LazBuildPath: string;
@@ -185,22 +192,6 @@ begin
   end;
 end;
 
-class function TLpkTest.CreateSuiteFromFile(const AName,
-  APath: string): TTestSuite;
-var
-  AhkFileName: String;
-begin
-  Result := TTestSuite.Create(AName);
-  Result.AddTest(TLpiTest.Create(APath, 'TestCompile'));
-{$IFDEF win32}
-  AhkFileName := GetScriptFileName(APath);
-  if FileExists(AhkFileName) then
-    Result.AddTest(TLpiTest.Create(APath, 'TestRun'));
-{$ELSE}
-  {$NOTE scripting is only available on win32}
-{$ENDIF}
-end;
-
 procedure TLpiTest.TestRun;
 var
   TestProcess : TProcess;