diff --git a/src/Tests/Handler/WebformHandlerEmailRenderingTest.php b/src/Tests/Handler/WebformHandlerEmailRenderingTest.php
index 642dd843..0678169f 100644
--- a/src/Tests/Handler/WebformHandlerEmailRenderingTest.php
+++ b/src/Tests/Handler/WebformHandlerEmailRenderingTest.php
@@ -52,9 +52,13 @@ class WebformHandlerEmailRenderingTest extends WebformTestBase {
     // Check submitting contact form and sending emails using the
     // default bartik.theme.
     $sent_emails = $this->drupalGetMails();
+
+    $this->assertEqual('webform_contact_email_confirmation', $sent_emails[0]['id']);
     $this->assertContains('HEADER 1 (CONTACT_EMAIL_CONFIRMATION)', $sent_emails[0]['body']);
     $this->assertContains('Please ignore this email.', $sent_emails[0]['body']);
     $this->assertContains('address (contact_email_confirmation)', $sent_emails[0]['body']);
+
+    $this->assertEqual('webform_contact_email_notification', $sent_emails[1]['id']);
     $this->assertContains('HEADER 1 (GLOBAL)', $sent_emails[1]['body']);
     $this->assertContains('Please ignore this email.', $sent_emails[1]['body']);
     $this->assertContains('address (global)', $sent_emails[1]['body']);
@@ -77,9 +81,13 @@ class WebformHandlerEmailRenderingTest extends WebformTestBase {
     // bartik.theme.
     // @see \Drupal\webform\Plugin\WebformHandler\EmailWebformHandler::getMessage
     $sent_emails = $this->drupalGetMails();
+
+    $this->assertEqual('webform_contact_email_confirmation', $sent_emails[2]['id']);
     $this->assertContains('HEADER 1 (CONTACT_EMAIL_CONFIRMATION)', $sent_emails[2]['body']);
     $this->assertContains('Please ignore this email.', $sent_emails[2]['body']);
     $this->assertContains('address (contact_email_confirmation)', $sent_emails[2]['body']);
+
+    $this->assertEqual('webform_contact_email_notification', $sent_emails[3]['id']);
     $this->assertContains('HEADER 1 (GLOBAL)', $sent_emails[3]['body']);
     $this->assertContains('Please ignore this email.', $sent_emails[3]['body']);
     $this->assertContains('address (global)', $sent_emails[3]['body']);
diff --git a/tests/src/Functional/WebformBrowserTestBase.php b/tests/src/Functional/WebformBrowserTestBase.php
index 9651fbdd..a06c73b6 100644
--- a/tests/src/Functional/WebformBrowserTestBase.php
+++ b/tests/src/Functional/WebformBrowserTestBase.php
@@ -428,8 +428,11 @@ abstract class WebformBrowserTestBase extends BrowserTestBase {
    */
   protected function getLastEmail() {
     $sent_emails = $this->getMails();
-    $sent_email = end($sent_emails);
-    $this->debug($sent_email);
+    // Log all messages as verbose output.
+    foreach ($sent_emails as $sent_email) {
+      $this->debug($sent_email);
+    }
+    // Return the last one.
     return $sent_email;
   }
 
diff --git a/tests/src/Functional/WebformBrowserTestBaseTest.php b/tests/src/Functional/WebformBrowserTestBaseTest.php
index d1cb8c47..b95ee8cd 100644
--- a/tests/src/Functional/WebformBrowserTestBaseTest.php
+++ b/tests/src/Functional/WebformBrowserTestBaseTest.php
@@ -59,11 +59,11 @@ class WebformBrowserTestBaseTest extends WebformBrowserTestBase {
     // Check submission load not from cache.
     $webform_submission = $this->loadSubmission($sid);
     $this->assertNotNull($webform_submission);
-    $this->assertEquals($webform_submission->getWebform()->id(), 'contact');
+    $this->assertEquals('contact', $webform_submission->getWebform()->id());
 
     // Check submission email.
     $last_email = $this->getLastEmail();
-    $this->assertEquals($last_email['id'], 'webform_contact_email_notification');
+    $this->assertEquals('webform_contact_email_notification', $last_email['id']);
 
     // Check purge submission deletes the submission.
     $this->purgeSubmissions();