diff --git a/Gemfile.lock b/Gemfile.lock
index fdd805ffb3..af73c172f2 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -145,13 +145,13 @@ GEM
       multi_json (~> 1.0)
     builder (3.0.4)
     cancan (1.6.7)
-    capybara (1.1.3)
+    capybara (2.0.2)
       mime-types (>= 1.16)
       nokogiri (>= 1.3.3)
       rack (>= 1.0.0)
       rack-test (>= 0.5.4)
       selenium-webdriver (~> 2.0)
-      xpath (~> 0.1.4)
+      xpath (~> 1.0.0)
     childprocess (0.3.6)
       ffi (~> 1.0, >= 1.0.6)
     cocaine (0.4.2)
@@ -196,7 +196,7 @@ GEM
     faker (1.0.1)
       i18n (~> 0.4)
     ffaker (1.12.1)
-    ffi (1.1.5)
+    ffi (1.3.1)
     haml (3.1.6)
     highline (1.6.11)
     hike (1.2.1)
@@ -215,8 +215,9 @@ GEM
       railties (>= 3.0.0)
     kgio (2.7.4)
     libv8 (3.3.10.4)
-    libwebsocket (0.1.5)
+    libwebsocket (0.1.7.1)
       addressable
+      websocket
     mail (2.4.4)
       i18n (>= 0.4.0)
       mime-types (~> 1.16)
@@ -226,12 +227,12 @@ GEM
     money (5.0.0)
       i18n (~> 0.4)
       json
-    multi_json (1.3.6)
+    multi_json (1.5.0)
     multi_xml (0.5.1)
     nested_set (1.7.0)
       activerecord (>= 3.0.0)
       railties (>= 3.0.0)
-    nokogiri (1.5.5)
+    nokogiri (1.5.6)
     orm_adapter (0.0.7)
     paperclip (2.8.0)
       activerecord (>= 2.3.0)
@@ -252,7 +253,7 @@ GEM
     rabl (0.6.5)
       activesupport (>= 2.3.14)
       multi_json (~> 1.0)
-    rack (1.4.1)
+    rack (1.4.4)
     rack-cache (1.2)
       rack (>= 0.4)
     rack-ssl (1.3.2)
@@ -309,7 +310,7 @@ GEM
       railties (~> 3.2.0)
       sass (>= 3.1.10)
       tilt (~> 1.3)
-    selenium-webdriver (2.25.0)
+    selenium-webdriver (2.27.2)
       childprocess (>= 0.2.5)
       libwebsocket (~> 0.1.3)
       multi_json (~> 1.0)
@@ -345,7 +346,8 @@ GEM
     uuidtools (2.1.3)
     warden (1.1.1)
       rack (>= 1.0)
-    xpath (0.1.4)
+    websocket (1.0.6)
+    xpath (1.0.0)
       nokogiri (~> 1.3)
 
 PLATFORMS
diff --git a/spec/requests/admin/cms_spec.rb b/spec/features/admin/cms_spec.rb
similarity index 100%
rename from spec/requests/admin/cms_spec.rb
rename to spec/features/admin/cms_spec.rb
diff --git a/spec/requests/admin/enterprise_fees_spec.rb b/spec/features/admin/enterprise_fees_spec.rb
similarity index 100%
rename from spec/requests/admin/enterprise_fees_spec.rb
rename to spec/features/admin/enterprise_fees_spec.rb
diff --git a/spec/requests/admin/enterprises_spec.rb b/spec/features/admin/enterprises_spec.rb
similarity index 100%
rename from spec/requests/admin/enterprises_spec.rb
rename to spec/features/admin/enterprises_spec.rb
diff --git a/spec/requests/admin/order_cycles_spec.rb b/spec/features/admin/order_cycles_spec.rb
similarity index 100%
rename from spec/requests/admin/order_cycles_spec.rb
rename to spec/features/admin/order_cycles_spec.rb
diff --git a/spec/requests/admin/product_spec.rb b/spec/features/admin/product_spec.rb
similarity index 100%
rename from spec/requests/admin/product_spec.rb
rename to spec/features/admin/product_spec.rb
diff --git a/spec/requests/admin/reports_spec.rb b/spec/features/admin/reports_spec.rb
similarity index 100%
rename from spec/requests/admin/reports_spec.rb
rename to spec/features/admin/reports_spec.rb
diff --git a/spec/requests/admin/shipping_methods_spec.rb b/spec/features/admin/shipping_methods_spec.rb
similarity index 100%
rename from spec/requests/admin/shipping_methods_spec.rb
rename to spec/features/admin/shipping_methods_spec.rb
diff --git a/spec/requests/consumer/add_to_cart_spec.rb b/spec/features/consumer/add_to_cart_spec.rb
similarity index 100%
rename from spec/requests/consumer/add_to_cart_spec.rb
rename to spec/features/consumer/add_to_cart_spec.rb
diff --git a/spec/requests/consumer/checkout_spec.rb b/spec/features/consumer/checkout_spec.rb
similarity index 100%
rename from spec/requests/consumer/checkout_spec.rb
rename to spec/features/consumer/checkout_spec.rb
diff --git a/spec/requests/consumer/cms_spec.rb b/spec/features/consumer/cms_spec.rb
similarity index 100%
rename from spec/requests/consumer/cms_spec.rb
rename to spec/features/consumer/cms_spec.rb
diff --git a/spec/requests/consumer/distributors_spec.rb b/spec/features/consumer/distributors_spec.rb
similarity index 100%
rename from spec/requests/consumer/distributors_spec.rb
rename to spec/features/consumer/distributors_spec.rb
diff --git a/spec/requests/consumer/product_spec.rb b/spec/features/consumer/product_spec.rb
similarity index 100%
rename from spec/requests/consumer/product_spec.rb
rename to spec/features/consumer/product_spec.rb
diff --git a/spec/requests/consumer/suppliers_spec.rb b/spec/features/consumer/suppliers_spec.rb
similarity index 100%
rename from spec/requests/consumer/suppliers_spec.rb
rename to spec/features/consumer/suppliers_spec.rb
diff --git a/spec/requests/consumer/taxonomy_spec.rb b/spec/features/consumer/taxonomy_spec.rb
similarity index 100%
rename from spec/requests/consumer/taxonomy_spec.rb
rename to spec/features/consumer/taxonomy_spec.rb