diff --git a/src/Form/RiddlerSettingsForm.php b/src/Form/RiddlerSettingsForm.php
index 80ca048..927f06c 100755
--- a/src/Form/RiddlerSettingsForm.php
+++ b/src/Form/RiddlerSettingsForm.php
@@ -69,7 +69,7 @@ class RiddlerSettingsForm extends ConfigFormBase {
       '#suffix' => '</div>'
     );
     $form['riddler']['help'] = array(
-      '#markup' => t('Add questions that you require users to answer. A random question will be presented to the user on forms as configured in the CAPTCHA settings. Allow more than one correct answer by entering a comma-separated list.'),
+      '#markup' => $this->t('Add questions that you require users to answer. A random question will be presented to the user on forms as configured in the CAPTCHA settings. Allow more than one correct answer by entering a comma-separated list.'),
       '#prefix' => '<p>',
       '#suffix' => '</p>'
     );
@@ -93,7 +93,7 @@ class RiddlerSettingsForm extends ConfigFormBase {
           // Delete a row button.
           'delete' => array(
             '#type' => 'submit',
-            '#value' => t('Remove'),
+            '#value' => $this->t('Remove'),
             '#id' => 'riddle' . $delta,
             '#name' => 'riddle-remove-' . $delta,
             '#submit' => array(array($this, 'removeSubmit')),
@@ -114,7 +114,7 @@ class RiddlerSettingsForm extends ConfigFormBase {
     // Add a row button.
     $form['add'] = array(
       '#type' => 'submit',
-      '#value' => t('Add another riddle'),
+      '#value' => $this->t('Add another riddle'),
       '#submit' => array(array($this, 'addMoreSubmit')),
       '#limit_validation_errors' => array(array('riddler')),
       '#ajax' => array(
diff --git a/src/Tests/RiddlerTestCase.php b/src/Tests/RiddlerTestCase.php
index 75dc017..2c9292c 100755
--- a/src/Tests/RiddlerTestCase.php
+++ b/src/Tests/RiddlerTestCase.php
@@ -169,7 +169,7 @@ class RiddlerTestCase extends CaptchaBaseWebTestCase {
 
     // This creates a new set of question and response.
     $ajax = $this->drupalPostAjaxForm(self::RIDDLER_ADMIN_PATH, $form_values_1_question, $addAnotherButton);
-    $this->assertText(t('Riddle 2'),
+    $this->assertText($this->t('Riddle 2'),
       'Admin should be able to ajax add a new riddle row.', 'Riddler');
 
     $this->drupalPostForm(NULL, $form_values_2_question, 'Save configuration');