diff --git a/Lib/test/test_coercion.py b/Lib/test/test_coercion.py
index 4356817..d704e4b 100644
--- a/Lib/test/test_coercion.py
+++ b/Lib/test/test_coercion.py
@@ -2,7 +2,7 @@
 import sys
 import warnings
 import unittest
-from test.test_support import run_unittest
+from test.test_support import run_unittest, TestFailed
 
 # Fake a number that implements numeric methods through __coerce__
 class CoerceNumber:
@@ -318,6 +318,24 @@
                 return 0
         self.assertEquals(cmp(ClassicWackyComparer(), evil_coercer), 0)
 
+    def test_infinite_rec_classic_classes(self):
+        # if __coerce__() returns its arguments reversed it causes an infinite
+        # recursion for classic classes.
+        class Tester:
+            def __coerce__(self, other):
+                return other, self
+
+        exc = TestFailed("__coerce__() returning its arguments reverse "
+                                "should raise RuntimeError")
+        try:
+            Tester() + 1
+        except (RuntimeError, TypeError):
+            return
+        except:
+            raise exc
+        else:
+            raise exc
+
 def test_main():
     warnings.filterwarnings("ignore",
                             r'complex divmod\(\), // and % are deprecated',