diff --git a/src/Form/QueueMailSettingsForm.php b/src/Form/QueueMailSettingsForm.php
index 2a918f5..61cb40c 100644
--- a/src/Form/QueueMailSettingsForm.php
+++ b/src/Form/QueueMailSettingsForm.php
@@ -35,15 +35,15 @@ class QueueMailSettingsForm extends ConfigFormBase {
 
     $form['queue_status'] = array(
       '#type' => 'item',
-      '#title' => t('Queue status'),
+      '#title' => $this->t('Queue status'),
       '#markup' => \Drupal::translation()->formatPlural(_queue_mail_get_queue()->numberOfItems(), '1 mail currently queued for sending.', '@count mails currently queued for sending.'),
       //'#description' => t('Sending of queued mails happens on cron. You can <a href="@cron_link">run cron manually</a>.', array('@cron_link' => url('admin/reports/status/run-cron', array('query' => drupal_get_destination())))),
     );
 
     $form['queue_mail_keys'] = array(
       '#type' => 'textarea',
-      '#title' => t('Mail IDs to queue'),
-      '#description' => t('Enter each mail ID to queue on a separate line. Use <strong>*</strong> to do a wildcard match.') .'<br/>'. t('Mail IDs are a combination of the first and second arguments sent to <em>drupal_mail</em> when a module sends an email. E.g. <em>user_mail</em>, <em>register_pending_approval_admin</em>') . '<br />' . t('For example, to queue all mails sent by the User module, enter: <em>user_*</em> above, to just queue password recovery emails enter: <em>user_password_reset</em>'),
+      '#title' => $this->t('Mail IDs to queue'),
+      '#description' => $this->t('Enter each mail ID to queue on a separate line. Use <strong>*</strong> to do a wildcard match.') .'<br/>'. t('Mail IDs are a combination of the first and second arguments sent to <em>drupal_mail</em> when a module sends an email. E.g. <em>user_mail</em>, <em>register_pending_approval_admin</em>') . '<br />' . $this->t('For example, to queue all mails sent by the User module, enter: <em>user_*</em> above, to just queue password recovery emails enter: <em>user_password_reset</em>'),
       '#default_value' => $config->get('queue_mail_keys'),
     );
 
@@ -72,7 +72,7 @@ class QueueMailSettingsForm extends ConfigFormBase {
 
     $form['advanced'] = array(
       '#type' => 'details',
-      '#title' => t('Advanced settings'),
+      '#title' => $this->t('Advanced settings'),
       '#collapsed' => TRUE,
     );
 
@@ -83,8 +83,8 @@ class QueueMailSettingsForm extends ConfigFormBase {
 
     $form['advanced']['queue_mail_queue_time'] = array(
       '#type' => 'select',
-      '#title' => t('Queue processing time (max)'),
-      '#description' => t('How much time in seconds to allow queue mail to send emails for on cron. Warning if you set a very high limit your cron run could timeout and never complete.'),
+      '#title' => $this->t('Queue processing time (max)'),
+      '#description' => $this->t('How much time in seconds to allow queue mail to send emails for on cron. Warning if you set a very high limit your cron run could timeout and never complete.'),
       '#options' => $options,
       '#default_value' => $config->get('queue_mail_queue_time'),
     );
diff --git a/src/Tests/QueueMailConfigurationTest.php b/src/Tests/QueueMailConfigurationTest.php
index 2b335cb..84daac8 100644
--- a/src/Tests/QueueMailConfigurationTest.php
+++ b/src/Tests/QueueMailConfigurationTest.php
@@ -1,10 +1,5 @@
 <?php
 
-/**
- * @file
- * Definition of Drupal\queue_mail\Tests\QueueMailConfigurationTest.
- */
-
 namespace Drupal\queue_mail\Tests;
 
 use Drupal\simpletest\WebTestBase;
@@ -55,7 +50,7 @@ class QueueMailConfigurationTest extends WebTestBase {
     $this->assertFieldByName('queue_mail_keys', '');
 
     // Test change of setting.
-    $this->drupalPostForm(self::CONFIGURATION_PATH, array('queue_mail_keys' => 'queue_mail_test'), t('Save configuration'));
+    $this->drupalPostForm(self::CONFIGURATION_PATH, array('queue_mail_keys' => 'queue_mail_test'), $this->t('Save configuration'));
     $this->assertFieldByName('queue_mail_keys', 'queue_mail_test');
   }
 
@@ -70,7 +65,7 @@ class QueueMailConfigurationTest extends WebTestBase {
     $this->assertFieldByName('queue_mail_queue_time', '15');
 
     // Test change of setting.
-    $this->drupalPostForm(self::CONFIGURATION_PATH, array('queue_mail_queue_time' => '30'), t('Save configuration'));
+    $this->drupalPostForm(self::CONFIGURATION_PATH, array('queue_mail_queue_time' => '30'), $this->t('Save configuration'));
     $this->assertFieldByName('queue_mail_queue_time', '30');
   }
 }
diff --git a/src/Tests/QueueMailFunctionalTest.php b/src/Tests/QueueMailFunctionalTest.php
index 5f5859c..1936888 100644
--- a/src/Tests/QueueMailFunctionalTest.php
+++ b/src/Tests/QueueMailFunctionalTest.php
@@ -1,8 +1,4 @@
 <?php
-/**
- * @file
- * Simpletests for the Queue Mail module.
- */
 
 namespace Drupal\queue_mail\Tests;