diff --git a/.travis.yml b/.travis.yml
index 5cb6052..b57f220 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -6,11 +6,19 @@ rvm:
   - jruby-19mode
 notifications:
   email: false
-script: xvfb-run rake
+script: xvfb-run bundle exec rake
 env:
   global:
     - BUNDLE_JOBS=4
     - NOKOGIRI_USE_SYSTEM_LIBRARIES=true
+    - QMAKE=/usr/lib/x86_64-linux-gnu/qt4/bin/qmake
+addons:
+  apt:
+    sources:
+      - ubuntu-sdk-team
+    packages:
+      - libqt5webkit5-dev
+      - qtdeclarative5-dev
 matrix:
   include:
     - rvm: 1.9.3
@@ -19,9 +27,14 @@ matrix:
     - rvm: 1.9.3
       gemfile: gemfiles/2.5.gemfile
       env: QMAKE=/usr/lib/x86_64-linux-gnu/qt5/bin/qmake
+    - rvm: 2.2
+      gemfile: gemfiles/master.gemfile
+      env: QMAKE=/usr/lib/x86_64-linux-gnu/qt5/bin/qmake
+  allow_failures:
+    - gemfile: gemfiles/master.gemfile
 gemfile:
   - gemfiles/2.4.gemfile
   - gemfiles/2.5.gemfile
 before_install:
-  - sh -c 'if [ -n "$QMAKE" ]; then sudo apt-add-repository -y ppa:ubuntu-sdk-team/ppa && sudo apt-get update && sudo apt-get install libqt5webkit5-dev qtdeclarative5-dev; fi'
+  - gem install bundler
 install: bundle
diff --git a/Appraisals b/Appraisals
index 2b16066..c91c7b6 100644
--- a/Appraisals
+++ b/Appraisals
@@ -5,3 +5,7 @@ end
 appraise "2.5" do
   gem "capybara", "~> 2.5.0"
 end
+
+appraise "master" do
+  gem "capybara", github: "jnicklas/capybara"
+end
diff --git a/gemfiles/master.gemfile b/gemfiles/master.gemfile
new file mode 100644
index 0000000..b9d1489
--- /dev/null
+++ b/gemfiles/master.gemfile
@@ -0,0 +1,7 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "capybara", github: "jnicklas/capybara"
+
+gemspec :path=>"../"
\ No newline at end of file
diff --git a/gemfiles/master.gemfile.lock b/gemfiles/master.gemfile.lock
new file mode 100644
index 0000000..372cdec
--- /dev/null
+++ b/gemfiles/master.gemfile.lock
@@ -0,0 +1,85 @@
+GIT
+  remote: git://github.com/jnicklas/capybara.git
+  revision: 4b3093f4bd12a682b41d8e88d3958d33e70f4662
+  specs:
+    capybara (2.6.0.dev)
+      mime-types (>= 1.16)
+      nokogiri (>= 1.3.3)
+      rack (>= 1.0.0)
+      rack-test (>= 0.5.4)
+      xpath (~> 2.0)
+
+PATH
+  remote: ../
+  specs:
+    capybara-webkit (1.7.1)
+      capybara (>= 2.3.0, < 2.6.0)
+      json
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    addressable (2.4.0)
+    appraisal (0.4.1)
+      bundler
+      rake
+    childprocess (0.5.8)
+      ffi (~> 1.0, >= 1.0.11)
+    diff-lcs (1.2.5)
+    ffi (1.9.10)
+    json (1.8.3)
+    launchy (2.4.3)
+      addressable (~> 2.3)
+    mime-types (3.0)
+      mime-types-data (~> 3.2015)
+    mime-types-data (3.2015.1120)
+    mini_magick (4.3.6)
+    mini_portile2 (2.0.0)
+    multi_json (1.11.2)
+    nokogiri (1.6.7.1)
+      mini_portile2 (~> 2.0.0.rc2)
+    rack (1.6.4)
+    rack-protection (1.5.3)
+      rack
+    rack-test (0.6.3)
+      rack (>= 1.0)
+    rake (10.4.2)
+    rspec (2.14.1)
+      rspec-core (~> 2.14.0)
+      rspec-expectations (~> 2.14.0)
+      rspec-mocks (~> 2.14.0)
+    rspec-core (2.14.8)
+    rspec-expectations (2.14.5)
+      diff-lcs (>= 1.1.3, < 2.0)
+    rspec-mocks (2.14.6)
+    rubyzip (1.1.7)
+    selenium-webdriver (2.48.1)
+      childprocess (~> 0.5)
+      multi_json (~> 1.0)
+      rubyzip (~> 1.0)
+      websocket (~> 1.0)
+    sinatra (1.4.6)
+      rack (~> 1.4)
+      rack-protection (~> 1.4)
+      tilt (>= 1.3, < 3)
+    tilt (2.0.1)
+    websocket (1.2.2)
+    xpath (2.0.0)
+      nokogiri (~> 1.3)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  appraisal (~> 0.4.0)
+  capybara!
+  capybara-webkit!
+  launchy
+  mini_magick
+  rake
+  rspec (~> 2.14.0)
+  selenium-webdriver
+  sinatra
+
+BUNDLED WITH
+   1.11.2
diff --git a/lib/capybara/webkit/driver.rb b/lib/capybara/webkit/driver.rb
index 652d71a..f4ebf0e 100644
--- a/lib/capybara/webkit/driver.rb
+++ b/lib/capybara/webkit/driver.rb
@@ -287,7 +287,8 @@ module Capybara::Webkit
     end
 
     def invalid_element_errors
-      [Capybara::Webkit::ClickFailed]
+      [Capybara::Webkit::ClickFailed,
+       Capybara::Webkit::NodeNotAttachedError]
     end
 
     def no_such_window_error