diff --git a/.ruby-version b/.ruby-version
index cd57a8b..21bb5e1 100644
--- a/.ruby-version
+++ b/.ruby-version
@@ -1 +1 @@
-2.1.5
+2.2.5
diff --git a/.travis.yml b/.travis.yml
index e907f54..9bfad37 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -10,33 +10,11 @@ rvm:
   - '2.3.0'
   - 'ruby-head'
   - 'jruby'
-  - 'rbx-2'
-  - 'rbx-3.5'
-
-addons:
-  apt:
-    packages:
-    - libevent-dev
-    - libxml2-dev
-    - libcurl4-gnutls-dev
-    - python2.7-dev
-    - python-virtualenv
-
+  - 'rbx-2.2.7'
 
 install: bundle install --jobs=3 --retry=3
 
-script:
-    # creating and activating virtualenv
-    - virtualenv -p python2.7 --distribute rubythumbor
-    - source ./rubythumbor/bin/activate
-
-    # install python requirements
-    - pip install -r test_requirements.txt --use-mirrors
-
-    # verify both requirements were met
-    - INSTALLDIR=$(python -c "import os; import thumbor; print(os.path.dirname(thumbor.__file__))")
+script: bundle exec rake spec
 
-    # finally run tests
-    - bundle exec rake spec
 after_success:
   coveralls
diff --git a/Gemfile b/Gemfile
index df47f47..8114ff4 100644
--- a/Gemfile
+++ b/Gemfile
@@ -4,5 +4,4 @@ gemspec
 
 platforms :ruby do
   gem 'coveralls', require: false
-  gem 'tins', '< 1.7.0' # the last one 1.9.2 compatible
 end
diff --git a/Guardfile b/Guardfile
deleted file mode 100644
index 07ba97e..0000000
--- a/Guardfile
+++ /dev/null
@@ -1,17 +0,0 @@
-guard :rspec, cmd: "bundle exec rspec" do
-  require "guard/rspec/dsl"
-  dsl = Guard::RSpec::Dsl.new(self)
-
-  # Feel free to open issues for suggestions and improvements
-
-  # RSpec files
-  rspec = dsl.rspec
-  watch(rspec.spec_helper) { rspec.spec_dir }
-  watch(rspec.spec_support) { rspec.spec_dir }
-  watch(rspec.spec_files)
-
-  # Ruby files
-  ruby = dsl.ruby
-  dsl.watch_spec_files_for(ruby.lib_files)
-
-end
diff --git a/Makefile b/Makefile
index 07c9930..ca165ba 100644
--- a/Makefile
+++ b/Makefile
@@ -1,10 +1,5 @@
 #!/bin/bash
 
-run_all:
-	@rvm 1.9.2,1.9.3,2.0.0,2.1.0 do rvm gemset create rubythumbor
-	@rvm 1.9.2@rubythumbor,1.9.3@rubythumbor,2.0.0@rubythumbor,2.1.0@rubythumbor do bundle
-	@rvm 1.9.2@rubythumbor,1.9.3@rubythumbor,2.0.0@rubythumbor,2.1.0@rubythumbor do bundle exec rake spec
-
 test unit:
 	@bundle exec rake spec
 
diff --git a/lib/ruby-thumbor.rb b/lib/ruby-thumbor.rb
index 2da8c52..85bf24e 100644
--- a/lib/ruby-thumbor.rb
+++ b/lib/ruby-thumbor.rb
@@ -3,4 +3,3 @@
 
 module Thumbor
 end
-
diff --git a/ruby-thumbor.gemspec b/ruby-thumbor.gemspec
index 8a505a1..f2a353a 100644
--- a/ruby-thumbor.gemspec
+++ b/ruby-thumbor.gemspec
@@ -4,21 +4,24 @@ $:.unshift lib unless $:.include?(lib)
 require 'thumbor/version'
 
 Gem::Specification.new do |s|
-  s.name = "ruby-thumbor"
+  s.name = 'ruby-thumbor'
   s.version = Thumbor::VERSION
 
-  s.authors = ["Bernardo Heynemann", "Guilherme Souza"]
-  s.description = "ruby-thumbor is the client to the thumbor imaging service (http://github.com/thumbor/thumbor)."
-  s.email = ["heynemann@gmail.com", "guivideojob@gmail.com"]
-  s.files =  Dir.glob('lib/**/*.rb') << 'README.rdoc'
+  s.authors = ['Bernardo Heynemann', 'Guilherme Souza']
+  s.description = 'ruby-thumbor is the client to the thumbor imaging service (http://github.com/thumbor/thumbor).'
+  s.email = ['heynemann@gmail.com', 'guivideojob@gmail.com']
+  s.files = Dir.glob('lib/**/*.rb') << 'README.rdoc'
   s.test_files = Dir.glob('spec/**/*.rb')
-  s.homepage = "http://github.com/thumbor/ruby-thumbor"
-  s.rdoc_options = ["--main", "README.rdoc"]
-  s.summary = "ruby-thumbor is the client to the thumbor imaging service (http://github.com/thumbor/thumbor)."
-
+  s.homepage = 'http://github.com/thumbor/ruby-thumbor'
+  s.rdoc_options = ['--main', 'README.rdoc']
+  s.summary = 'ruby-thumbor is the client to the thumbor imaging service (http://github.com/thumbor/thumbor).'
 
   s.add_development_dependency('rspec')
   s.add_development_dependency('simplecov')
-  s.add_development_dependency('guard-rspec')
   s.add_development_dependency('rake')
+  if RUBY_VERSION < '2.2'
+    s.add_development_dependency('json', ['< 2.0'])
+    s.add_development_dependency('term-ansicolor', ['< 1.4'])
+    s.add_development_dependency('tins', ['< 1.7'])
+  end
 end