diff --git a/.travis.yml b/.travis.yml
index a7f1afe..23364b9 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -3,6 +3,7 @@ language: php
 php:
   - 7.0
   - 7.1
+  - 7.2
 
 env:
   - COMPOSER_FLAGS=--prefer-lowest
diff --git a/composer.json b/composer.json
index 1f88730..f47643a 100644
--- a/composer.json
+++ b/composer.json
@@ -16,7 +16,7 @@
         "php": ">=7.0",
         "psr/log": "^1.0",
         "psr/http-message": "^1.0",
-        "zendframework/zend-diactoros": "^1.4",
+        "zendframework/zend-diactoros": "^1.4 || ^2.0",
         "http-interop/http-middleware": "^0.4.1",
         "php-middleware/double-pass-compatibility": "^1.0"
     },