diff --git a/.editorconfig b/.editorconfig
index 0ef9c98..2da7375 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -1,9 +1,21 @@
+# More info at:
+# https://editorconfig.org/
+
 root = true
 
-[*.php]
+[*]
 charset = utf-8
 end_of_line = lf
-indent_style = tab
+indent_style = space
 indent_size = 4
 trim_trailing_whitespace = true
 insert_final_newline = true
+
+[*.md]
+trim_trailing_whitespace = false
+
+[*.php]
+indent_style = tab
+
+[*.yml]
+indent_size = 2
diff --git a/.gitignore b/.gitignore
index d1502b0..c331141 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
-vendor/
 composer.lock
+coverage.xml
+vendor/
diff --git a/.scrutinizer.yml b/.scrutinizer.yml
new file mode 100644
index 0000000..be473c8
--- /dev/null
+++ b/.scrutinizer.yml
@@ -0,0 +1,13 @@
+build:
+  nodes:
+    analysis:
+      tests:
+        override:
+          - php-scrutinizer-run
+    coverage:
+      tests:
+        override:
+          - command: 'php vendor/bin/phpunit --coverage-clover coverage.xml'
+            coverage:
+              file: 'coverage.xml'
+              format: 'clover'
diff --git a/.travis.yml b/.travis.yml
index a18ff5e..44b7c62 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -4,15 +4,14 @@ matrix:
   include:
     - php: 7.1
     - php: 7.2
+    - php: 7.3
     - php: nightly
   fast_finish: true
 
-sudo: false
-
 before_install:
   - travis_retry composer self-update
 
 install:
   - travis_retry composer install --no-interaction --prefer-source --no-suggest
 
-script: vendor/bin/phpunit
+script: vendor/bin/phpunit --colors=always --coverage-text
diff --git a/README.md b/README.md
index c8b7c66..43321cc 100644
--- a/README.md
+++ b/README.md
@@ -4,7 +4,7 @@
 [![Build Status](https://api.travis-ci.com/sunrise-php/stream.svg?branch=master)](https://travis-ci.com/sunrise-php/stream)
 [![CodeFactor](https://www.codefactor.io/repository/github/sunrise-php/stream/badge)](https://www.codefactor.io/repository/github/sunrise-php/stream)
 [![Scrutinizer Code Quality](https://scrutinizer-ci.com/g/sunrise-php/stream/badges/quality-score.png?b=master)](https://scrutinizer-ci.com/g/sunrise-php/stream/?branch=master)
-[![Code Intelligence Status](https://scrutinizer-ci.com/g/sunrise-php/stream/badges/code-intelligence.svg?b=master)](https://scrutinizer-ci.com/code-intelligence)
+[![Code Coverage](https://scrutinizer-ci.com/g/sunrise-php/stream/badges/coverage.png?b=master)](https://scrutinizer-ci.com/g/sunrise-php/stream/?branch=master)
 [![Latest Stable Version](https://poser.pugx.org/sunrise/stream/v/stable)](https://packagist.org/packages/sunrise/stream)
 [![Total Downloads](https://poser.pugx.org/sunrise/stream/downloads)](https://packagist.org/packages/sunrise/stream)
 [![License](https://poser.pugx.org/sunrise/stream/license)](https://packagist.org/packages/sunrise/stream)
diff --git a/composer.json b/composer.json
index 9ffe99e..663756b 100644
--- a/composer.json
+++ b/composer.json
@@ -1,29 +1,34 @@
 {
-	"name": "sunrise/stream",
-	"description": "Sunrise Stream",
-	"keywords": ["fenric", "sunrise", "stream", "psr-7", "psr-17"],
-	"homepage": "https://github.com/sunrise-php/stream",
-	"license": "MIT",
-	"authors": [{
-		"name": "Anatoly Fenric",
-		"email": "anatoly@fenric.ru",
-		"homepage": "https://anatoly.fenric.ru/"
-	}],
-	"require": {
-		"php": "^7.1",
-		"psr/http-factory": "^1.0",
-		"psr/http-message": "^1.0"
-	},
-	"require-dev": {
-		"phpunit/phpunit": "7.5.1",
-		"php-http/psr7-integration-tests": "dev-master"
-	},
-	"provide": {
-		"psr/http-message-implementation": "1.0"
-	},
-	"autoload": {
-		"psr-4": {
-			"Sunrise\\Stream\\": "src/"
-		}
-	}
+    "name": "sunrise/stream",
+    "description": "Sunrise Stream",
+    "keywords": ["fenric", "sunrise", "stream", "psr-7", "psr-17"],
+    "homepage": "https://github.com/sunrise-php/stream",
+    "license": "MIT",
+    "authors": [{
+        "name": "Anatoly Fenric",
+        "email": "anatoly@fenric.ru",
+        "homepage": "https://anatoly.fenric.ru/"
+    }],
+    "require": {
+        "php": "^7.1",
+        "psr/http-factory": "^1.0",
+        "psr/http-message": "^1.0"
+    },
+    "require-dev": {
+        "phpunit/phpunit": "7.5.1",
+        "php-http/psr7-integration-tests": "dev-master"
+    },
+    "provide": {
+        "psr/http-message-implementation": "1.0"
+    },
+    "autoload": {
+        "psr-4": {
+            "Sunrise\\Stream\\": "src/"
+        }
+    },
+    "scripts": {
+        "test": [
+            "phpunit --colors=always --coverage-text"
+        ]
+    }
 }
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
index e126c39..e733ce9 100644
--- a/phpunit.xml.dist
+++ b/phpunit.xml.dist
@@ -1,12 +1,16 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0"?>
 <phpunit colors="true">
-	<testsuites>
-		<testsuite name="Sunrise Stream Test Suite">
-			<directory>./tests/</directory>
-		</testsuite>
-	</testsuites>
-
-	<php>
-		<const name="STREAM_FACTORY" value="Sunrise\Stream\StreamFactory"/>
-	</php>
+    <testsuites>
+        <testsuite name="Sunrise Stream Test Suite">
+            <directory>./tests/</directory>
+        </testsuite>
+    </testsuites>
+    <filter>
+        <whitelist>
+            <directory>./src</directory>
+        </whitelist>
+    </filter>
+    <php>
+        <const name="STREAM_FACTORY" value="Sunrise\Stream\StreamFactory"/>
+    </php>
 </phpunit>