diff --git a/.gitattributes b/.gitattributes
index 59746fd9ed..11c6fee369 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -144,6 +144,9 @@ components/customform/lazcustforms.pas svneol=native#text/plain
 components/fpcunit/Makefile svneol=native#text/plain
 components/fpcunit/Makefile.fpc svneol=native#text/plain
 components/fpcunit/blueball.xpm svneol=native#text/plain
+components/fpcunit/console/consoletestrunner.pas svneol=native#text/plain
+components/fpcunit/console/fpcunitconsolerunner.lpk svneol=native#text/plain
+components/fpcunit/console/fpcunitconsolerunner.pas svneol=native#text/plain
 components/fpcunit/fpcunittestrunner.lpk svneol=native#text/pascal
 components/fpcunit/fpcunittestrunner.pas svneol=native#text/pascal
 components/fpcunit/guitestrunner.lfm svneol=native#text/plain
@@ -2649,6 +2652,7 @@ packager/basepkgmanager.pas svneol=native#text/pascal
 packager/brokendependenciesdlg.pas svneol=native#text/pascal
 packager/globallinks/README.txt svneol=native#text/plain
 packager/globallinks/demopackagewithhelp-0.lpl svneol=native#text/plain
+packager/globallinks/fpcunitconsolerunner-1.lpl svneol=native#text/plain
 packager/globallinks/h2paswizard-0.lpl svneol=native#text/plain
 packager/globallinks/lazcustomform-0.lpl svneol=native#text/plain
 packager/globallinks/lazopenglcontext-0.lpl svneol=native#text/plain
@@ -2692,7 +2696,6 @@ test/runtests.lpr svneol=native#text/plain
 test/runtestsgui.lpi svneol=native#text/plain
 test/runtestsgui.lpr svneol=native#text/plain
 test/testlpi.pas svneol=native#text/plain
-test/testrunner.pas svneol=native#text/plain
 tools/apiwizz/apiwizard.lfm svneol=native#text/plain
 tools/apiwizz/apiwizard.lrs svneol=native#text/pascal
 tools/apiwizz/apiwizard.pp svneol=native#text/pascal
diff --git a/test/testrunner.pas b/components/fpcunit/console/consoletestrunner.pas
similarity index 99%
rename from test/testrunner.pas
rename to components/fpcunit/console/consoletestrunner.pas
index 3819700b97..be670deab2 100644
--- a/test/testrunner.pas
+++ b/components/fpcunit/console/consoletestrunner.pas
@@ -17,7 +17,7 @@
   along with this library; if not, write to the Free Software Foundation,
   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 }
-unit testrunner;
+unit consoletestrunner;
 
 {$mode objfpc}{$H+}
 
diff --git a/components/fpcunit/console/fpcunitconsolerunner.lpk b/components/fpcunit/console/fpcunitconsolerunner.lpk
new file mode 100644
index 0000000000..94617ea305
--- /dev/null
+++ b/components/fpcunit/console/fpcunitconsolerunner.lpk
@@ -0,0 +1,43 @@
+<?xml version="1.0"?>
+<CONFIG>
+  <Package Version="2">
+    <PathDelim Value="\"/>
+    <Name Value="fpcunitconsolerunner"/>
+    <Author Value="Vincent"/>
+    <CompilerOptions>
+      <Version Value="5"/>
+      <PathDelim Value="\"/>
+      <SearchPaths>
+        <UnitOutputDirectory Value="lib\$(TargetCPU)-$(TargetOS)\"/>
+      </SearchPaths>
+      <CodeGeneration>
+        <Generate Value="Faster"/>
+      </CodeGeneration>
+      <Other>
+        <CompilerPath Value="$(CompPath)"/>
+      </Other>
+    </CompilerOptions>
+    <License Value="Modified LGPL
+"/>
+    <Version Major="1"/>
+    <Files Count="1">
+      <Item1>
+        <Filename Value="consoletestrunner.pas"/>
+        <UnitName Value="consoletestrunner"/>
+      </Item1>
+    </Files>
+    <RequiredPkgs Count="1">
+      <Item1>
+        <PackageName Value="FCL"/>
+        <MinVersion Major="1" Valid="True"/>
+      </Item1>
+    </RequiredPkgs>
+    <UsageOptions>
+      <UnitPath Value="$(PkgOutDir)\"/>
+    </UsageOptions>
+    <PublishOptions>
+      <Version Value="2"/>
+      <IgnoreBinaries Value="False"/>
+    </PublishOptions>
+  </Package>
+</CONFIG>
diff --git a/components/fpcunit/console/fpcunitconsolerunner.pas b/components/fpcunit/console/fpcunitconsolerunner.pas
new file mode 100644
index 0000000000..984ca069d2
--- /dev/null
+++ b/components/fpcunit/console/fpcunitconsolerunner.pas
@@ -0,0 +1,14 @@
+{ This file was automatically created by Lazarus. Do not edit!
+This source is only used to compile and install the package.
+ }
+
+unit fpcunitconsolerunner; 
+
+interface
+
+uses
+  consoletestrunner; 
+
+implementation
+
+end.
diff --git a/packager/globallinks/fpcunitconsolerunner-1.lpl b/packager/globallinks/fpcunitconsolerunner-1.lpl
new file mode 100644
index 0000000000..ec41ab1549
--- /dev/null
+++ b/packager/globallinks/fpcunitconsolerunner-1.lpl
@@ -0,0 +1 @@
+$(LazarusDir)/components/fpcunit/console/fpcunitconsolerunner.lpk
diff --git a/test/runtests.lpi b/test/runtests.lpi
index dc6a47b86b..ff270a9ef4 100644
--- a/test/runtests.lpi
+++ b/test/runtests.lpi
@@ -21,15 +21,18 @@
         <LaunchingApplication PathPlusParams="/usr/X11R6/bin/xterm -T 'Lazarus Run Output' -e $(LazarusDir)/tools/runwait.sh $(TargetCmdLine)"/>
       </local>
     </RunParams>
-    <RequiredPackages Count="2">
+    <RequiredPackages Count="3">
       <Item1>
-        <PackageName Value="LCL"/>
+        <PackageName Value="fpcunitconsolerunner"/>
       </Item1>
       <Item2>
-        <PackageName Value="FCL"/>
+        <PackageName Value="LCL"/>
       </Item2>
+      <Item3>
+        <PackageName Value="FCL"/>
+      </Item3>
     </RequiredPackages>
-    <Units Count="3">
+    <Units Count="2">
       <Unit0>
         <Filename Value="runtests.lpr"/>
         <IsPartOfProject Value="True"/>
@@ -40,11 +43,6 @@
         <IsPartOfProject Value="True"/>
         <UnitName Value="TestLpi"/>
       </Unit1>
-      <Unit2>
-        <Filename Value="testrunner.pas"/>
-        <IsPartOfProject Value="True"/>
-        <UnitName Value="testrunner"/>
-      </Unit2>
     </Units>
   </ProjectOptions>
   <CompilerOptions>
diff --git a/test/runtests.lpr b/test/runtests.lpr
index 0889b1cc35..bbbfae95d0 100644
--- a/test/runtests.lpr
+++ b/test/runtests.lpr
@@ -1,4 +1,4 @@
-{ $ID: $}
+{ $Id: $}
 { Copyright (C) 2006 Vincent Snijders
 
   This source is free software; you can redistribute it and/or modify it under
@@ -21,7 +21,7 @@ program runtests;
 {$mode objfpc}{$H+}
 
 uses
-  Classes, TestLpi, testrunner;
+  Classes, TestLpi, consoletestrunner;
   
 type