diff --git a/.travis.yml b/.travis.yml
index 8542237bc..022dba9f2 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -33,6 +33,8 @@ before_script:
 script:
 - USE_JASMINE_RAKE=true bundle exec rake jasmine:ci
 - bundle exec rspec
+- bundle exec rake report_intermittent_fails:reassemble_spec_examples
+- bundle exec rake report_intermittent_fails:rerun_failing_tests
 - bundle exec rake cucumber:first_try
 - bundle exec rake cucumber:second_try
 after_script:
diff --git a/Gemfile b/Gemfile
index 7948cf808..67a422814 100644
--- a/Gemfile
+++ b/Gemfile
@@ -15,6 +15,11 @@ gem 'jbuilder'
 gem 'puma'
 gem 'rack-cors'
 
+gem 'report_intermittent_fails', git: 'https://github.com/tansaku/report_intermittent_fails'
+#, git: 'https://github.com/tansaku/report_intermittent_fails'
+#, path: '/Users/tansaku/Documents/GitHub/tansaku/report_intermittent_fails/'
+
+
 # Bundle edge Rails instead:
 # gem 'rails',     :git => 'git://github.com/rails/rails.git'
 
diff --git a/Gemfile.lock b/Gemfile.lock
index f7aa45c4a..d1c3900c8 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -6,6 +6,13 @@ GIT
       addressable
       rails
 
+GIT
+  remote: https://github.com/tansaku/report_intermittent_fails
+  revision: 1efaeb686901935191656635c1df81f6d472b6ac
+  specs:
+    report_intermittent_fails (0.1.2)
+      octokit (~> 4)
+
 GEM
   remote: https://rubygems.org/
   specs:
@@ -186,7 +193,7 @@ GEM
       railties (>= 4.2.0)
     faker (2.10.1)
       i18n (>= 1.6, < 2)
-    faraday (0.15.4)
+    faraday (1.0.0)
       multipart-post (>= 1.2, < 3)
     ffi (1.11.3)
     figaro (1.1.1)
@@ -302,6 +309,9 @@ GEM
     nio4r (2.5.2)
     nokogiri (1.10.7)
       mini_portile2 (~> 2.4.0)
+    octokit (4.15.0)
+      faraday (>= 0.9)
+      sawyer (~> 0.8.0, >= 0.5.3)
     orm_adapter (0.5.0)
     parallel (1.19.1)
     paranoia (2.4.2)
@@ -433,6 +443,9 @@ GEM
       sprockets (> 3.0)
       sprockets-rails
       tilt
+    sawyer (0.8.2)
+      addressable (>= 2.3.5)
+      faraday (> 0.8, < 2.0)
     selectize-rails (0.12.6)
     selenium (0.2.11)
       jar_wrapper
@@ -579,6 +592,7 @@ DEPENDENCIES
   rails-controller-testing
   rails_autolink
   redcarpet
+  report_intermittent_fails!
   rspec-activemodel-mocks
   rspec-rails
   rubocop-git
@@ -610,4 +624,4 @@ RUBY VERSION
    ruby 2.6.5p114
 
 BUNDLED WITH
-   1.17.3
+   2.1.4
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index 4a350035c..de5240971 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -1,4 +1,4 @@
-require 'simplecov'
+require 'simplecov' unless ARGV.include?('--only-failures')
 
 # This file was generated by the `rails generate rspec:install` command. Conventionally, all
 # specs live under a `spec` directory, which RSpec adds to the `$LOAD_PATH`.
@@ -87,4 +87,6 @@
   # as the one that triggered the failure.
   Kernel.srand config.seed
 =end
+
+  config.example_status_persistence_file_path = "spec/examples.txt"
 end