diff -r d62e57958e7c Lib/test/test_format.py
--- a/Lib/test/test_format.py	Mon Jun 06 02:49:54 2016 +0000
+++ b/Lib/test/test_format.py	Mon Jun 06 10:05:08 2016 +0200
@@ -274,7 +274,7 @@
         test_exc('%d', '1', TypeError, "%d format: a number is required, not str")
         test_exc('%x', '1', TypeError, "%x format: an integer is required, not str")
         test_exc('%x', 3.14, TypeError, "%x format: an integer is required, not float")
-        test_exc('%g', '1', TypeError, "a float is required")
+        test_exc('%g', '1', TypeError, "must be real number, not str")
         test_exc('no format', '1', TypeError,
                  "not all arguments converted during string formatting")
         test_exc('%c', -1, OverflowError, "%c arg not in range(0x110000)")