diff --git a/django_mailbox/tests/Bugs in 2.2/Attachment.mbox b/django_mailbox/tests/message_with_image_jpg_mimetype.eml
similarity index 100%
rename from django_mailbox/tests/Bugs in 2.2/Attachment.mbox
rename to django_mailbox/tests/message_with_image_jpg_mimetype.eml
diff --git a/django_mailbox/tests/Bugs in 2.2/UTF16.mbox b/django_mailbox/tests/message_with_utf16_char.eml
similarity index 100%
rename from django_mailbox/tests/Bugs in 2.2/UTF16.mbox
rename to django_mailbox/tests/message_with_utf16_char.eml