diff --git a/greenmail-core/src/test/java/com/icegreen/greenmail/specificmessages/EncodingTest.java b/greenmail-core/src/test/java/com/icegreen/greenmail/specificmessages/EncodingTest.java
index 93117ef659..8cf1df6049 100644
--- a/greenmail-core/src/test/java/com/icegreen/greenmail/specificmessages/EncodingTest.java
+++ b/greenmail-core/src/test/java/com/icegreen/greenmail/specificmessages/EncodingTest.java
@@ -201,6 +201,8 @@ public void messagesAdded(MessageCountEvent e) {
 
     @Test
     public void testAttachmentWithUTF8NameAndGreenMailApi() throws MessagingException, IOException {
+        System.setProperty("mail.mime.decodefilename", "true");
+
         greenMail.setUser("to@localhost", "pwd");
         final IMAPStore store = greenMail.getImap().createStore();
         store.connect("to@localhost", "pwd");