diff --git a/Makefile.am b/Makefile.am
index 9f2d3d2096bcaa9d7c714f0a37bcfd9e0f6c5f48..1e9a1ff750eaac1e91066132b05f1c50533878ae 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -18,8 +18,7 @@ EXTRA_DIST = \
 	COPYING.LGPL \
 	ChangeLog \
 	update-version.sh \
-	tests/test-address.svtest.in \
-	tests/failures/mailbox-bad-utf8.svtest.in
+	tests/test-address.svtest.in
 
 dist-hook:
 	rm -rf `find $(distdir)/tests -type f -name '*.svbin'`
@@ -59,8 +58,7 @@ test_unfinished =
 endif
 
 test_utf8_cases = \
-		  tests/test-address.svtest \
-		  tests/failures/mailbox-bad-utf8.svtest
+		  tests/test-address.svtest
 
 test_cases = \
 	tests/testsuite.svtest \
diff --git a/tests/failures/mailbox-bad-utf8.svtest b/tests/failures/mailbox-bad-utf8.svtest
new file mode 100644
index 0000000000000000000000000000000000000000..ad104e5ab8ddcc0f25a7773fce1b90d03120b2bf
--- /dev/null
+++ b/tests/failures/mailbox-bad-utf8.svtest
@@ -0,0 +1,6 @@
+require "vnd.dovecot.testsuite";
+require "encoded-character";
+
+test "Mailbox parameter with bad UTF-8" {
+	test_message :folder "I${hex:9b}BOX" 0;
+}
diff --git a/tests/failures/mailbox-bad-utf8.svtest.in b/tests/failures/mailbox-bad-utf8.svtest.in
deleted file mode 100644
index 2b441ed5cd8b09be0da439e25fcfe37f6fd249a2..0000000000000000000000000000000000000000
--- a/tests/failures/mailbox-bad-utf8.svtest.in
+++ /dev/null
@@ -1,6 +0,0 @@
-require "vnd.dovecot.testsuite";
-require "encoded-character";
-
-#UTF8# test "Mailbox parameter with bad UTF-8" {
-#UTF8#	test_message :folder "I${hex:9b}BOX" 0;
-#UTF8# }