diff --git a/engines/LuaCommon/lualib/ustring/make-normalization-table.php b/engines/LuaCommon/lualib/ustring/make-normalization-table.php
index 1d33a50c..77819372 100755
--- a/engines/LuaCommon/lualib/ustring/make-normalization-table.php
+++ b/engines/LuaCommon/lualib/ustring/make-normalization-table.php
@@ -1,7 +1,7 @@
 #!/usr/bin/php
 <?php
 
-if ( PHP_SAPI !== 'cli' ) {
+if ( PHP_SAPI !== 'cli' && PHP_SAPI !== 'phpdbg' ) {
 	die( "This script may only be executed from the command line.\n" );
 }
 
diff --git a/engines/LuaCommon/lualib/ustring/make-tables.php b/engines/LuaCommon/lualib/ustring/make-tables.php
index 482ee270..cd624626 100755
--- a/engines/LuaCommon/lualib/ustring/make-tables.php
+++ b/engines/LuaCommon/lualib/ustring/make-tables.php
@@ -1,7 +1,7 @@
 #!/usr/bin/php
 <?php
 
-if ( PHP_SAPI !== 'cli' ) {
+if ( PHP_SAPI !== 'cli' && PHP_SAPI !== 'phpdbg' ) {
 	die( "This script may only be executed from the command line.\n" );
 }
 
diff --git a/extension.json b/extension.json
index d04b6bac..3d3b33ac 100644
--- a/extension.json
+++ b/extension.json
@@ -10,7 +10,7 @@
 	"license-name": "GPL-2.0+ AND MIT",
 	"type": "parserhook",
 	"requires": {
-		"MediaWiki": ">=1.30.0"
+		"MediaWiki": ">=1.31.0"
 	},
 	"APIModules": {
 		"scribunto-console": "ApiScribuntoConsole"
diff --git a/tests/phpunit/engines/LuaSandbox/LuaSandboxInterpreterTest.php b/tests/phpunit/engines/LuaSandbox/LuaSandboxInterpreterTest.php
index e89241fb..256e8c6a 100644
--- a/tests/phpunit/engines/LuaSandbox/LuaSandboxInterpreterTest.php
+++ b/tests/phpunit/engines/LuaSandbox/LuaSandboxInterpreterTest.php
@@ -1,6 +1,6 @@
 <?php
 
-if ( PHP_SAPI !== 'cli' ) {
+if ( !wfIsCLI() ) {
 	exit;
 }
 
diff --git a/tests/phpunit/engines/LuaStandalone/LuaStandaloneInterpreterTest.php b/tests/phpunit/engines/LuaStandalone/LuaStandaloneInterpreterTest.php
index 95b21ceb..e22488a7 100644
--- a/tests/phpunit/engines/LuaStandalone/LuaStandaloneInterpreterTest.php
+++ b/tests/phpunit/engines/LuaStandalone/LuaStandaloneInterpreterTest.php
@@ -1,6 +1,6 @@
 <?php
 
-if ( PHP_SAPI !== 'cli' ) {
+if ( !wfIsCLI() ) {
 	exit;
 }