diff --git a/tests/support/helpers.py b/tests/support/helpers.py
index <HASH>..<HASH> 100644
--- a/tests/support/helpers.py
+++ b/tests/support/helpers.py
@@ -209,7 +209,10 @@ def flaky(caller=None, condition=True):
                 return caller(cls)
             except Exception as exc:
                 if attempt >= 3:
-                    raise exc
+                    if six.PY2:
+                        raise
+                    else:
+                        raise exc
                 backoff_time = attempt ** 2
                 log.info(
                     'Found Exception. Waiting %s seconds to retry.',
Handling in flaky when maximum number of attempts raised and the exception should be raised.  Different approaches depending on Py2 vs Py3.