diff --git a/.travis.yml b/.travis.yml
index 9c79bb8e12..3e056734ef 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -3,10 +3,10 @@ language: ruby
 rvm:
   - 2.0.0
   - 2.1
-  - 2.2.3
-  - 2.3.0
+  - 2.2.6
+  - 2.3.3
+  - 2.4.0
   - ruby-head
-  - rbx-2
 
 os:
   - linux
@@ -15,7 +15,6 @@ os:
 branches:
   only:
     - master
-    - v0.10
     - v0.12
     - v0.14
 
@@ -29,6 +28,6 @@ sudo: false
 matrix:
   allow_failures:
     - rvm: ruby-head
-    - rvm: rbx-2
-    - rvm: 2.3.0
-    - rvm: 1.9.3
+  exclude:
+    - rvm: 2.2.6
+      os: osx
diff --git a/fluentd.gemspec b/fluentd.gemspec
index 469f245cf0..697af2779d 100644
--- a/fluentd.gemspec
+++ b/fluentd.gemspec
@@ -19,7 +19,7 @@ Gem::Specification.new do |gem|
 
   gem.required_ruby_version = '>= 1.9.3'
 
-  gem.add_runtime_dependency("msgpack", [">= 0.5.11", "< 0.6.0"])
+  gem.add_runtime_dependency("msgpack", [">= 0.5.11", "< 2"])
   gem.add_runtime_dependency("json", [">= 1.4.3"])
   gem.add_runtime_dependency("yajl-ruby", ["~> 1.0"])
   gem.add_runtime_dependency("cool.io", [">= 1.2.2", "< 2.0.0"])