diff --git a/phpcs.xml b/phpcs.xml
index 38c7aaa96c0..edce2ea2677 100644
--- a/phpcs.xml
+++ b/phpcs.xml
@@ -26,9 +26,9 @@
 	<rule ref="Generic.ControlStructures.InlineControlStructure.NotAllowed">
 		<severity>0</severity>
 	</rule>
-	<exclude-pattern>node_modules</exclude-pattern>
-	<exclude-pattern>vendor</exclude-pattern>
-	<exclude-pattern>extensions</exclude-pattern>
-	<exclude-pattern>skins</exclude-pattern>
+	<exclude-pattern>node_modules/</exclude-pattern>
+	<exclude-pattern>vendor/</exclude-pattern>
+	<exclude-pattern type="relative">^extensions/</exclude-pattern>
+	<exclude-pattern type="relative">^skins/</exclude-pattern>
 	<exclude-pattern>.git</exclude-pattern>
 </ruleset>
diff --git a/tests/phpunit/suites/ExtensionsTestSuite.php b/tests/phpunit/suites/ExtensionsTestSuite.php
index 723328e2df7..0e23fdde823 100644
--- a/tests/phpunit/suites/ExtensionsTestSuite.php
+++ b/tests/phpunit/suites/ExtensionsTestSuite.php
@@ -8,16 +8,14 @@
 class ExtensionsTestSuite extends PHPUnit_Framework_TestSuite {
 	public function __construct() {
 		parent::__construct();
-		$paths = array();
+		$paths = [];
 		// Extensions can return a list of files or directories
-		Hooks::run( 'UnitTestsList', array( &$paths ) );
+		Hooks::run( 'UnitTestsList', [ &$paths ] );
 		foreach ( $paths as $path ) {
 			if ( is_dir( $path ) ) {
 				// If the path is a directory, search for test cases.
 				// @since 1.24
-				$suffixes = array(
-					'Test.php',
-				);
+				$suffixes = [ 'Test.php' ];
 				$fileIterator = new File_Iterator_Facade();
 				$matchingFiles = $fileIterator->getFilesAsArray( $path, $suffixes );
 				$this->addTestFiles( $matchingFiles );
@@ -26,7 +24,7 @@ class ExtensionsTestSuite extends PHPUnit_Framework_TestSuite {
 				$this->addTestFile( $path );
 			}
 		}
-		if ( !count( $paths ) ) {
+		if ( !$paths ) {
 			$this->addTest( new DummyExtensionsTest( 'testNothing' ) );
 		}
 	}