@@ -434,9 +434,12 @@ async def wait_for(fut, timeout, *, loop=None):
        try:
            await waiter
        except futures.CancelledError:
-            fut.remove_done_callback(cb)
-            fut.cancel()
-            raise

        if fut.done():
            return fut.result()

@@ -825,6 +825,22 @@ def gen():
        res = loop.run_until_complete(task)
        self.assertEqual(res, "ok")

    def test_wait_for_waits_for_task_cancellation(self):
        loop = asyncio.new_event_loop()
        self.addCleanup(loop.close)

diff --git a/Misc/NEWS.d/next/Library/2020-08-15-15-21-40.bpo-37658.f9nivB.rst b/Misc/NEWS.d/next/Library/2020-08-15-15-21-40.bpo-37658.f9nivB.rst
@@ -0,0 +1,2 @@