diff --git a/block_field.info.yml b/block_field.info.yml
index 66d6294..355357d 100644
--- a/block_field.info.yml
+++ b/block_field.info.yml
@@ -2,4 +2,4 @@ name: 'Block Field'
 type: module
 description: 'Provides a field that allows a content entity to create and configure custom block instances.'
 package: Field
-core: 8.x
+core_version_requirement: ^8.7.7 || ^9
diff --git a/src/BlockFieldSelectionBase.php b/src/BlockFieldSelectionBase.php
index af5659e..d7568ac 100644
--- a/src/BlockFieldSelectionBase.php
+++ b/src/BlockFieldSelectionBase.php
@@ -2,7 +2,7 @@
 
 namespace Drupal\block_field;
 
-use Drupal\Component\Plugin\ConfigurablePluginInterface;
+use Drupal\Component\Plugin\ConfigurableInterface;
 use Drupal\Component\Plugin\PluginBase;
 use Drupal\Component\Utility\NestedArray;
 use Drupal\Core\Form\FormStateInterface;
@@ -10,7 +10,7 @@ use Drupal\Core\Form\FormStateInterface;
 /**
  * Base class for Block field selection plugins.
  */
-abstract class BlockFieldSelectionBase extends PluginBase implements BlockFieldSelectionInterface, ConfigurablePluginInterface {
+abstract class BlockFieldSelectionBase extends PluginBase implements BlockFieldSelectionInterface, ConfigurableInterface {
 
   /**
    * Constructs a new selection object.
@@ -71,13 +71,6 @@ abstract class BlockFieldSelectionBase extends PluginBase implements BlockFieldS
     );
   }
 
-  /**
-   * {@inheritdoc}
-   */
-  public function calculateDependencies() {
-    // TODO: Implement calculateDependencies() method.
-  }
-
   /**
    * Move settings up a level for easier processing and storage.
    */
diff --git a/tests/modules/block_field_test/block_field_test.info.yml b/tests/modules/block_field_test/block_field_test.info.yml
index 44e2fc3..a665da6 100644
--- a/tests/modules/block_field_test/block_field_test.info.yml
+++ b/tests/modules/block_field_test/block_field_test.info.yml
@@ -2,11 +2,11 @@ name: 'Block field module tests'
 type: module
 description: 'Support module for Block field that provides a working example of a block field.'
 package: Testing
-core: 8.x
+core_version_requirement: ^8.7.7 || ^9
 dependencies:
-  - block_field
-  - field
-  - menu_ui
-  - node
-  - path
-  - user
+  - drupal:block_field
+  - drupal:field
+  - drupal:menu_ui
+  - drupal:node
+  - drupal:path
+  - drupal:user
diff --git a/tests/modules/block_field_widget_test/block_field_widget_test.info.yml b/tests/modules/block_field_widget_test/block_field_widget_test.info.yml
index 185a47d..ea9a657 100644
--- a/tests/modules/block_field_widget_test/block_field_widget_test.info.yml
+++ b/tests/modules/block_field_widget_test/block_field_widget_test.info.yml
@@ -2,12 +2,12 @@ name: 'Block field module widget tests'
 type: module
 description: 'Support module for block field that provides some default configuration to test the field widget.'
 package: Testing
-core: 8.x
+core_version_requirement: ^8.7.7 || ^9
 dependencies:
-  - block
-  - block_field
-  - field
-  - node
-  - path
-  - user
-  - views
+  - drupal:block
+  - drupal:block_field
+  - drupal:field
+  - drupal:node
+  - drupal:path
+  - drupal:user
+  - drupal:views
diff --git a/tests/src/Functional/BlockFieldTest.php b/tests/src/Functional/BlockFieldTest.php
index 96000ff..80e3fe4 100644
--- a/tests/src/Functional/BlockFieldTest.php
+++ b/tests/src/Functional/BlockFieldTest.php
@@ -11,6 +11,11 @@ use Drupal\Tests\BrowserTestBase;
  */
 class BlockFieldTest extends BrowserTestBase {
 
+  /**
+   * {@inheritdoc}
+   */
+  protected $defaultTheme = 'classy';
+
   /**
    * Modules to enable.
    *
diff --git a/tests/src/Functional/WidgetTest.php b/tests/src/Functional/WidgetTest.php
index 51d15d8..76960de 100644
--- a/tests/src/Functional/WidgetTest.php
+++ b/tests/src/Functional/WidgetTest.php
@@ -11,6 +11,11 @@ use Drupal\Tests\BrowserTestBase;
  */
 class WidgetTest extends BrowserTestBase {
 
+  /**
+   * {@inheritdoc}
+   */
+  protected $defaultTheme = 'classy';
+
   /**
    * {@inheritdoc}
    */