diff --git a/.rspec b/.rspec
new file mode 100644
index 000000000..43ae20365
--- /dev/null
+++ b/.rspec
@@ -0,0 +1,3 @@
+--color
+--require spec_helper
+--format documentation
diff --git a/Gemfile b/Gemfile
index 63cfd8cd4..1b3399fe1 100644
--- a/Gemfile
+++ b/Gemfile
@@ -117,3 +117,7 @@ group :testing do
   gem 'faker'
   gem 'rubocop', require: false
 end
+
+group :development, :test do
+  gem 'rspec-rails', '~> 3.0'
+end
diff --git a/Gemfile.lock b/Gemfile.lock
index 9d7113946..a6fde8d4d 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -82,6 +82,7 @@ GEM
       responders
       thread_safe (~> 0.1)
       warden (~> 1.2.3)
+    diff-lcs (1.2.5)
     domain_name (0.5.25)
       unf (>= 0.0.5, < 1.0.0)
     erubis (2.7.0)
@@ -204,6 +205,23 @@ GEM
       http-cookie (>= 1.0.2, < 2.0)
       mime-types (>= 1.16, < 3.0)
       netrc (~> 0.7)
+    rspec-core (3.4.1)
+      rspec-support (~> 3.4.0)
+    rspec-expectations (3.4.0)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.4.0)
+    rspec-mocks (3.4.1)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.4.0)
+    rspec-rails (3.4.0)
+      actionpack (>= 3.0, < 4.3)
+      activesupport (>= 3.0, < 4.3)
+      railties (>= 3.0, < 4.3)
+      rspec-core (~> 3.4.0)
+      rspec-expectations (~> 3.4.0)
+      rspec-mocks (~> 3.4.0)
+      rspec-support (~> 3.4.0)
+    rspec-support (3.4.1)
     rubocop (0.36.0)
       parser (>= 2.3.0.0, < 3.0)
       powerpack (~> 0.1)
@@ -306,6 +324,7 @@ DEPENDENCIES
   pry-rails
   rack-mini-profiler
   rails (~> 4.2.0)
+  rspec-rails (~> 3.0)
   rubocop
   ruby-prof
   sass-rails
diff --git a/Rakefile b/Rakefile
index 1d8426c6b..31f0532a0 100644
--- a/Rakefile
+++ b/Rakefile
@@ -5,4 +5,8 @@ require File.expand_path('../config/application', __FILE__)
 
 Logan::Application.load_tasks
 
-task default: [:rubocop, :test]
+RSpec::Core::RakeTask.new(:spec) do |t|
+  t.rspec_opts = '--format progress'
+end
+
+task default: [:rubocop, :test, :spec]