diff --git a/core/modules/system/src/Tests/Form/RadioTest.php b/core/modules/system/src/Tests/Form/RadioTest.php
index 8ce603f..4df04ec 100644
--- a/core/modules/system/src/Tests/Form/RadioTest.php
+++ b/core/modules/system/src/Tests/Form/RadioTest.php
@@ -1,10 +1,5 @@
 <?php
 
-/**
- * @file
- * Contains \Drupal\system\Tests\Form\RadioTest.
- */
-
 namespace Drupal\system\Tests\Form;
 
 use Drupal\simpletest\WebTestBase;
diff --git a/core/modules/system/tests/modules/form_test/src/Form/FormTestRadioTypeJugglingForm.php b/core/modules/system/tests/modules/form_test/src/Form/FormTestRadioTypeJugglingForm.php
index a3c845b..41e6d09 100644
--- a/core/modules/system/tests/modules/form_test/src/Form/FormTestRadioTypeJugglingForm.php
+++ b/core/modules/system/tests/modules/form_test/src/Form/FormTestRadioTypeJugglingForm.php
@@ -1,10 +1,5 @@
 <?php
 
-/**
- * @file
- * Contains \Drupal\form_test\Form\FormTestradioTypeJugglingForm.
- */
-
 namespace Drupal\form_test\Form;
 
 use Drupal\Core\Form\FormBase;
@@ -27,7 +22,7 @@ public function getFormId() {
    */
   public function buildForm(array $form, FormStateInterface $form_state, $default_value = NULL, $return_value = NULL) {
     $form['radio'] = [
-      '#title' => t('Radio'),
+      '#title' => $this->t('Radio'),
       '#type' => 'radio',
       '#return_value' => $return_value,
       '#default_value' => $default_value,
diff --git a/core/modules/system/tests/modules/form_test/src/Form/FormTestRadiosZeroForm.php b/core/modules/system/tests/modules/form_test/src/Form/FormTestRadiosZeroForm.php
index bd34b65..95fc9ea 100644
--- a/core/modules/system/tests/modules/form_test/src/Form/FormTestRadiosZeroForm.php
+++ b/core/modules/system/tests/modules/form_test/src/Form/FormTestRadiosZeroForm.php
@@ -1,10 +1,5 @@
 <?php
 
-/**
- * @file
- * Contains \Drupal\form_test\Form\FormTestRadiosZeroForm.
- */
-
 namespace Drupal\form_test\Form;
 
 use Drupal\Core\Form\FormBase;
@@ -29,18 +24,18 @@ public function getFormId() {
   public function buildForm(array $form, FormStateInterface $form_state, $json = TRUE) {
     $form_state->set('json', $json);
     $form['radio_off'] = [
-      '#title' => t('Radio off'),
+      '#title' => $this->t('Radio off'),
       '#type' => 'radios',
       '#options' => ['foo', 'bar', 'baz'],
     ];
     $form['radio_zero_default'] = [
-      '#title' => t('Zero default'),
+      '#title' => $this->t('Zero default'),
       '#type' => 'radios',
       '#options' => ['foo', 'bar', 'baz'],
       '#default_value' => 0,
     ];
     $form['radio_string_zero_default'] = [
-      '#title' => t('Zero default (string)'),
+      '#title' => $this->t('Zero default (string)'),
       '#type' => 'radios',
       '#options' => ['foo', 'bar', 'baz'],
       '#default_value' => '0',