diff --git a/Gemfile b/Gemfile
index 4d44e51b48..2df78ad741 100644
--- a/Gemfile
+++ b/Gemfile
@@ -13,4 +13,5 @@ gem 'rubocop', github: 'rubocop/rubocop'
 gem 'rubocop-performance', '~> 1.11.0'
 gem 'rubocop-rspec', '~> 1.29.0'
 gem 'simplecov'
+gem 'test-queue'
 gem 'yard', '~> 0.9'
diff --git a/Rakefile b/Rakefile
index d0ebba31a9..d2a52cd22e 100644
--- a/Rakefile
+++ b/Rakefile
@@ -18,8 +18,13 @@ end
 require 'rubocop/rake_task'
 require 'rspec/core/rake_task'
 
-RSpec::Core::RakeTask.new(:spec) do |spec|
-  spec.pattern = FileList['spec/**/*_spec.rb']
+desc 'Run RSpec'
+task :spec do
+  if Process.respond_to?(:fork)
+    sh('rspec-queue spec')
+  else
+    sh('rspec spec')
+  end
 end
 
 desc 'Run RSpec with code coverage'