diff --git a/simple_gmap.info.yml b/simple_gmap.info.yml
index c153828..d07c5a4 100644
--- a/simple_gmap.info.yml
+++ b/simple_gmap.info.yml
@@ -3,6 +3,7 @@ type: module
 description: 'Provides a Google Maps link/map formatter for simple Text fields.'
 package: Field types
 core: 8.x
+core_version_requirement: ^8 || ^9
 dependencies:
   - field
   - text
diff --git a/tests/src/FunctionalJavascript/SimpleGmapTest.php b/tests/src/FunctionalJavascript/SimpleGmapTest.php
index c3cd58d..8a3986d 100644
--- a/tests/src/FunctionalJavascript/SimpleGmapTest.php
+++ b/tests/src/FunctionalJavascript/SimpleGmapTest.php
@@ -91,8 +91,8 @@ class SimpleGmapTest extends WebDriverTestBase {
     $this->drupalGet('admin/structure/types/manage/simple_gmap_stress_test/display');
 
     // Find the table row containing the blank field.
-    $fields_page = $session->getPage();
-    $fields_form = $fields_page->find('css', 'form[action="/admin/structure/types/manage/simple_gmap_stress_test/display"]');
+    $fields_form = $assert_session->waitForElementVisible('css', 'form[action="/admin/structure/types/manage/simple_gmap_stress_test/display"]');
+    $this->assertNotNull($fields_form);
     $blank_row = $fields_form->find('css', "tr#field-blank");
 
     // Click on the row's edit button (styled with a gear icon).
@@ -140,6 +140,4 @@ class SimpleGmapTest extends WebDriverTestBase {
     $this->assertTrue($field_row_updated->has('css', 'div:contains("Original text displayed")'));
   }
 
-
-
 }