diff --git a/composer/layout/tests.py b/composer/layout/tests.py
index 51fe062..e29defd 100755
--- a/composer/layout/tests.py
+++ b/composer/layout/tests.py
@@ -1,7 +1,5 @@
-# $Id$
 
 import unittest, doctest
-from zope.testing.doctestunit import DocFileSuite
 
 
 class Test(unittest.TestCase):
@@ -15,7 +13,7 @@ def test_suite():
     flags = doctest.NORMALIZE_WHITESPACE | doctest.ELLIPSIS
     return unittest.TestSuite((
                 unittest.makeSuite(Test),
-                DocFileSuite('README.txt', optionflags=flags),
+                doctest.DocFileSuite('README.txt', optionflags=flags),
             ))
 
 if __name__ == '__main__':
diff --git a/composer/message/tests.py b/composer/message/tests.py
index 9886053..44129f7 100755
--- a/composer/message/tests.py
+++ b/composer/message/tests.py
@@ -1,7 +1,5 @@
-# $Id$
 
 import unittest, doctest
-from zope.testing.doctestunit import DocFileSuite
 
 
 class Test(unittest.TestCase):
@@ -15,7 +13,7 @@ def test_suite():
     flags = doctest.NORMALIZE_WHITESPACE | doctest.ELLIPSIS
     return unittest.TestSuite((
                 unittest.makeSuite(Test),
-                DocFileSuite('README.txt', optionflags=flags),
+                doctest.DocFileSuite('README.txt', optionflags=flags),
             ))
 
 if __name__ == '__main__':
diff --git a/composer/report/tests.py b/composer/report/tests.py
index 9886053..44129f7 100755
--- a/composer/report/tests.py
+++ b/composer/report/tests.py
@@ -1,7 +1,5 @@
-# $Id$
 
 import unittest, doctest
-from zope.testing.doctestunit import DocFileSuite
 
 
 class Test(unittest.TestCase):
@@ -15,7 +13,7 @@ def test_suite():
     flags = doctest.NORMALIZE_WHITESPACE | doctest.ELLIPSIS
     return unittest.TestSuite((
                 unittest.makeSuite(Test),
-                DocFileSuite('README.txt', optionflags=flags),
+                doctest.DocFileSuite('README.txt', optionflags=flags),
             ))
 
 if __name__ == '__main__':
diff --git a/composer/rule/tests.py b/composer/rule/tests.py
index f6319e6..9f3069e 100755
--- a/composer/rule/tests.py
+++ b/composer/rule/tests.py
@@ -1,10 +1,8 @@
-# $Id$
 
 import unittest, doctest
 from email import message_from_string
 from zope.interface import implements
 from zope.sendmail.interfaces import IMailDelivery
-from zope.testing.doctestunit import DocFileSuite
 
 
 class TestMailer(object):
@@ -31,7 +29,7 @@ def test_suite():
     flags = doctest.NORMALIZE_WHITESPACE | doctest.ELLIPSIS
     return unittest.TestSuite((
                 unittest.makeSuite(Test),
-                DocFileSuite('README.txt', optionflags=flags),
+                doctest.DocFileSuite('README.txt', optionflags=flags),
             ))
 
 if __name__ == '__main__':
diff --git a/composer/schema/tests.py b/composer/schema/tests.py
index 2e7a216..68fdf26 100755
--- a/composer/schema/tests.py
+++ b/composer/schema/tests.py
@@ -1,7 +1,5 @@
-# $Id$
 
 import unittest, doctest
-from zope.testing.doctestunit import DocFileSuite
 
 
 class Test(unittest.TestCase):
@@ -15,7 +13,7 @@ def test_suite():
     flags = doctest.NORMALIZE_WHITESPACE | doctest.ELLIPSIS
     return unittest.TestSuite((
                 unittest.makeSuite(Test),
-                DocFileSuite('README.txt', optionflags=flags),
+                doctest.DocFileSuite('README.txt', optionflags=flags),
             ))
 
 if __name__ == '__main__':
diff --git a/composer/tests.py b/composer/tests.py
index ccfbd9a..674c681 100755
--- a/composer/tests.py
+++ b/composer/tests.py
@@ -1,7 +1,5 @@
-# $Id$
 
 import unittest, doctest
-from zope.testing.doctestunit import DocFileSuite
 
 
 class Test(unittest.TestCase):
@@ -15,7 +13,7 @@ def test_suite():
     flags = doctest.NORMALIZE_WHITESPACE | doctest.ELLIPSIS
     return unittest.TestSuite((
                 unittest.makeSuite(Test),
-                DocFileSuite('README.txt', optionflags=flags),
+                doctest.DocFileSuite('README.txt', optionflags=flags),
             ))
 
 if __name__ == '__main__':