diff --git a/tests/modules/civicrm_entity_fullcalendar_test/civicrm_entity_fullcalendar_test.info.yml b/tests/modules/civicrm_entity_fullcalendar_test/civicrm_entity_fullcalendar_test.info.yml
index c0b913c7..16598e38 100644
--- a/tests/modules/civicrm_entity_fullcalendar_test/civicrm_entity_fullcalendar_test.info.yml
+++ b/tests/modules/civicrm_entity_fullcalendar_test/civicrm_entity_fullcalendar_test.info.yml
@@ -2,7 +2,7 @@ name: CiviCRM Entity Fullcalendar Test
 type: module
 description: 'Test module for CiviCRM Entity and Fullcalendar View.'
 package: CiviCRM
-core_version_requirement: ^10
+core_version_requirement: ^10 || ^11
 dependencies:
   - drupal:datetime
   - drupal:taxonomy
diff --git a/tests/modules/civicrm_entity_test/civicrm_entity_test.info.yml b/tests/modules/civicrm_entity_test/civicrm_entity_test.info.yml
index 1f0f2e2c..06394ae0 100644
--- a/tests/modules/civicrm_entity_test/civicrm_entity_test.info.yml
+++ b/tests/modules/civicrm_entity_test/civicrm_entity_test.info.yml
@@ -2,7 +2,7 @@ name: CiviCRM Entity Test
 type: module
 description: 'Test module for CiviCRM.'
 package: CiviCRM
-core_version_requirement: ^10
+core_version_requirement: ^10 || ^11
 dependencies:
   - civicrm
   - civicrm_entity
diff --git a/tests/modules/civicrm_entity_test_views/civicrm_entity_test_views.info.yml b/tests/modules/civicrm_entity_test_views/civicrm_entity_test_views.info.yml
index 31886ce2..c861905e 100644
--- a/tests/modules/civicrm_entity_test_views/civicrm_entity_test_views.info.yml
+++ b/tests/modules/civicrm_entity_test_views/civicrm_entity_test_views.info.yml
@@ -2,7 +2,7 @@ name: CiviCRM Entity Views Test
 type: module
 description: 'Test module for CiviCRM Entity and Views.'
 package: CiviCRM
-core_version_requirement: ^10
+core_version_requirement: ^10 || ^11
 dependencies:
   - drupal:views
   - civicrm:civicrm
diff --git a/tests/src/FunctionalJavascript/Views/CivicrmContactUserRelationshipTest.php b/tests/src/FunctionalJavascript/Views/CivicrmContactUserRelationshipTest.php
index 37f62cf1..c5a7c47b 100644
--- a/tests/src/FunctionalJavascript/Views/CivicrmContactUserRelationshipTest.php
+++ b/tests/src/FunctionalJavascript/Views/CivicrmContactUserRelationshipTest.php
@@ -32,7 +32,7 @@ final class CivicrmContactUserRelationshipTest extends CivicrmEntityTestBase {
    * {@inheritdoc}
    */
   public function setUp(): void {
-    if ($this->getName() === 'testWithSeperateDatabase' && empty(getenv('SIMPLETEST_CIVICRM_DB'))) {
+    if ($this->toString() === 'testWithSeperateDatabase' && empty(getenv('SIMPLETEST_CIVICRM_DB'))) {
       $this->markTestSkipped("Cannot run {$this->getName()} without specifying SIMPLETEST_CIVICRM_DB as a seperate database.");
     }
     parent::setUp();
@@ -93,7 +93,7 @@ public function setUp(): void {
   protected function changeDatabasePrefix() {
     parent::changeDatabasePrefix();
     // Change the CiviCRM connection to use the separate database.
-    if ($this->getName() === 'testWithSeperateDatabase') {
+    if ($this->toString() === 'testWithSeperateDatabase') {
       $db_url = getenv('SIMPLETEST_CIVICRM_DB');
       Database::removeConnection('civicrm_test');
       Database::removeConnection('civicrm');
diff --git a/tests/src/FunctionalJavascript/Views/CivicrmEventViewsTest.php b/tests/src/FunctionalJavascript/Views/CivicrmEventViewsTest.php
index ed8b0664..d8db346e 100644
--- a/tests/src/FunctionalJavascript/Views/CivicrmEventViewsTest.php
+++ b/tests/src/FunctionalJavascript/Views/CivicrmEventViewsTest.php
@@ -179,7 +179,7 @@ protected function assertViewWithSortsResults() {
   /**
    * {@inheritdoc}
    */
-  protected function doSetupViewWithArguments() {
+  public static function doSetupViewWithArguments() {
     $this->addArgumentToDisplay('name[civicrm_event.id]');
     $this->addFieldToDisplay('name[civicrm_event.description__value]');
     $this->addFieldToDisplay('name[civicrm_event.summary]');
diff --git a/tests/src/Kernel/CivicrmStorageGetTest.php b/tests/src/Kernel/CivicrmStorageGetTest.php
index 084add5d..874697f0 100644
--- a/tests/src/Kernel/CivicrmStorageGetTest.php
+++ b/tests/src/Kernel/CivicrmStorageGetTest.php
@@ -84,7 +84,7 @@ public function testLoadContact() {
    * @throws \Drupal\Component\Plugin\Exception\InvalidPluginDefinitionException
    * @throws \Drupal\Component\Plugin\Exception\PluginNotFoundException
    */
-  public function testDatetimeTimezone(array $original_datetimes, array $expected_utc_datetime, $timezone) {
+  public static function testDatetimeTimezone(array $original_datetimes, array $expected_utc_datetime, $timezone) {
     date_default_timezone_set($timezone);
     $civicrm_api_mock = $this->prophesize(CiviCrmApiInterface::class);
     $civicrm_api_mock->get('event', [