diff --git a/spec/features/admin/order_cycles_spec.rb b/spec/features/admin/order_cycles_spec.rb
index 8b451fa7c0..99069e9f7c 100644
--- a/spec/features/admin/order_cycles_spec.rb
+++ b/spec/features/admin/order_cycles_spec.rb
@@ -624,10 +624,10 @@ feature %q{
         visit edit_admin_order_cycle_path(oc)
 
         # When I remove all the exchanges and save
-        page.find("tr.supplier-#{supplier_managed.id} a.remove-exchange").click
-        page.find("tr.supplier-#{supplier_permitted.id} a.remove-exchange").click
-        page.find("tr.distributor-#{distributor_managed.id} a.remove-exchange").click
-        page.find("tr.distributor-#{distributor_permitted.id} a.remove-exchange").click
+        page.find("tr.supplier-#{supplier_managed.id} a.remove-exchange").trigger('click')
+        page.find("tr.supplier-#{supplier_permitted.id} a.remove-exchange").trigger('click')
+        page.find("tr.distributor-#{distributor_managed.id} a.remove-exchange").trigger('click')
+        page.find("tr.distributor-#{distributor_permitted.id} a.remove-exchange").trigger('click')
         click_button 'Update'
 
         # Then the exchanges should be removed
@@ -897,7 +897,7 @@ feature %q{
       # And I select some fees and update
       click_link 'order_cycle_coordinator_fee_0_remove'
       page.should_not have_select 'order_cycle_coordinator_fee_0_id'
-      click_button 'Add coordinator fee'
+      find_button('Add coordinator fee').trigger('click')
       select 'that fee', from: 'order_cycle_coordinator_fee_0_id'
 
       # When I update, or update and close, both work
diff --git a/spec/javascripts/unit/admin/order_cycles/controllers/simple_edit.js.coffee b/spec/javascripts/unit/admin/order_cycles/controllers/simple_edit.js.coffee
index dbad5a9f05..f5ccd25aac 100644
--- a/spec/javascripts/unit/admin/order_cycles/controllers/simple_edit.js.coffee
+++ b/spec/javascripts/unit/admin/order_cycles/controllers/simple_edit.js.coffee
@@ -10,7 +10,8 @@ describe "AdminSimpleEditOrderCycleCtrl", ->
   outgoing_exchange = {}
 
   beforeEach ->
-    scope = {}
+    scope =
+      $watch: jasmine.createSpy('$watch')
     location =
       absUrl: ->
         'example.com/admin/order_cycles/27/edit'
diff --git a/spec/javascripts/unit/order_cycle_spec.js.coffee b/spec/javascripts/unit/order_cycle_spec.js.coffee
index 2f1893bc43..b66acfcb1d 100644
--- a/spec/javascripts/unit/order_cycle_spec.js.coffee
+++ b/spec/javascripts/unit/order_cycle_spec.js.coffee
@@ -9,7 +9,7 @@ describe 'OrderCycle controllers', ->
     EnterpriseFee = null
 
     beforeEach ->
-      scope = { order_cycle_form: { $dirty: false}}
+      scope = {}
       event =
         preventDefault: jasmine.createSpy('preventDefault')
       OrderCycle =