diff --git a/Gemfile b/Gemfile
index 63bb37799e8..dbfc76df820 100644
--- a/Gemfile
+++ b/Gemfile
@@ -94,6 +94,8 @@ local_gemfile = File.dirname(__FILE__) + "/.Gemfile"
 instance_eval File.read local_gemfile if File.exist? local_gemfile
 
 group :test do
+  gem 'minitest-bisect'
+
   platforms :mri do
     gem "stackprof"
     gem "byebug"
diff --git a/Gemfile.lock b/Gemfile.lock
index 5d6845e6b98..71078c095f3 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -215,7 +215,12 @@ GEM
       mime-types-data (~> 3.2015)
     mime-types-data (3.2016.0521)
     mini_portile2 (2.1.0)
-    minitest (5.9.0)
+    minitest (5.10.1)
+    minitest-bisect (1.4.0)
+      minitest-server (~> 1.0)
+      path_expander (~> 1.0)
+    minitest-server (1.0.4)
+      minitest (~> 5.0)
     mocha (0.14.0)
       metaclass (~> 0.0.1)
     mono_logger (1.1.0)
@@ -234,6 +239,7 @@ GEM
       mini_portile2 (~> 2.1.0)
     parser (2.4.0.0)
       ast (~> 2.2)
+    path_expander (1.0.1)
     pg (0.19.0)
     pg (0.19.0-x64-mingw32)
     pg (0.19.0-x86-mingw32)
@@ -396,6 +402,7 @@ DEPENDENCIES
   kindlerb (~> 1.2.0)
   libxml-ruby
   listen (>= 3.0.5, < 3.2)
+  minitest-bisect
   mocha (~> 0.14)
   mysql2 (>= 0.4.4)
   nokogiri (>= 1.6.8)