diff --git a/Gemfile b/Gemfile
index c017428..78727dc 100644
--- a/Gemfile
+++ b/Gemfile
@@ -60,9 +60,6 @@ group :development, :test do
   gem "rspec-core", "~> 3.5.1"
   gem "rspec-rails", "~> 3.5.1"
 
-  # GUID generation
-  gem "uuid", "~> 2.3.8"
-
   # test database
   gem "sqlite3", "~> 1.3.11"
 end
diff --git a/Gemfile.lock b/Gemfile.lock
index e39f875..f4ebd75 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -13,6 +13,7 @@ PATH
     diaspora_federation-test (0.1.7)
       diaspora_federation (= 0.1.7)
       factory_girl (~> 4.7)
+      uuid (~> 2.3.8)
 
 GEM
   remote: https://rubygems.org/
@@ -316,7 +317,6 @@ DEPENDENCIES
   spring-commands-rspec
   spring-watcher-listen
   sqlite3 (~> 1.3.11)
-  uuid (~> 2.3.8)
   webmock (~> 2.0)
   yard
 
diff --git a/diaspora_federation-test.gemspec b/diaspora_federation-test.gemspec
index 5dd4c69..e0b8cba 100644
--- a/diaspora_federation-test.gemspec
+++ b/diaspora_federation-test.gemspec
@@ -21,4 +21,5 @@ Gem::Specification.new do |s|
 
   s.add_dependency "diaspora_federation", DiasporaFederation::VERSION
   s.add_dependency "factory_girl", "~> 4.7"
+  s.add_dependency "uuid", "~> 2.3.8"
 end
diff --git a/lib/diaspora_federation/test/factories.rb b/lib/diaspora_federation/test/factories.rb
index fbfa20d..e27e2f2 100644
--- a/lib/diaspora_federation/test/factories.rb
+++ b/lib/diaspora_federation/test/factories.rb
@@ -1,5 +1,6 @@
 require "diaspora_federation"
 require "factory_girl"
+require "uuid"
 
 module DiasporaFederation
   module Test