diff --git a/Gemfile b/Gemfile
index 0245454..396bca4 100644
--- a/Gemfile
+++ b/Gemfile
@@ -11,7 +11,7 @@ gemspec
 # your gem to rubygems.org.
 
 group :development do
-  gem "rubocop",  "0.32.0"
+  gem "rubocop", "0.32.0"
 
   # Debugging
   gem "pry"
@@ -20,17 +20,20 @@ group :development do
 end
 
 group :test do
-  gem "codeclimate-test-reporter", require: false
+  gem "rspec-instafail",           "0.2.6",  require: false
+  gem "fuubar",                    "2.0.0"
+  gem "nyan-cat-formatter",                  require: false
+
+  # test coverage
+  gem "simplecov",                 "0.10.0", require: false
+  gem "codeclimate-test-reporter",           require: false
+
+  # test helpers
+  gem "factory_girl_rails",        "4.5.0"
 end
 
 group :development, :test do
-  gem "rspec-rails",     "3.2.3"
-  gem "rspec-instafail", "0.2.6", require: false
-  gem "fuubar",          "2.0.0"
-  gem "nyan-cat-formatter", require: false
-
-  # test coverage
-  gem "simplecov", "0.10.0", require: false
+  gem "rspec-rails", "3.2.3"
 
   # test database
   gem "sqlite3"
diff --git a/Gemfile.lock b/Gemfile.lock
index fc9ea77..ebd4e6d 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -56,6 +56,11 @@ GEM
     diff-lcs (1.2.5)
     docile (1.1.5)
     erubis (2.7.0)
+    factory_girl (4.5.0)
+      activesupport (>= 3.0.0)
+    factory_girl_rails (4.5.0)
+      factory_girl (~> 4.5.0)
+      railties (>= 3.0.0)
     fuubar (2.0.0)
       rspec (~> 3.0)
       ruby-progressbar (~> 1.4)
@@ -170,6 +175,7 @@ PLATFORMS
 DEPENDENCIES
   codeclimate-test-reporter
   diaspora_federation!
+  factory_girl_rails (= 4.5.0)
   fuubar (= 2.0.0)
   nyan-cat-formatter
   pry