diff --git a/features/support/always_use_local_jquery.rb b/features/support/always_use_local_jquery.rb
new file mode 100644
index 000000000..faa428fe4
--- /dev/null
+++ b/features/support/always_use_local_jquery.rb
@@ -0,0 +1,5 @@
+module ApplicationHelper
+  def jquery_include_tag
+    include_javascripts :jquery
+  end
+end
\ No newline at end of file
diff --git a/features/support/env.rb b/features/support/env.rb
index b18a1f52c..db8c7b6ba 100644
--- a/features/support/env.rb
+++ b/features/support/env.rb
@@ -77,18 +77,12 @@ silence_warnings do
 end
 
 require File.join(File.dirname(__FILE__), "..", "..", "spec", "support", "fake_resque")
-module Resque
-  def enqueue(klass, *args)
-    klass.send(:perform, *args)
-  end
-end
 
-# Patch aspect stream to not ajax in itself
-class Stream::Aspect
-  def ajax_stream?
-    false
-  end
-end
+
+require File.join(File.dirname(__FILE__), 'run_resque_in_process')
+require File.join(File.dirname(__FILE__), 'always_use_local_jquery')
+require File.join(File.dirname(__FILE__), 'never_ajax_stream')
+
 
 Before('@localserver') do
   TestServerFixture.start_if_needed
@@ -99,22 +93,4 @@ end
 
 After('@localserver') do
   CapybaraSettings.instance.restore
-end
-
-# class Capybara::Driver::Selenium < Capybara::Driver::Base
-#   class Node < Capybara::Node
-#     def [](name)
-#       node.attribute(name.to_s)
-#     rescue Selenium::WebDriver::Error::WebDriverError
-#       nil
-#     end
-
-#     def select(option)
-#       option_node = node.find_element(:xpath, ".//option[normalize-space(text())=#{Capybara::XPath.escape(option)}]") || node.find_element(:xpath, ".//option[contains(.,#{Capybara::XPath.escape(option)})]")
-#       option_node.click
-#     rescue
-#       options = node.find_elements(:xpath, "//option").map { |o| "'#{o.text}'" }.join(', ')
-#       raise Capybara::OptionNotFound, "No such option '#{option}' in this select box. Available options: #{options}"
-#     end
-#   end
-# end
+end
\ No newline at end of file
diff --git a/features/support/never_ajax_stream.rb b/features/support/never_ajax_stream.rb
new file mode 100644
index 000000000..3630df95f
--- /dev/null
+++ b/features/support/never_ajax_stream.rb
@@ -0,0 +1,5 @@
+class Stream::Aspect
+  def ajax_stream?
+    false
+  end
+end
diff --git a/features/support/run_resque_in_process.rb b/features/support/run_resque_in_process.rb
new file mode 100644
index 000000000..c2b10aa45
--- /dev/null
+++ b/features/support/run_resque_in_process.rb
@@ -0,0 +1,5 @@
+module Resque
+  def enqueue(klass, *args)
+    klass.send(:perform, *args)
+  end
+end
\ No newline at end of file