diff --git a/spec/features/admin/order_cycles/complex_creating_specific_time_spec.rb b/spec/system/admin/order_cycles/complex_creating_specific_time_spec.rb
similarity index 99%
rename from spec/features/admin/order_cycles/complex_creating_specific_time_spec.rb
rename to spec/system/admin/order_cycles/complex_creating_specific_time_spec.rb
index f0402c2493..a473b54416 100644
--- a/spec/features/admin/order_cycles/complex_creating_specific_time_spec.rb
+++ b/spec/system/admin/order_cycles/complex_creating_specific_time_spec.rb
@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'spec_helper'
+require 'system_helper'
 
 describe '
     As an administrator
diff --git a/spec/features/admin/order_cycles/complex_editing_exchange_same_enterprise_spec.rb b/spec/system/admin/order_cycles/complex_editing_exchange_same_enterprise_spec.rb
similarity index 98%
rename from spec/features/admin/order_cycles/complex_editing_exchange_same_enterprise_spec.rb
rename to spec/system/admin/order_cycles/complex_editing_exchange_same_enterprise_spec.rb
index 79f34c2f7a..f3fc018a86 100644
--- a/spec/features/admin/order_cycles/complex_editing_exchange_same_enterprise_spec.rb
+++ b/spec/system/admin/order_cycles/complex_editing_exchange_same_enterprise_spec.rb
@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'spec_helper'
+require 'system_helper'
 
 describe '
     As an administrator
diff --git a/spec/features/admin/order_cycles/complex_editing_multiple_product_pages_spec.rb b/spec/system/admin/order_cycles/complex_editing_multiple_product_pages_spec.rb
similarity index 98%
rename from spec/features/admin/order_cycles/complex_editing_multiple_product_pages_spec.rb
rename to spec/system/admin/order_cycles/complex_editing_multiple_product_pages_spec.rb
index e782691d42..eb74531f19 100644
--- a/spec/features/admin/order_cycles/complex_editing_multiple_product_pages_spec.rb
+++ b/spec/system/admin/order_cycles/complex_editing_multiple_product_pages_spec.rb
@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'spec_helper'
+require 'system_helper'
 
 describe '
     As an administrator
diff --git a/spec/features/admin/order_cycles/complex_editing_spec.rb b/spec/system/admin/order_cycles/complex_editing_spec.rb
similarity index 98%
rename from spec/features/admin/order_cycles/complex_editing_spec.rb
rename to spec/system/admin/order_cycles/complex_editing_spec.rb
index 58cf43b67a..4b2e587b35 100644
--- a/spec/features/admin/order_cycles/complex_editing_spec.rb
+++ b/spec/system/admin/order_cycles/complex_editing_spec.rb
@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'spec_helper'
+require 'system_helper'
 
 describe '
     As an administrator
@@ -27,7 +27,7 @@ describe '
     expect(page.find('#order_cycle_name').value).to eq(oc.name)
     expect(page.find('#order_cycle_orders_open_at').value).to eq(oc.orders_open_at.strftime("%Y-%m-%d %H:%M"))
     expect(page.find('#order_cycle_orders_close_at').value).to eq(oc.orders_close_at.strftime("%Y-%m-%d %H:%M"))
-    expect(page).to have_content "COORDINATOR\n#{oc.coordinator.name}"
+    expect(page).to have_content "COORDINATOR #{oc.coordinator.name}"
 
     click_button 'Next'
 
diff --git a/spec/features/admin/order_cycles/complex_updating_specific_time_spec.rb b/spec/system/admin/order_cycles/complex_updating_specific_time_spec.rb
similarity index 99%
rename from spec/features/admin/order_cycles/complex_updating_specific_time_spec.rb
rename to spec/system/admin/order_cycles/complex_updating_specific_time_spec.rb
index 331e7995bf..3009bcd0f5 100644
--- a/spec/features/admin/order_cycles/complex_updating_specific_time_spec.rb
+++ b/spec/system/admin/order_cycles/complex_updating_specific_time_spec.rb
@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'spec_helper'
+require 'system_helper'
 
 xdescribe '
     As an administrator
diff --git a/spec/features/admin/order_cycles/list_spec.rb b/spec/system/admin/order_cycles/list_spec.rb
similarity index 99%
rename from spec/features/admin/order_cycles/list_spec.rb
rename to spec/system/admin/order_cycles/list_spec.rb
index 248ec8374a..c1766fec36 100644
--- a/spec/features/admin/order_cycles/list_spec.rb
+++ b/spec/system/admin/order_cycles/list_spec.rb
@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'spec_helper'
+require 'system_helper'
 
 describe '
     As an administrator
diff --git a/spec/features/admin/order_cycles/simple_spec.rb b/spec/system/admin/order_cycles/simple_spec.rb
similarity index 99%
rename from spec/features/admin/order_cycles/simple_spec.rb
rename to spec/system/admin/order_cycles/simple_spec.rb
index 0149b06b08..22a97ca84e 100644
--- a/spec/features/admin/order_cycles/simple_spec.rb
+++ b/spec/system/admin/order_cycles/simple_spec.rb
@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'spec_helper'
+require 'system_helper'
 
 describe '
     As an administrator