2 files changed, 3 insertions, 4 deletions
diff --git a/Gemfile b/Gemfile
index 0b0d6210e4..e810e0357e 100644
--- a/Gemfile
+++ b/Gemfile
@@ -88,7 +88,8 @@ local_gemfile = File.dirname(__FILE__) + "/.Gemfile"
 instance_eval File.read local_gemfile if File.exist? local_gemfile
 
 group :test do
-  gem "minitest"
+  # FIX: Our test suite isn't ready to run in random order yet.
+  gem "minitest", "< 5.3.4"
 
   platforms :mri do
     gem "stackprof"
diff --git a/Gemfile.lock b/Gemfile.lock
index b8473dd19b..67b5f8c240 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -198,8 +198,6 @@ GEM
       eventmachine (>= 0.12.0)
       websocket-driver (>= 0.5.1)
     ffi (1.9.17)
-    ffi (1.9.17-x64-mingw32)
-    ffi (1.9.17-x86-mingw32)
     globalid (0.3.7)
       activesupport (>= 4.1.0)
     hiredis (0.6.1)
@@ -398,7 +396,7 @@ DEPENDENCIES
   kindlerb (~> 1.2.0)
   libxml-ruby
   listen (>= 3.0.5, < 3.2)
-  minitest
+  minitest (< 5.3.4)
   mocha (~> 0.14)
   mysql2 (>= 0.4.4)
   nokogiri (>= 1.6.8)