diff --git a/config/machine_readable/how-to-vote.yml b/config/machine_readable/how-to-vote.yml
index acc93ce09..b35177af7 100644
--- a/config/machine_readable/how-to-vote.yml
+++ b/config/machine_readable/how-to-vote.yml
@@ -32,6 +32,23 @@ faqs:
       <h2 id="elections-you-can-vote-in">Elections you can vote in</h2>
       <p><a href="/elections-in-the-uk?src=schema">Different elections have different rules</a> on who can vote.</p>
 
+  - question: Voting and coronavirus (COVID-19)
+    answer: >
+      <p>Elections and referendums are going ahead during coronavirus (COVID-19), though you may see changes to some processes. You can still choose to vote in person.</p>
+      <p>If you’re self-isolating, <a rel="external" href="https://www.nhs.uk/conditions/coronavirus-covid-19/people-at-higher-risk/who-is-at-high-risk-from-coronavirus-clinically-extremely-vulnerable/?src=schema">clinically extremely vulnerable</a>, or do not want to go to the polling station, you can <a href="/how-to-vote?src=schema#postal-voting">vote by post</a> or <a href="/how-to-vote?src=schema#voting-by-proxy">vote by proxy</a>.</p>
+      <p>From 27 April you’ll also be able to get an emergency proxy vote at short notice if you need to self-isolate shortly before or on election day.</p>
+      <h2 id="at-the-polling-station">At the polling station</h2>
+      <p>Because of COVID-19, there will be safety measures in place at polling stations to help you vote safely (for example, restrictions on the number of people allowed in).</p>
+      <p>If you choose to vote in person, make sure you:</p>
+      <ul>
+        <li>wear a face covering (unless you have an exemption)</li>
+        <li>bring your own pen or pencil (there will be clean pencils available at the polling station if you forget to bring your own)</li>
+        <li>use hand sanitiser when entering and leaving the polling station</li>
+        <li>keep to <a href="/government/publications/how-to-stop-the-spread-of-coronavirus-covid-19/how-to-stop-the-spread-of-coronavirus-covid-19?src=schema">social distancing guidelines</a></li>
+      </ul>
+      <h2 id="if-you-have-covid-19-symptoms-or-have-been-asked-to-self-isolate">If you have COVID-19 symptoms or have been asked to self-isolate</h2>
+      <p>Do not visit the polling station. You’ll be able to apply for an emergency proxy vote instead from 27 April.</p>
+
   - question: Voting in person
     answer: >
       <p>You vote in person at a polling station (usually in a public building, such as a school or local hall).</p>
diff --git a/test/integration/guide_test.rb b/test/integration/guide_test.rb
index 926f6a94c..bbfdae9d6 100644
--- a/test/integration/guide_test.rb
+++ b/test/integration/guide_test.rb
@@ -123,7 +123,7 @@ class GuideTest < ActionDispatch::IntegrationTest
     assert_equal faq_schema["headline"], "How to vote"
     assert_equal faq_schema["description"], "<p>You need to be <a href=\"/register-to-vote?src=schema\">registered to vote</a> before you can vote in UK elections or referendums.</p> <p>If you’re eligible, you can vote in person on the day of the election at a named polling station. You can also apply for a postal or proxy vote instead.</p> <p>There are elections and referendums in England, Scotland and Wales on 6 May 2021.</p>\n"
 
-    assert_equal 9, q_and_as.count
+    assert_equal 10, q_and_as.count
   end
 
   test "voting in the UK guide shows all chapters on a single page" do