diff --git a/.phpcs.xml.dist b/.phpcs.xml.dist
index 1562a43..e659ea0 100644
--- a/.phpcs.xml.dist
+++ b/.phpcs.xml.dist
@@ -12,6 +12,19 @@
     <rule ref="Nepada">
     </rule>
 
+    <rule ref="SlevomatCodingStandard.Files.TypeNameMatchesFileName">
+        <exclude-pattern>*/exceptions.php</exclude-pattern>
+        <properties>
+            <property name="rootNamespaces" type="array">
+                <element key="src" value="Nepada"/>
+                <element key="tests" value="NepadaTests"/>
+            </property>
+            <property name="extensions" type="array">
+                <element value="php"/>
+                <element value="phpt"/>
+            </property>
+        </properties>
+    </rule>
     <rule ref="SlevomatCodingStandard.Namespaces.UnusedUses">
         <properties>
             <property name="ignoredAnnotationNames" type="array">
diff --git a/composer.json b/composer.json
index 329c649..2258542 100644
--- a/composer.json
+++ b/composer.json
@@ -45,9 +45,9 @@
         }
     },
     "autoload-dev": {
-        "classmap": [
-            "tests/"
-        ]
+        "psr-4": {
+            "NepadaTests\\": "tests/"
+        }
     },
     "extra": {
         "branch-alias": {