diff --git a/core/modules/system/lib/Drupal/system/Tests/Form/FormObjectTest.php b/core/modules/system/lib/Drupal/system/Tests/Form/FormObjectTest.php
index 11e74a8..55dd739 100644
--- a/core/modules/system/lib/Drupal/system/Tests/Form/FormObjectTest.php
+++ b/core/modules/system/lib/Drupal/system/Tests/Form/FormObjectTest.php
@@ -33,7 +33,7 @@ public static function getInfo() {
   protected function setUp() {
     parent::setUp();
 
-    $this->form_id = new FormTestObject();
+    $this->form = new FormTestObject();
     $this->values = array(
       'bananas' => array(
         '#value' => $this->randomString(10),
diff --git a/core/modules/system/lib/Drupal/system/Tests/System/SystemConfigFormTestBase.php b/core/modules/system/lib/Drupal/system/Tests/System/SystemConfigFormTestBase.php
index 22593c3..5686e3f 100644
--- a/core/modules/system/lib/Drupal/system/Tests/System/SystemConfigFormTestBase.php
+++ b/core/modules/system/lib/Drupal/system/Tests/System/SystemConfigFormTestBase.php
@@ -51,7 +51,7 @@ public function testConfigForm() {
       $values[$form_key] = $data['#value'];
     }
     $form_state = array('values' => $values);
-    drupal_form_submit($this->form->getFormID(), $form_state);
+    drupal_form_submit($this->form, $form_state);
 
     // Check that the form returns an error when expected, and vice versa.
     $errors = form_get_errors();