diff --git a/.editorconfig b/.editorconfig
new file mode 100644
index 0000000..d81e3b5
--- /dev/null
+++ b/.editorconfig
@@ -0,0 +1,14 @@
+# top-most EditorConfig file
+root = true
+
+# Unix-style newlines with a newline ending every file
+[*]
+charset = utf-8
+end_of_line = lf
+insert_final_newline = true
+trim_trailing_whitespace = true
+
+# PHP, JSON, XML
+[*.{php, json, xml}]
+indent_style = space
+indent_size = 4
diff --git a/.gitignore b/.gitignore
index e626282..979169b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,6 +2,7 @@
 .idea
 
 # PHPUnit result cache file
+.phpunit.cache
 .phpunit.result.cache
 
 # Composer autoload and dependencies
diff --git a/composer.json b/composer.json
index 2796efc..0946df5 100644
--- a/composer.json
+++ b/composer.json
@@ -17,9 +17,6 @@
         "ext-curl": "*",
         "ext-json": "*"
     },
-    "require-dev": {
-        "phpunit/phpunit": ">=7.5"
-    },
     "autoload": {
         "psr-4": {
             "Rooxie\\": "src/"
diff --git a/phpunit.xml b/phpunit.xml
index a3966cf..12658d6 100644
--- a/phpunit.xml
+++ b/phpunit.xml
@@ -1,8 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<phpunit backupGlobals="false" backupStaticAttributes="false" colors="true" failOnRisky="true" failOnWarning="true" stopOnFailure="false">
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" backupGlobals="false" colors="true" failOnRisky="true" failOnWarning="true" stopOnFailure="false" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/11.2/phpunit.xsd" cacheDirectory=".phpunit.cache" backupStaticProperties="false">
     <testsuites>
         <testsuite name="OMDb Test Suite">
-            <directory suffix=".php">./tests/</directory>
+            <file>./tests/BuildParamsTest.php</file>
+            <file>./tests/MovieModelTest.php</file>
+            <file>./tests/ResponseParserTest.php</file>
         </testsuite>
     </testsuites>
 </phpunit>