diff --git a/Lib/asyncio/tasks.py b/Lib/asyncio/tasks.py
index b52933fc6c6..38ffec162c6 100644
--- a/Lib/asyncio/tasks.py
+++ b/Lib/asyncio/tasks.py
@@ -394,6 +394,9 @@ def wait_for(fut, timeout, *, loop=None):
     if loop is None:
         loop = events.get_event_loop()
 
+    if timeout is None:
+        return (yield from fut)
+
     waiter = futures.Future(loop=loop)
     timeout_handle = loop.call_later(timeout, _release_waiter, waiter, False)
     cb = functools.partial(_release_waiter, waiter, True)
diff --git a/Lib/test/test_asyncio/test_tasks.py b/Lib/test/test_asyncio/test_tasks.py
index dbf130c1ddc..778b6e0d59d 100644
--- a/Lib/test/test_asyncio/test_tasks.py
+++ b/Lib/test/test_asyncio/test_tasks.py
@@ -380,6 +380,17 @@ class TaskTests(unittest.TestCase):
         self.assertEqual(foo_running, False)
 
 
+    def test_wait_for_blocking(self):
+        loop = test_utils.TestLoop()
+        self.addCleanup(loop.close)
+
+        @asyncio.coroutine
+        def coro():
+            return 'done'
+
+        res = loop.run_until_complete(asyncio.wait_for(coro(), timeout=None, loop=loop))
+        self.assertEqual(res, 'done')
+
     def test_wait_for_with_global_loop(self):
 
         def gen():