diff --git a/Makefile b/Makefile
index e272b2f6..434e796a 100644
--- a/Makefile
+++ b/Makefile
@@ -203,7 +203,7 @@ generate-accounts-after-run:
 	sleep 10
 
 fixtures:
-	cp config/postfix-accounts.cf config/postfix-accounts.cf.bak
+	cp -r config config.bak
 	# Setup sieve & create filtering folder (INBOX/spam)
 	docker cp "`pwd`/test/config/sieve/dovecot.sieve" mail:/var/mail/localhost.localdomain/user1/.dovecot.sieve
 	docker exec mail /bin/sh -c "maildirmake.dovecot /var/mail/localhost.localdomain/user1/.INBOX.spam"
@@ -259,9 +259,9 @@ clean:
 		mail_postscreen \
 		mail_override_hostname
 
-	@if [ -f config/postfix-accounts.cf.bak ]; then\
-		rm -f config/postfix-accounts.cf ;\
-		mv config/postfix-accounts.cf.bak config/postfix-accounts.cf ;\
+	@if [ -d config.bak ]; then\
+		sudo rm -rf config ;\
+		mv config.bak config ;\
 	fi
 	-sudo rm -rf test/onedir \
 		test/config/empty \
diff --git a/test/config/dovecot-lmtp/userdb b/test/config/dovecot-lmtp/userdb
deleted file mode 100644
index a0ddaba8..00000000
--- a/test/config/dovecot-lmtp/userdb
+++ /dev/null
@@ -1,2 +0,0 @@
-user1@localhost.localdomain:{SHA512-CRYPT}$6$pnBf.UoYuOJ0EcxA$AY.2iRKsDftvCs5u2u72jgKcQHdN/tLguweV08YuBNaZGN4Xn9N8ES0NPxErqRR433vqBFUMmOiVNVF3JgMpB.:5000:5000::/var/mail/localhost.localdomain/user1::
-user2@otherdomain.tld:{SHA512-CRYPT}$6$xkJ0klS8NqpoGeVB$jKmC1YE03GeLtrcwgnQ14AG.nYm8Vj0l0BqUVM.VQ3MVBwYoooJL7JS7czR17gfwM9SRB/311OP8nF/GpNKr5.:5000:5000::/var/mail/otherdomain.tld/user2::