diff --git a/Makefile b/Makefile
index 611bcdd5a..e6653bd6c 100644
--- a/Makefile
+++ b/Makefile
@@ -451,6 +451,7 @@ ruff:
 		test/zdtm.py \
 		test/inhfd/*.py \
 		test/others/rpc/config_file.py \
+		test/others/action-script/check_actions.py \
 		lib/pycriu/images/pb2dict.py \
 		lib/pycriu/images/images.py \
 		scripts/criu-ns \
diff --git a/test/jenkins/actions.sh b/test/jenkins/actions.sh
deleted file mode 100755
index 801904500..000000000
--- a/test/jenkins/actions.sh
+++ /dev/null
@@ -1,8 +0,0 @@
-# Check how crit de/encodes images
-set -e
-source `dirname $0`/criu-lib.sh
-# prep
-rm -f actions_called.txt
-./test/zdtm.py run -t zdtm/static/env00 --script "$(pwd)/test/show_action.sh" || fail
-./test/check_actions.py || fail
-exit 0
diff --git a/test/others/action-script/.gitignore b/test/others/action-script/.gitignore
index c0b6a2490..ca9a0b541 100644
--- a/test/others/action-script/.gitignore
+++ b/test/others/action-script/.gitignore
@@ -1 +1 @@
-img-dir-*
+actions_called.txt
diff --git a/test/others/action-script/Makefile b/test/others/action-script/Makefile
index f1ce191db..594edc070 100644
--- a/test/others/action-script/Makefile
+++ b/test/others/action-script/Makefile
@@ -1,5 +1,3 @@
 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
deleted file mode 100755
index aba8292c0..000000000
--- a/test/others/action-script/action-script.sh
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/bash
-touch action-hook-"$CRTOOLS_SCRIPT_ACTION"
diff --git a/test/check_actions.py b/test/others/action-script/check_actions.py
similarity index 100%
rename from test/check_actions.py
rename to test/others/action-script/check_actions.py
diff --git a/test/others/action-script/run.sh b/test/others/action-script/run.sh
index a82fccf35..f18301502 100755
--- a/test/others/action-script/run.sh
+++ b/test/others/action-script/run.sh
@@ -1,60 +1,11 @@
 #!/bin/bash
 
-set -ebm
+set -e
 
-# shellcheck source=test/others/env.sh
-source ../env.sh || exit 1
+SCRIPT_DIR="$(cd "$(dirname "$0")" && pwd)"
 
-SELFDIR="$(dirname "$(readlink -f "$0")")"
-SCRIPT="$SELFDIR/action-script.sh"
-IMGDIR="$SELFDIR/img-dir-$$"
+rm -f "${SCRIPT_DIR}"/actions_called.txt
+"${SCRIPT_DIR}"/../../zdtm.py run -t zdtm/static/env00 --script "$SCRIPT_DIR/show_action.sh" || exit 1
+"${SCRIPT_DIR}"/check_actions.py || exit 1
 
-rm -rf "$IMGDIR"
-mkdir "$IMGDIR"
-
-trap "cleanup" QUIT TERM INT HUP EXIT
-
-# shellcheck disable=SC2317
-# https://github.com/koalaman/shellcheck/issues/2660
-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"; 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"; 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
-
-echo PASS
-
-rm -rf "$IMGDIR"
 exit 0
diff --git a/test/show_action.sh b/test/others/action-script/show_action.sh
similarity index 66%
rename from test/show_action.sh
rename to test/others/action-script/show_action.sh
index 86468b67a..afbfc3f27 100755
--- a/test/show_action.sh
+++ b/test/others/action-script/show_action.sh
@@ -1,3 +1,4 @@
 #!/bin/bash
+
 echo "${CRTOOLS_SCRIPT_ACTION} ${CRTOOLS_IMAGE_DIR} ${CRTOOLS_INIT_PID}" \
-	     >> "$(dirname $0)/actions_called.txt"
+	>> "$(dirname "$0")/actions_called.txt"