diff --git a/src/Form/ConditionalFieldEditForm.php b/src/Form/ConditionalFieldEditForm.php
index 84f8c11..5de744e 100644
--- a/src/Form/ConditionalFieldEditForm.php
+++ b/src/Form/ConditionalFieldEditForm.php
@@ -575,7 +575,7 @@ class ConditionalFieldEditForm extends FormBase {
       $form_object->setEntity($dummy_entity);
     }
     catch (InvalidPluginDefinitionException $e) {
-      watchdog_exception('conditional_fields', $e);
+      \Drupal\Component\Utility\DeprecationHelper::backwardsCompatibleCall(\Drupal::VERSION, '10.1.0', fn() => \Drupal\Core\Utility\Error::logException(\Drupal::logger('conditional_fields'), $e), fn() => watchdog_exception('conditional_fields', $e));
       // @todo May be it make sense to return markup?
       return NULL;
     }
diff --git a/tests/src/Unit/ConditionalFieldControllerTest.php b/tests/src/Unit/ConditionalFieldControllerTest.php
index 6aafeb7..e7a9181 100644
--- a/tests/src/Unit/ConditionalFieldControllerTest.php
+++ b/tests/src/Unit/ConditionalFieldControllerTest.php
@@ -35,9 +35,7 @@ class ConditionalFieldControllerTest extends UnitTestCase {
 
     $entity_types = [];
     // `content_a` should appear in test results.
-    $entity_types['content_a'] = $this->getMockBuilder('Drupal\Core\Entity\ContentEntityType')
-      ->disableOriginalConstructor()
-      ->getMock();
+    $entity_types['content_a'] = $this->createMock('Drupal\Core\Entity\ContentEntityType');
     $entity_types['content_a']->expects($this->any())
       ->method('getLabel')
       ->will($this->returnValue("contentA"));