diff --git a/app/assets/stylesheets/work_packages.css b/app/assets/stylesheets/work_packages.css
index 970f8ea1c5..f8b9edd26c 100644
--- a/app/assets/stylesheets/work_packages.css
+++ b/app/assets/stylesheets/work_packages.css
@@ -30,3 +30,7 @@ See doc/COPYRIGHT.rdoc for more details.
 #work-packages-query-selection .select2-container {
   margin-left: 5px;
 }
+
+.issue .attributes td.work_package_attribute_header {
+  font-weight: bold;
+}
diff --git a/app/helpers/work_packages_helper.rb b/app/helpers/work_packages_helper.rb
index 4995d115f1..d41225c4f6 100644
--- a/app/helpers/work_packages_helper.rb
+++ b/app/helpers/work_packages_helper.rb
@@ -352,7 +352,9 @@ module WorkPackagesHelper
   def work_package_show_table_row(attribute, klass = nil, &block)
     klass = attribute.to_s.dasherize if klass.nil?
 
-    content = content_tag(:th, :class => klass) { "#{WorkPackage.human_attribute_name(attribute)}:" }
+    content = content_tag(:td, :class => [:work_package_attribute_header, klass]) do
+      "#{WorkPackage.human_attribute_name(attribute)}:"
+    end
     content << content_tag(:td, :class => klass, &block)
 
     WorkPackageAttribute.new(attribute, content)
diff --git a/doc/CHANGELOG.md b/doc/CHANGELOG.md
index c47d58288e..ae8e6220ef 100644
--- a/doc/CHANGELOG.md
+++ b/doc/CHANGELOG.md
@@ -38,6 +38,7 @@ See doc/COPYRIGHT.rdoc for more details.
 * `#2240` [Accessibility] correctly label document language of menu items
 * `#2250` [Accessibility] activity icon labels
 * `#2260` [Accessibility] no-existent alt-text for collapse/expand functionality in grouped work-package list
+* `#2263` [Accessibility] Correct markup for tables
 * `#2734` [API] Access-Key not supported for all controllers
 * `#2366` [Timelines] Add support for user deletion to timelines
 * `#3120` Implement a test suite the spikes can be developed against
diff --git a/features/step_definitions/work_package_steps.rb b/features/step_definitions/work_package_steps.rb
index 8ac8b0aa12..0785f896f7 100644
--- a/features/step_definitions/work_package_steps.rb
+++ b/features/step_definitions/work_package_steps.rb
@@ -113,8 +113,8 @@ Then /^the work package should be shown with the following values:$/ do |table|
   end
 
   table_attributes.each do |key, value|
-    label = first('th', :text => key)
-    should have_css("td.#{label[:class]}", :text => value)
+    label = find('td.work_package_attribute_header', :text => key)
+    should have_css("td.#{label[:class].split(' ').last}", :text => value)
   end
 
   if table.rows_hash["Type"] || table.rows_hash["Subject"]
diff --git a/features/work_packages/.destroy.feature.swp b/features/work_packages/.destroy.feature.swp
deleted file mode 100644
index 0bff9c0d93..0000000000
Binary files a/features/work_packages/.destroy.feature.swp and /dev/null differ