diff --git a/Gemfile b/Gemfile
index 8fbd501..83b3537 100644
--- a/Gemfile
+++ b/Gemfile
@@ -24,7 +24,7 @@ group :development do
 end
 
 group :test do
-  # unit tests
+  # rspec formatter
   gem "fuubar",                    "2.0.0",  require: false
   gem "nyan-cat-formatter",                  require: false
 
@@ -32,9 +32,16 @@ group :test do
   gem "simplecov",                 "0.10.0", require: false
   gem "simplecov-rcov",            "0.2.3",  require: false
   gem "codeclimate-test-reporter",           require: false
+
+  # test helpers
+  gem "fixture_builder",    "~> 0.4.1"
+  gem "factory_girl_rails", "~> 4.5.0"
 end
 
 group :development, :test do
+  # unit tests
+  gem "rspec-rails", "~> 3.3.2"
+
   # automatic test runs
   gem "guard-rspec", require: false
 
@@ -42,9 +49,11 @@ group :development, :test do
   gem "spring"
   gem "spring-commands-rspec"
 
-  # TODO: development dependencies from gemspec
-  gem "rspec-rails", "~> 3.3.2"
-  gem "uuid",        "~> 2.3.8"
+  # GUID generation
+  gem "uuid", "~> 2.3.8"
+
+  # test database
+  gem "sqlite3", "~> 1.3.10"
 end
 
 group :development, :production do
diff --git a/diaspora_federation.gemspec b/diaspora_federation.gemspec
index 7fb2dd9..50a8772 100644
--- a/diaspora_federation.gemspec
+++ b/diaspora_federation.gemspec
@@ -15,24 +15,7 @@ Gem::Specification.new do |s|
   s.license     = "AGPL 3.0 - http://www.gnu.org/licenses/agpl-3.0.html"
 
   s.files      = Dir["{app,lib}/**/*", "config/routes.rb", "LICENSE", "Rakefile", "README.md"]
-  s.test_files = `git ls-files -- {test,spec}/*`.split("\n")
 
   s.add_dependency "rails",    "~> 4.2.2"
   s.add_dependency "nokogiri", "~> 1.6.6.2"
-
-  ############################
-  # development dependencies #
-  ############################
-
-  # unit tests
-  s.add_development_dependency "rspec-rails",        "~> 3.3.2"
-  # test helpers
-  s.add_development_dependency "fixture_builder",    "~> 0.4.1"
-  s.add_development_dependency "factory_girl_rails", "~> 4.5.0"
-
-  # GUID generation
-  s.add_development_dependency "uuid",               "~> 2.3.8"
-
-  # test database
-  s.add_development_dependency "sqlite3",            "~> 1.3.10"
 end