diff --git a/Makefile.am b/Makefile.am
index ba3abf74a7b545723138f4295386d0a1aa9d0cbb..330c5046ad12bec7b3bbb9a6a07c801c403fbb7a 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -72,7 +72,7 @@ test_cases = \
 	tests/extensions/subaddress/rfc.svtest \
 	tests/extensions/vacation/errors.svtest \
 	tests/extensions/vacation/execute.svtest \
-	tests/extensions/vacation/references.svtest \
+	tests/extensions/vacation/message.svtest \
 	tests/extensions/enotify/basic.svtest \
 	tests/extensions/enotify/encodeurl.svtest \
 	tests/extensions/enotify/valid_notify_method.svtest \
diff --git a/tests/extensions/vacation/message.svtest b/tests/extensions/vacation/message.svtest
new file mode 100644
index 0000000000000000000000000000000000000000..75f7002eb6cce24c2179b455fc0d425372b848d3
--- /dev/null
+++ b/tests/extensions/vacation/message.svtest
@@ -0,0 +1,48 @@
+require "vnd.dovecot.testsuite";
+require "vacation";
+
+test_set "message" text:
+From: stephan@rename-it.nl
+Subject: frop
+References: <1234@local.machine.example> <3456@example.net>
+ <435444@ttms.com> <4223@froop.nl> <m345444444@message-id.exp>
+Message-ID: <432df324@rename-it.nl>
+To: nico@vestingbar.nl
+
+Frop
+.
+;
+
+test "References" {
+	vacation "I am not in today!";
+
+	if not test_result_execute {
+		test_fail "execution of result failed";
+	}
+
+	test_message :smtp 0;
+
+	if not header :contains "references" "432df324@rename-it.nl" {
+		test_fail "references header does not contain new id";
+	}
+
+	if anyof ( 
+		not header :contains "references" "1234@local.machine.example", 
+		not header :contains "references" "3456@example.net",
+		not header :contains "references" "435444@ttms.com", 
+		not header :contains "references" "4223@froop.nl", 
+		not header :contains "references" "m345444444@message-id.exp" 
+		) {
+		test_fail "references header does not contain all existing ids";
+	}
+
+	if header :contains "references" "hutsefluts" {
+		test_fail "references header contains nonsense";
+	}
+}
+
+test "In-Reply-To" {
+	if not header :is "in-reply-to" "<432df324@rename-it.nl>" {
+		test_fail "in-reply-to header set incorrectly";
+	}
+}
diff --git a/tests/extensions/vacation/references.svtest b/tests/extensions/vacation/references.svtest
deleted file mode 100644
index f67b1e69643c9c86056d6a35897fc9f2cfd30182..0000000000000000000000000000000000000000
--- a/tests/extensions/vacation/references.svtest
+++ /dev/null
@@ -1,18 +0,0 @@
-require "vnd.dovecot.testsuite";
-require "vacation";
-
-test_set "message" text:
-From: stephan@rename-it.nl
-Subject: frop
-References: <1234@local.machine.example> <3456@example.net>
- <435444@ttms.com> <4223@froop.nl> <m345444444@message-id.exp>
-Message-ID: <432df324@rename-it.nl>
-To: nico@vestingbar.nl
-
-Frop
-.
-;
-
-test "References" {
-	vacation "I am not in today!";
-}