diff --git a/src/Bundle/ChillActivityBundle/Export/Export/LinkedToPerson/ListActivity.php b/src/Bundle/ChillActivityBundle/Export/Export/LinkedToPerson/ListActivity.php
index e6c8e7c6a..c152fc8e5 100644
--- a/src/Bundle/ChillActivityBundle/Export/Export/LinkedToPerson/ListActivity.php
+++ b/src/Bundle/ChillActivityBundle/Export/Export/LinkedToPerson/ListActivity.php
@@ -11,6 +11,7 @@ declare(strict_types=1);
 
 namespace Chill\ActivityBundle\Export\Export\LinkedToPerson;
 
+use Chill\ActivityBundle\Entity\Activity;
 use Chill\ActivityBundle\Entity\ActivityReason;
 use Chill\ActivityBundle\Export\Declarations;
 use Chill\ActivityBundle\Repository\ActivityRepository;
@@ -214,7 +215,7 @@ class ListActivity implements ListInterface, GroupedExportInterface
         $qb = $this->entityManager->createQueryBuilder();
 
         $qb
-            ->from('ChillActivityBundle:Activity', 'activity')
+            ->from(Activity::class, 'activity')
             ->join('activity.person', 'person')
             ->join(
                 HouseholdMember::class,
diff --git a/src/Bundle/ChillBudgetBundle/Tests/Service/Summary/SummaryBudgetTest.php b/src/Bundle/ChillBudgetBundle/Tests/Service/Summary/SummaryBudgetTest.php
index 7fb437e05..67d9cf2a4 100644
--- a/src/Bundle/ChillBudgetBundle/Tests/Service/Summary/SummaryBudgetTest.php
+++ b/src/Bundle/ChillBudgetBundle/Tests/Service/Summary/SummaryBudgetTest.php
@@ -22,6 +22,7 @@ use Chill\PersonBundle\Entity\Household\HouseholdMember;
 use Chill\PersonBundle\Entity\Person;
 use Doctrine\ORM\AbstractQuery;
 use Doctrine\ORM\EntityManagerInterface;
+use Doctrine\ORM\NativeQuery;
 use Doctrine\ORM\Query;
 use PHPUnit\Framework\TestCase;
 use Prophecy\Argument;
@@ -38,7 +39,7 @@ final class SummaryBudgetTest extends TestCase
 
     public function testGenerateSummaryForPerson(): void
     {
-        $queryCharges = $this->prophesize(AbstractQuery::class);
+        $queryCharges = $this->prophesize(NativeQuery::class);
         $queryCharges->getResult()->willReturn([
             [
                 'sum' => 250.0,
@@ -49,7 +50,7 @@ final class SummaryBudgetTest extends TestCase
         $queryCharges->setParameters(Argument::type('array'))
             ->will(static fn ($args, $query) => $query);
 
-        $queryResources = $this->prophesize(AbstractQuery::class);
+        $queryResources = $this->prophesize(NativeQuery::class);
         $queryResources->getResult()->willReturn([
             [
                 'sum' => 1500.0,