diff --git a/README.md b/README.md
index f73a9ad0..fa2c8741 100644
--- a/README.md
+++ b/README.md
@@ -59,7 +59,7 @@ $ popd
 
 ### Run tests
 ```sh-session
-$ bundle exec rspec
+$ bundle exec rake
 ```
 ### Run the server
 ```sh-session
diff --git a/Rakefile b/Rakefile
index 0b13d449..3f07de68 100644
--- a/Rakefile
+++ b/Rakefile
@@ -9,6 +9,21 @@ namespace :db do
   end
 end
 
+begin
+  require 'rspec/core/rake_task'
+  RSpec::Core::RakeTask.new(:spec)
+
+  task :core_specs do
+    RSpec::Core::RakeTask.new(:core_spec) do |t|
+      t.pattern = 'core_specs/**{,/*/**}/*_spec.rb'
+    end
+    Rake::Task["core_spec"].execute
+  end
+
+  task :default => [:spec, :core_specs]
+rescue LoadError
+end
+
 desc "generate gemspec"
 task 'travis-api.gemspec' do
   content = File.read 'travis-api.gemspec'