diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2f8c039..201ac69 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,7 @@
+UNRELEASED
+----
+- bump json to 2.3.1
+
 2.0.0
 ----
 - initial API v2 client release
diff --git a/Gemfile b/Gemfile
index 970b74a..73af58e 100644
--- a/Gemfile
+++ b/Gemfile
@@ -2,7 +2,7 @@ source 'https://rubygems.org'
 
 group :test do
   gem 'coveralls', :require => false
-  gem 'json', '~> 1.7', :platforms => [:ruby_18, :jruby]
+  gem 'json', '~> 2.3.1', :platforms => [:ruby_18, :jruby]
   gem 'mime-types', '< 2.0.0'
   gem 'netrc', '~> 0.7.7'
   gem 'rb-fsevent', '~> 0.9'