diff --git a/composer.json b/composer.json
index 7f922cf..e7fb3ef 100644
--- a/composer.json
+++ b/composer.json
@@ -13,12 +13,16 @@
     },
     "require-dev": {
         "internations/kodierungsregelwerksammlung": "^0.35.0",
-        "phpunit/phpunit": "~6"
+        "phpunit/phpunit": "~7"
     },
     "autoload": {
-        "psr-0": {
-            "InterNations\\Component\\Solr\\Util": "src/",
-            "InterNations\\Component\\Solr\\ExpressionInterface": "src/"
+        "psr-4": {
+            "InterNations\\Component\\Solr\\": "src/InterNations/Component/Solr/"
+        }
+    },
+    "autoload-dev": {
+        "psr-4": {
+            "InterNations\\Component\\Solr\\Tests\\": "tests/InterNations/Component/Solr/"
         }
     },
     "extra": {
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
index 07b7560..7f8fde6 100644
--- a/phpunit.xml.dist
+++ b/phpunit.xml.dist
@@ -3,9 +3,7 @@
          convertErrorsToExceptions="true"
          convertWarningsToExceptions="true"
          convertNoticesToExceptions="true"
-         mapTestClassNameToCoveredClassName="true"
          bootstrap="vendor/autoload.php"
-         strict="true"
          verbose="true"
          colors="true"
          timeoutForLargeTests="100">
@@ -17,18 +15,16 @@
     </testsuites>
 
     <logging>
-        <log type="coverage-html" target="build/coverage" title="SolrUtils code coverage"
-             charset="UTF-8" yui="true" highlight="true"
+        <log type="coverage-html" target="build/coverage"
              lowUpperBound="35" highLowerBound="70"/>
         <log type="coverage-clover" target="build/logs/clover.xml"/>
-        <log type="junit" target="build/logs/junit.xml" logIncompleteSkipped="false"/>
+        <log type="junit" target="build/logs/junit.xml"/>
     </logging>
 
     <filter>
-        <blacklist>
-            <directory suffix=".php">vendor/</directory>
-            <directory suffix=".php">tests/</directory>
-        </blacklist>
+        <whitelist>
+            <directory suffix=".php">src</directory>
+        </whitelist>
     </filter>
 
     <php>