diff --git a/.gitignore b/.gitignore
index b38d1e8..98c7579 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,5 @@
 /.idea/
-/.vagrant/
 /vendor/
+/build/.phpunit.result.cache
 /build/logs/
 /composer.lock
diff --git a/build/phpunit.xml b/build/phpunit.xml
index 9a47706..de94987 100644
--- a/build/phpunit.xml
+++ b/build/phpunit.xml
@@ -1,17 +1,24 @@
 <phpunit
-        bootstrap="../tests/bootstrap.php"
-        verbose="true"
-        beStrictAboutOutputDuringTests="true"
-        beStrictAboutTestSize="true"
-        colors="true"
-        convertErrorsToExceptions="true"
-        convertNoticesToExceptions="true"
-        convertWarningsToExceptions="true">
+    bootstrap="../tests/bootstrap.php"
+    verbose="true"
+    beStrictAboutOutputDuringTests="true"
+    colors="true"
+    convertErrorsToExceptions="true"
+    convertNoticesToExceptions="true"
+    convertWarningsToExceptions="true">
+    <php>
+        <env name="network-socket-host" value="127.0.0.1"/>
+        <env name="network-socket-port" value="9001"/>
+        <env name="unix-domain-socket" value="/var/run/php-uds.sock"/>
+        <env name="restricted-unix-domain-socket" value="/var/run/php-ruds.sock"/>
+        <env name="non-existing-unix-domain-socket" value="/tmp/not/existing.sock"/>
+        <env name="invalid-unix-domain-socket" value="/Fixtures/test.sock"/>
+    </php>
     <testsuites>
-        <testsuite name="FastCGI-Unit">
+        <testsuite name="Unit">
             <directory suffix="Test.php">../tests/Unit</directory>
         </testsuite>
-        <testsuite name="FastCGI-Integration">
+        <testsuite name="Integration">
             <directory suffix="Test.php">../tests/Integration</directory>
         </testsuite>
     </testsuites>
@@ -20,9 +27,4 @@
             <directory suffix=".php">../src</directory>
         </whitelist>
     </filter>
-    <logging>
-        <log type="coverage-html" target="logs/coverage"/>
-        <log type="coverage-clover" target="logs/clover.xml"/>
-        <log type="coverage-text" target="php://stdout" showUncoveredFiles="true"/>
-    </logging>
 </phpunit>
diff --git a/build/xdebug-filter.php b/build/xdebug-filter.php
new file mode 100644
index 0000000..322535c
--- /dev/null
+++ b/build/xdebug-filter.php
@@ -0,0 +1,14 @@
+<?php declare(strict_types=1);
+
+if ( !function_exists( 'xdebug_set_filter' ) )
+{
+	return;
+}
+
+/** @noinspection PhpUndefinedFunctionInspection */
+/** @noinspection PhpUndefinedConstantInspection */
+xdebug_set_filter(
+	XDEBUG_FILTER_CODE_COVERAGE,
+	XDEBUG_PATH_WHITELIST,
+	[dirname( __DIR__ ) . '/src']
+);
\ No newline at end of file
diff --git a/tests/bootstrap.php b/tests/bootstrap.php
index d6f0eed..d9cb0c2 100644
--- a/tests/bootstrap.php
+++ b/tests/bootstrap.php
@@ -1,17 +1,3 @@
 <?php declare(strict_types=1);
 
-if (
-	extension_loaded( 'xdebug' )
-	&& version_compare( '2.6.0', phpversion( 'xdebug' ), '<=' )
-)
-{
-	/** @noinspection PhpUndefinedFunctionInspection */
-	/** @noinspection PhpUndefinedConstantInspection */
-	xdebug_set_filter(
-		XDEBUG_FILTER_CODE_COVERAGE,
-		XDEBUG_PATH_WHITELIST,
-		[dirname( __DIR__ ) . '/src']
-	);
-}
-
 require_once __DIR__ . '/../vendor/autoload.php';