diff --git a/.circleci/config.yml b/.circleci/config.yml
index 8de7e4fb..6c639f4a 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -9,7 +9,6 @@ jobs:
       - run: COMPOSER=composer.json composer test
       - run: COMPOSER=composer.json composer phpstan
       - run: COMPOSER=composer.json composer lint
-      - run: COMPOSER=composer.json composer lint-self
   build_php5:
     docker:
       - image: circleci/php:5.6.40-zts-stretch-node-browsers-legacy
diff --git a/composer.json b/composer.json
index dfe8bea7..5179aab6 100644
--- a/composer.json
+++ b/composer.json
@@ -30,8 +30,7 @@
     "prefer-stable": true,
     "scripts": {
         "test": "./vendor/bin/phpunit",
-        "lint": "./vendor/bin/phpcs -s -p VariableAnalysis/Sniffs VariableAnalysis/Lib",
-        "lint-self": "./vendor/bin/phpcs --standard=./VariableAnalysis -s -p VariableAnalysis/Sniffs VariableAnalysis/Lib",
+        "lint": "./vendor/bin/phpcs",
         "phpstan": "./vendor/bin/phpstan analyse -l 7 VariableAnalysis"
     },
     "require" : {
diff --git a/phpcs.xml.dist b/phpcs.xml.dist
index f7b8bcd2..745cf48b 100644
--- a/phpcs.xml.dist
+++ b/phpcs.xml.dist
@@ -6,6 +6,23 @@
             - bracers on end of line instead new line
             - two space indentation
     </description>
+
+    <file>./VariableAnalysis/</file>
+    <exclude-pattern>./VariableAnalysis/Tests/CodeAnalysis/fixtures/</exclude-pattern>
+
+    <!-- Only check PHP files. -->
+    <arg name="extensions" value="php"/>
+
+    <!-- Show progress, show the error codes for each message (source). -->
+    <arg value="sp"/>
+
+    <!-- Strip the filepaths down to the relevant bit. -->
+    <arg name="basepath" value="./"/>
+
+    <!-- Check up to 8 files simultaneously. -->
+    <arg name="parallel" value="8"/>
+
+    <!-- Rules -->
     <rule ref="PSR2">
         <exclude name="Squiz.Functions.MultiLineFunctionDeclaration.BraceOnSameLine" />
         <exclude name="PSR2.Classes.ClassDeclaration.OpenBraceNewLine" />
@@ -31,4 +48,5 @@
     <rule ref="Generic.Functions.OpeningFunctionBraceKernighanRitchie" />
     <rule ref="Generic.Classes.OpeningBraceSameLine"/>
     <rule ref="ImportDetection" />
+    <rule ref="VariableAnalysis"/>
 </ruleset>