diff --git a/Gemfile b/Gemfile
index 8fa9a71..27ad0e9 100644
--- a/Gemfile
+++ b/Gemfile
@@ -52,6 +52,8 @@ end
 
 group :test do
   gem 'factory_girl_rails'
+  gem 'shoulda'
+  gem 'shoulda-context'
   gem 'shoulda-matchers'
   gem 'poltergeist'
   gem 'database_cleaner'
@@ -72,7 +74,7 @@ gem 'pg'
 gem 'devise'
 gem 'simple_form'
 gem 'squeel'
-#gem 'mini_exiftool'
+# gem 'mini_exiftool'
 gem 'will_paginate'
 gem 'redcarpet'
 gem 'dragonfly'
diff --git a/Gemfile.lock b/Gemfile.lock
index 4aee0ed..649729b 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -218,8 +218,12 @@ GEM
       sprockets-rails (>= 2.0, < 4.0)
       tilt (>= 1.1, < 3)
     sexp_processor (4.6.0)
-    shoulda-matchers (3.0.0)
-      activesupport (>= 4.0.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)
     simple_form (3.2.0)
       actionpack (~> 4.0)
       activemodel (~> 4.0)
@@ -298,6 +302,8 @@ DEPENDENCIES
   rspec-rails
   ruby_parser
   sass-rails (~> 5.0.0)
+  shoulda
+  shoulda-context
   shoulda-matchers
   simple_form
   simplecov