diff --git a/Gemfile b/Gemfile
index c48211b..70cb3ae 100644
--- a/Gemfile
+++ b/Gemfile
@@ -53,7 +53,7 @@ end
 
 group :test do
   gem 'factory_girl_rails'
-  gem 'shoulda'
+  gem 'shoulda-matchers', '~> 3.1'
   gem 'faker'
   gem 'simplecov', require: false
 end
diff --git a/Gemfile.lock b/Gemfile.lock
index e3ccfea..39312c5 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -187,12 +187,8 @@ GEM
     sdoc (0.4.1)
       json (~> 1.7, >= 1.7.7)
       rdoc (~> 4.0)
-    shoulda (3.5.0)
-      shoulda-context (~> 1.0, >= 1.0.1)
-      shoulda-matchers (>= 1.4.1, < 3.0)
-    shoulda-context (1.2.1)
-    shoulda-matchers (2.8.0)
-      activesupport (>= 3.0.0)
+    shoulda-matchers (3.1.1)
+      activesupport (>= 4.0.0)
     simplecov (0.11.1)
       docile (~> 1.1.0)
       json (~> 1.8)
@@ -260,7 +256,7 @@ DEPENDENCIES
   rspec-rails (~> 3.0)
   sass-rails
   sdoc (~> 0.4.0)
-  shoulda
+  shoulda-matchers (~> 3.1)
   simplecov
   slim-rails
   spring