diff --git a/src/FileEntityServiceProvider.php b/src/FileEntityServiceProvider.php
index bd8b893..aab59bc 100644
--- a/src/FileEntityServiceProvider.php
+++ b/src/FileEntityServiceProvider.php
@@ -8,6 +8,8 @@ namespace Drupal\file_entity;
 
 use Drupal\Core\DependencyInjection\ContainerBuilder;
 use Drupal\Core\DependencyInjection\ServiceProviderBase;
+use Drupal\file_entity\Normalizer\FileEntityNormalizer;
+use Drupal\file_entity\Normalizer\FileItemNormalizer;
 use Symfony\Component\DependencyInjection\Definition;
 use Symfony\Component\DependencyInjection\Reference;
 
@@ -21,12 +23,10 @@ class FileEntityServiceProvider extends ServiceProviderBase {
    */
   public function alter(ContainerBuilder $container) {
     $modules = $container->getParameter('container.modules');
-    // Check for installed REST and HAL modules. HAL does not require REST
-    // anymore in 8.3 and later.
-    if (isset($modules['hal']) && isset($modules['rest'])) {
+    if (isset($modules['hal'])) {
       // Add a normalizer service for file entities.
-      $service_definition = new Definition('Drupal\file_entity\Normalizer\FileEntityNormalizer', array(
-        new Reference('rest.link_manager'),
+      $service_definition = new Definition(FileEntityNormalizer::class, array(
+        new Reference('hal.link_manager'),
         new Reference('entity.manager'),
         new Reference('module_handler'),
       ));
@@ -36,8 +36,8 @@ class FileEntityServiceProvider extends ServiceProviderBase {
       $container->setDefinition('serializer.normalizer.entity.file_entity', $service_definition);
 
       // Add a normalizer service for file fields.
-      $service_definition = new Definition('Drupal\file_entity\Normalizer\FileItemNormalizer', array(
-        new Reference('rest.link_manager'),
+      $service_definition = new Definition(FileItemNormalizer::class, array(
+        new Reference('hal.link_manager'),
         new Reference('serializer.entity_resolver'),
       ));
       // Supersede EntityReferenceItemNormalizer.
diff --git a/src/Tests/FileEntityServicesTest.php b/src/Tests/FileEntityServicesTest.php
index 540f81d..d9cc8cb 100644
--- a/src/Tests/FileEntityServicesTest.php
+++ b/src/Tests/FileEntityServicesTest.php
@@ -29,6 +29,7 @@ class FileEntityServicesTest extends RESTTestBase {
   public static $modules = array(
     'node',
     'hal',
+    'rest',
     'file_entity'
   );
 
@@ -93,6 +94,7 @@ class FileEntityServicesTest extends RESTTestBase {
     $this->assertResponse(404);
 
     // POST node to create new.
+    unset($response_data['nid']);
     unset($response_data['created']);
     unset($response_data['changed']);
     unset($response_data['status']);