@@ -460,8 +460,13 @@ async def wait_for(fut, timeout, *, loop=None):
        if fut.done():
            return fut.result()

-        fut.cancel()
-        raise exceptions.TimeoutError()

    waiter = loop.create_future()
    timeout_handle = loop.call_later(timeout, _release_waiter, waiter)

@@ -888,6 +888,9 @@ async def inner():
                nonlocal task_done
                try:
                    await asyncio.sleep(0.2)
                finally:
                    task_done = True

@@ -900,6 +903,34 @@ async def inner():

        loop.run_until_complete(foo())

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

diff --git a/Misc/NEWS.d/next/Library/2020-08-15-15-50-12.bpo-32751.85je5X.rst b/Misc/NEWS.d/next/Library/2020-08-15-15-50-12.bpo-32751.85je5X.rst
@@ -0,0 +1,3 @@