diff --git a/.travis.yml b/.travis.yml
index 7b697c1..b0e5e8d 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -5,6 +5,8 @@ matrix:
     - php: 7.1
     - php: 7.2
     - php: 7.3
+    - php: 7.4
+    - php: nightly
   fast_finish: true
 
 before_install:
@@ -13,4 +15,4 @@ before_install:
 install:
   - travis_retry composer install --no-interaction --prefer-source --no-suggest
 
-script: vendor/bin/phpunit --colors=always --coverage-text
+script: php vendor/bin/phpunit --colors=always --coverage-text
diff --git a/composer.json b/composer.json
index 601b8c8..958757d 100644
--- a/composer.json
+++ b/composer.json
@@ -1,9 +1,18 @@
 {
     "name": "sunrise/http-server-request",
-    "description": "Sunrise HTTP Server Request wrapper for PHP 7.1+ based on PSR-7 & PSR-17",
-    "keywords": ["fenric", "sunrise", "http-server-request", "psr-7", "psr-17"],
     "homepage": "https://github.com/sunrise-php/http-server-request",
+    "description": "Sunrise HTTP server request wrapper for PHP 7.1+ based on PSR-7 & PSR-17",
     "license": "MIT",
+    "keywords": [
+        "fenric",
+        "sunrise",
+        "http",
+        "http-server-request",
+        "psr-7",
+        "psr-17",
+        "php7",
+        "php8"
+    ],
     "authors": [
         {
             "name": "Anatoly Fenric",
@@ -17,15 +26,16 @@
         }
     ],
     "require": {
-        "php": "^7.1",
+        "php": "^7.1|^8.0",
         "psr/http-factory": "^1.0",
         "psr/http-message": "^1.0",
-        "sunrise/http-message": "^1.0",
-        "sunrise/stream": "^1.0",
-        "sunrise/uri": "^1.0"
+        "sunrise/http-message": "^1.4",
+        "sunrise/stream": "^1.2",
+        "sunrise/uri": "^1.2"
     },
     "require-dev": {
-        "phpunit/phpunit": "7.5.6"
+        "phpunit/phpunit": "7.5.20|9.5.0",
+        "sunrise/coding-standard": "1.0.0"
     },
     "provide": {
         "psr/http-message-implementation": "1.0"
@@ -45,7 +55,8 @@
     },
     "scripts": {
         "test": [
-            "phpunit --colors=always --coverage-text"
+            "phpunit --colors=always --coverage-text",
+            "phpcs"
         ]
     }
 }