diff --git a/tests/modules/programs/neomutt/neomutt-with-named-mailboxes-expected.conf b/tests/modules/programs/neomutt/neomutt-with-named-mailboxes-expected.conf
index 605b5ed6d..cb2585f32 100644
--- a/tests/modules/programs/neomutt/neomutt-with-named-mailboxes-expected.conf
+++ b/tests/modules/programs/neomutt/neomutt-with-named-mailboxes-expected.conf
@@ -4,33 +4,24 @@ set message_cachedir = "/home/hm-user/.cache/neomutt/messages/"
 set editor = "$EDITOR"
 set implicit_autoview = yes
 set crypt_use_gpgme = yes
-
 alternative_order text/enriched text/plain text
-
 set delete = yes
 
 
-
-# Binds
-
-
 # Macros
 
-
 # Register accounts
-# register account hm@example.com
+
+## register account hm@example.com
 named-mailboxes "someCustomName" "/home/hm-user/Mail/hm@example.com/Inbox"
 mailboxes "/home/hm-user/Mail/hm@example.com/Sent"
 named-mailboxes "Spam" "/home/hm-user/Mail/hm@example.com/Junk Email"
 mailboxes "/home/hm-user/Mail/hm@example.com/Trash"
 folder-hook /home/hm-user/Mail/hm@example.com/ " \
-    source /home/hm-user/.config/neomutt/hm@example.com "
-
+          source /home/hm-user/.config/neomutt/hm@example.com "
 
 # Source primary account
 source /home/hm-user/.config/neomutt/hm@example.com
 
 # Extra configuration
 
-
-
diff --git a/tests/modules/programs/neomutt/neomutt-with-named-mailboxes.nix b/tests/modules/programs/neomutt/neomutt-with-named-mailboxes.nix
index 1d1d2fa47..bbd3afb5a 100644
--- a/tests/modules/programs/neomutt/neomutt-with-named-mailboxes.nix
+++ b/tests/modules/programs/neomutt/neomutt-with-named-mailboxes.nix
@@ -31,7 +31,7 @@
   nmt.script = ''
     assertFileExists home-files/.config/neomutt/neomuttrc
     assertFileExists home-files/.config/neomutt/hm@example.com
-    assertFileContent home-files/.config/neomutt/neomuttrc ${
+    assertFileContent $(normalizeStorePaths home-files/.config/neomutt/neomuttrc) ${
       ./neomutt-with-named-mailboxes-expected.conf
     }
     assertFileContent home-files/.config/neomutt/hm@example.com ${