diff --git a/Makefile.am b/Makefile.am
index 43e40031b8cd5fb1b55b6df187665984853ad1b2..bd7624aa50bb5810194e61888885c1ed9012a5a9 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -20,6 +20,11 @@ TESTSUITE_BIN = $(top_srcdir)/src/testsuite/testsuite
 test_cases = \
 	tests/testsuite.svtest\
 	tests/control-structures.svtest \
+	tests/compile/compile.svtest \
+	tests/compile/examples.svtest \
+	tests/compile/errors.svtest \
+	tests/execute/errors.svtest \
+	tests/execute/actions.svtest \
 	tests/exists.svtest \
 	tests/header.svtest \
 	tests/address.svtest \
@@ -53,11 +58,7 @@ test_cases = \
 	tests/extensions/subaddress/basic.svtest \
 	tests/extensions/subaddress/rfc.svtest \
 	tests/extensions/vacation/errors.svtest \
-	tests/extensions/vacation/execute.svtest \
-	tests/compile/compile.svtest \
-	tests/compile/examples.svtest \
-	tests/compile/errors.svtest \
-	tests/execute/errors.svtest
+	tests/extensions/vacation/execute.svtest
 
 $(test_cases):
 	@$(TESTSUITE_BIN) $@
diff --git a/tests/execute/actions.svtest b/tests/execute/actions.svtest
new file mode 100644
index 0000000000000000000000000000000000000000..0660167283f9cd8a237eedf80c3b1e49c8522da7
--- /dev/null
+++ b/tests/execute/actions.svtest
@@ -0,0 +1,31 @@
+require "vnd.dovecot.testsuite";
+
+test_set "message" text:
+To: nico@vestingbar.nl
+From: stephan@rename-it.nl
+Subject: Test
+
+Test.
+.
+;
+
+test "Fileinto" {
+	if not test_compile "actions/fileinto.sieve" {
+		test_fail "compile failed";
+	}
+
+	if not test_execute {
+		test_fail "execute failed";
+	}
+}
+
+test "Redirect" {
+	if not test_compile "actions/redirect.sieve" {
+		test_fail "compile failed";
+	}
+
+	if not test_execute {
+		test_fail "execute failed";
+	}
+}
+
diff --git a/sieve/tests/fileinto.sieve b/tests/execute/actions/fileinto.sieve
similarity index 100%
rename from sieve/tests/fileinto.sieve
rename to tests/execute/actions/fileinto.sieve
diff --git a/sieve/tests/redirect.sieve b/tests/execute/actions/redirect.sieve
similarity index 100%
rename from sieve/tests/redirect.sieve
rename to tests/execute/actions/redirect.sieve
diff --git a/tests/extensions/reject/execute.svtest b/tests/extensions/reject/execute.svtest
index e80fe1e27f46e4021d4c2e2420751395e1e5a1db..7400de8bd3ac56916025f1f2523713ff2073b2ae 100644
--- a/tests/extensions/reject/execute.svtest
+++ b/tests/extensions/reject/execute.svtest
@@ -1,5 +1,14 @@
 require "vnd.dovecot.testsuite";
 
+test_set "message" text:
+To: nico@vestingbar.nl
+From: stephan@rename-it.nl
+Subject: Test
+
+Test.
+.
+;
+
 test "Execute" {
 	if not test_compile "execute/basic.sieve" {
 		test_fail "compile failed";