diff --git a/.gitignore b/.gitignore
index 38ce2399..50587aca 100644
--- a/.gitignore
+++ b/.gitignore
@@ -9,15 +9,16 @@
 /*.gem
 
 # Ignore bundler config
+/bin
 /.bundle
-/Gemfile.lock
+/Gemfile*.lock
 
 # Ignore autoset environment variables
 /.ruby-env
 
 # Ignore all bundler caching
 /vendor/cache
-/vendor/ruby
+/vendor/bundle
 
 # Ignore all tempfiles
 /tmp
diff --git a/Gemfile.faraday-0.8 b/Gemfile.faraday-0.8
new file mode 100644
index 00000000..b394047b
--- /dev/null
+++ b/Gemfile.faraday-0.8
@@ -0,0 +1,5 @@
+source "https://rubygems.org"
+
+gem "faraday", "~> 0.8.8"
+
+gemspec
diff --git a/Gemfile.typhoeus-0.4 b/Gemfile.typhoeus-0.4
new file mode 100644
index 00000000..14b461ae
--- /dev/null
+++ b/Gemfile.typhoeus-0.4
@@ -0,0 +1,6 @@
+source "https://rubygems.org"
+
+gem "typhoeus", "~> 0.4.2"
+gem "webmock", "~> 1.8.11"
+
+gemspec
diff --git a/Rakefile b/Rakefile
index a5e4af65..6a6bffe8 100644
--- a/Rakefile
+++ b/Rakefile
@@ -11,12 +11,6 @@ task default: :spec
 
 using_git = File.exist?(File.expand_path('../.git/', __FILE__))
 
-begin
-  require 'appraisal'
-rescue LoadError
-  warn "Warning: %s" % $! unless ENV['CI']
-end
-
 require 'cucumber/rake/task'
 Cucumber::Rake::Task.new
 
diff --git a/gemfiles/faraday_old.gemfile b/gemfiles/faraday_old.gemfile
deleted file mode 100644
index 85729fae..00000000
--- a/gemfiles/faraday_old.gemfile
+++ /dev/null
@@ -1,29 +0,0 @@
-# This file was generated by Appraisal
-
-source "https://rubygems.org"
-
-gem "jruby-openssl", :platforms=>:jruby
-gem "yard"
-gem "rake", ">= 0.9.2"
-gem "cucumber", ">= 1.1.4"
-gem "aruba", ">= 0.5"
-gem "rspec", "~> 3.1"
-gem "fakeweb", ">= 1.3.0"
-gem "webmock", ">= 1.14"
-gem "httpclient", ">= 2.2"
-gem "excon", ">= 0.22"
-gem "timecop", "0.6.1"
-gem "rack", ">= 1.3.6"
-gem "sinatra", ">= 1.3.2"
-gem "multi_json", ">= 1.0.3"
-gem "json", ">= 1.6.5"
-gem "simplecov", ">= 0.5.3"
-gem "redis", ">= 2.2.2"
-gem "typhoeus", ">= 0.6"
-gem "patron", ">= 0.4.15", :platform=>:ruby
-gem "em-http-request", ">= 1.0.2", :platform=>:ruby
-gem "curb", ">= 0.8.0", :platform=>:ruby
-gem "yajl-ruby", ">= 1.1.0", :platform=>:ruby
-gem "faraday", "~> 0.8.8"
-
-gemspec :path=>"../"
\ No newline at end of file
diff --git a/gemfiles/faraday_old.gemfile.lock b/gemfiles/faraday_old.gemfile.lock
deleted file mode 100644
index 6cf63c6a..00000000
--- a/gemfiles/faraday_old.gemfile.lock
+++ /dev/null
@@ -1,118 +0,0 @@
-PATH
-  remote: ../
-  specs:
-    vcr (2.9.3)
-
-GEM
-  remote: https://rubygems.org/
-  specs:
-    addressable (2.3.6)
-    aruba (0.6.1)
-      childprocess (>= 0.3.6)
-      cucumber (>= 1.1.1)
-      rspec-expectations (>= 2.7.0)
-    builder (3.2.2)
-    childprocess (0.5.5)
-      ffi (~> 1.0, >= 1.0.11)
-    cookiejar (0.3.2)
-    crack (0.4.2)
-      safe_yaml (~> 1.0.0)
-    cucumber (1.3.17)
-      builder (>= 2.1.2)
-      diff-lcs (>= 1.1.3)
-      gherkin (~> 2.12)
-      multi_json (>= 1.7.5, < 2.0)
-      multi_test (>= 0.1.1)
-    curb (0.8.6)
-    diff-lcs (1.2.5)
-    docile (1.1.5)
-    em-http-request (1.1.2)
-      addressable (>= 2.3.4)
-      cookiejar
-      em-socksify (>= 0.3)
-      eventmachine (>= 1.0.3)
-      http_parser.rb (>= 0.6.0)
-    em-socksify (0.3.0)
-      eventmachine (>= 1.0.0.beta.4)
-    ethon (0.7.1)
-      ffi (>= 1.3.0)
-    eventmachine (1.0.3)
-    excon (0.40.0)
-    fakeweb (1.3.0)
-    faraday (0.8.9)
-      multipart-post (~> 1.2.0)
-    ffi (1.9.5)
-    gherkin (2.12.2)
-      multi_json (~> 1.3)
-    http_parser.rb (0.6.0)
-    httpclient (2.4.0)
-    json (1.8.1)
-    multi_json (1.10.1)
-    multi_test (0.1.1)
-    multipart-post (1.2.0)
-    patron (0.4.18)
-    rack (1.5.2)
-    rack-protection (1.5.3)
-      rack
-    rake (10.3.2)
-    redis (3.1.0)
-    rspec (3.1.0)
-      rspec-core (~> 3.1.0)
-      rspec-expectations (~> 3.1.0)
-      rspec-mocks (~> 3.1.0)
-    rspec-core (3.1.6)
-      rspec-support (~> 3.1.0)
-    rspec-expectations (3.1.2)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.1.0)
-    rspec-mocks (3.1.3)
-      rspec-support (~> 3.1.0)
-    rspec-support (3.1.2)
-    safe_yaml (1.0.4)
-    simplecov (0.9.1)
-      docile (~> 1.1.0)
-      multi_json (~> 1.0)
-      simplecov-html (~> 0.8.0)
-    simplecov-html (0.8.0)
-    sinatra (1.4.5)
-      rack (~> 1.4)
-      rack-protection (~> 1.4)
-      tilt (~> 1.3, >= 1.3.4)
-    tilt (1.4.1)
-    timecop (0.6.1)
-    typhoeus (0.6.9)
-      ethon (>= 0.7.1)
-    webmock (1.19.0)
-      addressable (>= 2.3.6)
-      crack (>= 0.3.2)
-    yajl-ruby (1.2.1)
-    yard (0.8.7.4)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  aruba (>= 0.5)
-  cucumber (>= 1.1.4)
-  curb (>= 0.8.0)
-  em-http-request (>= 1.0.2)
-  excon (>= 0.22)
-  fakeweb (>= 1.3.0)
-  faraday (~> 0.8.8)
-  httpclient (>= 2.2)
-  jruby-openssl
-  json (>= 1.6.5)
-  multi_json (>= 1.0.3)
-  patron (>= 0.4.15)
-  rack (>= 1.3.6)
-  rake (>= 0.9.2)
-  redis (>= 2.2.2)
-  rspec (~> 3.1)
-  simplecov (>= 0.5.3)
-  sinatra (>= 1.3.2)
-  timecop (= 0.6.1)
-  typhoeus (>= 0.6)
-  vcr!
-  webmock (>= 1.14)
-  yajl-ruby (>= 1.1.0)
-  yard
diff --git a/gemfiles/typhoeus_old.gemfile b/gemfiles/typhoeus_old.gemfile
deleted file mode 100644
index 47fe72d0..00000000
--- a/gemfiles/typhoeus_old.gemfile
+++ /dev/null
@@ -1,29 +0,0 @@
-# This file was generated by Appraisal
-
-source "https://rubygems.org"
-
-gem "jruby-openssl", :platforms=>:jruby
-gem "yard"
-gem "rake", ">= 0.9.2"
-gem "cucumber", ">= 1.1.4"
-gem "aruba", ">= 0.5"
-gem "rspec", "~> 3.1"
-gem "fakeweb", ">= 1.3.0"
-gem "faraday", ">= 0.8"
-gem "httpclient", ">= 2.2"
-gem "excon", ">= 0.22"
-gem "timecop", "0.6.1"
-gem "rack", ">= 1.3.6"
-gem "sinatra", ">= 1.3.2"
-gem "multi_json", ">= 1.0.3"
-gem "json", ">= 1.6.5"
-gem "simplecov", ">= 0.5.3"
-gem "redis", ">= 2.2.2"
-gem "patron", ">= 0.4.15", :platform=>:ruby
-gem "em-http-request", ">= 1.0.2", :platform=>:ruby
-gem "curb", ">= 0.8.0", :platform=>:ruby
-gem "yajl-ruby", ">= 1.1.0", :platform=>:ruby
-gem "typhoeus", "~> 0.4.2"
-gem "webmock", "1.8.11"
-
-gemspec :path=>"../"
\ No newline at end of file
diff --git a/gemfiles/typhoeus_old.gemfile.lock b/gemfiles/typhoeus_old.gemfile.lock
deleted file mode 100644
index a565dcc7..00000000
--- a/gemfiles/typhoeus_old.gemfile.lock
+++ /dev/null
@@ -1,118 +0,0 @@
-PATH
-  remote: ../
-  specs:
-    vcr (2.9.3)
-
-GEM
-  remote: https://rubygems.org/
-  specs:
-    addressable (2.3.5)
-    aruba (0.5.3)
-      childprocess (>= 0.3.6)
-      cucumber (>= 1.1.1)
-      rspec-expectations (>= 2.7.0)
-    builder (3.2.2)
-    childprocess (0.3.9)
-      ffi (~> 1.0, >= 1.0.11)
-    cookiejar (0.3.0)
-    crack (0.4.1)
-      safe_yaml (~> 0.9.0)
-    cucumber (1.3.10)
-      builder (>= 2.1.2)
-      diff-lcs (>= 1.1.3)
-      gherkin (~> 2.12)
-      multi_json (>= 1.7.5, < 2.0)
-      multi_test (>= 0.0.2)
-    curb (0.8.5)
-    diff-lcs (1.2.5)
-    docile (1.1.0)
-    em-http-request (1.1.1)
-      addressable (>= 2.3.4)
-      cookiejar
-      em-socksify (>= 0.3)
-      eventmachine (>= 1.0.3)
-      http_parser.rb (>= 0.6.0.beta.2)
-    em-socksify (0.3.0)
-      eventmachine (>= 1.0.0.beta.4)
-    eventmachine (1.0.3)
-    excon (0.29.0)
-    fakeweb (1.3.0)
-    faraday (0.8.8)
-      multipart-post (~> 1.2.0)
-    ffi (1.9.3)
-    gherkin (2.12.2)
-      multi_json (~> 1.3)
-    http_parser.rb (0.6.0.beta.2)
-    httpclient (2.3.4.1)
-    json (1.8.1)
-    mime-types (1.25)
-    multi_json (1.8.2)
-    multi_test (0.0.2)
-    multipart-post (1.2.0)
-    patron (0.4.18)
-    rack (1.5.2)
-    rack-protection (1.5.1)
-      rack
-    rake (10.1.0)
-    redis (3.0.6)
-    rspec (3.1.0)
-      rspec-core (~> 3.1.0)
-      rspec-expectations (~> 3.1.0)
-      rspec-mocks (~> 3.1.0)
-    rspec-core (3.1.6)
-      rspec-support (~> 3.1.0)
-    rspec-expectations (3.1.2)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.1.0)
-    rspec-mocks (3.1.3)
-      rspec-support (~> 3.1.0)
-    rspec-support (3.1.2)
-    safe_yaml (0.9.7)
-    simplecov (0.8.2)
-      docile (~> 1.1.0)
-      multi_json
-      simplecov-html (~> 0.8.0)
-    simplecov-html (0.8.0)
-    sinatra (1.4.4)
-      rack (~> 1.4)
-      rack-protection (~> 1.4)
-      tilt (~> 1.3, >= 1.3.4)
-    tilt (1.4.1)
-    timecop (0.6.1)
-    typhoeus (0.4.2)
-      ffi (~> 1.0)
-      mime-types (~> 1.18)
-    webmock (1.8.11)
-      addressable (>= 2.2.7)
-      crack (>= 0.1.7)
-    yajl-ruby (1.1.0)
-    yard (0.8.7.3)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  aruba (>= 0.5)
-  cucumber (>= 1.1.4)
-  curb (>= 0.8.0)
-  em-http-request (>= 1.0.2)
-  excon (>= 0.22)
-  fakeweb (>= 1.3.0)
-  faraday (>= 0.8)
-  httpclient (>= 2.2)
-  jruby-openssl
-  json (>= 1.6.5)
-  multi_json (>= 1.0.3)
-  patron (>= 0.4.15)
-  rack (>= 1.3.6)
-  rake (>= 0.9.2)
-  redis (>= 2.2.2)
-  rspec (~> 3.1)
-  simplecov (>= 0.5.3)
-  sinatra (>= 1.3.2)
-  timecop (= 0.6.1)
-  typhoeus (~> 0.4.2)
-  vcr!
-  webmock (= 1.8.11)
-  yajl-ruby (>= 1.1.0)
-  yard
diff --git a/script/ci.sh b/script/ci.sh
index ddf41ba8..83aaf07a 100755
--- a/script/ci.sh
+++ b/script/ci.sh
@@ -47,6 +47,7 @@ fold() {
 }
 
 run() {
+  [[ "${BUNDLE_GEMFILE##*/}" == Gemfile.* ]] && bundle install
   # Save warnings on stderr to a separate file
   RUBYOPT="$RUBYOPT -w" "$@" 2> >(tee >(grep 'warning:' >>"$warnings") | grep -v 'warning:')
 }
@@ -72,10 +73,10 @@ export JAVA_OPTS='-client -XX:+TieredCompilation -XX:TieredStopAtLevel=1'
 
 export SPEC_OPTS="--backtrace --profile"
 
-BUNDLE_GEMFILE=gemfiles/typhoeus_old.gemfile fold "typhoeus-old" \
+BUNDLE_GEMFILE=Gemfile.typhoeus-0.4 fold "typhoeus-0.4" \
   run script/test spec/lib/vcr/library_hooks/typhoeus_0.4_spec.rb
 
-BUNDLE_GEMFILE=gemfiles/faraday_old.gemfile fold "faraday-old" \
+BUNDLE_GEMFILE=Gemfile.faraday-0.8 fold "faraday-0.8" \
   run script/test spec/lib/vcr/middleware/faraday_spec.rb spec/lib/vcr/library_hooks/faraday_spec.rb \
     features/middleware/faraday.feature
 
diff --git a/vcr.gemspec b/vcr.gemspec
index b702725e..f7d153ac 100644
--- a/vcr.gemspec
+++ b/vcr.gemspec
@@ -43,7 +43,6 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "em-http-request"
   spec.add_development_dependency "curb"
   spec.add_development_dependency "yajl-ruby"
-  spec.add_development_dependency "appraisal"
   spec.add_development_dependency "relish"
   spec.add_development_dependency "mime-types"
   spec.add_development_dependency "sinatra"