diff --git a/app/helpers/queries_helper.rb b/app/helpers/queries_helper.rb
index a4c3c3e..9d3f246 100644
--- a/app/helpers/queries_helper.rb
+++ b/app/helpers/queries_helper.rb
@@ -195,7 +195,7 @@ module QueriesHelper
     else
       content = column.caption
     end
-    content_tag('th', content)
+    content_tag('th', content, :class => column.css_classes)
   end
 
   def column_content(column, item)
diff --git a/test/functional/issues_controller_test.rb b/test/functional/issues_controller_test.rb
index 34d3532..95402ff 100644
--- a/test/functional/issues_controller_test.rb
+++ b/test/functional/issues_controller_test.rb
@@ -1012,7 +1012,12 @@ class IssuesControllerTest < Redmine::ControllerTest
     assert_response :success
 
     # query should use specified columns + id and checkbox
-    assert_select 'table.issues thead th', columns.size + 2
+    assert_select 'table.issues thead' do
+      assert_select 'th', columns.size + 2
+      assert_select 'th.tracker'
+      assert_select 'th.subject'
+      assert_select 'th.assigned_to'
+    end
 
     # columns should be stored in session
     assert_kind_of Hash, session[:issue_query]
@@ -1073,7 +1078,10 @@ class IssuesControllerTest < Redmine::ControllerTest
 
     # query should use specified columns
     assert_equal ["#", "Tracker", "Subject", "Searchable field"], columns_in_issues_list
-    assert_select 'table.issues td.cf_2.string'
+    assert_select 'table.issues' do
+      assert_select 'th.cf_2.string'
+      assert_select 'td.cf_2.string'
+    end
   end
 
   def test_index_with_multi_custom_field_column
@@ -1119,7 +1127,10 @@ class IssuesControllerTest < Redmine::ControllerTest
           :set_filter => 1,
           :c => %w(start_date)
         }
-      assert_select "table.issues td.start_date", :text => '24/08/1987'
+      assert_select 'table.issues' do
+        assert_select 'th.start_date'
+        assert_select 'td.start_date', :text => '24/08/1987'
+      end
     end
   end
 
diff --git a/test/functional/timelog_controller_test.rb b/test/functional/timelog_controller_test.rb
index de975bb..1dfe229 100644
--- a/test/functional/timelog_controller_test.rb
+++ b/test/functional/timelog_controller_test.rb
@@ -721,6 +721,18 @@ class TimelogControllerTest < Redmine::ControllerTest
       assert_response :success
     end
 
+    assert_select 'table.time-entries thead' do
+      assert_select 'th.spent_on'
+      assert_select 'th.issue'
+      assert_select 'th.user'
+      assert_select 'th.hours'
+    end
+    assert_select 'table.time-entries tbody' do
+      assert_select 'td.spent_on'
+      assert_select 'td.issue'
+      assert_select 'td.user'
+      assert_select 'td.hours'
+    end
     assert_equal ['Date', 'Issue', 'User', 'Hours'], columns_in_list
   end
 
@@ -947,6 +959,8 @@ class TimelogControllerTest < Redmine::ControllerTest
       :c => %w(project spent_on issue comments hours issue.status)
     }
     assert_response :success
+
+    assert_select 'th.issue-status'
     assert_select 'td.issue-status', :text => issue.status.name
   end
 
@@ -1059,7 +1073,7 @@ class TimelogControllerTest < Redmine::ControllerTest
       :sort => field_name
     }
     assert_response :success
-    assert_select "th a.sort", :text => 'String Field'
+    assert_select "th.cf_#{field.id} a.sort", :text => 'String Field'
 
     # Make sure that values are properly sorted
     values = css_select("td.#{field_name}").map(&:text).reject(&:blank?)