diff --git a/spec/support/request/tomselect_helper.rb b/spec/support/request/tomselect_helper.rb
deleted file mode 100644
index 93b0717d8e..0000000000
--- a/spec/support/request/tomselect_helper.rb
+++ /dev/null
@@ -1,45 +0,0 @@
-# frozen_string_literal: true
-
-module TomselectHelper
-  def tomselect_open(field_name)
-    page.find("##{field_name}-ts-control").click
-  end
-
-  def tomselect_multiselect(value, options)
-    tomselect_wrapper = page.find_field(options[:from]).sibling(".ts-wrapper")
-    tomselect_wrapper.find(".ts-control").click
-    tomselect_wrapper.find(:css, '.ts-dropdown.multi .ts-dropdown-content .option',
-                           text: value).click
-    # Close the dropdown
-    page.find("body").click
-  end
-
-  def tomselect_search_and_select(value, options)
-    tomselect_wrapper = page.find_field(options[:from]).sibling(".ts-wrapper")
-    tomselect_wrapper.find(".ts-control").click
-    # Use send_keys as setting the value directly doesn't trigger the search
-    tomselect_wrapper.find(:css, '.ts-dropdown input.dropdown-input').send_keys(value)
-    tomselect_wrapper.find(:css, '.ts-dropdown .ts-dropdown-content .option', text: value).click
-  end
-
-  def tomselect_select(value, options)
-    tomselect_wrapper = page.find_field(options[:from]).sibling(".ts-wrapper")
-    tomselect_wrapper.find(".ts-control").click
-
-    tomselect_wrapper.find(:css, '.ts-dropdown .ts-dropdown-content .option', text: value).click
-  end
-
-  def open_tomselect_to_validate!(page, field_name)
-    tomselect_wrapper = page.find_field(field_name).sibling(".ts-wrapper")
-    tomselect_wrapper.find(".ts-control").click # open the dropdown
-
-    raise 'Please pass the block for expectations' unless block_given?
-
-    # execute block containing expectations
-    yield
-
-    tomselect_wrapper.find(
-      '.ts-dropdown .ts-dropdown-content .option.active',
-    ).click # close the dropdown by selecting the already selected value
-  end
-end
diff --git a/spec/support/request/web_helper.rb b/spec/support/request/web_helper.rb
index de10dc79c6..3e4bb3a632 100644
--- a/spec/support/request/web_helper.rb
+++ b/spec/support/request/web_helper.rb
@@ -1,8 +1,6 @@
 # frozen_string_literal: true
 
 module WebHelper
-  include TomselectHelper
-
   def have_input(name, opts = {})
     selector  = "[name='#{name}']"
     selector += "[placeholder='#{opts[:placeholder]}']" if opts.key? :placeholder
diff --git a/spec/support/tom_select_helper.rb b/spec/support/tom_select_helper.rb
index d066bbe6ea..d6faed8eb5 100644
--- a/spec/support/tom_select_helper.rb
+++ b/spec/support/tom_select_helper.rb
@@ -6,14 +6,16 @@ module TomSelectHelper
   end
 
   def tomselect_multiselect(value, options)
-    tomselect_wrapper = page.find("[name='#{options[:from]}']").sibling(".ts-wrapper")
+    tomselect_wrapper = page.find_field(options[:from]).sibling(".ts-wrapper")
     tomselect_wrapper.find(".ts-control").click
     tomselect_wrapper.find(:css, '.ts-dropdown.multi .ts-dropdown-content .option',
                            text: value).click
+    # Close the dropdown
+    page.find("body").click
   end
 
   def tomselect_search_and_select(value, options)
-    tomselect_wrapper = page.find("[name='#{options[:from]}']").sibling(".ts-wrapper")
+    tomselect_wrapper = page.find_field(options[:from]).sibling(".ts-wrapper")
     tomselect_wrapper.find(".ts-control").click
     # Use send_keys as setting the value directly doesn't trigger the search
     tomselect_wrapper.find(:css, '.ts-dropdown input.dropdown-input').send_keys(value)
@@ -21,7 +23,7 @@ module TomSelectHelper
   end
 
   def tomselect_select(value, options)
-    tomselect_wrapper = page.find("[name='#{options[:from]}']").sibling(".ts-wrapper")
+    tomselect_wrapper = page.find_field(options[:from]).sibling(".ts-wrapper")
     tomselect_wrapper.find(".ts-control").click
 
     tomselect_wrapper.find(:css, '.ts-dropdown .ts-dropdown-content .option', text: value).click
@@ -36,4 +38,18 @@ module TomSelectHelper
 
     find('.ts-dropdown .ts-dropdown-content .option', text: /#{Regexp.quote(value)}/i).click
   end
+
+  def open_tomselect_to_validate!(page, field_name)
+    tomselect_wrapper = page.find_field(field_name).sibling(".ts-wrapper")
+    tomselect_wrapper.find(".ts-control").click # open the dropdown
+
+    raise 'Please pass the block for expectations' unless block_given?
+
+    # execute block containing expectations
+    yield
+
+    tomselect_wrapper.find(
+      '.ts-dropdown .ts-dropdown-content .option.active',
+    ).click # close the dropdown by selecting the already selected value
+  end
 end