diff --git a/.circleci/config.yml b/.circleci/config.yml
new file mode 100644
index 0000000..0441507
--- /dev/null
+++ b/.circleci/config.yml
@@ -0,0 +1,55 @@
+# PHP CircleCI 2.0 configuration file
+#
+# Check https://circleci.com/docs/2.0/language-php/ for more details
+#
+version: 2
+jobs:
+  php71:
+    docker:
+      - image: circleci/php:7.1-cli-node-browsers
+    steps:
+      - checkout
+      - run: php -v
+      - run: composer install --no-interaction --no-suggest --prefer-source
+      - run: XDEBUG_MODE=coverage php vendor/bin/phpunit --coverage-text
+  php72:
+    docker:
+      - image: circleci/php:7.2-cli-node-browsers
+    steps:
+      - checkout
+      - run: php -v
+      - run: composer install --no-interaction --no-suggest --prefer-source
+      - run: XDEBUG_MODE=coverage php vendor/bin/phpunit --coverage-text
+  php73:
+    docker:
+      - image: circleci/php:7.3-cli-node-browsers
+    steps:
+      - checkout
+      - run: php -v
+      - run: composer install --no-interaction --no-suggest --prefer-source
+      - run: XDEBUG_MODE=coverage php vendor/bin/phpunit --coverage-text
+  php74:
+    docker:
+      - image: circleci/php:7.4-cli-node-browsers
+    steps:
+      - checkout
+      - run: php -v
+      - run: composer install --no-interaction --no-suggest --prefer-source
+      - run: XDEBUG_MODE=coverage php vendor/bin/phpunit --coverage-text
+  php80:
+    docker:
+      - image: circleci/php:8.0-cli-node-browsers
+    steps:
+      - checkout
+      - run: php -v
+      - run: composer install --no-interaction --no-suggest --prefer-source
+      - run: XDEBUG_MODE=coverage php vendor/bin/phpunit --coverage-text
+workflows:
+  version: 2
+  build:
+    jobs:
+      - php71
+      - php72
+      - php73
+      - php74
+      - php80
diff --git a/.editorconfig b/.editorconfig
index 27e2667..91aebb8 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -11,8 +11,5 @@ indent_size = 4
 trim_trailing_whitespace = true
 insert_final_newline = true
 
-[*.md]
-trim_trailing_whitespace = false
-
 [*.yml]
 indent_size = 2
diff --git a/.gitignore b/.gitignore
index 41cf726..ac89ebd 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,7 +1,8 @@
-.php_cs.cache
-.phpunit.result.cache
-composer.lock
-coverage.xml
-phpcs.xml
-phpunit.xml
-vendor/
+/.php_cs.cache
+/.phpunit.result.cache
+/composer.lock
+/coverage.xml
+/phpbench.json
+/phpcs.xml
+/phpunit.xml
+/vendor/
diff --git a/.scrutinizer.yml b/.scrutinizer.yml
index d95425d..1e6a96f 100644
--- a/.scrutinizer.yml
+++ b/.scrutinizer.yml
@@ -1,4 +1,7 @@
 build:
+  environment:
+    php:
+      version: '8.0'
   nodes:
     analysis:
       tests:
@@ -7,7 +10,7 @@ build:
     coverage:
       tests:
         override:
-          - command: php vendor/bin/phpunit --coverage-clover coverage.xml
+          - command: XDEBUG_MODE=coverage php vendor/bin/phpunit --coverage-clover coverage.xml
             coverage:
               file: coverage.xml
               format: clover
diff --git a/.travis.yml b/.travis.yml
deleted file mode 100644
index b0e5e8d..0000000
--- a/.travis.yml
+++ /dev/null
@@ -1,18 +0,0 @@
-language: php
-
-matrix:
-  include:
-    - php: 7.1
-    - php: 7.2
-    - php: 7.3
-    - php: 7.4
-    - php: nightly
-  fast_finish: true
-
-before_install:
-  - travis_retry composer self-update
-
-install:
-  - travis_retry composer install --no-interaction --prefer-source --no-suggest
-
-script: php vendor/bin/phpunit --colors=always --coverage-text
diff --git a/README.md b/README.md
index 46c0bf6..0456325 100644
--- a/README.md
+++ b/README.md
@@ -1,10 +1,13 @@
-## HTTP factory for PHP 7.1+ (incl. PHP 8) based on PSR-17
+# HTTP factory for PHP 7.1+ (incl. PHP 8) based on PSR-17
 
-[![Gitter](https://badges.gitter.im/sunrise-php/support.png)](https://gitter.im/sunrise-php/support)
-[![Build Status](https://scrutinizer-ci.com/g/sunrise-php/http-factory/badges/build.png?b=master)](https://scrutinizer-ci.com/g/sunrise-php/http-factory/build-status/master)
-[![Latest Stable Version](https://poser.pugx.org/sunrise/http-factory/v/stable)](https://packagist.org/packages/sunrise/http-factory)
-[![Total Downloads](https://poser.pugx.org/sunrise/http-factory/downloads)](https://packagist.org/packages/sunrise/http-factory)
-[![License](https://poser.pugx.org/sunrise/http-factory/license)](https://packagist.org/packages/sunrise/http-factory)
+[![Build Status](https://circleci.com/gh/sunrise-php/http-factory.svg?style=shield)](https://circleci.com/gh/sunrise-php/http-factory)
+[![Code Coverage](https://scrutinizer-ci.com/g/sunrise-php/http-factory/badges/coverage.png?b=master)](https://scrutinizer-ci.com/g/sunrise-php/http-factory/?branch=master)
+[![Scrutinizer Code Quality](https://scrutinizer-ci.com/g/sunrise-php/http-factory/badges/quality-score.png?b=master)](https://scrutinizer-ci.com/g/sunrise-php/http-factory/?branch=master)
+[![Total Downloads](https://poser.pugx.org/sunrise/http-factory/downloads?format=flat)](https://packagist.org/packages/sunrise/http-factory)
+[![Latest Stable Version](https://poser.pugx.org/sunrise/http-factory/v/stable?format=flat)](https://packagist.org/packages/sunrise/http-factory)
+[![License](https://poser.pugx.org/sunrise/http-factory/license?format=flat)](https://packagist.org/packages/sunrise/http-factory)
+
+---
 
 ## Installation
 
@@ -35,7 +38,7 @@ use Sunrise\Http\Factory\UriFactory;
 ## Test run
 
 ```bash
-php vendor/bin/phpunit
+composer test
 ```
 
 ## Useful links
diff --git a/composer.json b/composer.json
index cd4439b..8a27b05 100644
--- a/composer.json
+++ b/composer.json
@@ -1,7 +1,7 @@
 {
     "name": "sunrise/http-factory",
     "homepage": "https://github.com/sunrise-php/http-factory",
-    "description": "Sunrise HTTP factory for PHP 7.1+ based on PSR-17",
+    "description": "Sunrise // HTTP factory for PHP 7.1+ based on PSR-17",
     "license": "MIT",
     "keywords": [
         "fenric",
@@ -40,8 +40,12 @@
     },
     "scripts": {
         "test": [
-            "phpunit --colors=always --coverage-text",
-            "phpcs"
+            "phpcs",
+            "XDEBUG_MODE=coverage phpunit --coverage-text"
+        ],
+        "build": [
+            "phpdoc -d src/ -t phpdoc/",
+            "XDEBUG_MODE=coverage phpunit --coverage-html coverage/"
         ]
     }
 }
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
index bf1b36c..f4e6672 100644
--- a/phpunit.xml.dist
+++ b/phpunit.xml.dist
@@ -1,21 +1,13 @@
 <?xml version="1.0"?>
-<phpunit colors="true">
+<phpunit colors="true" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.3/phpunit.xsd">
+    <coverage>
+        <include>
+            <directory>./src</directory>
+        </include>
+    </coverage>
     <testsuites>
-        <testsuite name="Sunrise HTTP Factory Test Suite">
+        <testsuite name="sunrise.http.factory.testSuite">
             <directory>./tests/</directory>
         </testsuite>
     </testsuites>
-    <filter>
-        <whitelist>
-            <directory>./src</directory>
-        </whitelist>
-    </filter>
-    <php>
-        <const name="REQUEST_FACTORY" value="Sunrise\Http\Factory\RequestFactory"/>
-        <const name="RESPONSE_FACTORY" value="Sunrise\Http\Factory\ResponseFactory"/>
-        <const name="SERVER_REQUEST_FACTORY" value="Sunrise\Http\Factory\ServerRequestFactory"/>
-        <const name="STREAM_FACTORY" value="Sunrise\Http\Factory\StreamFactory"/>
-        <const name="UPLOADED_FILE_FACTORY" value="Sunrise\Http\Factory\UploadedFileFactory"/>
-        <const name="URI_FACTORY" value="Sunrise\Http\Factory\UriFactory"/>
-    </php>
 </phpunit>
diff --git a/tests/FactoryTest.php b/tests/FactoryTest.php
index a3be99c..70f30a9 100644
--- a/tests/FactoryTest.php
+++ b/tests/FactoryTest.php
@@ -45,6 +45,9 @@ public function testResponseFactory() : void
         $this->assertInstanceOf(ResponseFactoryInterface::class, $factory);
     }
 
+    /**
+     * @return void
+     */
     public function testServerRequestFactory() : void
     {
         $factory = new ServerRequestFactory();