diff --git a/Admin/AdminInterface.php b/Admin/AdminInterface.php
index 2eb7387b12..7279aea9f3 100644
--- a/Admin/AdminInterface.php
+++ b/Admin/AdminInterface.php
@@ -513,7 +513,7 @@ public function getParent();
     /**
      * @param AdminInterface $admin
      */
-    public function setParent(AdminInterface $admin);
+    public function setParent(self $admin);
 
     /**
      * Returns true if the Admin class has an Parent Admin defined.
diff --git a/Route/RouteCollection.php b/Route/RouteCollection.php
index 23a4efd6b5..8edb088c55 100644
--- a/Route/RouteCollection.php
+++ b/Route/RouteCollection.php
@@ -115,7 +115,7 @@ public function getCode($name)
      *
      * @return RouteCollection
      */
-    public function addCollection(RouteCollection $collection)
+    public function addCollection(self $collection)
     {
         foreach ($collection->getElements() as $code => $route) {
             $this->elements[$code] = $route;
diff --git a/Tests/DependencyInjection/Compiler/AddDependencyCallsCompilerPassTest.php b/Tests/DependencyInjection/Compiler/AddDependencyCallsCompilerPassTest.php
index badebc5c1f..f823a4083f 100644
--- a/Tests/DependencyInjection/Compiler/AddDependencyCallsCompilerPassTest.php
+++ b/Tests/DependencyInjection/Compiler/AddDependencyCallsCompilerPassTest.php
@@ -14,11 +14,11 @@
 use PHPUnit\Framework\TestCase;
 use Sonata\AdminBundle\DependencyInjection\Compiler\AddDependencyCallsCompilerPass;
 use Sonata\AdminBundle\DependencyInjection\SonataAdminExtension;
+use Sonata\DoctrinePHPCRAdminBundle\Route\PathInfoBuilderSlashes;
 use Symfony\Component\DependencyInjection\ChildDefinition;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\DependencyInjection\Definition;
 use Symfony\Component\DependencyInjection\DefinitionDecorator;
-use Sonata\DoctrinePHPCRAdminBundle\Route\PathInfoBuilderSlashes;
 
 /**
  * @author Tiago Garcia