diff --git a/features/support/env.rb b/features/support/env.rb
index ce0ef0d87..93119226c 100644
--- a/features/support/env.rb
+++ b/features/support/env.rb
@@ -50,19 +50,19 @@ module Resque
     klass.send(:perform, *args)
   end
 end
-module Diaspora::Websocket
-  def redis
+module Diaspora::WebSocket
+  def self.redis
     FakeRedis.new
   end
 end
 class FakeRedis
-  def rpop
+  def rpop(*args)
     true
   end
-  def llen
+  def llen(*args)
     true
   end
-  def lpush
+  def lpush(*args)
     true
   end
 end
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index 6087c8fed..f5efe9203 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -38,19 +38,19 @@ RSpec.configure do |config|
   end
 end
 
-module Diaspora::Websocket
-  def redis
+module Diaspora::WebSocket
+  def self.redis
     FakeRedis.new
   end
 end
 class FakeRedis
-  def rpop
+  def rpop(*args)
     true
   end
-  def llen
+  def llen(*args)
     true
   end
-  def lpush
+  def lpush(*args)
     true
   end
 end