diff --git a/core/modules/poll/poll-results.tpl.php b/core/modules/poll/poll-results.tpl.php
index 4eb0fe2..bf615f2 100644
--- a/core/modules/poll/poll-results.tpl.php
+++ b/core/modules/poll/poll-results.tpl.php
@@ -17,7 +17,7 @@
  * @see template_preprocess_poll_results()
  */
 ?>
-<article class="poll">
+<div class="poll">
   <?php if ($block): ?>
     <h3 class="poll-title"><?php print $title; ?></h3>
   <?php endif; ?>
@@ -30,7 +30,7 @@
   <?php if (!empty($cancel_form)): ?>
     <?php print $cancel_form; ?>
   <?php endif; ?>
-</article>
+</div>
 <?php if ($block): ?>
   <div class="links"><?php print $links; ?></div>
 <?php endif; ?>
diff --git a/core/modules/poll/poll-vote.tpl.php b/core/modules/poll/poll-vote.tpl.php
index a749f91..6fc368b 100644
--- a/core/modules/poll/poll-vote.tpl.php
+++ b/core/modules/poll/poll-vote.tpl.php
@@ -14,7 +14,7 @@
  * @see template_preprocess_poll_vote()
  */
 ?>
-<article class="poll">
+<div class="poll">
   <div class="vote-form">
 
     <?php if ($block): ?>
@@ -26,4 +26,4 @@
   </div>
   <?php // This is the 'rest' of the form, in case items have been added. ?>
   <?php print $rest ?>
-</article>
+</div>
diff --git a/core/modules/poll/poll.test b/core/modules/poll/poll.test
index d6ed485..3ab570c 100644
--- a/core/modules/poll/poll.test
+++ b/core/modules/poll/poll.test
@@ -233,10 +233,10 @@ class PollCreateTestCase extends PollWebTestCase {
     $this->clickLink($title);
     $this->assertText($new_option, 'New option found.');
 
-    $option = $this->xpath('//article[@id="node-1"]//article[@class="poll"]//dt[@class="choice-title"]');
+    $option = $this->xpath('//article[@id="node-1"]//div[@class="poll"]//dt[@class="choice-title"]');
     $this->assertEqual(end($option), $new_option, 'Last item is equal to new option.');
 
-    $votes = $this->xpath('//article[@id="node-1"]//article[@class="poll"]//div[@class="percent"]');
+    $votes = $this->xpath('//article[@id="node-1"]//div[@class="poll"]//div[@class="percent"]');
     $this->assertTrue(strpos(end($votes), $vote_count) > 0, t("Votes saved."));
   }