diff -r 41613bb27f80 Lib/imghdr.py
--- a/Lib/imghdr.py	Wed Nov 09 09:41:15 2016 -0500
+++ b/Lib/imghdr.py	Thu Nov 10 19:10:27 2016 -0400
@@ -34,7 +34,7 @@
 
 def test_jpeg(h, f):
     """JPEG data in JFIF format"""
-    if h[6:10] == 'JFIF':
+    if h[6:10] == 'JFIF' or h[:2] == '\xFF\xD8':
         return 'jpeg'
 
 tests.append(test_jpeg)
@@ -157,3 +157,6 @@
                 print what(filename)
             except IOError:
                 print '*** not found ***'
+
+if __name__ == "__main__":  # pragma: no cover
+    test()
\ No newline at end of file
diff -r 41613bb27f80 Lib/test/imghdrdata/python1.jpg
Binary file Lib/test/imghdrdata/python1.jpg has changed
diff -r 41613bb27f80 Lib/test/test_imghdr.py
--- a/Lib/test/test_imghdr.py	Wed Nov 09 09:41:15 2016 -0500
+++ b/Lib/test/test_imghdr.py	Thu Nov 10 19:10:27 2016 -0400
@@ -12,6 +12,7 @@
     ('python.pgm', 'pgm'),
     ('python.pbm', 'pbm'),
     ('python.jpg', 'jpeg'),
+    ('python1.jpg', 'jpeg'),
     ('python.ras', 'rast'),
     ('python.sgi', 'rgb'),
     ('python.tiff', 'tiff'),