diff --git a/ci-lua b/ci-lua
index d8faaae49..b0c720768 100755
--- a/ci-lua
+++ b/ci-lua
@@ -2,24 +2,17 @@
 
 . ./config
 
-rm -rf "$TEST_OUT_DIR/lua"
-mkdir -p "$TEST_OUT_DIR/lua"
+LUA_OUT_DIR="${TEST_OUT_DIR}/lua"
+
+rm -rf "${LUA_OUT_DIR}"
+mkdir -p "${LUA_OUT_DIR}"
+
 export LUA_PATH="$LUA_PATH;$LUA_RUNTIME_DIR/?.lua;spec/lua/?.lua;spec/lua/extra/?.lua;compiled/lua/?.lua;;"
 
 # Add `lua_install` dir to PATH, as this is where hererocks installs Lua at CI
 export PATH=$PATH:$PWD/../lua_install/bin
 
-# Detect lua executable
-if lua5.3 -v; then
-	LUA_BIN=lua5.3
-elif lua -v; then
-	LUA_BIN=lua
-else
-	echo "Unable to detect lua executable, bailing out :("
-	exit 1
-fi
-
-"$LUA_BIN" spec/lua/run_test_suite.lua -v -o junit -n "$TEST_OUT_DIR/lua/report"
+lua spec/lua/run_test_suite.lua --output junit --name "${LUA_OUT_DIR}/report"
 
 ./kst-adoption-report lua
-aggregate/convert_to_json lua "$TEST_OUT_DIR/lua" "$TEST_OUT_DIR/lua/ci.json"
+aggregate/convert_to_json lua "${LUA_OUT_DIR}" "${LUA_OUT_DIR}/ci.json"
diff --git a/run-lua b/run-lua
index b86f97428..e0d2c6a98 100755
--- a/run-lua
+++ b/run-lua
@@ -4,4 +4,4 @@
 
 export LUA_PATH="$LUA_PATH;$LUA_RUNTIME_DIR/?.lua;spec/lua/?.lua;spec/lua/extra/?.lua;compiled/lua/?.lua;;"
 
-lua5.3 spec/lua/run_test_suite.lua -v
+lua spec/lua/run_test_suite.lua -v
diff --git a/spec/lua/run_test_suite.lua b/spec/lua/run_test_suite.lua
index be104cb2a..d4e7c2083 100644
--- a/spec/lua/run_test_suite.lua
+++ b/spec/lua/run_test_suite.lua
@@ -4,7 +4,7 @@ local luaunit = require("luaunit")
 local lfs = require("lfs")
 
 function srequire(t)
-    local success, err = xpcall(require, require_err_handler(t), t)
+    local success, err = xpcall(function() require(t) end, require_err_handler(t))
     return success
 end