diff --git a/.gitattributes b/.gitattributes
index 3da5fabc..6b1774d6 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -13,7 +13,7 @@
 /phpunit.xml.dist export-ignore
 /phpunit.circleci.xml export-ignore
 /.circleci/ export-ignore
-/VariableAnalysis/Tests/ export-ignore
+/Tests/ export-ignore
 
 #
 # Auto detect text files and perform LF normalization
diff --git a/VariableAnalysis/Tests/BaseTestCase.php b/Tests/BaseTestCase.php
similarity index 87%
rename from VariableAnalysis/Tests/BaseTestCase.php
rename to Tests/BaseTestCase.php
index afadab20..5f4c9200 100644
--- a/VariableAnalysis/Tests/BaseTestCase.php
+++ b/Tests/BaseTestCase.php
@@ -8,7 +8,7 @@
 
 class BaseTestCase extends TestCase {
   const STANDARD_NAME = 'VariableAnalysis';
-  const SNIFF_FILE = __DIR__ . '/../Sniffs/CodeAnalysis/VariableAnalysisSniff.php';
+  const SNIFF_FILE = __DIR__ . '/../VariableAnalysis/Sniffs/CodeAnalysis/VariableAnalysisSniff.php';
 
   public function prepareLocalFileForSniffs($fixtureFile) {
     $config            = new Config();
@@ -41,6 +41,6 @@ public function getErrorLineNumbersFromFile(LocalFile $phpcsFile) {
   }
 
   public function getFixture($fixtureFilename) {
-    return realpath(__DIR__ . '/CodeAnalysis/fixtures/' . $fixtureFilename);
+    return realpath(__DIR__ . '/VariableAnalysisSniff/fixtures/' . $fixtureFilename);
   }
 }
diff --git a/VariableAnalysis/Tests/CodeAnalysis/VariableAnalysisTest.php b/Tests/VariableAnalysisSniff/VariableAnalysisTest.php
similarity index 99%
rename from VariableAnalysis/Tests/CodeAnalysis/VariableAnalysisTest.php
rename to Tests/VariableAnalysisSniff/VariableAnalysisTest.php
index 9d15acc7..08a3f65f 100644
--- a/VariableAnalysis/Tests/CodeAnalysis/VariableAnalysisTest.php
+++ b/Tests/VariableAnalysisSniff/VariableAnalysisTest.php
@@ -1,5 +1,5 @@
 <?php
-namespace VariableAnalysis\Tests\CodeAnalysis;
+namespace VariableAnalysis\Tests\VariableAnalysisSniff;
 
 use VariableAnalysis\Tests\BaseTestCase;
 
diff --git a/VariableAnalysis/Tests/CodeAnalysis/fixtures/AnonymousClassFixture.php b/Tests/VariableAnalysisSniff/fixtures/AnonymousClassFixture.php
similarity index 100%
rename from VariableAnalysis/Tests/CodeAnalysis/fixtures/AnonymousClassFixture.php
rename to Tests/VariableAnalysisSniff/fixtures/AnonymousClassFixture.php
diff --git a/VariableAnalysis/Tests/CodeAnalysis/fixtures/AnonymousClassWithPropertiesFixture.php b/Tests/VariableAnalysisSniff/fixtures/AnonymousClassWithPropertiesFixture.php
similarity index 100%
rename from VariableAnalysis/Tests/CodeAnalysis/fixtures/AnonymousClassWithPropertiesFixture.php
rename to Tests/VariableAnalysisSniff/fixtures/AnonymousClassWithPropertiesFixture.php
diff --git a/VariableAnalysis/Tests/CodeAnalysis/fixtures/AssignmentByReferenceFixture.php b/Tests/VariableAnalysisSniff/fixtures/AssignmentByReferenceFixture.php
similarity index 100%
rename from VariableAnalysis/Tests/CodeAnalysis/fixtures/AssignmentByReferenceFixture.php
rename to Tests/VariableAnalysisSniff/fixtures/AssignmentByReferenceFixture.php
diff --git a/VariableAnalysis/Tests/CodeAnalysis/fixtures/ClassReferenceFixture.php b/Tests/VariableAnalysisSniff/fixtures/ClassReferenceFixture.php
similarity index 100%
rename from VariableAnalysis/Tests/CodeAnalysis/fixtures/ClassReferenceFixture.php
rename to Tests/VariableAnalysisSniff/fixtures/ClassReferenceFixture.php
diff --git a/VariableAnalysis/Tests/CodeAnalysis/fixtures/ClassWithMembersFixture.php b/Tests/VariableAnalysisSniff/fixtures/ClassWithMembersFixture.php
similarity index 100%
rename from VariableAnalysis/Tests/CodeAnalysis/fixtures/ClassWithMembersFixture.php
rename to Tests/VariableAnalysisSniff/fixtures/ClassWithMembersFixture.php
diff --git a/VariableAnalysis/Tests/CodeAnalysis/fixtures/CompactFixture.php b/Tests/VariableAnalysisSniff/fixtures/CompactFixture.php
similarity index 100%
rename from VariableAnalysis/Tests/CodeAnalysis/fixtures/CompactFixture.php
rename to Tests/VariableAnalysisSniff/fixtures/CompactFixture.php
diff --git a/VariableAnalysis/Tests/CodeAnalysis/fixtures/DestructuringFixture.php b/Tests/VariableAnalysisSniff/fixtures/DestructuringFixture.php
similarity index 100%
rename from VariableAnalysis/Tests/CodeAnalysis/fixtures/DestructuringFixture.php
rename to Tests/VariableAnalysisSniff/fixtures/DestructuringFixture.php
diff --git a/VariableAnalysis/Tests/CodeAnalysis/fixtures/FunctionWithClosureFixture.php b/Tests/VariableAnalysisSniff/fixtures/FunctionWithClosureFixture.php
similarity index 100%
rename from VariableAnalysis/Tests/CodeAnalysis/fixtures/FunctionWithClosureFixture.php
rename to Tests/VariableAnalysisSniff/fixtures/FunctionWithClosureFixture.php
diff --git a/VariableAnalysis/Tests/CodeAnalysis/fixtures/FunctionWithDefaultParamFixture.php b/Tests/VariableAnalysisSniff/fixtures/FunctionWithDefaultParamFixture.php
similarity index 100%
rename from VariableAnalysis/Tests/CodeAnalysis/fixtures/FunctionWithDefaultParamFixture.php
rename to Tests/VariableAnalysisSniff/fixtures/FunctionWithDefaultParamFixture.php
diff --git a/VariableAnalysis/Tests/CodeAnalysis/fixtures/FunctionWithForeachFixture.php b/Tests/VariableAnalysisSniff/fixtures/FunctionWithForeachFixture.php
similarity index 100%
rename from VariableAnalysis/Tests/CodeAnalysis/fixtures/FunctionWithForeachFixture.php
rename to Tests/VariableAnalysisSniff/fixtures/FunctionWithForeachFixture.php
diff --git a/VariableAnalysis/Tests/CodeAnalysis/fixtures/FunctionWithGlobalVarFixture.php b/Tests/VariableAnalysisSniff/fixtures/FunctionWithGlobalVarFixture.php
similarity index 100%
rename from VariableAnalysis/Tests/CodeAnalysis/fixtures/FunctionWithGlobalVarFixture.php
rename to Tests/VariableAnalysisSniff/fixtures/FunctionWithGlobalVarFixture.php
diff --git a/VariableAnalysis/Tests/CodeAnalysis/fixtures/FunctionWithInlineAssignFixture.php b/Tests/VariableAnalysisSniff/fixtures/FunctionWithInlineAssignFixture.php
similarity index 100%
rename from VariableAnalysis/Tests/CodeAnalysis/fixtures/FunctionWithInlineAssignFixture.php
rename to Tests/VariableAnalysisSniff/fixtures/FunctionWithInlineAssignFixture.php
diff --git a/VariableAnalysis/Tests/CodeAnalysis/fixtures/FunctionWithRedeclarationsFixture.php b/Tests/VariableAnalysisSniff/fixtures/FunctionWithRedeclarationsFixture.php
similarity index 100%
rename from VariableAnalysis/Tests/CodeAnalysis/fixtures/FunctionWithRedeclarationsFixture.php
rename to Tests/VariableAnalysisSniff/fixtures/FunctionWithRedeclarationsFixture.php
diff --git a/VariableAnalysis/Tests/CodeAnalysis/fixtures/FunctionWithReferenceFixture.php b/Tests/VariableAnalysisSniff/fixtures/FunctionWithReferenceFixture.php
similarity index 100%
rename from VariableAnalysis/Tests/CodeAnalysis/fixtures/FunctionWithReferenceFixture.php
rename to Tests/VariableAnalysisSniff/fixtures/FunctionWithReferenceFixture.php
diff --git a/VariableAnalysis/Tests/CodeAnalysis/fixtures/FunctionWithTryCatchFixture.php b/Tests/VariableAnalysisSniff/fixtures/FunctionWithTryCatchFixture.php
similarity index 100%
rename from VariableAnalysis/Tests/CodeAnalysis/fixtures/FunctionWithTryCatchFixture.php
rename to Tests/VariableAnalysisSniff/fixtures/FunctionWithTryCatchFixture.php
diff --git a/VariableAnalysis/Tests/CodeAnalysis/fixtures/FunctionWithUnusedParamsFixture.php b/Tests/VariableAnalysisSniff/fixtures/FunctionWithUnusedParamsFixture.php
similarity index 100%
rename from VariableAnalysis/Tests/CodeAnalysis/fixtures/FunctionWithUnusedParamsFixture.php
rename to Tests/VariableAnalysisSniff/fixtures/FunctionWithUnusedParamsFixture.php
diff --git a/VariableAnalysis/Tests/CodeAnalysis/fixtures/FunctionWithUseReferenceFixture.php b/Tests/VariableAnalysisSniff/fixtures/FunctionWithUseReferenceFixture.php
similarity index 100%
rename from VariableAnalysis/Tests/CodeAnalysis/fixtures/FunctionWithUseReferenceFixture.php
rename to Tests/VariableAnalysisSniff/fixtures/FunctionWithUseReferenceFixture.php
diff --git a/VariableAnalysis/Tests/CodeAnalysis/fixtures/FunctionWithVariableCallFixture.php b/Tests/VariableAnalysisSniff/fixtures/FunctionWithVariableCallFixture.php
similarity index 100%
rename from VariableAnalysis/Tests/CodeAnalysis/fixtures/FunctionWithVariableCallFixture.php
rename to Tests/VariableAnalysisSniff/fixtures/FunctionWithVariableCallFixture.php
diff --git a/VariableAnalysis/Tests/CodeAnalysis/fixtures/FunctionWithoutParamFixture.php b/Tests/VariableAnalysisSniff/fixtures/FunctionWithoutParamFixture.php
similarity index 100%
rename from VariableAnalysis/Tests/CodeAnalysis/fixtures/FunctionWithoutParamFixture.php
rename to Tests/VariableAnalysisSniff/fixtures/FunctionWithoutParamFixture.php
diff --git a/VariableAnalysis/Tests/CodeAnalysis/fixtures/FunctionsOutsideClassFixture.php b/Tests/VariableAnalysisSniff/fixtures/FunctionsOutsideClassFixture.php
similarity index 100%
rename from VariableAnalysis/Tests/CodeAnalysis/fixtures/FunctionsOutsideClassFixture.php
rename to Tests/VariableAnalysisSniff/fixtures/FunctionsOutsideClassFixture.php
diff --git a/VariableAnalysis/Tests/CodeAnalysis/fixtures/GetDefinedVarsFixture.php b/Tests/VariableAnalysisSniff/fixtures/GetDefinedVarsFixture.php
similarity index 100%
rename from VariableAnalysis/Tests/CodeAnalysis/fixtures/GetDefinedVarsFixture.php
rename to Tests/VariableAnalysisSniff/fixtures/GetDefinedVarsFixture.php
diff --git a/VariableAnalysis/Tests/CodeAnalysis/fixtures/HeredocFixture.php b/Tests/VariableAnalysisSniff/fixtures/HeredocFixture.php
similarity index 100%
rename from VariableAnalysis/Tests/CodeAnalysis/fixtures/HeredocFixture.php
rename to Tests/VariableAnalysisSniff/fixtures/HeredocFixture.php
diff --git a/VariableAnalysis/Tests/CodeAnalysis/fixtures/PregReplaceFixture.php b/Tests/VariableAnalysisSniff/fixtures/PregReplaceFixture.php
similarity index 100%
rename from VariableAnalysis/Tests/CodeAnalysis/fixtures/PregReplaceFixture.php
rename to Tests/VariableAnalysisSniff/fixtures/PregReplaceFixture.php
diff --git a/VariableAnalysis/Tests/CodeAnalysis/fixtures/ThisWithinNestedClosedScopeFixture.php b/Tests/VariableAnalysisSniff/fixtures/ThisWithinNestedClosedScopeFixture.php
similarity index 100%
rename from VariableAnalysis/Tests/CodeAnalysis/fixtures/ThisWithinNestedClosedScopeFixture.php
rename to Tests/VariableAnalysisSniff/fixtures/ThisWithinNestedClosedScopeFixture.php
diff --git a/VariableAnalysis/Tests/CodeAnalysis/fixtures/TraitFixture.php b/Tests/VariableAnalysisSniff/fixtures/TraitFixture.php
similarity index 100%
rename from VariableAnalysis/Tests/CodeAnalysis/fixtures/TraitFixture.php
rename to Tests/VariableAnalysisSniff/fixtures/TraitFixture.php
diff --git a/VariableAnalysis/Tests/CodeAnalysis/fixtures/TraitWithMembersFixture.php b/Tests/VariableAnalysisSniff/fixtures/TraitWithMembersFixture.php
similarity index 100%
rename from VariableAnalysis/Tests/CodeAnalysis/fixtures/TraitWithMembersFixture.php
rename to Tests/VariableAnalysisSniff/fixtures/TraitWithMembersFixture.php
diff --git a/VariableAnalysis/Tests/CodeAnalysis/fixtures/TraitWithPropertiesFixture.php b/Tests/VariableAnalysisSniff/fixtures/TraitWithPropertiesFixture.php
similarity index 100%
rename from VariableAnalysis/Tests/CodeAnalysis/fixtures/TraitWithPropertiesFixture.php
rename to Tests/VariableAnalysisSniff/fixtures/TraitWithPropertiesFixture.php
diff --git a/VariableAnalysis/Tests/CodeAnalysis/fixtures/UnusedAfterUsedFixture.php b/Tests/VariableAnalysisSniff/fixtures/UnusedAfterUsedFixture.php
similarity index 100%
rename from VariableAnalysis/Tests/CodeAnalysis/fixtures/UnusedAfterUsedFixture.php
rename to Tests/VariableAnalysisSniff/fixtures/UnusedAfterUsedFixture.php
diff --git a/VariableAnalysis/Tests/CodeAnalysis/fixtures/UnusedForeachFixture.php b/Tests/VariableAnalysisSniff/fixtures/UnusedForeachFixture.php
similarity index 100%
rename from VariableAnalysis/Tests/CodeAnalysis/fixtures/UnusedForeachFixture.php
rename to Tests/VariableAnalysisSniff/fixtures/UnusedForeachFixture.php
diff --git a/VariableAnalysis/Tests/CodeAnalysis/fixtures/UnusedVarWithValueChangeFixture.php b/Tests/VariableAnalysisSniff/fixtures/UnusedVarWithValueChangeFixture.php
similarity index 100%
rename from VariableAnalysis/Tests/CodeAnalysis/fixtures/UnusedVarWithValueChangeFixture.php
rename to Tests/VariableAnalysisSniff/fixtures/UnusedVarWithValueChangeFixture.php
diff --git a/VariableAnalysis/Tests/CodeAnalysis/fixtures/VariableVariablesFixture.php b/Tests/VariableAnalysisSniff/fixtures/VariableVariablesFixture.php
similarity index 100%
rename from VariableAnalysis/Tests/CodeAnalysis/fixtures/VariableVariablesFixture.php
rename to Tests/VariableAnalysisSniff/fixtures/VariableVariablesFixture.php
diff --git a/Tests/bootstrap.php b/Tests/bootstrap.php
new file mode 100644
index 00000000..079490fa
--- /dev/null
+++ b/Tests/bootstrap.php
@@ -0,0 +1,3 @@
+<?php
+require_once(__DIR__ . '/../vendor/squizlabs/php_codesniffer/tests/bootstrap.php');
+require_once(__DIR__ . '/BaseTestCase.php');
diff --git a/VariableAnalysis/Tests/bootstrap.php b/VariableAnalysis/Tests/bootstrap.php
deleted file mode 100644
index 07c21022..00000000
--- a/VariableAnalysis/Tests/bootstrap.php
+++ /dev/null
@@ -1,3 +0,0 @@
-<?php
-require_once(__DIR__ . '/../../vendor/squizlabs/php_codesniffer/tests/bootstrap.php');
-require_once(__DIR__ . '/BaseTestCase.php');
diff --git a/composer.circleci.json b/composer.circleci.json
index 485e2aaa..dce6a631 100644
--- a/composer.circleci.json
+++ b/composer.circleci.json
@@ -26,6 +26,11 @@
             "VariableAnalysis\\": "VariableAnalysis/"
         }
     },
+    "autoload-dev": {
+        "psr-4": {
+            "VariableAnalysis\\Tests\\": "Tests/"
+        }
+    },
     "minimum-stability": "dev",
     "prefer-stable": true,
     "scripts": {
diff --git a/composer.json b/composer.json
index 810e75bc..dc27b5a8 100644
--- a/composer.json
+++ b/composer.json
@@ -26,6 +26,11 @@
             "VariableAnalysis\\": "VariableAnalysis/"
         }
     },
+    "autoload-dev": {
+        "psr-4": {
+            "VariableAnalysis\\Tests\\": "Tests/"
+        }
+    },
     "minimum-stability": "dev",
     "prefer-stable": true,
     "scripts": {
diff --git a/phpcs.xml.dist b/phpcs.xml.dist
index 745cf48b..defd2eb2 100644
--- a/phpcs.xml.dist
+++ b/phpcs.xml.dist
@@ -1,14 +1,9 @@
 <?xml version="1.0"?>
 <ruleset name="PaytonsStandard">
-    <description>
-        Originally from https://gist.github.com/Ovsyanka/e2ab2ff76e7c0d7e75a1e4213a03ff95
-        PSR2 with changes:
-            - bracers on end of line instead new line
-            - two space indentation
-    </description>
-
     <file>./VariableAnalysis/</file>
-    <exclude-pattern>./VariableAnalysis/Tests/CodeAnalysis/fixtures/</exclude-pattern>
+    <file>./Tests/</file>
+    <exclude-pattern>./Tests/VariableAnalysisSniff/fixtures/</exclude-pattern>
+    <exclude-pattern>./vendor/</exclude-pattern>
 
     <!-- Only check PHP files. -->
     <arg name="extensions" value="php"/>
diff --git a/phpstan.neon.dist b/phpstan.neon.dist
index becd359d..725e053f 100644
--- a/phpstan.neon.dist
+++ b/phpstan.neon.dist
@@ -6,6 +6,6 @@ parameters:
   paths:
     - %currentWorkingDirectory%/VariableAnalysis/
   excludes_analyse:
-    - %currentWorkingDirectory%/VariableAnalysis/Tests/
+    - %currentWorkingDirectory%/Tests/
   ignoreErrors:
     - '~^Constant T_\w+ not found.$~'
diff --git a/phpunit.circleci.xml b/phpunit.circleci.xml
index d316d568..32dac349 100644
--- a/phpunit.circleci.xml
+++ b/phpunit.circleci.xml
@@ -1,9 +1,9 @@
 <phpunit
-	bootstrap="VariableAnalysis/Tests/bootstrap.php"
+	bootstrap="Tests/bootstrap.php"
 	>
 	<testsuites>
 		<testsuite name="VariableAnalysis">
-			<directory>VariableAnalysis/Tests</directory>
+			<directory>Tests</directory>
 		</testsuite>
 	</testsuites>
 </phpunit>
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
index d91e29a2..07f4fd1f 100644
--- a/phpunit.xml.dist
+++ b/phpunit.xml.dist
@@ -1,10 +1,10 @@
 <phpunit
-	bootstrap="VariableAnalysis/Tests/bootstrap.php"
+	bootstrap="Tests/bootstrap.php"
 	printerClass="LimeDeck\Testing\Printer"
 	>
 	<testsuites>
 		<testsuite name="VariableAnalysis">
-			<directory>VariableAnalysis/Tests</directory>
+			<directory>Tests</directory>
 		</testsuite>
 	</testsuites>
 </phpunit>