diff --git a/app/helpers/issues_helper.rb b/app/helpers/issues_helper.rb
index b4c87f758..a6c79ec58 100644
--- a/app/helpers/issues_helper.rb
+++ b/app/helpers/issues_helper.rb
@@ -21,6 +21,7 @@ module IssuesHelper
   include ApplicationHelper
   include Redmine::Export::PDF::IssuesPdfHelper
   include IssueStatusesHelper
+  include QueriesHelper

   def issue_list(issues, &)
     ancestors = []
diff --git a/test/functional/settings_controller_test.rb b/test/functional/settings_controller_test.rb
index e1b155a92..a27333c7e 100644
--- a/test/functional/settings_controller_test.rb
+++ b/test/functional/settings_controller_test.rb
@@ -50,7 +50,7 @@ class SettingsControllerTest < Redmine::ControllerTest
       assert_response :success
     end

-    assert_select 'select[name=?]', 'settings[issue_list_default_columns][]' do
+    assert_select 'select#selected_settings_issue_list_default_columns' do
       assert_select 'option', 4
       assert_select 'option[value=tracker]', :text => 'Tracker'
       assert_select 'option[value=subject]', :text => 'Subject'
@@ -58,7 +58,7 @@ class SettingsControllerTest < Redmine::ControllerTest
       assert_select 'option[value=updated_on]', :text => 'Updated'
     end

-    assert_select 'select[name=?]', 'available_columns[]' do
+    assert_select 'select#available_settings_issue_list_default_columns' do
       assert_select 'option[value=tracker]', 0
       assert_select 'option[value=priority]', :text => 'Priority'
     end