diff --git a/modules/salesforce_mapping_ui/src/Tests/SalesforceMappingCrudFormTest.php b/modules/salesforce_mapping_ui/src/Tests/SalesforceMappingCrudFormTest.php
index b5142749efcc8438dde3be1bd06867df747a7af1..b5c1a566d05f73be0902c41c1d9edc8626dd662d 100644
--- a/modules/salesforce_mapping_ui/src/Tests/SalesforceMappingCrudFormTest.php
+++ b/modules/salesforce_mapping_ui/src/Tests/SalesforceMappingCrudFormTest.php
@@ -63,6 +63,7 @@ class SalesforceMappingCrudFormTest extends BrowserTestBase {
     $mappingStorage = \Drupal::entityTypeManager()->getStorage('salesforce_mapping');
     $this->drupalLogin($this->adminSalesforceUser);
 
+    $this->drupalGet('admin/structure/salesforce/mappings/add');
     /* Salesforce Mapping Add Form */
     $mapping_name = 'mapping' . rand(100, 10000);
     $post = [
@@ -72,7 +73,7 @@ class SalesforceMappingCrudFormTest extends BrowserTestBase {
       'drupal_bundle' => 'salesforce_mapping_test_content',
       'salesforce_object_type' => 'Contact',
     ];
-    $this->drupalPostForm('admin/structure/salesforce/mappings/add', $post, $this->t('Save'));
+    $this->submitForm($post, $this->t('Save'));
     $this->assertSession()->pageTextContainsOnce($this->t('The mapping has been successfully saved.'));
 
     $mapping = $mappingStorage->load($mapping_name);
@@ -83,13 +84,14 @@ class SalesforceMappingCrudFormTest extends BrowserTestBase {
     /* Salesforce Mapping Edit Form */
     // Need to rebuild caches before proceeding to edit link.
     drupal_flush_all_caches();
+    $this->drupalGet('admin/structure/salesforce/mappings/manage/' . $mapping_name);
     $post = [
       'label' => $this->randomMachineName(),
       'drupal_entity_type' => 'node',
       'drupal_bundle' => 'salesforce_mapping_test_content',
       'salesforce_object_type' => 'Contact',
     ];
-    $this->drupalPostForm('admin/structure/salesforce/mappings/manage/' . $mapping_name, $post, $this->t('Save'));
+    $this->submitForm($post, $this->t('Save'));
     $this->assertSession()->fieldValueEquals('label', $post['label']);
 
     // Test simply adding a field plugin of every possible type. This is not
@@ -105,7 +107,7 @@ class SalesforceMappingCrudFormTest extends BrowserTestBase {
       if (call_user_func([$definition['class'], 'isAllowed'], $mapping)) {
         // Add a new field:
         $post['buttons[field_type]'] = $definition['id'];
-        $this->drupalPostForm(NULL, $post, $this->t('Add a field mapping to get started'));
+        $this->submitForm($post, $this->t('Add a field mapping to get started'));
         // Confirm that the new field shows up:
         $this->assertSession()->pageTextContains($definition['label']);
 
@@ -127,7 +129,7 @@ class SalesforceMappingCrudFormTest extends BrowserTestBase {
     }
 
     // Confirm that form saves correctly.
-    $this->drupalPostForm(NULL, $post, $this->t('Save'));
+    $this->submitForm($post, $this->t('Save'));
     $this->assertSession()->pageTextContainsOnce($this->t('The mapping has been successfully saved.'));
 
     // Confirm that the changes are stored properly by reloading and counting the fields.
diff --git a/tests/src/Functional/StatusPageTest.php b/tests/src/Functional/StatusPageTest.php
index 135e7e5e08318a2f4056a48681250182df9808ac..4083fb3f5e63c864f6d86e34384dc38ca7ec596c 100644
--- a/tests/src/Functional/StatusPageTest.php
+++ b/tests/src/Functional/StatusPageTest.php
@@ -27,7 +27,7 @@ class StatusPageTest extends BrowserTestBase {
    *
    * @var array
    */
-  public static $modules = ['salesforce', 'salesforce_test_rest_client'];
+  protected static $modules = ['salesforce', 'salesforce_test_rest_client'];
 
   /**
    * Auth provider manager service.
@@ -60,7 +60,7 @@ class StatusPageTest extends BrowserTestBase {
   /**
    * {@inheritDoc}
    */
-  public function setUp() {
+  public function setUp(): void {
     parent::setUp();
     $this->authMan = \Drupal::service('plugin.manager.salesforce.auth_providers');
     $file = __DIR__ . "/../../../salesforce.install";