diff --git a/.travis.yml b/.travis.yml
index 961bc66339f5aec6dd89b3999ea75f6c64cb02ef..113b7bbc4a71b42ad6cae8025aede3b5a6411d04 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -28,39 +28,28 @@ script: 'ci/travis.rb'
 
 env:
   matrix:
-    - "GEM=railties"
-    - "GEM=ap"
-    - "GEM=ac"
-    - "GEM=ac FAYE=1"
-    - "GEM=am,amo,as,av,aj"
-    - "GEM=as PRESERVE_TIMEZONES=1"
-    - "GEM=ar:mysql2"
-    - "GEM=ar:sqlite3"
-    - "GEM=ar:postgresql"
-    - "GEM=aj:integration"
-    - "GEM=guides"
+    - "Z=1 FIX=1 GEM=as"
+    - "Z=2 FIX=1 GEM=as"
+    - "Z=3 FIX=1 GEM=as"
+    - "Z=4 FIX=1 GEM=as"
+    - "Z=1 FIX=1 GEM=as PRESERVE_TIMEZONES=1"
+    - "Z=2 FIX=1 GEM=as PRESERVE_TIMEZONES=1"
+    - "Z=3 FIX=1 GEM=as PRESERVE_TIMEZONES=1"
+    - "Z=4 FIX=1 GEM=as PRESERVE_TIMEZONES=1"
+    - "Z=1 GEM=as"
+    - "Z=2 GEM=as"
+    - "Z=3 GEM=as"
+    - "Z=4 GEM=as"
+    - "Z=1 GEM=as PRESERVE_TIMEZONES=1"
+    - "Z=2 GEM=as PRESERVE_TIMEZONES=1"
+    - "Z=3 GEM=as PRESERVE_TIMEZONES=1"
+    - "Z=4 GEM=as PRESERVE_TIMEZONES=1"
 
 rvm:
   - 2.2.5
   - 2.3.1
-  - ruby-head
 
 matrix:
-  include:
-    # Latest compiled version in http://rubies.travis-ci.org
-    - rvm: 2.3.1
-      env:
-        - "GEM=ar:mysql2"
-      addons:
-        mariadb: 10.0
-    - rvm: jruby-9.0.5.0
-      jdk: oraclejdk8
-      env:
-        - "JRUBY_OPTS='--dev -J-Xmx1024M'"
-        - "GEM='ap'"
-  allow_failures:
-    - rvm: ruby-head
-    - rvm: jruby-9.0.5.0
   fast_finish: true
 
 notifications:
diff --git a/Gemfile b/Gemfile
index 3d13033b24da49f263c38d0511ad9647c8c75fe0..55864ce95893d4b8582671577f5633bbf593ce77 100644
--- a/Gemfile
+++ b/Gemfile
@@ -37,7 +37,9 @@ end
 # Active Support.
 gem 'dalli', '>= 2.2.1'
 gem 'listen', '~> 3.0.5', require: false
-gem 'rb-inotify', github: 'matthewd/rb-inotify', branch: 'close-handling'
+if ENV['FIX'] == '1'
+  gem 'rb-inotify', github: 'matthewd/rb-inotify', branch: 'close-handling'
+end
 
 # Active Job.
 group :job do