diff --git a/Gemfile b/Gemfile
index 6732e758c..cea80acfd 100644
--- a/Gemfile
+++ b/Gemfile
@@ -103,9 +103,9 @@ group :development do
   gem 'spring-watcher-listen',   # otherwise spring polls the filesystem on every 0.2 seconds
     github: 'jonleighton/spring-watcher-listen',
     ref: '7f6003e14f8f9ca178a5194f210c07f54cfb67ec'
-  gem 'guard',                 '~> 2.6.1' # run tests automatically
-  gem 'guard-rspec',           '~> 4.3.1'
-  gem 'guard-rails',           '~> 0.7.0' # run EPP server automatically
+  gem 'guard',                 '~> 2.12.6' # run tests automatically
+  gem 'guard-rspec',           '~> 4.5.2'
+  gem 'guard-rails',           '~> 0.7.1' # run EPP server automatically
   gem 'rubocop',               '~> 0.32.1'
   gem 'guard-rubocop',         '~> 1.2.0'
 
@@ -123,15 +123,15 @@ group :development, :test do
   gem 'rspec-rails',        '~> 3.0.2'
   gem 'capybara',           '~> 2.4.1'
   gem 'phantomjs-binaries', '~> 1.9.2.4'
-  gem 'poltergeist',        '~> 1.5.1'  # We are using PhantomJS instead
-  gem 'phantomjs',          '~> 1.9.7.1'
+  gem 'poltergeist',        '~> 1.6.0'  # We are using PhantomJS instead
+  gem 'phantomjs',          '~> 1.9.8.0'
   gem 'fabrication',        '~> 2.13.2' # Replacement for fixtures
   gem 'shoulda-matchers',   '~> 2.6.1', require: false # Additional matchers for RSpec
   gem 'launchy',            '~> 2.4.3' # for opening browser automatically
 
   # helper gems
-  gem 'database_cleaner',    '~> 1.3.0' # For cleaning db in feature and epp tests
-  gem 'faker',               '~> 1.3.0' # Library to generate fake data
+  gem 'database_cleaner',    '~> 1.4.1' # For cleaning db in feature and epp tests
+  gem 'faker',               '~> 1.4.3' # Library to generate fake data
 
   # debug
   gem 'pry', '~> 0.10.1'
diff --git a/Gemfile.lock b/Gemfile.lock
index 3e67d909c..66ecb33eb 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -160,7 +160,7 @@ GEM
     crack (0.4.2)
       safe_yaml (~> 1.0.0)
     currencies (0.4.2)
-    database_cleaner (1.3.0)
+    database_cleaner (1.4.1)
     debug_inspector (0.0.2)
     deep_cloneable (2.1.1)
       activerecord (>= 3.1.0, < 5.0.0)
@@ -188,7 +188,7 @@ GEM
     erubis (2.7.0)
     execjs (2.5.2)
     fabrication (2.13.2)
-    faker (1.3.0)
+    faker (1.4.3)
       i18n (~> 0.5)
     fastercsv (1.5.5)
     ffi (1.9.8)
@@ -213,17 +213,23 @@ GEM
       rack-accept
       rack-mount
       virtus (>= 1.0.0)
-    guard (2.6.1)
+    guard (2.12.6)
       formatador (>= 0.2.4)
       listen (~> 2.7)
       lumberjack (~> 1.0)
+      nenv (~> 0.1)
+      notiffany (~> 0.0)
       pry (>= 0.9.12)
+      shellany (~> 0.0)
       thor (>= 0.18.1)
-    guard-rails (0.7.0)
-      guard (~> 2.0)
-    guard-rspec (4.3.1)
+    guard-compat (1.2.1)
+    guard-rails (0.7.1)
+      guard (~> 2.11)
+      guard-compat (~> 1.0)
+    guard-rspec (4.5.2)
       guard (~> 2.1)
-      rspec (>= 2.14, < 4.0)
+      guard-compat (~> 1.1)
+      rspec (>= 2.99.0, < 4.0)
     guard-rubocop (1.2.0)
       guard (~> 2.0)
       rubocop (~> 0.20)
@@ -306,10 +312,14 @@ GEM
       railties (>= 3.0)
     multi_json (1.11.1)
     multi_xml (0.5.5)
+    nenv (0.2.0)
     newrelic_rpm (3.12.0.288)
     nokogiri (1.6.6.2)
       mini_portile (~> 0.6.0)
     nori (2.6.0)
+    notiffany (0.0.6)
+      nenv (~> 0.1)
+      shellany (~> 0.0)
     nprogress-rails (0.1.6.7)
     open4 (1.3.4)
     orm_adapter (0.5.0)
@@ -317,10 +327,10 @@ GEM
       ast (>= 1.1, < 3.0)
     pdfkit (0.6.2)
     pg (0.18.2)
-    phantomjs (1.9.7.1)
+    phantomjs (1.9.8.0)
     phantomjs-binaries (1.9.2.4)
       sys-uname (= 0.9.0)
-    poltergeist (1.5.1)
+    poltergeist (1.6.0)
       capybara (~> 2.1)
       cliver (~> 0.3.1)
       multi_json (~> 1.0)
@@ -456,6 +466,7 @@ GEM
       thor (~> 0.14)
     selectize-rails (0.12.1)
     sexp_processor (4.6.0)
+    shellany (0.0.1)
     shoulda-matchers (2.6.2)
       activesupport (>= 3.0.0)
     simplecov (0.10.0)
@@ -549,19 +560,19 @@ DEPENDENCIES
   coffee-rails (~> 4.1.0)
   countries (~> 0.10.0)
   data_migrate!
-  database_cleaner (~> 1.3.0)
+  database_cleaner (~> 1.4.1)
   deep_cloneable (~> 2.1.1)
   devise (~> 3.4.1)
   digidoc_client (~> 0.2.1)
   epp (~> 1.4.2)!
   epp-xml (~> 1.0.3)
   fabrication (~> 2.13.2)
-  faker (~> 1.3.0)
+  faker (~> 1.4.3)
   figaro (~> 1.1.0)
   grape (~> 0.10.1)
-  guard (~> 2.6.1)
-  guard-rails (~> 0.7.0)
-  guard-rspec (~> 4.3.1)
+  guard (~> 2.12.6)
+  guard-rails (~> 0.7.1)
+  guard-rspec (~> 4.5.2)
   guard-rubocop (~> 1.2.0)
   haml-rails (~> 0.9.0)
   hashie-forbidden_attributes (~> 0.1.1)
@@ -583,9 +594,9 @@ DEPENDENCIES
   paper_trail!
   pdfkit (~> 0.6.2)
   pg (~> 0.18.0)
-  phantomjs (~> 1.9.7.1)
+  phantomjs (~> 1.9.8.0)
   phantomjs-binaries (~> 1.9.2.4)
-  poltergeist (~> 1.5.1)
+  poltergeist (~> 1.6.0)
   pry (~> 0.10.1)
   que (~> 0.10.0)
   que-web (~> 0.4.0)