diff --git a/Tools/autotest/common.py b/Tools/autotest/common.py
index fd60578c0e..1070070e0a 100644
--- a/Tools/autotest/common.py
+++ b/Tools/autotest/common.py
@@ -6558,10 +6558,12 @@ Also, ignores heartbeats not from our target system'''
     def get_exception_stacktrace(self, e):
         if sys.version_info[0] >= 3:
             ret = "%s\n" % e
-            ret += ''.join(traceback.format_exception(etype=type(e),
-                                                      value=e,
+            ret += ''.join(traceback.format_exception(type(e),
+                                                      e,
                                                       tb=e.__traceback__))
             return ret
+
+        # Python2:
         return traceback.format_exc(e)
 
     def bin_logs(self):
diff --git a/Tools/scripts/build_binaries.py b/Tools/scripts/build_binaries.py
index 4af52ba655..ac3125c499 100755
--- a/Tools/scripts/build_binaries.py
+++ b/Tools/scripts/build_binaries.py
@@ -527,10 +527,12 @@ is bob we will attempt to checkout bob-AVR'''
     def get_exception_stacktrace(self, e):
         if sys.version_info[0] >= 3:
             ret = "%s\n" % e
-            ret += ''.join(traceback.format_exception(etype=type(e),
-                                                      value=e,
+            ret += ''.join(traceback.format_exception(type(e),
+                                                      e,
                                                       tb=e.__traceback__))
             return ret
+
+        # Python2:
         return traceback.format_exc(e)
 
     def print_exception_caught(self, e, send_statustext=True):