diff --git a/modoboa/amavis/tests/sample_messages/quarantined-output-plain_nolinks.txt b/modoboa/amavis/tests/sample_messages/quarantined-output-plain_nolinks.txt
index 2506f75ad..c7b3e0b75 100644
--- a/modoboa/amavis/tests/sample_messages/quarantined-output-plain_nolinks.txt
+++ b/modoboa/amavis/tests/sample_messages/quarantined-output-plain_nolinks.txt
@@ -7,7 +7,7 @@ incorrect We need to verify your account information in order to continue
 using your Apple ID, Please Verify your account information by clicking on the
 link below  
 
- **Click here to Verify your ID**  
+**Click here to Verify your ID**  
 
 Thanks for choosing Apple,  
 Apple Team  
diff --git a/modoboa/amavis/tests/test_sql_email.py b/modoboa/amavis/tests/test_sql_email.py
index aac155f7e..fa9aa012e 100644
--- a/modoboa/amavis/tests/test_sql_email.py
+++ b/modoboa/amavis/tests/test_sql_email.py
@@ -35,7 +35,7 @@ class EmailTests(TestCase):
     """
 
     def _get_expected_output(self, message_id, **kwargs):
-        ext = kwargs["dformat"] if "dformat" in kwargs else "plain"
+        ext = kwargs.get("dformat", "plain")
         ext += "_links" if "links" in kwargs and kwargs["links"] else "_nolinks"
         message_path = os.path.join(SAMPLES_DIR, f"{message_id}-output-{ext}.txt")
         assert os.path.isfile(message_path), f"{message_path} does not exist."