diff --git a/integrator/bscw.txt b/integrator/bscw.txt
index ccb38d9..16fd44c 100644
--- a/integrator/bscw.txt
+++ b/integrator/bscw.txt
@@ -13,7 +13,7 @@ Accessing Objects on a Remote BSCW Repository
 In fact we do not access a remote repository but just a dummy (fake)
 repository for testing purposes.
 
-  >>> from cybertools.integrator.testing.bscw import BSCWServer, sampleObjects
+  >>> from cybertools.integrator.tests.bscw import BSCWServer, sampleObjects
   >>> from cybertools.integrator.bscw import standardAttributes
   >>> server = BSCWServer(sampleObjects)
 
diff --git a/integrator/README.txt b/integrator/filesystem.txt
similarity index 94%
rename from integrator/README.txt
rename to integrator/filesystem.txt
index 46f6f18..7c25f41 100644
--- a/integrator/README.txt
+++ b/integrator/filesystem.txt
@@ -14,7 +14,7 @@ Let's do some basic set up
 
   >>> from zope import component
 
-  >>> from cybertools.integrator.tests.test_all import testDir
+  >>> from cybertools.integrator.tests.test_filesystem import testDir
   >>> from cybertools.integrator.filesystem import ContainerFactory, FileFactory
   >>> from cybertools.integrator.interfaces import IContainerFactory
   >>> component.provideUtility(ContainerFactory(), name='filesystem')
diff --git a/integrator/testing/__init__.py b/integrator/testing/__init__.py
deleted file mode 100644
index 38314f3..0000000
--- a/integrator/testing/__init__.py
+++ /dev/null
@@ -1,3 +0,0 @@
-"""
-$Id$
-"""
diff --git a/integrator/testing/bscw.py b/integrator/tests/bscw.py
similarity index 100%
rename from integrator/testing/bscw.py
rename to integrator/tests/bscw.py
diff --git a/integrator/testing/data/index.html b/integrator/tests/data/index.html
similarity index 100%
rename from integrator/testing/data/index.html
rename to integrator/tests/data/index.html
diff --git a/integrator/testing/data/sub/demo.tgz b/integrator/tests/data/sub/demo.tgz
similarity index 100%
rename from integrator/testing/data/sub/demo.tgz
rename to integrator/tests/data/sub/demo.tgz
diff --git a/integrator/testing/data/sub/index.html b/integrator/tests/data/sub/index.html
similarity index 100%
rename from integrator/testing/data/sub/index.html
rename to integrator/tests/data/sub/index.html
diff --git a/integrator/testing/data/sub/loops_logo.png b/integrator/tests/data/sub/loops_logo.png
similarity index 100%
rename from integrator/testing/data/sub/loops_logo.png
rename to integrator/tests/data/sub/loops_logo.png
diff --git a/integrator/tests/test_all.py b/integrator/tests/test_filesystem.py
similarity index 75%
rename from integrator/tests/test_all.py
rename to integrator/tests/test_filesystem.py
index 9919b6f..8a2e6d0 100755
--- a/integrator/tests/test_all.py
+++ b/integrator/tests/test_filesystem.py
@@ -7,7 +7,7 @@ from zope.interface.verify import verifyClass
 
 
 baseDir = os.path.dirname(os.path.dirname(__file__))
-testDir = os.path.join(baseDir, 'testing', 'data')
+testDir = os.path.join(baseDir, 'tests', 'data')
 
 flags = doctest.NORMALIZE_WHITESPACE | doctest.ELLIPSIS
 
@@ -22,8 +22,7 @@ class Test(unittest.TestCase):
 def test_suite():
     return unittest.TestSuite((
                 unittest.makeSuite(Test),
-                DocFileSuite('../README.txt', optionflags=flags),
-                DocFileSuite('../bscw.txt', optionflags=flags),
+                DocFileSuite('../filesystem.txt', optionflags=flags),
             ))
 
 if __name__ == '__main__':