diff --git a/.travis.yml b/.travis.yml
index 0ae22a393..9e23f517c 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,5 +1,4 @@
 rvm:
-  - 1.8.7
   - 1.9.2
   - 1.9.3
   - 2.0.0
@@ -9,14 +8,19 @@ rvm:
   - 2.3.0
   - rbx-2
   - ruby-head
-  - ree
   - jruby-9.0.0.0
   - jruby-9.0.1.0
-  - jruby-18mode
   - jruby-19mode
   - jruby
   - jruby-head
 matrix:
+  include:
+    - rvm: 1.8.7
+      gemfile: ruby1.8.7.gemfile
+    - rvm: ree
+      gemfile: ruby1.8.7.gemfile
+    - rvm: jruby-18mode
+      gemfile: ruby1.8.7.gemfile
   allow_failures:
     - rvm: jruby-9.0.0.0
     - rvm: jruby-18mode
diff --git a/Gemfile b/Gemfile
index fb12b151d..92a8f0bac 100644
--- a/Gemfile
+++ b/Gemfile
@@ -1,6 +1,9 @@
 source 'http://rubygems.org/'
 
 gemspec
+
+gem 'addressable', '>= 2.3.6'
+
 if ENV["EM_HTTP_REQUEST_0_X"]
   gem 'em-http-request', '~> 0.3.0'
 end
diff --git a/ruby1.8.7.gemfile b/ruby1.8.7.gemfile
new file mode 100644
index 000000000..22803d3b7
--- /dev/null
+++ b/ruby1.8.7.gemfile
@@ -0,0 +1,22 @@
+source 'http://rubygems.org/'
+
+gemspec
+
+gem 'addressable', '< 2.3.6'
+
+if ENV["EM_HTTP_REQUEST_0_X"]
+  gem 'em-http-request', '~> 0.3.0'
+end
+
+group :development do
+  gem 'rake'
+end
+
+group :test do
+  gem 'minitest_tu_shim', '1.3.2'
+end
+
+platforms :jruby do
+  gem 'jruby-openssl'
+end
+
diff --git a/webmock.gemspec b/webmock.gemspec
index c52d022ad..4f62fc0ba 100644
--- a/webmock.gemspec
+++ b/webmock.gemspec
@@ -18,7 +18,6 @@ Gem::Specification.new do |s|
   patron_version      = (RUBY_VERSION <= '1.8.7') ? '0.4.18'   : '>= 0.4.18'
   manticore_version   = (RUBY_VERSION) > '1.8.7'  ? '>= 0.5.1' : '<= 0.5.1'
 
-  s.add_dependency 'addressable', '>= 2.3.6'
   s.add_dependency 'crack', '>=0.3.2'
   s.add_dependency 'hashdiff'