diff --git a/.travis.yml b/.travis.yml
index 4ee44be4cfb41842d020bff5fb8b094a8edaa2ea..25ff7fe50c164c305917df971e9f5029a7364712 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -47,7 +47,7 @@ script:
     export typo3DatabaseHost="localhost";
     export typo3DatabaseUsername="root";
     export typo3DatabasePassword="";
-    grep directory typo3/sysext/core/Build/FunctionalTests.xml | awk '{print $1}' | sed 's%<directory>\(\.\./\)*\(typo3/sysext.*\)</directory>$%\2%g' | parallel --gnu 'echo; echo "Running functional {} tests"; ./bin/phpunit --colors -c typo3/sysext/core/Build/FunctionalTests.xml {}'
+    find . -wholename '*typo3/sysext/*/Tests/Functional/*Test.php' | parallel --gnu 'echo; echo "Running functional test suite {}"; ./bin/phpunit --colors -c typo3/sysext/core/Build/FunctionalTests.xml {}'
   - >
     echo;
     echo "Running php lint";
diff --git a/typo3/sysext/core/Build/FunctionalTests.xml b/typo3/sysext/core/Build/FunctionalTests.xml
index ee538fd09786612b6a23e31e202b87b7900a7f6c..db3cc77b72e18282cc04f60dcf06184a5d879780 100644
--- a/typo3/sysext/core/Build/FunctionalTests.xml
+++ b/typo3/sysext/core/Build/FunctionalTests.xml
@@ -24,25 +24,8 @@
 	verbose="false"
 >
 	<testsuites>
-		<testsuite name="EXT:core tests">
-			<directory>../../../../typo3/sysext/core/Tests/Functional/</directory>
-		</testsuite>
-		<testsuite name="EXT:frontend tests">
-			<directory>../../../../typo3/sysext/frontend/Tests/Functional/</directory>
-		</testsuite>
-		<testsuite name="EXT:impexp tests">
-			<directory>../../../../typo3/sysext/impexp/Tests/Functional/</directory>
-		</testsuite>
-		<testsuite name="EXT:workspaces tests">
-			<directory>../../../../typo3/sysext/workspaces/Tests/Functional/DataHandling/Group/</directory>
-			<directory>../../../../typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/</directory>
-			<directory>../../../../typo3/sysext/workspaces/Tests/Functional/DataHandling/ManyToMany/</directory>
-			<directory>../../../../typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/</directory>
-			<directory>../../../../typo3/sysext/workspaces/Tests/Functional/DataHandling/Select/</directory>
-			<directory>../../../../typo3/sysext/workspaces/Tests/Functional/Service/</directory>
-		</testsuite>
-		<testsuite name="EXT:extbase tests">
-			<directory>../../../../typo3/sysext/extbase/Tests/Functional/</directory>
+		<testsuite name="Core tests">
+			<directory>../../../../typo3/sysext/*/Tests/Functional/</directory>
 		</testsuite>
 	</testsuites>
 </phpunit>