diff --git a/.gitattributes b/.gitattributes
index 18e14aa..4838772 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -1 +1,11 @@
-/tests export-ignore
+*.php text eol=lf
+
+.github export-ignore
+tests export-ignore
+tmp export-ignore
+.gitattributes export-ignore
+.gitignore export-ignore
+Makefile export-ignore
+phpcs.xml export-ignore
+phpstan.neon export-ignore
+phpunit.xml export-ignore
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index aba91f0..3cf185e 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -44,7 +44,7 @@ jobs:
 
 
       - name: "Lint"
-        run: "vendor/bin/phing lint"
+        run: "make lint"
 
   coding-standards:
     name: "Coding Standard"
@@ -68,10 +68,10 @@ jobs:
         run: "composer install --no-interaction --no-progress --no-suggest"
 
       - name: "Lint"
-        run: "vendor/bin/phing lint"
+        run: "make lint"
 
       - name: "Coding Standard"
-        run: "vendor/bin/phing cs"
+        run: "make cs"
 
   tests:
     name: "Tests"
@@ -113,7 +113,7 @@ jobs:
         run: "composer require --dev phpunit/phpunit:'^9.5' --update-with-dependencies"
 
       - name: "Tests"
-        run: "vendor/bin/phing tests"
+        run: "make tests"
 
   static-analysis:
     name: "PHPStan"
@@ -157,4 +157,4 @@ jobs:
         run: "composer require --dev phpunit/phpunit:'^9.5' --update-with-dependencies"
 
       - name: "PHPStan"
-        run: "vendor/bin/phing phpstan"
+        run: "make phpstan"
diff --git a/.gitignore b/.gitignore
index ff72e2d..d6a83e5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,4 @@
-/composer.lock
+/tests/tmp
 /vendor
+composer.lock
+.phpunit.result.cache
diff --git a/Makefile b/Makefile
new file mode 100644
index 0000000..fe917d3
--- /dev/null
+++ b/Makefile
@@ -0,0 +1,23 @@
+.PHONY: check
+check: lint cs tests phpstan
+
+.PHONY: tests
+tests:
+	php vendor/bin/phpunit
+
+.PHONY: lint
+lint:
+	php vendor/bin/parallel-lint --colors \
+		src tests
+
+.PHONY: cs
+cs:
+	composer install --working-dir build-cs && php build-cs/vendor/bin/phpcs
+
+.PHONY: cs-fix
+cs-fix:
+	php build-cs/vendor/bin/phpcbf
+
+.PHONY: phpstan
+phpstan:
+	php vendor/bin/phpstan analyse -l 8 -c phpstan.neon src tests
diff --git a/build-cs/composer.json b/build-cs/composer.json
index 9acd027..ed7744e 100644
--- a/build-cs/composer.json
+++ b/build-cs/composer.json
@@ -1,6 +1,6 @@
 {
 	"require-dev": {
-		"consistence/coding-standard": "^3.10",
+		"consistence-community/coding-standard": "^3.10",
 		"dealerdirect/phpcodesniffer-composer-installer": "^0.7.0",
 		"slevomat/coding-standard": "^6.4"
 	}
diff --git a/build.xml b/build.xml
deleted file mode 100644
index 77e7bab..0000000
--- a/build.xml
+++ /dev/null
@@ -1,110 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<project name="PHPStan Dibi class reflection extension" default="check">
-
-	<target name="check" depends="
-		composer,
-		lint,
-		cs,
-		tests,
-		phpstan
-	"/>
-
-	<target name="composer">
-		<exec
-				executable="composer"
-				logoutput="true"
-				passthru="true"
-				checkreturn="true"
-		>
-			<arg value="install"/>
-		</exec>
-	</target>
-
-	<target name="lint">
-		<exec
-				executable="vendor/bin/parallel-lint"
-				logoutput="true"
-				passthru="true"
-				checkreturn="true"
-		>
-			<arg value="--exclude"/>
-			<arg path="tests/PHPStan/Analyser/data"/>
-			<arg path="src" />
-			<arg path="tests" />
-		</exec>
-	</target>
-
-	<target name="cs">
-		<exec
-				executable="composer"
-				logoutput="true"
-				passthru="true"
-				checkreturn="true"
-		>
-			<arg value="install"/>
-			<arg value="--working-dir"/>
-			<arg path="build-cs"/>
-			<arg value="--ansi"/>
-		</exec>
-		<exec
-				executable="build-cs/vendor/bin/phpcs"
-				logoutput="true"
-				passthru="true"
-				checkreturn="true"
-		>
-			<arg value="--extensions=php"/>
-			<arg value="--encoding=utf-8"/>
-			<arg value="--tab-width=4"/>
-			<arg value="-sp"/>
-			<arg path="src"/>
-			<arg path="tests"/>
-		</exec>
-	</target>
-
-	<target name="cs-fix">
-		<exec
-				executable="build-cs/vendor/bin/phpcbf"
-				logoutput="true"
-				passthru="true"
-				checkreturn="true"
-		>
-			<arg value="--extensions=php"/>
-			<arg value="--encoding=utf-8"/>
-			<arg value="--tab-width=4"/>
-			<arg value="-sp"/>
-			<arg path="src"/>
-			<arg path="tests"/>
-		</exec>
-	</target>
-
-	<target name="tests">
-		<exec
-				executable="vendor/bin/phpunit"
-				logoutput="true"
-				passthru="true"
-				checkreturn="true"
-		>
-			<arg value="-c"/>
-			<arg value="tests/phpunit.xml"/>
-			<arg path="tests"/>
-		</exec>
-	</target>
-
-	<target name="phpstan">
-		<exec
-				executable="vendor/bin/phpstan"
-				logoutput="true"
-				passthru="true"
-				checkreturn="true"
-		>
-			<arg value="analyse"/>
-			<arg value="-l"/>
-			<arg value="8"/>
-			<arg value="-c"/>
-			<arg path="phpstan.neon"/>
-			<arg path="src"/>
-			<arg path="tests"/>
-		</exec>
-	</target>
-
-</project>
diff --git a/composer.json b/composer.json
index fa26994..d102b18 100644
--- a/composer.json
+++ b/composer.json
@@ -14,7 +14,6 @@
 	},
 	"require-dev": {
 		"dibi/dibi": "~4.0",
-		"phing/phing": "^2.16.3",
 		"php-parallel-lint/php-parallel-lint": "^1.2",
 		"phpstan/phpstan-phpunit": "^0.12.16",
 		"phpstan/phpstan-strict-rules": "^0.12.6",
diff --git a/phpcs.xml b/phpcs.xml
index 3cb5ac0..3811a5a 100644
--- a/phpcs.xml
+++ b/phpcs.xml
@@ -1,6 +1,14 @@
 <?xml version="1.0"?>
 <ruleset name="PHPStan Dibi">
-	<rule ref="build-cs/vendor/consistence/coding-standard/Consistence/ruleset.xml">
+	<arg name="colors"/>
+	<arg name="extensions" value="php"/>
+	<arg name="encoding" value="utf-8"/>
+	<arg name="tab-width" value="4"/>
+	<arg name="cache" value="tmp/cache/phpcs"/>
+	<arg value="sp"/>
+	<file>src</file>
+	<file>tests</file>
+	<rule ref="build-cs/vendor/consistence-community/coding-standard/Consistence/ruleset.xml">
 		<exclude name="Squiz.Functions.GlobalFunction.Found"/>
 		<exclude name="SlevomatCodingStandard.Namespaces.FullyQualifiedClassNameAfterKeyword"/>
 		<exclude name="SlevomatCodingStandard.Namespaces.FullyQualifiedClassNameInAnnotation"/>
@@ -53,5 +61,6 @@
 			<property name="rootNamespaces" type="array" value="src=>PHPStan,tests=>PHPStan"/>
 		</properties>
 	</rule>
+	<exclude-pattern>tests/tmp</exclude-pattern>
 	<exclude-pattern>tests/*/data</exclude-pattern>
 </ruleset>
diff --git a/phpunit.xml b/phpunit.xml
new file mode 100644
index 0000000..5833330
--- /dev/null
+++ b/phpunit.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0"?>
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         bootstrap="tests/bootstrap.php"
+         colors="true"
+         backupGlobals="false"
+         backupStaticAttributes="false"
+         beStrictAboutChangesToGlobalState="true"
+         beStrictAboutOutputDuringTests="true"
+         beStrictAboutTestsThatDoNotTestAnything="true"
+         beStrictAboutTodoAnnotatedTests="true"
+         failOnRisky="true"
+         failOnWarning="true"
+         xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.3/phpunit.xsd"
+>
+    <coverage>
+        <include>
+            <directory suffix=".php">./src</directory>
+        </include>
+        <report>
+            <clover outputFile="tests/tmp/clover.xml"/>
+            <text
+                outputFile="php://stdout"
+                showUncoveredFiles="true"
+                showOnlySummary="true"
+            />
+        </report>
+    </coverage>
+
+    <testsuites>
+        <testsuite name="PHPStan for Dibi">
+            <directory suffix="Test.php">tests</directory>
+        </testsuite>
+    </testsuites>
+
+    <logging/>
+</phpunit>
diff --git a/tests/phpunit.xml b/tests/phpunit.xml
deleted file mode 100644
index 1a84817..0000000
--- a/tests/phpunit.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<phpunit
-		bootstrap="bootstrap.php"
-		colors="true"
-		backupGlobals="false"
-		backupStaticAttributes="false"
-		beStrictAboutChangesToGlobalState="true"
-		beStrictAboutOutputDuringTests="true"
-		beStrictAboutTestsThatDoNotTestAnything="true"
-		beStrictAboutTodoAnnotatedTests="true"
-		failOnRisky="true"
-		failOnWarning="true"
->
-	<filter>
-		<whitelist>
-			<directory suffix=".php">../src</directory>
-		</whitelist>
-	</filter>
-	<logging>
-		<log
-				type="coverage-text"
-				target="php://stdout"
-				showUncoveredFiles="true"
-				showOnlySummary="true"
-		/>
-		<log type="coverage-clover" target="tmp/clover.xml"/>
-	</logging>
-</phpunit>
diff --git a/tmp/.gitignore b/tmp/.gitignore
new file mode 100644
index 0000000..37890ca
--- /dev/null
+++ b/tmp/.gitignore
@@ -0,0 +1,3 @@
+*
+!cache
+!.*
diff --git a/tmp/cache/.gitignore b/tmp/cache/.gitignore
new file mode 100644
index 0000000..125e342
--- /dev/null
+++ b/tmp/cache/.gitignore
@@ -0,0 +1,2 @@
+*
+!.*