diff --git a/CHANGES.txt b/CHANGES.txt
index d2696b7..1c1be8b 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -2,6 +2,12 @@
 CHANGES
 =======
 
+3.8.2 (unreleased)
+------------------
+
+- Using stdlib's ``doctest`` module, instead of ``zope.testing.doctest``.
+
+
 3.8.1 (2010-04-19)
 ------------------
 
diff --git a/buildout.cfg b/buildout.cfg
index d80ddec..a04ced4 100644
--- a/buildout.cfg
+++ b/buildout.cfg
@@ -1,6 +1,10 @@
 [buildout]
 develop = .
 parts = test interpreter
+versions = versions
+
+[versions]
+zope.app.testing = 3.7.8
 
 [test]
 recipe = zc.recipe.testrunner
diff --git a/setup.py b/setup.py
index d5141cd..4809842 100644
--- a/setup.py
+++ b/setup.py
@@ -77,7 +77,7 @@
             'zope.traversing',
             'zope.app.appsetup',
             'zope.app.publication',
-            'zope.app.testing',
+            'zope.app.testing < 3.8',
             ],
         'zope-functional-testing': [
             'zope.app.testing',
diff --git a/src/zope/testbrowser/tests.py b/src/zope/testbrowser/tests.py
index eabc807..b218876 100644
--- a/src/zope/testbrowser/tests.py
+++ b/src/zope/testbrowser/tests.py
@@ -17,8 +17,8 @@
 """
 
 from zope.app.testing.functional import FunctionalDocFileSuite
-from zope.testing import doctest
 import cStringIO
+import doctest
 import httplib
 import mechanize
 import os