diff --git a/tests-on-jvm/src/com/fsck/k9/mail/internet/TextBodyBuilderTest.java b/tests-on-jvm/src/com/fsck/k9/mail/internet/TextBodyBuilderTest.java
index a568fb65f..a813580ba 100644
--- a/tests-on-jvm/src/com/fsck/k9/mail/internet/TextBodyBuilderTest.java
+++ b/tests-on-jvm/src/com/fsck/k9/mail/internet/TextBodyBuilderTest.java
@@ -20,8 +20,7 @@ class TestingTextBodyBuilder extends TextBodyBuilder {
             boolean signatureUse,
             String messageContent,
             String signature) {
-        super(messageContent,
-                signatureUse ? signature : null);
+        super(messageContent);
 
         if (isDraft || includeQuotedText) {
             this.setIncludeQuotedText(true);
@@ -41,6 +40,10 @@ class TestingTextBodyBuilder extends TextBodyBuilder {
         else {
             this.setReplyAfterQuote(false);
         }
+
+        if (signatureUse) {
+            this.setSignature(signature);
+        }
     }
 
     // HtmlConverter depends on Android.