diff --git a/spec/features/admin/bulk_order_management_spec.rb b/spec/features/admin/bulk_order_management_spec.rb
index 1a227bc6bd..a56f669756 100644
--- a/spec/features/admin/bulk_order_management_spec.rb
+++ b/spec/features/admin/bulk_order_management_spec.rb
@@ -9,7 +9,7 @@ feature %q{
 
   before :all do
     @default_wait_time = Capybara.default_wait_time
-    Capybara.default_wait_time = 5
+    Capybara.default_wait_time = 10
   end
 
   after :all do
diff --git a/spec/features/admin/cms_spec.rb b/spec/features/admin/cms_spec.rb
index f032994a9d..27fc57582a 100644
--- a/spec/features/admin/cms_spec.rb
+++ b/spec/features/admin/cms_spec.rb
@@ -8,6 +8,14 @@ feature %q{
   include AuthenticationWorkflow
   include WebHelper
 
+  before :all do
+    @default_wait_time = Capybara.default_wait_time
+    Capybara.default_wait_time = 5
+  end
+
+  after :all do
+    Capybara.default_wait_time = @default_wait_time
+  end
 
   scenario "admin can access CMS admin and return to Spree admin" do
     login_to_admin_section