diff --git a/integrator/README.txt b/integrator/README.txt
index 18154fa..46f6f18 100644
--- a/integrator/README.txt
+++ b/integrator/README.txt
@@ -14,7 +14,7 @@ Let's do some basic set up
 
   >>> from zope import component
 
-  >>> from cybertools.integrator.tests import testDir
+  >>> from cybertools.integrator.tests.test_all import testDir
   >>> from cybertools.integrator.filesystem import ContainerFactory, FileFactory
   >>> from cybertools.integrator.interfaces import IContainerFactory
   >>> component.provideUtility(ContainerFactory(), name='filesystem')
diff --git a/integrator/tests/__init__.py b/integrator/tests/__init__.py
new file mode 100644
index 0000000..38314f3
--- /dev/null
+++ b/integrator/tests/__init__.py
@@ -0,0 +1,3 @@
+"""
+$Id$
+"""
diff --git a/integrator/tests.py b/integrator/tests/test_all.py
similarity index 75%
rename from integrator/tests.py
rename to integrator/tests/test_all.py
index 1cef3ba..9919b6f 100755
--- a/integrator/tests.py
+++ b/integrator/tests/test_all.py
@@ -6,7 +6,7 @@ from zope.testing.doctestunit import DocFileSuite
 from zope.interface.verify import verifyClass
 
 
-baseDir = os.path.dirname(__file__)
+baseDir = os.path.dirname(os.path.dirname(__file__))
 testDir = os.path.join(baseDir, 'testing', 'data')
 
 flags = doctest.NORMALIZE_WHITESPACE | doctest.ELLIPSIS
@@ -22,8 +22,8 @@ class Test(unittest.TestCase):
 def test_suite():
     return unittest.TestSuite((
                 unittest.makeSuite(Test),
-                DocFileSuite('README.txt', optionflags=flags),
-                DocFileSuite('bscw.txt', optionflags=flags),
+                DocFileSuite('../README.txt', optionflags=flags),
+                DocFileSuite('../bscw.txt', optionflags=flags),
             ))
 
 if __name__ == '__main__':
diff --git a/integrator/tests/test_bscw.py b/integrator/tests/test_bscw.py
new file mode 100755
index 0000000..41bd51d
--- /dev/null
+++ b/integrator/tests/test_bscw.py
@@ -0,0 +1,20 @@
+# $Id$
+
+import os
+import unittest, doctest
+from zope.testing.doctestunit import DocFileSuite
+from zope.interface.verify import verifyClass
+
+
+baseDir = os.path.dirname(os.path.dirname(__file__))
+testDir = os.path.join(baseDir, 'testing', 'data')
+
+flags = doctest.NORMALIZE_WHITESPACE | doctest.ELLIPSIS
+
+def test_suite():
+    return unittest.TestSuite((
+                DocFileSuite('../bscw.txt', optionflags=flags),
+            ))
+
+if __name__ == '__main__':
+    unittest.main(defaultTest='test_suite')