diff --git a/test/system/groups/samples_test.rb b/test/system/groups/samples_test.rb
index 3f489b4eb4..f10d582e07 100644
--- a/test/system/groups/samples_test.rb
+++ b/test/system/groups/samples_test.rb
@@ -323,8 +323,7 @@ def retrieve_puids
         assert_selector 'th', count: 6
       end
 
-      assert_selector 'label', text: I18n.t('projects.samples.shared.metadata_toggle.label'), count: 1
-      find('label', text: I18n.t('projects.samples.shared.metadata_toggle.label')).click
+      select(I18n.t('components.metadata_templates_dropdown.all'), from: 'q[metadata_template]')
 
       assert_selector 'div#spinner'
       assert_no_selector 'div#spinner'
@@ -448,8 +447,7 @@ def retrieve_puids
       click_on 'Last Updated'
       assert_selector 'table thead th:nth-child(5) svg.icon-arrow_up'
 
-      assert_selector 'label', text: I18n.t('projects.samples.shared.metadata_toggle.label'), count: 1
-      find('label', text: I18n.t('projects.samples.shared.metadata_toggle.label')).click
+      select(I18n.t('components.metadata_templates_dropdown.all'), from: 'q[metadata_template]')
 
       assert_selector 'div#spinner'
       assert_no_selector 'div#spinner'
@@ -465,9 +463,11 @@ def retrieve_puids
         assert_selector 'td:nth-child(9) button', text: ''
       end
 
-      find('label', text: I18n.t('projects.samples.shared.metadata_toggle.label')).click
+      select(I18n.t('components.metadata_templates_dropdown.all'), from: 'q[metadata_template]')
+
       assert_selector 'div#spinner'
       assert_no_selector 'div#spinner'
+
       assert_selector 'table thead tr th', count: 6
     end
 
@@ -475,12 +475,13 @@ def retrieve_puids
       visit group_samples_url(@group)
       assert_text strip_tags(I18n.t(:'viral.pagy.limit_component.summary', from: 1, to: 20, count: 26,
                                                                            locale: @user.locale))
-      assert_selector 'label', text: I18n.t('projects.samples.shared.metadata_toggle.label'), count: 1
+      select(I18n.t('components.metadata_templates_dropdown.all'), from: 'q[metadata_template]')
       within('table thead tr') do
         assert_selector 'th', count: 6
       end
 
-      find('label', text: I18n.t('projects.samples.shared.metadata_toggle.label')).click
+      select(I18n.t('components.metadata_templates_dropdown.all'), from: 'q[metadata_template]')
+
       assert_selector 'div#spinner'
       assert_no_selector 'div#spinner'
 
@@ -501,7 +502,8 @@ def retrieve_puids
       assert_selector 'tbody tr:first-child td:nth-child(2)', text: @sample30.name
 
       # toggling metadata again causes sort to be reset
-      find('label', text: I18n.t(:'projects.samples.shared.metadata_toggle.label')).click
+      select(I18n.t('components.metadata_templates_dropdown.all'), from: 'q[metadata_template]')
+
       assert_selector 'div#spinner'
       assert_no_selector 'div#spinner'
 
@@ -931,7 +933,7 @@ def retrieve_puids
     test 'should partially import metadata with missing sample errors' do
       visit group_samples_url(@group)
 
-      find('label', text: I18n.t('projects.samples.shared.metadata_toggle.label')).click
+      select(I18n.t('components.metadata_templates_dropdown.all'), from: 'q[metadata_template]')
       assert_selector 'div#spinner'
       assert_no_selector 'div#spinner'
 
@@ -984,8 +986,7 @@ def retrieve_puids
       assert_selector 'div#spinner'
       assert_no_selector 'div#spinner'
 
-      assert_selector 'label', text: I18n.t('projects.samples.shared.metadata_toggle.label'), count: 1
-      find('label', text: I18n.t('projects.samples.shared.metadata_toggle.label')).click
+      select(I18n.t('components.metadata_templates_dropdown.all'), from: 'q[metadata_template]')
 
       within('table thead tr') do
         assert_selector 'th', count: 9
@@ -1022,7 +1023,7 @@ def retrieve_puids
       login_as users(:ryan_doe)
       visit group_samples_url(@group)
 
-      find('label', text: I18n.t('projects.samples.shared.metadata_toggle.label')).click
+      select(I18n.t('components.metadata_templates_dropdown.all'), from: 'q[metadata_template]')
 
       within('table thead tr') do
         assert_selector 'th', count: 9