diff --git a/tests/src/UnitTest/CalculationFieldsHandlerExpressionTest.php b/tests/src/UnitTest/CalculationFieldsHandlerExpressionTest.php
index 721ae1a52aeb1940805d8b3b0ab6ff51e47826fd..4b7028bda48e8ed76fa12624541df4f906c8c844 100644
--- a/tests/src/UnitTest/CalculationFieldsHandlerExpressionTest.php
+++ b/tests/src/UnitTest/CalculationFieldsHandlerExpressionTest.php
@@ -44,7 +44,7 @@ class CalculationFieldsHandlerExpressionTest extends UnitTestCase {
   /**
    * Data provider for evaluation.
    */
-  public function getEvaluationDataProvider() {
+  public static function getEvaluationDataProvider() {
     return [
       ['1 + 2', 3],
       ['1 - 2', -1],
@@ -67,7 +67,7 @@ class CalculationFieldsHandlerExpressionTest extends UnitTestCase {
   /**
    * Provide test for testBuildExpression.
    */
-  public function buildExpressionDataProvider() {
+  public static function buildExpressionDataProvider() {
     return [
       [':field1 + :field2', ['field1' => 1, 'field2' => 2], '1 + 2'],
       [':field1 * :field2', ['field1' => 1, 'field2' => 2], '1 * 2'],
@@ -99,7 +99,7 @@ class CalculationFieldsHandlerExpressionTest extends UnitTestCase {
   /**
    * Provides data for the testgetFieldsFromExpression method.
    */
-  public function getFieldsFromExpressionDataProvider() {
+  public static function getFieldsFromExpressionDataProvider() {
     return [
       // Test simple math expressions.
       [':field1 + :field2', ['field1', 'field2']],
@@ -137,7 +137,7 @@ class CalculationFieldsHandlerExpressionTest extends UnitTestCase {
   /**
    * Data provider for the validate expression method.
    */
-  public function dataValidationFunctionProvider() {
+  public static function dataValidationFunctionProvider() {
     return [
       [':field1 + :field2', TRUE],
       [':fie___ld1 + :fie___ld2', TRUE],
diff --git a/tests/src/UnitTest/FormCalculationMarkupElementTest.php b/tests/src/UnitTest/FormCalculationMarkupElementTest.php
index afba274e262436c26f43758636885073e25f6358..c7f6d62e6be4ec6c83481cc2332e9692e3c170ec 100644
--- a/tests/src/UnitTest/FormCalculationMarkupElementTest.php
+++ b/tests/src/UnitTest/FormCalculationMarkupElementTest.php
@@ -2,8 +2,8 @@
 
 namespace Drupal\calculation_fields\Tests\Kernel;
 
-use Drupal\Tests\UnitTestCase;
 use Drupal\calculation_fields\Element\FormCalculationMarkupElement;
+use Drupal\Tests\UnitTestCase;
 
 /**
  * Test the evaluation of the form calculation element markup.
@@ -27,7 +27,7 @@ class FormCalculationMarkupElementTest extends UnitTestCase {
   /**
    * Data provider to text extract evaluation.
    */
-  public function dataProviderExtractEvaluationDataProvider() {
+  public static function dataProviderExtractEvaluationDataProvider(): array {
     return [
       [
         '<h3>You account amount is: {{ :result }}</h3>',