diff --git a/run_tests.py b/run_tests.py
index e368590..96bb3cf 100644
--- a/run_tests.py
+++ b/run_tests.py
@@ -22,8 +22,6 @@
 ##
 
 import coverage
-coverage.erase()
-coverage.start()
 import logging
 import unittest
 from test import test_support
@@ -42,11 +40,7 @@ from tests.jcl.model.test_account import *
 
 import jcl
 
-if __name__ == '__main__':
-    logger = logging.getLogger()
-    logger.addHandler(logging.StreamHandler())
-    logger.setLevel(logging.CRITICAL)
-    
+def test_suite():
     component_suite = unittest.makeSuite(JCLComponent_TestCase, "test")
     feeder_component_suite = unittest.makeSuite(FeederComponent_TestCase, "test")
     feeder_suite = unittest.makeSuite(Feeder_TestCase, "test")
@@ -72,17 +66,26 @@ if __name__ == '__main__':
                                     account_suite, \
                                     presence_account_suite))
 
-    test_support.run_suite(jcl_suite)
+    return jcl_suite
 
+if __name__ == '__main__':
+    logger = logging.getLogger()
+    logger.addHandler(logging.StreamHandler())
+    logger.setLevel(logging.CRITICAL)
+    
+    coverage.erase()
+    coverage.start()
 
-coverage.stop()
-coverage.analysis(jcl.jabber.component)
-coverage.analysis(jcl.jabber.feeder)
-coverage.analysis(jcl.lang)
-coverage.analysis(jcl.model.account)
+    unittest.main()
 
-coverage.report([jcl.jabber.component, \
-                 jcl.jabber.feeder, \
-                 jcl.lang, \
-                 jcl.model.account])
+    coverage.stop()
+    coverage.analysis(jcl.jabber.component)
+    coverage.analysis(jcl.jabber.feeder)
+    coverage.analysis(jcl.lang)
+    coverage.analysis(jcl.model.account)
+
+    coverage.report([jcl.jabber.component, \
+                     jcl.jabber.feeder, \
+                     jcl.lang, \
+                     jcl.model.account])
 
diff --git a/setup.py b/setup.py
new file mode 100644
index 0000000..901919f
--- /dev/null
+++ b/setup.py
@@ -0,0 +1,33 @@
+##
+## setup.py
+## Login : <dax@happycoders.org>
+## Started on  Tue Apr 17 21:12:33 2007 David Rousselie
+## $Id$
+## 
+## Copyright (C) 2007 David Rousselie
+## 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
+##
+
+from setuptools import setup
+
+setup(name = 'jcl', \
+      version = '0.1', \
+      description = 'Jabber Component Library', \
+      author = 'David Rousselie', \
+      author_email = 'dax@happycoders.org', \
+      url = 'http://people.happycoders.org/dax/projects/jcl', \
+      package_dir = {'': 'src'}, \
+      packages = ['jcl', 'jcl.jabber', 'jcl.model'], \
+      test_suite = 'run_tests.test_suite')
diff --git a/tests/jcl/jabber/test_component.py b/tests/jcl/jabber/test_component.py
index 218d1fd..35b5d27 100644
--- a/tests/jcl/jabber/test_component.py
+++ b/tests/jcl/jabber/test_component.py
@@ -47,7 +47,10 @@ from jcl.lang import Lang
 
 from tests.jcl.model.account import ExampleAccount, Example2Account
 
-DB_PATH = "/tmp/test.db"
+if sys.platform == "win32":
+   DB_PATH = "/c|/temp/test.db"
+else:
+   DB_PATH = "/tmp/test.db"
 DB_URL = DB_PATH# + "?debug=1&debugThreading=1"
 
 class MockStream(object):
diff --git a/tests/jcl/jabber/test_feeder.py b/tests/jcl/jabber/test_feeder.py
index 0652b89..9cff208 100644
--- a/tests/jcl/jabber/test_feeder.py
+++ b/tests/jcl/jabber/test_feeder.py
@@ -25,6 +25,7 @@ import unittest
 import os
 import threading
 import time
+import sys
 
 from sqlobject import *
 from sqlobject.dbconnection import TheURIOpener
@@ -40,7 +41,10 @@ from jcl.model import account
 
 from tests.jcl.model.account import ExampleAccount, Example2Account
 
-DB_PATH = "/tmp/test.db"
+if sys.platform == "win32":
+   DB_PATH = "/c|/temp/test.db"
+else:
+   DB_PATH = "/tmp/test.db"
 DB_URL = DB_PATH #+ "?debug=1&debugThreading=1"
 
 class FeederComponent_TestCase(JCLComponent_TestCase):
diff --git a/tests/jcl/model/test_account.py b/tests/jcl/model/test_account.py
index a9a8e52..9ec3c62 100644
--- a/tests/jcl/model/test_account.py
+++ b/tests/jcl/model/test_account.py
@@ -21,7 +21,7 @@
 ##
 
 import unittest
-
+import sys
 import os
 
 from sqlobject import *
@@ -33,7 +33,10 @@ from jcl.model.account import Account, PresenceAccount
 
 from tests.jcl.model.account import ExampleAccount, PresenceAccountExample
 
-DB_PATH = "/tmp/test.db"
+if sys.platform == "win32":
+   DB_PATH = "/c|/temp/test.db"
+else:
+   DB_PATH = "/tmp/test.db"
 DB_URL = DB_PATH# + "?debug=1&debugThreading=1"
 
 class AccountModule_TestCase(unittest.TestCase):