diff -r ac176a69d188 Doc/library/timeit.rst
--- a/Doc/library/timeit.rst	Sun Dec 28 22:14:23 2014 -0600
+++ b/Doc/library/timeit.rst	Wed Dec 31 20:12:24 2014 +0200
@@ -69,12 +69,6 @@ The module defines three convenience fun
    .. versionchanged:: 3.5
       The optional *globals* parameter was added.
 
-   .. note::
-
-        Because :meth:`.timeit` is executing *stmt*, placing a return statement
-        in *stmt* will prevent :meth:`.timeit` from returning execution time.
-        It will instead return the data specified by your return statement.
-
 
 .. function:: repeat(stmt='pass', setup='pass', timer=<default timer>, repeat=3, number=1000000, globals=None)
 
diff -r ac176a69d188 Lib/test/test_timeit.py
--- a/Lib/test/test_timeit.py	Sun Dec 28 22:14:23 2014 -0600
+++ b/Lib/test/test_timeit.py	Wed Dec 31 20:12:24 2014 +0200
@@ -73,9 +73,21 @@ class TestTimeit(unittest.TestCase):
 
     def test_timer_invalid_stmt(self):
         self.assertRaises(ValueError, timeit.Timer, stmt=None)
+        self.assertRaises(SyntaxError, timeit.Timer, stmt='return')
+        self.assertRaises(SyntaxError, timeit.Timer, stmt='yield')
+        self.assertRaises(SyntaxError, timeit.Timer, stmt='yield from ()')
+        self.assertRaises(SyntaxError, timeit.Timer, stmt='break')
+        self.assertRaises(SyntaxError, timeit.Timer, stmt='continue')
+        self.assertRaises(SyntaxError, timeit.Timer, stmt='from timeit import *')
 
     def test_timer_invalid_setup(self):
         self.assertRaises(ValueError, timeit.Timer, setup=None)
+        self.assertRaises(SyntaxError, timeit.Timer, setup='return')
+        self.assertRaises(SyntaxError, timeit.Timer, setup='yield')
+        self.assertRaises(SyntaxError, timeit.Timer, setup='yield from ()')
+        self.assertRaises(SyntaxError, timeit.Timer, setup='break')
+        self.assertRaises(SyntaxError, timeit.Timer, setup='continue')
+        self.assertRaises(SyntaxError, timeit.Timer, setup='from timeit import *')
 
     fake_setup = "import timeit; timeit._fake_timer.setup()"
     fake_stmt = "import timeit; timeit._fake_timer.inc()"
diff -r ac176a69d188 Lib/timeit.py
--- a/Lib/timeit.py	Sun Dec 28 22:14:23 2014 -0600
+++ b/Lib/timeit.py	Wed Dec 31 20:12:24 2014 +0200
@@ -115,6 +115,12 @@ class Timer:
         local_ns = {}
         global_ns = _globals() if globals is None else globals
         if isinstance(stmt, str):
+            # Check that the code can be compiled outside a function
+            if isinstance(setup, str):
+                compile(setup, dummy_src_name, "exec")
+                compile(setup + '\n' + stmt, dummy_src_name, "exec")
+            else:
+                compile(stmt, dummy_src_name, "exec")
             stmt = reindent(stmt, 8)
             if isinstance(setup, str):
                 setup = reindent(setup, 4)