diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index cbd008b..136d1e1 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -35,6 +35,13 @@ jobs:
             database_image: "mariadb:11.2"
             coverage: true
             experimental: false
+          - mediawiki_version: '1.41'
+            smw_version: dev-master
+            php_version: 8.1
+            database_type: mysql
+            database_image: "mariadb:11.2"
+            coverage: false
+            experimental: false
 
 
     env:
diff --git a/extension.json b/extension.json
index 716b709..d89091f 100644
--- a/extension.json
+++ b/extension.json
@@ -23,6 +23,10 @@
 	"AutoloadNamespaces": {
 		"Mermaid\\": "src/"
 	},
+	"TestAutoloadNamespaces": {
+  		"Mermaid\\Tests\\": "tests/phpunit/Unit/",
+ 		"Mermaid\\Tests\\Integration\\": "tests/phpunit/Integration/"
+  	},
 	"ResourceModules": {
 		"ext.mermaid": {
 			"scripts": [
diff --git a/tests/phpunit/Integration/I18nJsonFileIntegrityTest.php b/tests/phpunit/Integration/I18nJsonFileIntegrityTest.php
index 6b52e02..3e1e81d 100644
--- a/tests/phpunit/Integration/I18nJsonFileIntegrityTest.php
+++ b/tests/phpunit/Integration/I18nJsonFileIntegrityTest.php
@@ -11,7 +11,7 @@
  *
  * @author mwjames
  */
-class I18nJsonFileIntegrityTest extends \PHPUnit_Framework_TestCase {
+class I18nJsonFileIntegrityTest extends \PHPUnit\Framework\TestCase {
 
 	/**
 	 * @dataProvider i18nFileProvider
diff --git a/tests/phpunit/Unit/ConfigTest.php b/tests/phpunit/Unit/ConfigTest.php
index f2047c5..1876f56 100644
--- a/tests/phpunit/Unit/ConfigTest.php
+++ b/tests/phpunit/Unit/ConfigTest.php
@@ -4,7 +4,7 @@
 
 use Mermaid\Config;
 
-class ConfigTest extends \PHPUnit_Framework_TestCase
+class ConfigTest extends \PHPUnit\Framework\TestCase
 {
 
 	public function testGetDefaultThemeWithNoValueInGlobal()
diff --git a/tests/phpunit/Unit/MermaidConfigExtractorTest.php b/tests/phpunit/Unit/MermaidConfigExtractorTest.php
index 177d748..0fbd314 100644
--- a/tests/phpunit/Unit/MermaidConfigExtractorTest.php
+++ b/tests/phpunit/Unit/MermaidConfigExtractorTest.php
@@ -13,7 +13,7 @@
  *
  * @author howlowck
  */
-class MermaidConfigExtractorTest extends \PHPUnit_Framework_TestCase
+class MermaidConfigExtractorTest extends \PHPUnit\Framework\TestCase
 {
 	/**
 	 * @dataProvider caseProvider
diff --git a/tests/phpunit/Unit/MermaidParserFunctionTest.php b/tests/phpunit/Unit/MermaidParserFunctionTest.php
index fe87469..0d6fb25 100644
--- a/tests/phpunit/Unit/MermaidParserFunctionTest.php
+++ b/tests/phpunit/Unit/MermaidParserFunctionTest.php
@@ -13,7 +13,7 @@
  *
  * @author mwjames
  */
-class MermaidParserFunctionTest extends \PHPUnit_Framework_TestCase
+class MermaidParserFunctionTest extends \PHPUnit\Framework\TestCase
 {
 	public function testCanConstruct()
 	{