diff --git a/Gemfile b/Gemfile
index 5ecfbedf7..6e85e6ae9 100644
--- a/Gemfile
+++ b/Gemfile
@@ -3,7 +3,11 @@ source 'https://rubygems.org'
 gem 'typhoeus', '~>0.8.0'
 gem 'nokogiri'
 gem 'addressable'
-gem 'yajl-ruby' # Better JSON parser regarding memory usage
+if defined?(JRUBY_VERSION)
+  gem 'json'
+else
+  gem 'yajl-ruby' # Better JSON parser regarding memory usage
+end
 # TODO: update the below when terminal-table 1.5.3+ is released.
 # (and delete the Terminal module in lib/common/hacks.rb)
 gem 'terminal-table', '~>1.4.5'
diff --git a/lib/environment.rb b/lib/environment.rb
index 85ae571d3..5f54c734d 100644
--- a/lib/environment.rb
+++ b/lib/environment.rb
@@ -31,7 +31,12 @@
   require 'pathname'
   # Third party libs
   require 'typhoeus'
-  require 'yajl/json_gem'
+  begin
+    require 'yajl/json_gem'
+  rescue LoadError
+    # Require basic json library if yajl is not available
+    require 'json'
+  end
   require 'nokogiri'
   require 'terminal-table'
   require 'ruby-progressbar'