6 files changed, 9 insertions, 64 deletions
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
index 1d9e35c9f3..e5b074cf16 100644
--- a/phpunit.xml.dist
+++ b/phpunit.xml.dist
@@ -24,8 +24,7 @@
             <file>./tests/lint_test.php</file>
         </testsuite>
         <testsuite name="phpBB UI Tests">
-            <directory suffix="_test.php" phpVersion="5.3.19"
-                phpVersionOperator=">=">./tests/ui</directory>
+            <directory suffix="_test.php">./tests/ui</directory>
         </testsuite>
     </testsuites>
 
diff --git a/travis/phpunit-mariadb-travis.xml b/travis/phpunit-mariadb-travis.xml
index 4b85124783..35ade72d4e 100644
--- a/travis/phpunit-mariadb-travis.xml
+++ b/travis/phpunit-mariadb-travis.xml
@@ -7,8 +7,6 @@
          convertWarningsToExceptions="true"
          processIsolation="false"
          stopOnFailure="false"
-         syntaxCheck="true"
-         strict="true"
          verbose="true"
          bootstrap="../tests/bootstrap.php">
 	<testsuites>
@@ -19,10 +17,10 @@
 			<exclude>../tests/ui</exclude>
 		</testsuite>
 		<testsuite name="phpBB Functional Tests">
-			<directory suffix="_test.php" phpVersion="5.3.19" phpVersionOperator=">=">../tests/functional</directory>
+			<directory suffix="_test.php">../tests/functional</directory>
 		</testsuite>
 		<testsuite name="phpBB UI Tests">
-			<directory suffix="_test.php" phpVersion="5.3.19" phpVersionOperator=">=">../tests/ui</directory>
+			<directory suffix="_test.php">../tests/ui</directory>
 		</testsuite>
 	</testsuites>
 
diff --git a/travis/phpunit-mysql-travis.xml b/travis/phpunit-mysql-travis.xml
deleted file mode 100644
index cccfc0aee8..0000000000
--- a/travis/phpunit-mysql-travis.xml
+++ /dev/null
@@ -1,46 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<phpunit backupGlobals="true"
-         backupStaticAttributes="false"
-         colors="true"
-         convertErrorsToExceptions="true"
-         convertNoticesToExceptions="true"
-         convertWarningsToExceptions="true"
-         processIsolation="false"
-         stopOnFailure="false"
-         syntaxCheck="true"
-         strict="true"
-         verbose="true"
-         bootstrap="../tests/bootstrap.php">
-	<testsuites>
-		<testsuite name="phpBB Test Suite">
-			<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" phpVersion="5.3.19" phpVersionOperator=">=">../tests/functional</directory>
-		</testsuite>
-		<testsuite name="phpBB UI Tests">
-			<directory suffix="_test.php" phpVersion="5.3.19" phpVersionOperator=">=">../tests/ui</directory>
-		</testsuite>
-	</testsuites>
-
-	<groups>
-		<exclude>
-			<group>slow</group>
-		</exclude>
-	</groups>
-
-	<php>
-		<server name="PHPBB_TEST_DBMS" value="phpbb\db\driver\mysql" />
-		<server name="PHPBB_TEST_DBHOST" value="0.0.0.0" />
-		<server name="PHPBB_TEST_DBPORT" value="3306" />
-		<server name="PHPBB_TEST_DBNAME" value="phpbb_tests" />
-		<server name="PHPBB_TEST_DBUSER" value="root" />
-		<server name="PHPBB_TEST_DBPASSWD" value="" />
-		<server name="PHPBB_TEST_REDIS_HOST" value="localhost" />
-		<server name="PHPBB_TEST_TABLE_PREFIX" value="phpbb_"/>
-		<server name="PHPBB_FUNCTIONAL_URL" value="http://localhost/" />
-	</php>
-</phpunit>
diff --git a/travis/phpunit-mysqli-travis.xml b/travis/phpunit-mysqli-travis.xml
index 4d649681b0..d2284086b9 100644
--- a/travis/phpunit-mysqli-travis.xml
+++ b/travis/phpunit-mysqli-travis.xml
@@ -7,8 +7,6 @@
          convertWarningsToExceptions="true"
          processIsolation="false"
          stopOnFailure="false"
-         syntaxCheck="true"
-         strict="true"
          verbose="true"
          bootstrap="../tests/bootstrap.php">
 	<testsuites>
@@ -19,10 +17,10 @@
 			<exclude>../tests/ui</exclude>
 		</testsuite>
 		<testsuite name="phpBB Functional Tests">
-			<directory suffix="_test.php" phpVersion="5.3.19" phpVersionOperator=">=">../tests/functional</directory>
+			<directory suffix="_test.php">../tests/functional</directory>
 		</testsuite>
 		<testsuite name="phpBB UI Tests">
-			<directory suffix="_test.php" phpVersion="5.3.19" phpVersionOperator=">=">../tests/ui</directory>
+			<directory suffix="_test.php">../tests/ui</directory>
 		</testsuite>
 	</testsuites>
 
diff --git a/travis/phpunit-postgres-travis.xml b/travis/phpunit-postgres-travis.xml
index ae56da37f5..6faab4d61a 100644
--- a/travis/phpunit-postgres-travis.xml
+++ b/travis/phpunit-postgres-travis.xml
@@ -7,8 +7,6 @@
          convertWarningsToExceptions="true"
          processIsolation="false"
          stopOnFailure="false"
-         syntaxCheck="true"
-		 strict="true"
          verbose="true"
          bootstrap="../tests/bootstrap.php">
 	<testsuites>
@@ -19,10 +17,10 @@
 			<exclude>../tests/ui</exclude>
 		</testsuite>
 		<testsuite name="phpBB Functional Tests">
-			<directory suffix="_test.php" phpVersion="5.3.19" phpVersionOperator=">=">../tests/functional</directory>
+			<directory suffix="_test.php">../tests/functional</directory>
 		</testsuite>
 		<testsuite name="phpBB UI Tests">
-			<directory suffix="_test.php" phpVersion="5.3.19" phpVersionOperator=">=">../tests/ui</directory>
+			<directory suffix="_test.php">../tests/ui</directory>
 		</testsuite>
 	</testsuites>
 
diff --git a/travis/phpunit-sqlite3-travis.xml b/travis/phpunit-sqlite3-travis.xml
index 8eabcc7243..633963c9fb 100644
--- a/travis/phpunit-sqlite3-travis.xml
+++ b/travis/phpunit-sqlite3-travis.xml
@@ -7,8 +7,6 @@
          convertWarningsToExceptions="true"
          processIsolation="false"
          stopOnFailure="false"
-         syntaxCheck="true"
-         strict="true"
          verbose="true"
          bootstrap="../tests/bootstrap.php">
 	<testsuites>
@@ -19,10 +17,10 @@
 			<exclude>../tests/ui</exclude>
 		</testsuite>
 		<testsuite name="phpBB Functional Tests">
-			<directory suffix="_test.php" phpVersion="5.3.19" phpVersionOperator=">=">../tests/functional</directory>
+			<directory suffix="_test.php">../tests/functional</directory>
 		</testsuite>
 		<testsuite name="phpBB UI Tests">
-			<directory suffix="_test.php" phpVersion="5.3.19" phpVersionOperator=">=">../tests/ui</directory>
+			<directory suffix="_test.php">../tests/ui</directory>
 		</testsuite>
 	</testsuites>