diff --git a/composer.json b/composer.json
index 8cb76c3..686bc90 100644
--- a/composer.json
+++ b/composer.json
@@ -82,7 +82,7 @@
 			"integration-tests"
 		],
 		"test:phpcs": [
-			"phpcs -nps --colors --report-code --report-summary --report-width=80 --cache=tests/cache/phpcs.json --basepath='./' ."
+			"phpcs -ps --colors --report-code --report-summary --report-width=80 --basepath='./' ."
 		],
 		"test:phpstan": [
 			"codecept build",
diff --git a/phpcs.xml.dist b/phpcs.xml.dist
index 82af8d3..cbb98e4 100644
--- a/phpcs.xml.dist
+++ b/phpcs.xml.dist
@@ -1,6 +1,8 @@
 <?xml version="1.0"?>
 <ruleset name="User Switching">
+	<arg name="cache" value="tests/cache/phpcs.json"/>
 
+	<config name="minimum_wp_version" value="5.1"/>
 	<config name="testVersion" value="7.2-"/>
 
 	<!--
@@ -27,6 +29,7 @@
 		<exclude name="PEAR.Functions.FunctionCallSignature.CloseBracketLine" />
 		<exclude name="PEAR.Functions.FunctionCallSignature.ContentAfterOpenBracket" />
 		<exclude name="PEAR.Functions.FunctionCallSignature.MultipleArguments" />
+		<exclude name="Universal.Files.SeparateFunctionsFromOO.Mixed" />
 
 		<!-- These are all false positives: -->
 		<exclude name="WordPress.Security.NonceVerification.Recommended" />
@@ -34,27 +37,32 @@
 		<!-- Sanity: -->
 		<exclude name="Generic.Formatting.MultipleStatementAlignment.NotSameWarning" />
 		<exclude name="WordPress.Arrays.MultipleStatementAlignment.DoubleArrowNotAligned" />
-		<exclude name="WordPress.PHP.YodaConditions.NotYoda" />
 	</rule>
 
 	<rule ref="WordPress-Docs" />
 
 	<rule ref="WordPress.Security.EscapeOutput">
 		<properties>
-			<property type="array" name="customAutoEscapedFunctions" value="bp_get_button"/>
+			<property name="customAutoEscapedFunctions" type="array">
+				<element value="bp_get_button"/>
+			</property>
 		</properties>
 	</rule>
 
 	<rule ref="WordPress.WP.I18n">
 		<properties>
-			<property name="text_domain" type="array" value="user-switching"/>
+			<property name="text_domain" type="array">
+				<element value="user-switching"/>
+			</property>
 		</properties>
 	</rule>
 
-	<rule ref="WordPress.WP.DeprecatedFunctions">
+	<rule ref="WordPress.WP.Capabilities">
 		<properties>
-			<property name="minimum_supported_version" value="5.1" />
+			<property name="custom_capabilities" type="array">
+				<element value="switch_to_user"/>
+				<element value="switch_off"/>
+			</property>
 		</properties>
 	</rule>
-
 </ruleset>