diff --git a/.gitignore b/.gitignore
index 5f3d6f78f2475fe4f124223fe969969bf1a43214..55871f06bce9cc82a11899a4a2c59ef27ac9104e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -27,5 +27,4 @@ testsite/backup_keyring/
 test_report*
 
 # Ignore test site CLI artefacts.
-testsite/mutt/*/record
-testsite/mutt/*/record
\ No newline at end of file
+testsite/mutt/*files
\ No newline at end of file
diff --git a/testsite/mutt/jane.doe/config b/testsite/mutt/jane.doe
similarity index 61%
rename from testsite/mutt/jane.doe/config
rename to testsite/mutt/jane.doe
index 4dfc01a81eb422e59779f09f3a27721d77c79f63..bf48cfd3dd79d1b4cca7874b128e1a7632030e15 100644
--- a/testsite/mutt/jane.doe/config
+++ b/testsite/mutt/jane.doe
@@ -25,13 +25,13 @@ bind index G imap-fetch-mail
 
 # Configure various paths explicitly to prevent them from clashing
 # with user's system-wide files.
-set alias_file = mutt/jane.doe/config
-set certificate_file = mutt/jane.doe/certificates
-set folder = mutt/jane.doe/mail
-set history_file = mutt/jane.doe/history
-set mbox = mutt/jane.doe/mbox
-set news_cache_dir = mutt/jane.doe/news_cache
-set newsrc = mutt/jane.doe/newsrc
-set postponed = mutt/jane.doe/postponed
-set record = mutt/jane.doe/record
-set signature = mutt/jane.doe/signature
+set alias_file = mutt/jane.doe-files/config
+set certificate_file = mutt/jane.doe-files/certificates
+set folder = mutt/jane.doe-files/mail
+set history_file = mutt/jane.doe-files/history
+set mbox = mutt/jane.doe-files/mbox
+set news_cache_dir = mutt/jane.doe-files/news_cache
+set newsrc = mutt/jane.doe-files/newsrc
+set postponed = mutt/jane.doe-files/postponed
+set record = mutt/jane.doe-files/record
+set signature = mutt/jane.doe-files/signature
diff --git a/testsite/mutt/jane.doe-files/mail/.keep b/testsite/mutt/jane.doe-files/mail/.keep
new file mode 100644
index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
diff --git a/testsite/mutt/john.doe/config b/testsite/mutt/john.doe
similarity index 61%
rename from testsite/mutt/john.doe/config
rename to testsite/mutt/john.doe
index 9c6215866e4ec7ed480c083990c22f72a4e6ec01..d9e91690f65e3fb3bcb01993482cbd9898d33aa7 100644
--- a/testsite/mutt/john.doe/config
+++ b/testsite/mutt/john.doe
@@ -25,13 +25,13 @@ bind index G imap-fetch-mail
 
 # Configure various paths explicitly to prevent them from clashing
 # with user's system-wide files.
-set alias_file = mutt/john.doe/config
-set certificate_file = mutt/john.doe/certificates
-set folder = mutt/john.doe/mail
-set history_file = mutt/john.doe/history
-set mbox = mutt/john.doe/mbox
-set news_cache_dir = mutt/john.doe/news_cache
-set newsrc = mutt/john.doe/newsrc
-set postponed = mutt/john.doe/postponed
-set record = mutt/john.doe/record
-set signature = mutt/john.doe/signature
+set alias_file = mutt/john.doe-files/config
+set certificate_file = mutt/john.doe-files/certificates
+set folder = mutt/john.doe-files/mail
+set history_file = mutt/john.doe-files/history
+set mbox = mutt/john.doe-files/mbox
+set news_cache_dir = mutt/john.doe-files/news_cache
+set newsrc = mutt/john.doe-files/newsrc
+set postponed = mutt/john.doe-files/postponed
+set record = mutt/john.doe-files/record
+set signature = mutt/john.doe-files/signature
diff --git a/testsite/mutt/john.doe-files/mail/.keep b/testsite/mutt/john.doe-files/mail/.keep
new file mode 100644
index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391