diff --git a/spec/system/admin/orders_spec.rb b/spec/system/admin/orders_spec.rb
index 41858b9e1e..b9f29d296b 100644
--- a/spec/system/admin/orders_spec.rb
+++ b/spec/system/admin/orders_spec.rb
@@ -934,8 +934,8 @@ describe '
       fill_in "Order number", with: "R123456"
       tomselect_multiselect order_cycle.name, from: 'q[order_cycle_id_in][]'
       tomselect_multiselect distributor.name, from: 'q[distributor_id_in][]'
-      tomselect_search_and_select shipping_method.name, from: 'shipping_method_id'
-      tomselect_search_and_select "complete", from: 'q[state_eq]'
+      tomselect_select shipping_method.name, from: 'shipping_method_id'
+      tomselect_select "complete", from: 'q[state_eq]'
       fill_in "Email", with: user.email
       fill_in "First name begins with", with: "J"
       fill_in "Last name begins with", with: "D"
diff --git a/spec/system/admin/subscriptions/crud_spec.rb b/spec/system/admin/subscriptions/crud_spec.rb
index 274ecf823d..cb4c901639 100644
--- a/spec/system/admin/subscriptions/crud_spec.rb
+++ b/spec/system/admin/subscriptions/crud_spec.rb
@@ -233,7 +233,7 @@ describe 'Subscriptions' do
       before do
         visit admin_subscriptions_path
         page.find("#new-subscription").click
-        tomselect_search_and_select shop.name, from: "subscription[shop_id]"
+        tomselect_select shop.name, from: "subscription[shop_id]"
         click_button "Continue"
       end
 
diff --git a/spec/system/admin/subscriptions/smoke_tests_spec.rb b/spec/system/admin/subscriptions/smoke_tests_spec.rb
index cfd1e7a2a4..86ab504a4b 100644
--- a/spec/system/admin/subscriptions/smoke_tests_spec.rb
+++ b/spec/system/admin/subscriptions/smoke_tests_spec.rb
@@ -183,7 +183,7 @@ describe 'Subscriptions' do
       before do
         visit admin_subscriptions_path
         page.find("#new-subscription").click
-        tomselect_search_and_select shop.name, from: "subscription[shop_id]"
+        tomselect_select shop.name, from: "subscription[shop_id]"
         click_button "Continue"
       end