diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 5d4eba8..d1e181c 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -11,13 +11,14 @@ jobs:
         cfg:
           - { image: 'registry.gitlab.com/minetest/minetest/server:5.0.1', mtg: false }
           - { image: 'registry.gitlab.com/minetest/minetest/server:5.5.1', mtg: false }
-          - { image: '', mtg: true } # latest mater
+          - { image: 'ghcr.io/minetest/minetest:5.10.0', mtg: true }
+          - { image: 'ghcr.io/luanti-org/luanti', mtg: true } # latest git
     steps:
     - uses: actions/checkout@v4
 
     - uses: actions/checkout@v4
       with:
-        repository: 'minetest/minetest_game'
+        repository: 'luanti-org/minetest_game'
         path: minetest_game
       if: ${{ matrix.cfg.mtg }}
 
diff --git a/.util/run_tests.sh b/.util/run_tests.sh
index e596dda..f3de912 100755
--- a/.util/run_tests.sh
+++ b/.util/run_tests.sh
@@ -11,9 +11,9 @@ if [ "$1" == "--docker" ]; then
 	command -v docker >/dev/null || { echo "Docker is not installed." >&2; exit 1; }
 	[ -d minetest_game ] || echo "A source checkout of minetest_game was not found. This can fail if your docker image does not ship a game." >&2;
 else
-	mtserver=$(command -v minetestserver)
-	[[ -z "$mtserver" && -x ../../bin/minetestserver ]] && mtserver=../../bin/minetestserver
-	[ -z "$mtserver" ] && { echo "To run the test outside of Docker, an installation of minetestserver is required." >&2; exit 1; }
+	mtserver=$(command -v luantiserver)
+	[[ -z "$mtserver" && -x ../../bin/luantiserver ]] && mtserver=../../bin/luantiserver
+	[ -z "$mtserver" ] && { echo "To run the test outside of Docker, an installation of luantiserver is required." >&2; exit 1; }
 fi
 
 mkdir $worldpath
@@ -22,7 +22,7 @@ printf '%s\n' worldedit_run_tests=true max_forceloaded_blocks=9999 >$confpath
 
 if [ -z "$mtserver" ]; then
 	chmod -R 777 $tempdir
-	[ -z "$DOCKER_IMAGE" ] && DOCKER_IMAGE="ghcr.io/minetest/minetest:master"
+	[ -n "$DOCKER_IMAGE" ] || { echo "Missing DOCKER_IMAGE env variable" >&2; exit 1; }
 	vol=(
 		-v "$confpath":/etc/minetest/minetest.conf
 		-v "$tempdir":/var/lib/minetest/.minetest