diff --git a/phpunit.xml.dist b/phpunit.xml.dist
index e5b074cf16..6888fe0357 100644
--- a/phpunit.xml.dist
+++ b/phpunit.xml.dist
@@ -15,7 +15,6 @@
             <directory suffix="_test.php">./tests</directory>
             <exclude>./tests/functional</exclude>
             <exclude>./tests/lint_test.php</exclude>
-            <exclude>./tests/ui</exclude>
         </testsuite>
         <testsuite name="phpBB Functional Tests">
             <directory suffix="_test.php">./tests/functional</directory>
@@ -23,9 +22,6 @@
         <testsuite name="phpBB Lint Test">
             <file>./tests/lint_test.php</file>
         </testsuite>
-        <testsuite name="phpBB UI Tests">
-            <directory suffix="_test.php">./tests/ui</directory>
-        </testsuite>
     </testsuites>
 
     <groups>
diff --git a/tests/bootstrap.php b/tests/bootstrap.php
index 62f91e346e..2aa9c6c986 100644
--- a/tests/bootstrap.php
+++ b/tests/bootstrap.php
@@ -40,7 +40,6 @@ require_once 'test_framework/phpbb_test_case.php';
 require_once 'test_framework/phpbb_database_test_case.php';
 require_once 'test_framework/phpbb_database_test_connection_manager.php';
 require_once 'test_framework/phpbb_functional_test_case.php';
-require_once 'test_framework/phpbb_ui_test_case.php';
 
 if (file_exists(__DIR__ . '/vendor/autoload.php'))
 {
diff --git a/travis/phpunit-mariadb-travis.xml b/travis/phpunit-mariadb-travis.xml
index 35ade72d4e..74b3b85483 100644
--- a/travis/phpunit-mariadb-travis.xml
+++ b/travis/phpunit-mariadb-travis.xml
@@ -14,14 +14,10 @@
 			<directory suffix="_test.php">../tests</directory>
 			<exclude>../tests/functional</exclude>
 			<exclude>../tests/lint_test.php</exclude>
-			<exclude>../tests/ui</exclude>
 		</testsuite>
 		<testsuite name="phpBB Functional Tests">
 			<directory suffix="_test.php">../tests/functional</directory>
 		</testsuite>
-		<testsuite name="phpBB UI Tests">
-			<directory suffix="_test.php">../tests/ui</directory>
-		</testsuite>
 	</testsuites>
 
 	<groups>
diff --git a/travis/phpunit-mysqli-travis.xml b/travis/phpunit-mysqli-travis.xml
index 0f064ab996..d14359d618 100644
--- a/travis/phpunit-mysqli-travis.xml
+++ b/travis/phpunit-mysqli-travis.xml
@@ -14,14 +14,10 @@
 			<directory suffix="_test.php">../tests</directory>
 			<exclude>../tests/functional</exclude>
 			<exclude>../tests/lint_test.php</exclude>
-			<exclude>../tests/ui</exclude>
 		</testsuite>
 		<testsuite name="phpBB Functional Tests">
 			<directory suffix="_test.php">../tests/functional</directory>
 		</testsuite>
-		<testsuite name="phpBB UI Tests">
-			<directory suffix="_test.php">../tests/ui</directory>
-		</testsuite>
 	</testsuites>
 
 	<groups>
diff --git a/travis/phpunit-postgres-travis.xml b/travis/phpunit-postgres-travis.xml
index f9b8a6f595..3d8376bda1 100644
--- a/travis/phpunit-postgres-travis.xml
+++ b/travis/phpunit-postgres-travis.xml
@@ -14,14 +14,10 @@
 			<directory suffix="_test.php">../tests</directory>
 			<exclude>../tests/functional</exclude>
 			<exclude>../tests/lint_test.php</exclude>
-			<exclude>../tests/ui</exclude>
 		</testsuite>
 		<testsuite name="phpBB Functional Tests">
 			<directory suffix="_test.php">../tests/functional</directory>
 		</testsuite>
-		<testsuite name="phpBB UI Tests">
-			<directory suffix="_test.php">../tests/ui</directory>
-		</testsuite>
 	</testsuites>
 
 	<groups>
diff --git a/travis/phpunit-sqlite3-travis.xml b/travis/phpunit-sqlite3-travis.xml
index 1b1fa24e7d..f5b2b67b22 100644
--- a/travis/phpunit-sqlite3-travis.xml
+++ b/travis/phpunit-sqlite3-travis.xml
@@ -14,14 +14,10 @@
 			<directory suffix="_test.php">../tests</directory>
 			<exclude>../tests/functional</exclude>
 			<exclude>../tests/lint_test.php</exclude>
-			<exclude>../tests/ui</exclude>
 		</testsuite>
 		<testsuite name="phpBB Functional Tests">
 			<directory suffix="_test.php">../tests/functional</directory>
 		</testsuite>
-		<testsuite name="phpBB UI Tests">
-			<directory suffix="_test.php">../tests/ui</directory>
-		</testsuite>
 	</testsuites>
 
 	<groups>