diff --git a/fieldable_path.info.yml b/fieldable_path.info.yml
index e74b949..03ef82f 100644
--- a/fieldable_path.info.yml
+++ b/fieldable_path.info.yml
@@ -2,7 +2,7 @@ name: Fieldable Path
 description: Provides a fieldable mirror of "path" property for entities.
 
 type: module
-core: 8.x
+core_version_requirement: ^8.8 || ^9
 
 dependencies:
   - drupal:path
diff --git a/src/Controller/FieldablePathController.php b/src/Controller/FieldablePathController.php
index 68caaba..3c29f21 100644
--- a/src/Controller/FieldablePathController.php
+++ b/src/Controller/FieldablePathController.php
@@ -161,7 +161,7 @@ class FieldablePathController {
     // and check if any of those exist in the current entity.
     $entity_type = $entity->getEntityTypeId();
     $entity_bundle = $entity->bundle();
-    $bundle_fields = \Drupal::entityManager()->getFieldDefinitions($entity_type, $entity_bundle);
+    $bundle_fields = \Drupal::service('entity_field.manager')->getFieldDefinitions($entity_type, $entity_bundle);
 
     // Loop through the fields and searching for added
     // 'fieldable_path' field.
diff --git a/src/Plugin/Action/CopyPathAction.php b/src/Plugin/Action/CopyPathAction.php
index 04e2c68..8a0b261 100644
--- a/src/Plugin/Action/CopyPathAction.php
+++ b/src/Plugin/Action/CopyPathAction.php
@@ -31,7 +31,7 @@ class CopyPathAction extends ActionBase {
 
     // Load entity's internal path (i.e. /node/2).
     $internal_path = $entity->toUrl()->getInternalPath();
-    $alias = \Drupal::service('path.alias_manager')
+    $alias = \Drupal::service('path_alias.manager')
       ->getAliasByPath('/' . $internal_path);
 
     \Drupal::service('fieldable_path.controller')
diff --git a/tests/src/Functional/FieldablePathBasicTest.php b/tests/src/Functional/FieldablePathBasicTest.php
index 4a8d7f4..e06ecbd 100644
--- a/tests/src/Functional/FieldablePathBasicTest.php
+++ b/tests/src/Functional/FieldablePathBasicTest.php
@@ -18,13 +18,18 @@ class FieldablePathBasicTest extends BrowserTestBase {
    *
    * @var array
    */
-  public static $modules = [
+  protected static $modules = [
     'path',
     'fieldable_path',
     'node',
   ];
 
   /**
+   * {@inheritdoc}
+   */
+  protected $defaultTheme = 'classy';
+
+  /**
    * Describes a user with necessary permissions.
    *
    * @var \Drupal\user\Entity\User
@@ -55,7 +60,7 @@ class FieldablePathBasicTest extends BrowserTestBase {
   /**
    * {@inheritdoc}
    */
-  protected function setUp() {
+  protected function setUp() : void {
     parent::setUp();
 
     // Create a new Article node type.
@@ -85,13 +90,13 @@ class FieldablePathBasicTest extends BrowserTestBase {
       ->save();
 
     // Add the field to the node article form.
-    entity_get_form_display('node', 'article', 'default')
+    \Drupal::service('entity_display.repository')->getFormDisplay('node', 'article', 'default')
       ->setComponent($this->fieldName, [
         'type' => $this->fieldWidget,
       ])
       ->save();
 
-    entity_get_display('node', 'article', 'full')
+    \Drupal::service('entity_display.repository')->getViewDisplay('node', 'article', 'full')
       ->setComponent($this->fieldName)
       ->save();
 
@@ -107,7 +112,7 @@ class FieldablePathBasicTest extends BrowserTestBase {
   /**
    * Tests basic Create, Read, Update, Delete operations for nodes.
    */
-  public function testNodePath() {
+  public function testNodePath() : void {
 
     /*
      * Test creation of a new node with new path alias.
@@ -121,6 +126,7 @@ class FieldablePathBasicTest extends BrowserTestBase {
 
     // Create a new node with path alias set.
     $this->drupalPostForm('node/add/article', $edit, 'Save');
+    $this->assertSession()->statusCodeEquals(200);
 
     // Make sure field formatter works properly and displays
     // the correct alias.