diff --git a/.gitmodules b/.gitmodules
index 072bbc6..4d93961 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,3 +1,6 @@
 [submodule "spec/ruby_spec"]
 	path = spec/ruby_spec
 	url = https://github.com/ruby/spec
+[submodule "spec/mspec"]
+	path = spec/mspec
+	url = https://github.com/ruby/mspec
diff --git a/.travis.yml b/.travis.yml
index 00730c7..1883abd 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -19,7 +19,7 @@ matrix:
   allow_failures:
   - env: RUST_BACKTRACE=1 ENCODING=true TEST_MONKEYPATCHES=true WITH_REGRESSION=true
 before_install:
-- gem install bundler -v 1.14.5
+- gem install bundler --pre
 - curl -sSf https://static.rust-lang.org/rustup.sh | sudo sh -s -- --channel=nightly
 - bundle && bundle exec rake build_src && rake clean_src
 script: bundle exec rake test
diff --git a/Rakefile b/Rakefile
index 33a6b33..65936e2 100644
--- a/Rakefile
+++ b/Rakefile
@@ -69,12 +69,12 @@ Rake::TestTask.new(minitest: :build_lib) do |t|
 end
 
 task test: [:cargo, :minitest, :lint] do |_t|
-  exec 'mspec --format spec core/file/basename core/file/extname core/file/dirname library/pathname'
+  exec 'spec/mspec/bin/mspec --format spec core/file/basename core/file/extname core/file/dirname library/pathname'
 end
 
 desc "Full mspec results w/o encoding"
 task :mspec_full do
-  exec %(bash -c "TEST_MONKEYPATCHES=true WITH_REGRESSION=true mspec --format spec core/file/basename core/file/extname core/file/dirname library/pathname")
+  exec %(bash -c "TEST_MONKEYPATCHES=true WITH_REGRESSION=true spec/mspec/bin/mspec --format spec core/file/basename core/file/extname core/file/dirname library/pathname")
 end
 
 desc "Full mspec results w/ encoding"
diff --git a/spec/mspec b/spec/mspec
new file mode 160000
index 0000000..7b67e04
--- /dev/null
+++ b/spec/mspec
@@ -0,0 +1 @@
+Subproject commit 7b67e04874dd16ea920c41d44fd67fecbdad8426