diff --git a/.travis.yml b/.travis.yml
index 11f7a0ec25..d9717c85a6 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -24,6 +24,9 @@ addons:
       - libreadline-dev
       - libsqlite3-dev
       - libxslt1-dev
+  artifacts:
+    paths:
+      - $(ls tmp/artifact* | tr "\n" ":")
 
 # workaround for https://github.com/travis-ci/travis-ci/issues/4536
 before_install:
diff --git a/features/support/snapshot.rb b/features/support/snapshot.rb
new file mode 100644
index 0000000000..9cb19d4a73
--- /dev/null
+++ b/features/support/snapshot.rb
@@ -0,0 +1,9 @@
+
+After do |scenario|
+  if scenario.failed?
+    if ENV['TRAVIS']
+      build = ENV['TRAVIS_BUILD_NUMBER']
+      page.driver.save_screenshot "./tmp/artifact-travis-#{build}-#{scenario.name.parameterize}.png"
+    end
+  end
+end