diff --git a/.travis.yml b/.travis.yml
index 3cdd4c0..2982e22 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,14 +1,35 @@
 language: php
 
-php:
-  - 7.2
-  - 7.3
+cache:
+  directories:
+    - $HOME/.composer/cache
 
-sudo: false
+matrix:
+  fast_finish: true
+  include:
+    - php: 7.2
+      env: LARAVEL='5.8.*' COMPOSER_FLAGS='--prefer-lowest'
+    - php: 7.2
+      env: LARAVEL='5.8.*' COMPOSER_FLAGS='--prefer-stable'
+    - php: 7.3
+      env: LARAVEL='5.8.*' COMPOSER_FLAGS='--prefer-lowest'
+    - php: 7.3
+      env: LARAVEL='5.8.*' COMPOSER_FLAGS='--prefer-stable'
+    - php: 7.2
+      env: LARAVEL='6.*' COMPOSER_FLAGS='--prefer-lowest'
+    - php: 7.2
+      env: LARAVEL='6.*' COMPOSER_FLAGS='--prefer-stable'
+    - php: 7.3
+      env: LARAVEL='6.*' COMPOSER_FLAGS='--prefer-lowest'
+    - php: 7.3
+      env: LARAVEL='6.*' COMPOSER_FLAGS='--prefer-stable'
 
-before_script:
+before_install:
   - travis_retry composer self-update
-  - travis_retry composer install --no-interaction --prefer-source
+  - travis_retry composer require --no-update --no-interaction "illuminate/support:${LARAVEL}"
+
+install:
+  - travis_retry composer update ${COMPOSER_FLAGS} --prefer-dist --no-interaction --no-suggest
 
 script:
   - phpunit --coverage-text --coverage-clover=coverage.clover
diff --git a/composer.json b/composer.json
index 616825f..2d1bea7 100644
--- a/composer.json
+++ b/composer.json
@@ -2,7 +2,13 @@
     "name": "pulkitjalan/geoip",
     "description": "Geoip Wrapper with Laravel Support",
     "homepage": "https://github.com/pulkitjalan/geoip",
-    "keywords": ["geoip", "ipstack", "ip-api", "maxmind", "telize"],
+    "keywords": [
+        "geoip",
+        "ipstack",
+        "ip-api",
+        "maxmind",
+        "telize"
+    ],
     "license": "MIT",
     "authors": [
         {
@@ -28,6 +34,12 @@
             "helpers.php"
         ]
     },
+    "scripts": {
+        "test": "vendor/bin/phpunit"
+    },
+    "config": {
+        "sort-packages": true
+    },
     "extra": {
         "branch-alias": {
             "dev-master": "4.0.x-dev"