diff --git a/.travis.yml b/.travis.yml
index c9569fa..2d3930d 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -11,6 +11,8 @@ php:
     - 5.6
     - 7.0
     - 7.1
+    - 7.2
+    - 7.3
 
 env:
     global:
@@ -32,7 +34,7 @@ before_install:
 install:
     # To be removed when this issue will be resolved: https://github.com/composer/composer/issues/5355
     - if [[ "$COMPOSER_FLAGS" == *"--prefer-lowest"* ]]; then travis_retry composer update --prefer-dist --no-interaction --prefer-stable --quiet; fi
-    - travis_retry composer update ${COMPOSER_FLAGS} --prefer-dist --no-interaction
+    - composer update ${COMPOSER_FLAGS} --prefer-dist --no-interaction
 
 script:
     - $TEST_COMMAND
diff --git a/composer.json b/composer.json
index ec93269..5eb00e6 100644
--- a/composer.json
+++ b/composer.json
@@ -13,7 +13,7 @@
     "require": {
         "php": "^5.5 || ^7.0",
         "php-http/httplug": "^1.0",
-        "php-http/client-common": "^1.1",
+        "php-http/client-common": "^1.1 || ^2.0",
         "php-http/discovery": "^1.0",
         "php-http/message-factory": "^1.0"
     },
@@ -36,7 +36,9 @@
     },
     "extra": {
         "branch-alias": {
-            "dev-master": "1.1-dev"
+            "dev-master": "1.2-dev"
         }
-    }
+    },
+    "prefer-stable": true,
+    "minimum-stability": "dev"
 }