diff --git a/Makefile.am b/Makefile.am
index fd136e063c842519ef6982c9f89711860f729f47..e34e744240c3386579cb568d48ea8d63f2915e53 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -55,9 +55,9 @@ test_cases = \
 	tests/extensions/variables/regex.svtest \
 	tests/extensions/include/errors.svtest \
 	tests/extensions/include/variables.svtest \
-	tests/extensions/imapflags/basic.svtest \
-	tests/extensions/imapflags/hasflag.svtest \
-	tests/extensions/imapflags/execute.svtest \
+	tests/extensions/imap4flags/basic.svtest \
+	tests/extensions/imap4flags/hasflag.svtest \
+	tests/extensions/imap4flags/execute.svtest \
 	tests/extensions/body/basic.svtest \
 	tests/extensions/body/match-values.svtest \
 	tests/extensions/regex/basic.svtest \
diff --git a/tests/extensions/imapflags/basic.svtest b/tests/extensions/imap4flags/basic.svtest
similarity index 100%
rename from tests/extensions/imapflags/basic.svtest
rename to tests/extensions/imap4flags/basic.svtest
diff --git a/tests/extensions/imapflags/execute.svtest b/tests/extensions/imap4flags/execute.svtest
similarity index 100%
rename from tests/extensions/imapflags/execute.svtest
rename to tests/extensions/imap4flags/execute.svtest
diff --git a/tests/extensions/imapflags/execute/flags-side-effect.sieve b/tests/extensions/imap4flags/execute/flags-side-effect.sieve
similarity index 100%
rename from tests/extensions/imapflags/execute/flags-side-effect.sieve
rename to tests/extensions/imap4flags/execute/flags-side-effect.sieve
diff --git a/tests/extensions/imapflags/hasflag.svtest b/tests/extensions/imap4flags/hasflag.svtest
similarity index 100%
rename from tests/extensions/imapflags/hasflag.svtest
rename to tests/extensions/imap4flags/hasflag.svtest