diff --git a/Makefile b/Makefile
index 377c6a3b5f..103f507eb2 100644
--- a/Makefile
+++ b/Makefile
@@ -448,6 +448,7 @@ lint:
 	shellcheck -x test/others/libcriu/*.sh
 	shellcheck -x test/others/crit/*.sh test/others/criu-coredump/*.sh
 	shellcheck -x test/others/config-file/*.sh
+	shellcheck -x test/others/action-script/*.sh
 	codespell -S tags
 	# Do not append \n to pr_perror or fail
 	! git --no-pager grep -E '^\s*\<(pr_perror|fail)\>.*\\n"'
diff --git a/scripts/ci/run-ci-tests.sh b/scripts/ci/run-ci-tests.sh
index 229de97c1c..033a58eca9 100755
--- a/scripts/ci/run-ci-tests.sh
+++ b/scripts/ci/run-ci-tests.sh
@@ -319,6 +319,9 @@ make -C test/others/ns_ext run
 # config file parser and parameter testing
 make -C test/others/config-file run
 
+# action script testing
+make -C test/others/action-script run
+
 # Skip all further tests when running with GCOV=1
 # The one test which currently cannot handle GCOV testing is compel/test
 # Probably because the GCOV Makefile infrastructure does not exist in compel
diff --git a/test/others/action-script/.gitignore b/test/others/action-script/.gitignore
new file mode 100644
index 0000000000..c0b6a2490a
--- /dev/null
+++ b/test/others/action-script/.gitignore
@@ -0,0 +1 @@
+img-dir-*
diff --git a/test/others/action-script/Makefile b/test/others/action-script/Makefile
new file mode 100644
index 0000000000..f1ce191dbc
--- /dev/null
+++ b/test/others/action-script/Makefile
@@ -0,0 +1,5 @@
+run:
+	@make -C .. loop
+	./run.sh
+
+.PHONY: run
diff --git a/test/others/action-script/action-script.sh b/test/others/action-script/action-script.sh
new file mode 100755
index 0000000000..94845becca
--- /dev/null
+++ b/test/others/action-script/action-script.sh
@@ -0,0 +1,13 @@
+#!/bin/bash
+touch action-hook-"$CRTOOLS_SCRIPT_ACTION"
+
+vars=("E1" "E2" "E3" "E4")
+
+for var in "${vars[@]}"
+do
+  if [ -n "${!var}" ]; then
+    echo "${!var}" > "action-env-$var"
+  fi
+done
+
+exit 0
diff --git a/test/others/action-script/run.sh b/test/others/action-script/run.sh
new file mode 100755
index 0000000000..7400de27f1
--- /dev/null
+++ b/test/others/action-script/run.sh
@@ -0,0 +1,74 @@
+#!/bin/bash
+
+set -ebm
+
+# shellcheck source=test/others/env.sh
+source ../env.sh || exit 1
+
+SELFDIR="$(dirname "$(readlink -f "$0")")"
+SCRIPT="$SELFDIR/action-script.sh"
+IMGDIR="$SELFDIR/img-dir-$$"
+
+rm -rf "$IMGDIR"
+mkdir "$IMGDIR"
+
+trap "cleanup" QUIT TERM INT HUP EXIT
+
+function cleanup()
+{
+	if [[ -n "$PID" ]]; then
+		kill -9 "$PID"
+	fi
+}
+
+PID=$(../loop)
+if ! $CRIU dump -v4 -o dump.log -t "$PID" -D "$IMGDIR" --action-script "$SCRIPT" --action-env E1=A --action-env E2=B; then
+	echo "Failed to checkpoint process $PID"
+	cat dump.log
+	kill -9 "$PID"
+	exit 1
+fi
+
+if ! $CRIU restore -v4 -o restore.log -D "$IMGDIR" -d --pidfile test.pidfile --action-script "$SCRIPT" --action-env E3=C --action-env E4=D; then
+	echo "CRIU restore failed"
+	echo FAIL
+	exit 1
+fi
+
+PID=$(cat "$IMGDIR"/test.pidfile)
+
+found_missing_file=false
+hooks=("pre-dump" "post-dump" "pre-restore" "pre-resume" "post-restore" "post-resume")
+
+for hook in "${hooks[@]}"
+do
+	if [ ! -e "$IMGDIR/action-hook-$hook" ]; then
+		echo "ERROR: action-hook-$hook does not exist"
+		found_missing_file=true
+	fi
+done
+
+if [ "$found_missing_file" = true ]; then
+	exit 1
+fi
+
+found_mismatch=false
+vars=("E1:A" "E2:B" "E3:C" "E4:D")
+
+for var in "${vars[@]}"
+do
+	IFS=':' read -r file expected <<< "$var"
+	actual=$(< "$IMGDIR/action-env-$file")
+
+	if [ "$actual" != "$expected" ]; then
+		echo "ERROR: action-env-$file does not contain '$expected'."
+		found_mismatch=true
+	fi
+done
+
+if [ "$found_mismatch" = true ]; then
+	exit 1
+fi
+
+rm -rf "$IMGDIR"
+exit 0