diff --git a/phpcs.xml.dist b/phpcs.xml.dist
index 8294d53803..be0349890a 100644
--- a/phpcs.xml.dist
+++ b/phpcs.xml.dist
@@ -178,4 +178,13 @@
 
     <!-- Handle consistent formatting of return types. -->
     <rule ref="PSR12.Functions.ReturnTypeDeclaration"/>
+
+    <!-- Separate header blocks with a single blank line. -->
+    <rule ref="PSR12.Files.FileHeader">
+        <exclude name="PSR12.Files.FileHeader.SpacingAfterTagBlock"/>
+    </rule>
+    <rule ref="PSR12.Files.FileHeader.SpacingAfterNamespaceBlock">
+        <!-- Prevent conflict with function spacing sniff. -->
+        <exclude-pattern>/requirements\.php</exclude-pattern>
+    </rule>
 </ruleset>
diff --git a/src/Standards/Generic/Tests/PHP/DisallowRequestSuperglobalUnitTest.php b/src/Standards/Generic/Tests/PHP/DisallowRequestSuperglobalUnitTest.php
index c582501179..437c9a55da 100644
--- a/src/Standards/Generic/Tests/PHP/DisallowRequestSuperglobalUnitTest.php
+++ b/src/Standards/Generic/Tests/PHP/DisallowRequestSuperglobalUnitTest.php
@@ -6,6 +6,7 @@
  * @copyright 2006-2019 Squiz Pty Ltd (ABN 77 084 670 600)
  * @license   https://github.com/PHPCSStandards/PHP_CodeSniffer/blob/master/licence.txt BSD Licence
  */
+
 namespace PHP_CodeSniffer\Standards\Generic\Tests\PHP;
 
 use PHP_CodeSniffer\Tests\Standards\AbstractSniffTestCase;