diff --git a/features/support/env.rb b/features/support/env.rb
index 9df9ade66..5c6c5ecd7 100644
--- a/features/support/env.rb
+++ b/features/support/env.rb
@@ -44,7 +44,7 @@ Cucumber::Rails::World.use_transactional_fixtures = false
 
 require File.join(File.dirname(__FILE__), "database_cleaner_patches")
 require File.join(File.dirname(__FILE__), "integration_sessions_controller")
-require File.join(File.dirname(__FILE__), "mock_api_calls")
+require File.join(File.dirname(__FILE__), "poor_mans_webmock")
 
 require File.join(File.dirname(__FILE__), "..", "..", "spec", "support", "fake_redis")
 require File.join(File.dirname(__FILE__), "..", "..", "spec", "helper_methods")
diff --git a/features/support/mock_api_calls.rb b/features/support/mock_api_calls.rb
deleted file mode 100644
index da4d00077..000000000
--- a/features/support/mock_api_calls.rb
+++ /dev/null
@@ -1,12 +0,0 @@
-#   Copyright (c) 2010, Diaspora Inc.  This file is
-#   licensed under the Affero General Public License version 3 or later.  See
-#   the COPYRIGHT file.
-
-module Job
-  class PublishToHub < Base
-    @queue = :http_service
-    def self.perform(sender_public_url)
-      # don't publish when in cucumber
-    end
-  end
-end
diff --git a/features/support/poor_mans_webmock.rb b/features/support/poor_mans_webmock.rb
new file mode 100644
index 000000000..060efbe91
--- /dev/null
+++ b/features/support/poor_mans_webmock.rb
@@ -0,0 +1,40 @@
+#   Copyright (c) 2010, Diaspora Inc.  This file is
+#   licensed under the Affero General Public License version 3 or later.  See
+#   the COPYRIGHT file.
+
+module Job
+  class PublishToHub < Base
+    @queue = :http_service
+    def self.perform(sender_public_url)
+      # don't publish to pubsubhubbub in cucumber
+    end
+  end
+
+  class HttpMulti < Base
+    @queue = :http
+    def self.perform(user_id, enc_object_xml, person_ids, retry_count=0)
+      # don't federate in cucumber
+    end
+  end
+
+  class HttpPost < Base
+    @queue = :http
+    def self.perform(url, body, tries_remaining = NUM_TRIES)
+      # don't post to outside services in cucumber
+    end
+  end
+
+  class PostToService < Base
+    @queue = :http_service
+    def self.perform(service_id, post_id, url)
+      # don't post to services in cucumber
+    end
+  end
+
+  class UpdateServiceUsers < Base
+    @queue = :http_service
+    def self.perform(service_id)
+      # don't update services in cucumber
+    end
+  end
+end