diff --git a/test/rsrc/image-jpeg.mp3 b/test/rsrc/image-jpeg.mp3
new file mode 100644
index 000000000..3f2d22ffb
Binary files /dev/null and b/test/rsrc/image-jpeg.mp3 differ
diff --git a/test/test_embedart.py b/test/test_embedart.py
index 4ba5c3424..0d64b0d9a 100644
--- a/test/test_embedart.py
+++ b/test/test_embedart.py
@@ -163,6 +163,17 @@ class EmbedartCliTest(_common.TestCase, TestHelper):
 
         self.assertExists(os.path.join(albumpath, b'extracted.png'))
 
+    def test_extracted_extension(self):
+        resource_path = os.path.join(_common.RSRC, b'image-jpeg.mp3')
+        album = self.add_album_fixture()
+        trackpath = album.items()[0].path
+        albumpath = album.path
+        shutil.copy(syspath(resource_path), syspath(trackpath))
+
+        self.run_command('extractart', '-n', 'extracted')
+
+        self.assertExists(os.path.join(albumpath, b'extracted.jpg'))
+
 
 @patch('beets.art.subprocess')
 @patch('beets.art.extract')
diff --git a/test/test_mediafile_edge.py b/test/test_mediafile_edge.py
index d09b11fb8..0be177699 100644
--- a/test/test_mediafile_edge.py
+++ b/test/test_mediafile_edge.py
@@ -91,8 +91,7 @@ class EdgeTest(unittest.TestCase):
         with open(magic_bytes_file, 'rb') as f:
             jpg_data = f.read()
         self.assertEqual(
-            beets.mediafile.image_mime_type(jpg_data),
-            'image/jpeg')
+            beets.mediafile._imghdr_what_wrapper(jpg_data), 'jpeg')
 
     def test_soundcheck_non_ascii(self):
         # Make sure we don't crash when the iTunes SoundCheck field contains