diff --git a/tests/taglib/test_flac.rs b/tests/taglib/test_flac.rs
index 06fdce6fe..cdccbf12b 100644
--- a/tests/taglib/test_flac.rs
+++ b/tests/taglib/test_flac.rs
@@ -40,7 +40,7 @@ fn test_read_picture() {
 	assert_eq!(info.height, 1);
 	assert_eq!(info.color_depth, 24);
 	assert_eq!(info.num_colors, 0);
-	assert_eq!(pic.mime_type(), &MimeType::Png);
+	assert_eq!(pic.mime_type(), Some(&MimeType::Png));
 	assert_eq!(pic.description(), Some("A pixel."));
 	assert_eq!(pic.data().len(), 150);
 }
@@ -57,7 +57,7 @@ fn test_add_picture() {
 
 		let new_pic = Picture::new_unchecked(
 			PictureType::CoverBack,
-			MimeType::Jpeg,
+			Some(MimeType::Jpeg),
 			Some(String::from("new image")),
 			Vec::from("JPEG data"),
 		);
@@ -85,7 +85,7 @@ fn test_add_picture() {
 		assert_eq!(info.height, 1);
 		assert_eq!(info.color_depth, 24);
 		assert_eq!(info.num_colors, 0);
-		assert_eq!(pic.mime_type(), &MimeType::Png);
+		assert_eq!(pic.mime_type(), Some(&MimeType::Png));
 		assert_eq!(pic.description(), Some("A pixel."));
 		assert_eq!(pic.data().len(), 150);
 
@@ -95,7 +95,7 @@ fn test_add_picture() {
 		assert_eq!(info.height, 6);
 		assert_eq!(info.color_depth, 16);
 		assert_eq!(info.num_colors, 7);
-		assert_eq!(pic.mime_type(), &MimeType::Jpeg);
+		assert_eq!(pic.mime_type(), Some(&MimeType::Jpeg));
 		assert_eq!(pic.description(), Some("new image"));
 		assert_eq!(pic.data(), b"JPEG data");
 	}
@@ -113,7 +113,7 @@ fn test_replace_picture() {
 
 		let new_pic = Picture::new_unchecked(
 			PictureType::CoverBack,
-			MimeType::Jpeg,
+			Some(MimeType::Jpeg),
 			Some(String::from("new image")),
 			Vec::from("JPEG data"),
 		);
@@ -142,7 +142,7 @@ fn test_replace_picture() {
 		assert_eq!(info.height, 6);
 		assert_eq!(info.color_depth, 16);
 		assert_eq!(info.num_colors, 7);
-		assert_eq!(pic.mime_type(), &MimeType::Jpeg);
+		assert_eq!(pic.mime_type(), Some(&MimeType::Jpeg));
 		assert_eq!(pic.description(), Some("new image"));
 		assert_eq!(pic.data(), b"JPEG data");
 	}
@@ -605,7 +605,7 @@ fn test_picture_stored_after_comment() {
 
 		let pic = Picture::new_unchecked(
 			PictureType::CoverFront,
-			MimeType::Png,
+			Some(MimeType::Png),
 			Some(String::from("blank.png")),
 			BLANK_PNG_DATA.to_vec(),
 		);
@@ -634,7 +634,7 @@ fn test_picture_stored_after_comment() {
 		assert_eq!(pictures.len(), 1);
 		assert_eq!(pictures[0].0.data(), BLANK_PNG_DATA);
 		assert_eq!(pictures[0].0.pic_type(), PictureType::CoverFront);
-		assert_eq!(pictures[0].0.mime_type(), &MimeType::Png);
+		assert_eq!(pictures[0].0.mime_type(), Some(&MimeType::Png));
 		assert_eq!(pictures[0].0.description(), Some("blank.png"));
 		assert_eq!(pictures[0].1.width, 3);
 		assert_eq!(pictures[0].1.height, 2);
diff --git a/tests/taglib/test_flacpicture.rs b/tests/taglib/test_flacpicture.rs
index 03e49f0cc..2480a5446 100644
--- a/tests/taglib/test_flacpicture.rs
+++ b/tests/taglib/test_flacpicture.rs
@@ -25,7 +25,7 @@ fn test_parse() {
 	assert_eq!(info.height, 1);
 	assert_eq!(info.color_depth, 24);
 	assert_eq!(info.num_colors, 0);
-	assert_eq!(picture.mime_type(), &MimeType::Png);
+	assert_eq!(picture.mime_type(), Some(&MimeType::Png));
 	assert_eq!(picture.description(), Some("A pixel."));
 	assert_eq!(picture.data().len(), 150);
 }
diff --git a/tests/taglib/test_id3v2.rs b/tests/taglib/test_id3v2.rs
index c7341147d..f37854020 100644
--- a/tests/taglib/test_id3v2.rs
+++ b/tests/taglib/test_id3v2.rs
@@ -139,7 +139,10 @@ fn test_parse_apic() {
 		Id3v2Version::V4,
 	)
 	.unwrap();
-	assert_eq!(f.picture.mime_type(), &MimeType::Unknown(String::from("m")));
+	assert_eq!(
+		f.picture.mime_type(),
+		Some(&MimeType::Unknown(String::from("m")))
+	);
 	assert_eq!(f.picture.pic_type(), PictureType::Icon);
 	assert_eq!(f.picture.description(), Some("d"));
 }
@@ -155,7 +158,7 @@ fn test_parse_apic_utf16_bom() {
 	)
 	.unwrap();
 
-	assert_eq!(f.picture.mime_type(), &MimeType::Jpeg);
+	assert_eq!(f.picture.mime_type(), Some(&MimeType::Jpeg));
 	assert_eq!(f.picture.pic_type(), PictureType::Other);
 	assert_eq!(f.picture.description(), Some("cover.jpg"));
 	assert_eq!(f.picture.data(), b"\xff\xd8\xff");
@@ -174,7 +177,7 @@ fn test_parse_apicv22() {
 	)
 	.unwrap();
 
-	assert_eq!(frame.picture.mime_type(), &MimeType::Jpeg);
+	assert_eq!(frame.picture.mime_type(), Some(&MimeType::Jpeg));
 	assert_eq!(frame.picture.pic_type(), PictureType::Icon);
 	assert_eq!(frame.picture.description(), Some("d"));
 }
@@ -185,7 +188,7 @@ fn test_render_apic() {
 		encoding: TextEncoding::UTF8,
 		picture: Picture::new_unchecked(
 			PictureType::CoverBack,
-			MimeType::Png,
+			Some(MimeType::Png),
 			Some(String::from("Description")),
 			b"PNG data".to_vec(),
 		),
@@ -929,7 +932,7 @@ fn test_compressed_frame_with_broken_length() {
 		_ => unreachable!(),
 	};
 
-	assert_eq!(picture.mime_type(), &MimeType::Bmp);
+	assert_eq!(picture.mime_type(), Some(&MimeType::Bmp));
 	assert_eq!(picture.pic_type(), PictureType::Other);
 	assert!(picture.description().is_none());
 	assert_eq!(picture.data().len(), 86414);
diff --git a/tests/taglib/test_mp4.rs b/tests/taglib/test_mp4.rs
index 3c25a4e30..35e708979 100644
--- a/tests/taglib/test_mp4.rs
+++ b/tests/taglib/test_mp4.rs
@@ -258,9 +258,9 @@ fn test_covr_read() {
 	};
 
 	assert!(covrs.next().is_none());
-	assert_eq!(picture1.mime_type(), &MimeType::Png);
+	assert_eq!(picture1.mime_type(), Some(&MimeType::Png));
 	assert_eq!(picture1.data().len(), 79);
-	assert_eq!(picture2.mime_type(), &MimeType::Jpeg);
+	assert_eq!(picture2.mime_type(), Some(&MimeType::Jpeg));
 	assert_eq!(picture2.data().len(), 287);
 }
 
@@ -276,7 +276,7 @@ fn test_covr_write() {
 		assert!(tag.contains(&AtomIdent::Fourcc(*b"covr")));
 		tag.insert_picture(Picture::new_unchecked(
 			PictureType::Other,
-			MimeType::Png,
+			Some(MimeType::Png),
 			None,
 			b"foo".to_vec(),
 		));
@@ -300,11 +300,11 @@ fn test_covr_write() {
 		};
 
 		assert!(covrs.next().is_none());
-		assert_eq!(picture1.mime_type(), &MimeType::Png);
+		assert_eq!(picture1.mime_type(), Some(&MimeType::Png));
 		assert_eq!(picture1.data().len(), 79);
-		assert_eq!(picture2.mime_type(), &MimeType::Jpeg);
+		assert_eq!(picture2.mime_type(), Some(&MimeType::Jpeg));
 		assert_eq!(picture2.data().len(), 287);
-		assert_eq!(picture3.mime_type(), &MimeType::Png);
+		assert_eq!(picture3.mime_type(), Some(&MimeType::Png));
 		assert_eq!(picture3.data().len(), 3);
 	}
 }
@@ -323,9 +323,9 @@ fn test_covr_read2() {
 	};
 
 	assert!(covrs.next().is_none());
-	assert_eq!(picture1.mime_type(), &MimeType::Png);
+	assert_eq!(picture1.mime_type(), Some(&MimeType::Png));
 	assert_eq!(picture1.data().len(), 79);
-	assert_eq!(picture2.mime_type(), &MimeType::Jpeg);
+	assert_eq!(picture2.mime_type(), Some(&MimeType::Jpeg));
 	assert_eq!(picture2.data().len(), 287);
 }
 
@@ -458,9 +458,9 @@ fn test_non_full_meta_atom() {
 	};
 
 	assert!(covrs.next().is_none());
-	assert_eq!(picture1.mime_type(), &MimeType::Png);
+	assert_eq!(picture1.mime_type(), Some(&MimeType::Png));
 	assert_eq!(picture1.data().len(), 79);
-	assert_eq!(picture2.mime_type(), &MimeType::Jpeg);
+	assert_eq!(picture2.mime_type(), Some(&MimeType::Jpeg));
 	assert_eq!(picture2.data().len(), 287);
 
 	assert_eq!(tag.artist().as_deref(), Some("Test Artist!!!!"));
diff --git a/tests/taglib/test_xiphcomment.rs b/tests/taglib/test_xiphcomment.rs
index 06811b7d9..a100fc23c 100644
--- a/tests/taglib/test_xiphcomment.rs
+++ b/tests/taglib/test_xiphcomment.rs
@@ -115,7 +115,7 @@ fn test_picture() {
 
 		let picture = Picture::new_unchecked(
 			PictureType::CoverBack,
-			MimeType::Jpeg,
+			Some(MimeType::Jpeg),
 			Some(String::from("new image")),
 			b"JPEG data".to_vec(),
 		);
@@ -140,7 +140,7 @@ fn test_picture() {
 		assert_eq!(pictures[0].1.height, 6);
 		assert_eq!(pictures[0].1.color_depth, 16);
 		assert_eq!(pictures[0].1.num_colors, 7);
-		assert_eq!(pictures[0].0.mime_type(), &MimeType::Jpeg);
+		assert_eq!(pictures[0].0.mime_type(), Some(&MimeType::Jpeg));
 		assert_eq!(pictures[0].0.description(), Some("new image"));
 		assert_eq!(pictures[0].0.data(), b"JPEG data");
 	}