diff --git a/phpunit.xml.all b/phpunit.xml.all
index b835a38c20..fde3bbb1a7 100644
--- a/phpunit.xml.all
+++ b/phpunit.xml.all
@@ -14,10 +14,6 @@
     <testsuites>
         <testsuite name="phpBB Test Suite">
             <directory suffix="_test.php">./tests/</directory>
-            <exclude>./tests/functional</exclude>
-        </testsuite>
-        <testsuite name="phpBB Functional Tests">
-            <directory suffix="_test.php" phpVersion="5.3.0" phpVersionOperator=">=">./tests/functional</directory>
         </testsuite>
     </testsuites>
 
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
index da31dce5e3..27dee48aac 100644
--- a/phpunit.xml.dist
+++ b/phpunit.xml.dist
@@ -14,10 +14,6 @@
     <testsuites>
         <testsuite name="phpBB Test Suite">
             <directory suffix="_test.php">./tests/</directory>
-            <exclude>./tests/functional</exclude>
-        </testsuite>
-        <testsuite name="phpBB Functional Tests">
-            <directory suffix="_test.php" phpVersion="5.3.0" phpVersionOperator=">=">./tests/functional</directory>
         </testsuite>
     </testsuites>
 
diff --git a/phpunit.xml.functional b/phpunit.xml.functional
index 91d569e65b..9facbcff8b 100644
--- a/phpunit.xml.functional
+++ b/phpunit.xml.functional
@@ -14,10 +14,6 @@
     <testsuites>
         <testsuite name="phpBB Test Suite">
             <directory suffix="_test.php">./tests/</directory>
-            <exclude>./tests/functional</exclude>
-        </testsuite>
-        <testsuite name="phpBB Functional Tests">
-            <directory suffix="_test.php" phpVersion="5.3.0" phpVersionOperator=">=">./tests/functional</directory>
         </testsuite>
     </testsuites>
 
diff --git a/tests/bootstrap.php b/tests/bootstrap.php
index 302701e3b3..f103d8f15a 100644
--- a/tests/bootstrap.php
+++ b/tests/bootstrap.php
@@ -25,8 +25,4 @@ require_once 'test_framework/phpbb_test_case_helpers.php';
 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';
-
-if (version_compare(PHP_VERSION, '5.3.0-dev', '>='))
-{
-	require_once 'test_framework/phpbb_functional_test_case.php';
-}
+require_once 'test_framework/phpbb_functional_test_case.php';