diff --git a/modules/acquia_cms_tour/tests/src/Functional/AcquiaGoogleMapsTest.php b/modules/acquia_cms_tour/tests/src/Functional/AcquiaGoogleMapsTest.php
index 431acd8ca..3ad375e74 100644
--- a/modules/acquia_cms_tour/tests/src/Functional/AcquiaGoogleMapsTest.php
+++ b/modules/acquia_cms_tour/tests/src/Functional/AcquiaGoogleMapsTest.php
@@ -51,13 +51,23 @@ public function testAcquiaGoogleMaps() {
     $account = $this->drupalCreateUser(['access acquia cms tour dashboard']);
     $this->drupalLogin($account);
 
+    // Add Geocoder provider - googlemaps.
+    GeocoderProvider::create([
+      'id' => 'googlemaps',
+      'plugin' => 'googlemaps',
+      'configuration' => [
+        'apiKey' => 'oldkey12345',
+      ],
+    ])->save();
+
     // Visit the tour page.
     $this->drupalGet('/admin/tour/dashboard');
     $assert_session->statusCodeEquals(200);
 
     $container = $assert_session->elementExists('css', '[data-drupal-selector="edit-geocoder"]');
     // API key should be blank to start.
-    $assert_session->fieldValueEquals('maps_api_key', '', $container);
+    $assert_session->fieldValueEquals('maps_api_key', 'oldkey12345', $container);
+    $container->fillField('edit-maps-api-key', '');
     $container->pressButton('Save');
     $assert_session->pageTextContains('Maps API key field is required.');
 
diff --git a/modules/acquia_cms_tour/tests/src/Functional/GoogleTagManager.php b/modules/acquia_cms_tour/tests/src/Functional/GoogleTagManager.php
index d7084745a..712218028 100644
--- a/modules/acquia_cms_tour/tests/src/Functional/GoogleTagManager.php
+++ b/modules/acquia_cms_tour/tests/src/Functional/GoogleTagManager.php
@@ -25,21 +25,6 @@ class GoogleTagManager extends BrowserTestBase {
     'google_tag',
   ];
 
-  /**
-   * Disable strict config schema checks in this test.
-   *
-   * Cohesion has a lot of config schema errors, and until they are all fixed,
-   * this test cannot pass unless we disable strict config schema checking
-   * altogether. Since strict config schema isn't critically important in
-   * testing this functionality, it's okay to disable it for now, but it should
-   * be re-enabled (i.e., this property should be removed) as soon as possible.
-   *
-   * @var bool
-   */
-  // @codingStandardsIgnoreStart
-  protected $strictConfigSchema = FALSE;
-  // @codingStandardsIgnoreEnd
-
   /**
    * Tests the Google Tag Manager Form.
    */
@@ -61,7 +46,8 @@ public function testGoogleTagManager() {
     $container->pressButton('Save');
     $assert_session->pageTextContains('The configuration options have been saved.');
     // Test that the config values we expect are set correctly.
-    $tag_id = $this->config($this->config('google_tag.settings')->get('default_google_tag_entity'))->get('tag_container_ids');
+    $tag = $this->config('google_tag.settings')->get('default_google_tag_entity');
+    $tag_id = $this->config('google_tag.container.' . $tag)->get('tag_container_ids');
     $this->assertEquals($tag_id, [$dummy_tag]);
   }
 
diff --git a/modules/acquia_cms_tour/tests/src/Functional/HelpIntegrationTest.php b/modules/acquia_cms_tour/tests/src/Functional/HelpIntegrationTest.php
index 3866da06f..0060fc8f7 100644
--- a/modules/acquia_cms_tour/tests/src/Functional/HelpIntegrationTest.php
+++ b/modules/acquia_cms_tour/tests/src/Functional/HelpIntegrationTest.php
@@ -26,21 +26,6 @@ class HelpIntegrationTest extends BrowserTestBase {
     'toolbar',
   ];
 
-  /**
-   * Disable strict config schema checks in this test.
-   *
-   * Scheduler has a config schema errors, and until it's fixed,
-   * this test cannot pass unless we disable strict config schema checking
-   * altogether. Since strict config schema isn't critically important in
-   * testing this functionality, it's okay to disable it for now, but it should
-   * be re-enabled (i.e., this property should be removed) as soon as possible.
-   *
-   * @var bool
-   */
-  // @codingStandardsIgnoreStart
-  protected $strictConfigSchema = FALSE;
-  // @codingStandardsIgnoreEnd
-
   /**
    * Tests the Acquia CMS Tour module's integration with the core Help module.
    */
diff --git a/modules/acquia_cms_tour/tests/src/Functional/RecaptchaTest.php b/modules/acquia_cms_tour/tests/src/Functional/RecaptchaTest.php
index d6a9d45fa..6f5c7c228 100644
--- a/modules/acquia_cms_tour/tests/src/Functional/RecaptchaTest.php
+++ b/modules/acquia_cms_tour/tests/src/Functional/RecaptchaTest.php
@@ -25,21 +25,6 @@ class RecaptchaTest extends BrowserTestBase {
     'recaptcha',
   ];
 
-  /**
-   * Disable strict config schema checks in this test.
-   *
-   * Cohesion has a lot of config schema errors, and until they are all fixed,
-   * this test cannot pass unless we disable strict config schema checking
-   * altogether. Since strict config schema isn't critically important in
-   * testing this functionality, it's okay to disable it for now, but it should
-   * be re-enabled (i.e., this property should be removed) as soon as possible.
-   *
-   * @var bool
-   */
-  // @codingStandardsIgnoreStart
-  protected $strictConfigSchema = FALSE;
-  // @codingStandardsIgnoreEnd
-
   /**
    * Tests the Recaptcha Form.
    */
diff --git a/modules/acquia_cms_tour/tests/src/Kernel/AcquiaTourDashboardTest.php b/modules/acquia_cms_tour/tests/src/Kernel/AcquiaTourDashboardTest.php
index dd86497aa..5d6f4fc9e 100644
--- a/modules/acquia_cms_tour/tests/src/Kernel/AcquiaTourDashboardTest.php
+++ b/modules/acquia_cms_tour/tests/src/Kernel/AcquiaTourDashboardTest.php
@@ -22,21 +22,6 @@ class AcquiaTourDashboardTest extends KernelTestBase {
     'acquia_cms_tour',
   ];
 
-  /**
-   * Disable strict config schema checks in this test.
-   *
-   * Cohesion has a lot of config schema errors, and until they are all fixed,
-   * this test cannot pass unless we disable strict config schema checking
-   * altogether. Since strict config schema isn't critically important in
-   * testing this functionality, it's okay to disable it for now, but it should
-   * be re-enabled (i.e., this property should be removed) as soon as possible.
-   *
-   * @var bool
-   */
-  // @codingStandardsIgnoreStart
-  protected $strictConfigSchema = FALSE;
-  // @codingStandardsIgnoreEnd
-
   /**
    * Tests AcquiaCMSTour plugins and make sure they are sorted per weights.
    */