diff --git a/.gitignore b/.gitignore
index ea4d702..450b365 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,7 +2,5 @@
 .bundle
 Gemfile.lock
 pkg/*
-.rspec
 .rvmrc
 .idea/
-
diff --git a/.rspec b/.rspec
new file mode 100644
index 0000000..4e1e0d2
--- /dev/null
+++ b/.rspec
@@ -0,0 +1 @@
+--color
diff --git a/.ruby-version b/.ruby-version
deleted file mode 100644
index 7b0231f..0000000
--- a/.ruby-version
+++ /dev/null
@@ -1 +0,0 @@
-1.9.3
\ No newline at end of file
diff --git a/.travis.yml b/.travis.yml
index 9be0735..ee95d32 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,13 +1,38 @@
 language: ruby
-before_install: gem install bundler -v 1.11.2
-script: "bundle exec rspec spec"
+before_install: gem update --remote bundler
+cache: bundler
 rvm:
-  - 1.9.3
-  - 2.0.0
-  - 2.1.0
+  - 2.0
+  - 2.1
+  - 2.2
+  - 2.3
   - ruby-head
-  - jruby-19mode
-  - rbx-2
+  - jruby-9
+  - rbx-2.2.7
+  - rbx-3
+gemfile:
+  - Gemfile.activesupport-3.2
+  - Gemfile.activesupport-4.0
+  - Gemfile.activesupport-4.1
+  - Gemfile.activesupport-4.2
+  - Gemfile.activesupport-5.0
+matrix:
+  allow_failures:
+    - rvm: ruby-head
+    - rvm: rbx-2.2.7
+    - rvm: rbx-3
+  exclude:
+    - rvm: 2.0
+      gemfile: Gemfile.activesupport-5.0
+    - rvm: 2.1
+      gemfile: Gemfile.activesupport-5.0
+    - rvm: 2.3
+      gemfile: Gemfile.activesupport-3.2
+    - rvm: ruby-head
+      gemfile: Gemfile.activesupport-3.2
+    - rvm: jruby-9
+      gemfile: Gemfile.activesupport-5.0
+  fast_finish: true
 notifications:
   email:
     - pnascimento@gmail.com
diff --git a/Gemfile b/Gemfile
index 85f56c6..b4e2a20 100644
--- a/Gemfile
+++ b/Gemfile
@@ -1,4 +1,3 @@
 source "https://rubygems.org"
 
-# Specify your gem's dependencies in taza.gemspec
 gemspec
diff --git a/Gemfile.activesupport-3.2 b/Gemfile.activesupport-3.2
new file mode 100644
index 0000000..7630904
--- /dev/null
+++ b/Gemfile.activesupport-3.2
@@ -0,0 +1,5 @@
+source "https://rubygems.org"
+
+gemspec
+
+gem 'activesupport', '~> 3.2.0'
diff --git a/Gemfile.activesupport-4.0 b/Gemfile.activesupport-4.0
new file mode 100644
index 0000000..76152a2
--- /dev/null
+++ b/Gemfile.activesupport-4.0
@@ -0,0 +1,5 @@
+source "https://rubygems.org"
+
+gemspec
+
+gem 'activesupport', '~> 4.0.0'
diff --git a/Gemfile.activesupport-4.1 b/Gemfile.activesupport-4.1
new file mode 100644
index 0000000..c55160b
--- /dev/null
+++ b/Gemfile.activesupport-4.1
@@ -0,0 +1,5 @@
+source "https://rubygems.org"
+
+gemspec
+
+gem 'activesupport', '~> 4.1.0'
diff --git a/Gemfile.activesupport-4.2 b/Gemfile.activesupport-4.2
new file mode 100644
index 0000000..6e1a7c9
--- /dev/null
+++ b/Gemfile.activesupport-4.2
@@ -0,0 +1,5 @@
+source "https://rubygems.org"
+
+gemspec
+
+gem 'activesupport', '~> 4.2.0'
diff --git a/Gemfile.activesupport-5.0 b/Gemfile.activesupport-5.0
new file mode 100644
index 0000000..d23d143
--- /dev/null
+++ b/Gemfile.activesupport-5.0
@@ -0,0 +1,5 @@
+source "https://rubygems.org"
+
+gemspec
+
+gem 'activesupport', '~> 5.0.0'
diff --git a/History.txt b/History.txt
index 566b575..d21365c 100644
--- a/History.txt
+++ b/History.txt
@@ -1,3 +1,7 @@
+=== master
+
+* Run builds against more versions of Ruby and ActiveSupport
+
 === 1.0
 updated to RSpec 3 (thanks @drewboardman)
 taza now accepts erb settings.yml (thanks @drewboardman)
diff --git a/README.md b/README.md
index 92e9857..9d143ad 100644
--- a/README.md
+++ b/README.md
@@ -3,9 +3,6 @@
 ###### Master 
 [![Build Status](https://travis-ci.org/hammernight/taza.svg?branch=master)](https://travis-ci.org/hammernight/taza) [![Code Climate](https://codeclimate.com/github/hammernight/taza.png)](https://codeclimate.com/github/hammernight/taza) [![Build Status](https://snap-ci.com/hammernight/taza/branch/master/build_image)](https://snap-ci.com/hammernight/taza/branch/master)
 
-###### Branches 
-[![Build Status](https://secure.travis-ci.org/hammernight/taza.png)](http://travis-ci.org/hammernight/taza)
-
 
 * https://github.com/hammernight/taza
 * Wiki: http://github.com/scudco/taza/wikis
@@ -58,7 +55,7 @@ That will generate an RSpec HTML report at artifacts/functional/google/index.htm
 
 ## REQUIREMENTS:
 
-  * Ruby >= 1.9.3
+  * Ruby >= 2.0.0
   * A browser.
 
 ## INSTALL:
diff --git a/taza.gemspec b/taza.gemspec
index 8439fa8..6a515a8 100644
--- a/taza.gemspec
+++ b/taza.gemspec
@@ -11,7 +11,7 @@ Gem::Specification.new do |s|
   s.homepage              = "http://github.com/hammernight/taza"
   s.summary               = "Taza is an opinionated page object framework."
   s.description           = "Taza is an opinionated page object framework."
-  s.required_ruby_version = '>= 1.9.3'
+  s.required_ruby_version = '>= 2.0.0'
   s.rubyforge_project     = "taza"
   s.files                 = `git ls-files`.split("\n")
   s.test_files            = `git ls-files -- {test,spec,features}/*`.split("\n")
@@ -25,7 +25,7 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency(%q<firewatir>, ["~> 1.9.4"])
   s.add_runtime_dependency(%q<watir-webdriver>, ["~> 0.4"])
   s.add_runtime_dependency(%q<watir>, ["~> 5.0.0"])
-  s.add_runtime_dependency(%q<activesupport>, [">= 3.1.0"])
+  s.add_runtime_dependency(%q<activesupport>, [">= 3.2.0"])
   s.add_runtime_dependency(%q<thor>, [">= 0.18.1"])
   s.add_runtime_dependency(%q<rspec>, ["~> 3.0"])
 end