diff --git a/config/environments/test.rb b/config/environments/test.rb
index 7f40c884b..2611a12fa 100644
--- a/config/environments/test.rb
+++ b/config/environments/test.rb
@@ -26,7 +26,8 @@ Diaspora::Application.configure do
   config.action_mailer.delivery_method = :test
   config.threadsafe!
   
-
+  ENV['GNUPGHOME'] = File.expand_path("../../gpg/diaspora-#{Rails.env}/", __FILE__)
+  GPGME::check_version({})
   # Use SQL instead of Active Record's schema dumper when creating the test database.
   # This is necessary if your schema can't be completely dumped by the schema dumper,
   # like if you have constraints or database-specific column types
diff --git a/gpg/diaspora-test/random_seed b/gpg/diaspora-test/random_seed
index 3662498f0..ea68b1833 100644
Binary files a/gpg/diaspora-test/random_seed and b/gpg/diaspora-test/random_seed differ
diff --git a/spec/factories.rb b/spec/factories.rb
index 90eddd3ba..912cb7d90 100644
--- a/spec/factories.rb
+++ b/spec/factories.rb
@@ -1,7 +1,9 @@
 #For Guidance
 #http://github.com/thoughtbot/factory_girl
 # http://railscasts.com/episodes/158-factories-not-fixtures
-
+#This inclsion, because gpg-agent(not needed) is never run and hence never sets any env. variables on a MAC
+ENV['GNUPGHOME'] = File.expand_path("../../gpg/diaspora-#{Rails.env}/", __FILE__)
+GPGME::check_version({})
 
 Factory.define :profile do |p|
   p.first_name "Robert"
@@ -21,7 +23,7 @@ Factory.define :user do |u|
   u.password "bluepin7"
   u.password_confirmation "bluepin7"
   u.url  "www.example.com/"
-  u.key_fingerprint  GPGME.list_keys(nil, true).first.subkeys.first.fingerprint
+  u.key_fingerprint GPGME.list_keys(nil, true).first.subkeys.first.fingerprint
   u.profile Profile.new( :first_name => "Bob", :last_name => "Smith" )
 end