diff --git a/.editorconfig b/.editorconfig
index 51d29a157..4dd58c7de 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -8,3 +8,6 @@ indent_size = 4
 end_of_line = lf
 insert_final_newline = true
 trim_trailing_whitespace = true
+
+[*.xml.dist]
+indent_size = 2
diff --git a/phpcs.xml.dist b/phpcs.xml.dist
index 03df4eece..382167d91 100644
--- a/phpcs.xml.dist
+++ b/phpcs.xml.dist
@@ -24,9 +24,14 @@
 
   <rule ref="AcquiaPHPStrict">
     <exclude name="Generic.Files.LineLength"/>
+    <exclude name="PHPCompatibility"/>
+  </rule>
+  <config name="testVersion" value="8.2-"/>
+  <rule ref="PHPCompatibility">
+    <exclude name="PHPCompatibility.Extensions.RemovedExtensions.famRemoved"/>
   </rule>
 
-    <rule ref="Generic.PHP.ForbiddenFunctions">
+  <rule ref="Generic.PHP.ForbiddenFunctions">
     <properties>
       <property name="forbiddenFunctions" type="array">
         <element key="echo" value="$output->writeln"/>