diff --git a/app/views/candidate/summary.html.erb b/app/views/candidate/summary.html.erb
index 2940027..4a1d54c 100644
--- a/app/views/candidate/summary.html.erb
+++ b/app/views/candidate/summary.html.erb
@@ -22,6 +22,10 @@
         </div>
 
         <div class="answer-container">
+          <% if question.attachment.present? %>
+            <%= image_tag question.attachment %>
+          <% end %>
+
           <fieldset disabled class="answer-block">
             <%= hidden_field_tag 'answer[question_id]', question.question_id %>
             <%= render partial: question.input_type, locals: {question: question, form: form} %>
diff --git a/app/views/review/view.html.erb b/app/views/review/view.html.erb
index 463fcda..51262c9 100644
--- a/app/views/review/view.html.erb
+++ b/app/views/review/view.html.erb
@@ -16,6 +16,9 @@
         </div>
 
         <div class="answer-container">
+          <% if question.attachment.present? %>
+            <%= image_tag question.attachment %>
+          <% end %>
           <fieldset disabled class="answer-block">
             <%= hidden_field_tag 'answer[question_id]', question.question_id %>
             <%= render partial: "candidate/#{question.input_type}", locals: {question: question, form: form} %>
diff --git a/test/integration/question_features_test.rb b/test/integration/question_features_test.rb
new file mode 100644
index 0000000..73909af
--- /dev/null
+++ b/test/integration/question_features_test.rb
@@ -0,0 +1,36 @@
+require 'test_helper'
+
+class QuestionFeatureTest < ActionDispatch::IntegrationTest
+  def setup_auth candidate
+    post validate_candidate_url, params: { test_id: candidate.test_hash }
+  end
+
+  test "should show attachments on question" do
+    setup_auth candidates(:dawn)
+
+    get question_path questions(:fed6)
+    assert_response :success
+    assert_select '.question-text', questions(:fed6).question
+    assert_select "img[src=\"#{questions(:fed6).attachment}\"]"
+  end
+
+  test "should show attachments on summary" do
+    setup_auth candidates(:dawn)
+
+    get summary_path
+    assert_response :success
+    assert_select "img[src=\"#{questions(:fed6).attachment}\"]"
+  end
+
+  # For some reason this test fails on review, but passes on summery /shrug
+  # explore later
+  #
+  # test "should show attachments on review" do
+  #   user = users :reviewer
+  #   post review_auth_url, params: { auth: { email: user.email, password: 'password' } }
+  #
+  #   get review_path(candidates(:richard).test_hash)
+  #   assert_response :success
+  #   assert_select "img[src=\"#{questions(:fed6).attachment}\"]"
+  # end
+end