diff --git a/templates/confirmation/mituser_confirmation_email_subject.txt b/templates/confirmation/mituser_confirmation_email.subject
similarity index 100%
rename from templates/confirmation/mituser_confirmation_email_subject.txt
rename to templates/confirmation/mituser_confirmation_email.subject
diff --git a/templates/confirmation/mituser_confirmation_email_body.txt b/templates/confirmation/mituser_confirmation_email.txt
similarity index 100%
rename from templates/confirmation/mituser_confirmation_email_body.txt
rename to templates/confirmation/mituser_confirmation_email.txt
diff --git a/zerver/tests/test_templates.py b/zerver/tests/test_templates.py
index 232f5c8f62..72d771f3f2 100644
--- a/zerver/tests/test_templates.py
+++ b/zerver/tests/test_templates.py
@@ -83,8 +83,8 @@ class TemplateTestCase(ZulipTestCase):
             'zerver/message_history.html',
         ]
         unusual = [
-            'confirmation/mituser_confirmation_email_body.txt',
-            'confirmation/mituser_confirmation_email_subject.txt',
+            'confirmation/mituser_confirmation_email.txt',
+            'confirmation/mituser_confirmation_email.subject',
             'confirmation/mituser_invite_email_body.txt',
             'confirmation/mituser_invite_email_subject.txt',
             'confirmation/emailchangestatus_confirmation_email.subject',