Index: Lib/test/lock_tests.py
===================================================================
--- Lib/test/lock_tests.py	(revision 79534)
+++ Lib/test/lock_tests.py	(working copy)
@@ -359,10 +359,12 @@
         phase_num = 1
         cond.release()
         while len(results1) < 3:
+            self.assertEqual(results2, [])
             _wait()
         self.assertEqual(results1, [1] * 3)
         self.assertEqual(results2, [])
         # Notify 5 threads: they might be in their first or second wait
+        _wait() #so all threads settle in on a wait()
         cond.acquire()
         cond.notify(5)
         _wait()
@@ -373,6 +375,7 @@
         self.assertEqual(results1, [1] * 3 + [2] * 2)
         self.assertEqual(results2, [2] * 3)
         # Notify all threads: they are all in their second wait
+        _wait()
         cond.acquire()
         cond.notify_all()
         _wait()