diff --git a/.travis.yml b/.travis.yml
index 2c6db646..24b9ee14 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,18 +1,21 @@
 language: ruby
 cache: bundler
 
-rvm:
-  - 2.3
-  - 2.4
-  - 2.5
-  - 2.6
-  - ruby-head
-  - truffleruby
-  - jruby
-  - jruby-head
-  - rbx-3
-
 matrix:
+  include:
+    - rvm: 2.3
+    - rvm: 2.4
+    - rvm: 2.5
+    - rvm: 2.6
+    - rvm: 2.5
+      os: osx
+    - rvm: 2.6
+      os: osx
+    - rvm: jruby
+    - rvm: truffleruby
+    - rvm: jruby-head
+    - rvm: ruby-head
+    - rvm: rbx-3
   allow_failures:
     - rvm: truffleruby
     - rvm: jruby
@@ -32,10 +35,6 @@ matrix:
       os: osx
   fast_finish: true
 
-os:
-  - linux
-  - osx
-
 env:
   # TODO: 0.8 is enough on Linux, but 2 seems needed for Travis/OSX
   - LISTEN_TESTS_DEFAULT_LAG=2