diff --git a/agent/testing/agent.cfg b/agent/testing/agent.cfg
new file mode 100644
index 0000000..2be0906
--- /dev/null
+++ b/agent/testing/agent.cfg
@@ -0,0 +1,9 @@
+#
+#   Standard configuration for agent application
+#
+#   $Id$
+#
+
+controller(names=['test'])
+scheduler(name='core')
+logger(name='default', standard=30)
diff --git a/agent/testing/control.py b/agent/testing/control.py
new file mode 100644
index 0000000..28fb4e0
--- /dev/null
+++ b/agent/testing/control.py
@@ -0,0 +1,43 @@
+#
+#  Copyright (c) 2008 Helmut Merz helmutm@cy55.de
+#
+#  This program is free software; you can redistribute it and/or modify
+#  it under the terms of the GNU General Public License as published by
+#  the Free Software Foundation; either version 2 of the License, or
+#  (at your option) any later version.
+#
+#  This program is distributed in the hope that it will be useful,
+#  but WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#  GNU General Public License for more details.
+#
+#  You should have received a copy of the GNU General Public License
+#  along with this program; if not, write to the Free Software
+#  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+#
+
+"""
+Controller for testing purposes.
+
+$Id$
+"""
+
+from zope.interface import implements
+
+from cybertools.agent.base.agent import Master
+from cybertools.agent.base.control import SampleController, JobSpecification
+from cybertools.agent.components import controllers
+from cybertools.agent.crawl.mail import MailResource
+
+
+class Controller(SampleController):
+
+    agents = (('tr1', 'transport.remote'),)
+
+    def _getCurrentJobs(self):
+        print '_getCurrentJobs'
+        return [JobSpecification('sample', '00001', agent='tr1',
+                        params=dict(resource=MailResource()))]
+
+
+controllers.register(Controller, Master, name='test')
diff --git a/agent/testing/main.py b/agent/testing/main.py
new file mode 100755
index 0000000..ca9d536
--- /dev/null
+++ b/agent/testing/main.py
@@ -0,0 +1,73 @@
+#! /usr/bin/env python2.4
+#
+#  Copyright (c) 2008 Helmut Merz helmutm@cy55.de
+#
+#  This program is free software; you can redistribute it and/or modify
+#  it under the terms of the GNU General Public License as published by
+#  the Free Software Foundation; either version 2 of the License, or
+#  (at your option) any later version.
+#
+#  This program is distributed in the hope that it will be useful,
+#  but WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#  GNU General Public License for more details.
+#
+#  You should have received a copy of the GNU General Public License
+#  along with this program; if not, write to the Free Software
+#  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+#
+
+"""
+Agent application.
+
+$Id$
+"""
+
+import os
+from twisted.internet import reactor
+
+from cybertools.agent.base.agent import Master
+
+
+application = None  # contains application object if started via twistd
+
+
+def getConfig():
+    home = os.path.abspath(os.path.dirname(__file__))
+    configName = 'agent.cfg'
+    configFile = open(os.path.join(home, configName))
+    config = configFile.read()
+    configFile.close()
+    return config
+
+
+def setup(configInfo=None):
+    if configInfo is None:
+        configInfo = getConfig()
+    master = Master(configInfo)
+    setupEnvironment(master.config)
+    master.setup()
+    print 'Starting agent application...'
+    print 'Using controllers %s.' % ', '.join(master.config.controller.names)
+    return master
+
+
+def setupEnvironment(config):
+    from cybertools.agent.base import agent, control, job, log, schedule
+    from cybertools.agent.core import agent, control, schedule
+    from cybertools.agent.control import cmdline, remote
+    from cybertools.agent.transport import remote, loops
+    from cybertools.agent.testing import control
+    from cybertools.agent.system.windows import api
+    api.setup(config)
+    from cybertools.agent.crawl import base, filesystem, outlook
+
+
+def startReactor():
+    reactor.run()
+    print 'Agent application has been stopped.'
+
+
+if __name__ == '__main__':
+    setup()
+    startReactor()