diff --git a/Lib/test/test_bsddb3.py b/Lib/test/test_bsddb3.py
index 349a6b0..5a4258e 100644
--- a/Lib/test/test_bsddb3.py
+++ b/Lib/test/test_bsddb3.py
@@ -3,6 +3,7 @@
 Run all test cases.
 """
 import sys
+import time
 import unittest
 from test.test_support import requires, verbose, run_unittest, unlink
 
@@ -21,6 +22,30 @@
     sys.argv.remove('silent')
 
 
+class TimingCheck(unittest.TestCase):
+
+    """This class is not a real test.  Its purpose is to print a message
+    periodically when the test runs slowly.  This will prevent the buildbots
+    from timing out on slow machines."""
+
+    # How much time in seconds before printing a 'Still working' message.
+    # Since this is run at most once between each test module, use a smaller
+    # interval than other tests.
+    _PRINT_WORKING_MSG_INTERVAL = 4 * 60
+
+    # next_time is used as a global variable that survives each instance.
+    # This is necessary since a new instance will be created for each test.
+    next_time = time.time() + _PRINT_WORKING_MSG_INTERVAL
+
+    def testCheckElapsedTime(self):
+        # Print still working message since these tests can be really slow.
+        now = time.time()
+        if self.next_time <= now:
+            TimingCheck.next_time = now + self._PRINT_WORKING_MSG_INTERVAL
+            sys.__stdout__.write('  test_bsddb3 still working, be patient...\n')
+            sys.__stdout__.flush()
+
+
 def suite():
     try:
         # this is special, it used to segfault the interpreter
@@ -53,6 +78,7 @@
         module = __import__("bsddb.test."+name, globals(), locals(), name)
         #print module,name
         alltests.addTest(module.test_suite())
+        alltests.addTest(unittest.makeSuite(TimingCheck))
     return alltests