diff --git a/Makefile b/Makefile
index 8c11203..e1ffc2c 100644
--- a/Makefile
+++ b/Makefile
@@ -8,7 +8,8 @@ tests:
 .PHONY: lint
 lint:
 	php vendor/bin/parallel-lint --colors \
-		--exclude tests/Rules/DeadCode/data/bug-383.php \
+		--exclude tests/phpt/infection-config-default.phpt \
+		--exclude tests/phpt/infection-config.phpt \
 		src tests
 
 .PHONY: cs-install
diff --git a/bin/infection-config.php b/bin/infection-config.php
index e7a6e3a..2697a32 100644
--- a/bin/infection-config.php
+++ b/bin/infection-config.php
@@ -1,24 +1,31 @@
 #!/usr/bin/env php
 <?php declare(strict_types = 1);
 
+// Usage: php infection-config.php [--source-directory='another/path'] [--mutator-class='Infection\Mutator\Removal\MethodCallRemoval'] [--timeout=60]
+
 error_reporting(E_ALL & ~E_DEPRECATED);
 ini_set('display_errors', 'stderr');
 
-$opts = getopt('', ['source-directory::', 'mutator-class::']);
-if ($argc < 1) {
-	echo "Usage: php ". $argv[0] ." [--source-directory='another/path'] [--mutator-class='Infection\Mutator\Removal\MethodCallRemoval]'\n";
-	exit(1);
-}
+$opts = getopt('', ['source-directory::', 'mutator-class::', 'timeout::']);
 $addSourceDirectories = (array) ($opts['source-directory'] ?? []);
 $addMutatorClasses = (array) ($opts['mutator-class'] ?? []);
+$timeout = $opts['timeout'] ?? null;
+
+$defaults = file_get_contents(__DIR__.'/../resources/infection.json5');
+if ($defaults === false) {
+	throw new RuntimeException('Unable to read infection.json5');
+}
+$decoded = json_decode($defaults);
 
-$decoded = json_decode(file_get_contents(__DIR__.'/../resources/infection.json5'));
 foreach($addSourceDirectories as $path) {
 	$decoded->source->directories[] = $path;
 }
 foreach($addMutatorClasses as $mutatorclass) {
 	$decoded->mutators->$mutatorclass = true;
 }
+if ($timeout !== null) {
+	$decoded->timeout = (int) $timeout;
+}
 
 echo json_encode($decoded);
 
diff --git a/phpstan.neon b/phpstan.neon
index 6d7c0fd..834f007 100644
--- a/phpstan.neon
+++ b/phpstan.neon
@@ -1,6 +1,7 @@
 parameters:
 	level: 8
 	paths:
+		- bin
 		- src
 		- tests
 
diff --git a/phpunit.xml b/phpunit.xml
index 4674938..c2392f8 100644
--- a/phpunit.xml
+++ b/phpunit.xml
@@ -1,19 +1,23 @@
 <?xml version="1.0"?>
 <phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         colors="true"
+		 colors="true"
 		 bootstrap="./vendor/autoload.php"
-         beStrictAboutChangesToGlobalState="true"
-         beStrictAboutOutputDuringTests="true"
-         failOnRisky="true"
-         failOnWarning="true"
-         xsi:noNamespaceSchemaLocation="vendor/phpunit/phpunit/phpunit.xsd"
-         executionOrder="random"
+		 beStrictAboutChangesToGlobalState="true"
+		 beStrictAboutOutputDuringTests="true"
+		 failOnRisky="true"
+		 failOnWarning="true"
+		 xsi:noNamespaceSchemaLocation="vendor/phpunit/phpunit/phpunit.xsd"
+		 executionOrder="random"
 >
-    <testsuites>
-        <testsuite name="Infection for PHPStan">
-            <directory suffix="Test.php">tests</directory>
-        </testsuite>
-    </testsuites>
+	<testsuites>
+		<testsuite name="Infection for PHPStan">
+			<directory suffix="Test.php">tests</directory>
+		</testsuite>
 
-    <logging/>
+		<testsuite name="end-to-end">
+			<directory suffix=".phpt">tests/phpt</directory>
+		</testsuite>
+	</testsuites>
+
+	<logging/>
 </phpunit>
diff --git a/tests/phpt/infection-config-default.phpt b/tests/phpt/infection-config-default.phpt
new file mode 100644
index 0000000..78d75bf
--- /dev/null
+++ b/tests/phpt/infection-config-default.phpt
@@ -0,0 +1,25 @@
+--TEST--
+infection-config.php renders proper json defaults
+--FILE--
+<?php declare(strict_types=1);
+$bin = PHP_BINARY . ' '. __DIR__.'/../../bin/infection-config.php';
+echo shell_exec($bin ."| jq");
+--EXPECT--
+{
+  "$schema": "vendor/infection/infection/resources/schema.json",
+  "timeout": 30,
+  "source": {
+    "directories": [
+      "src"
+    ]
+  },
+  "staticAnalysisTool": "phpstan",
+  "logs": {
+    "text": "tmp/infection.log"
+  },
+  "mutators": {
+    "@default": false,
+    "PHPStan\\Infection\\TrinaryLogicMutator": true
+  },
+  "bootstrap": "build-infection/vendor/autoload.php"
+}
diff --git a/tests/phpt/infection-config.phpt b/tests/phpt/infection-config.phpt
new file mode 100644
index 0000000..f9de77a
--- /dev/null
+++ b/tests/phpt/infection-config.phpt
@@ -0,0 +1,27 @@
+--TEST--
+infection-config.php renders proper json
+--FILE--
+<?php declare(strict_types=1);
+$bin = PHP_BINARY . ' '. __DIR__.'/../../bin/infection-config.php';
+echo shell_exec($bin." --source-directory='more/files/' --timeout=180 --mutator-class='My\Class' | jq");
+--EXPECT--
+{
+  "$schema": "vendor/infection/infection/resources/schema.json",
+  "timeout": 180,
+  "source": {
+    "directories": [
+      "src",
+      "more/files/"
+    ]
+  },
+  "staticAnalysisTool": "phpstan",
+  "logs": {
+    "text": "tmp/infection.log"
+  },
+  "mutators": {
+    "@default": false,
+    "PHPStan\\Infection\\TrinaryLogicMutator": true,
+    "My\\Class": true
+  },
+  "bootstrap": "build-infection/vendor/autoload.php"
+}