diff --git a/src/Bundle/ChillPersonBundle/DataFixtures/ORM/LoadPeople.php b/src/Bundle/ChillPersonBundle/DataFixtures/ORM/LoadPeople.php
index 5cb8c1601..f1be52959 100644
--- a/src/Bundle/ChillPersonBundle/DataFixtures/ORM/LoadPeople.php
+++ b/src/Bundle/ChillPersonBundle/DataFixtures/ORM/LoadPeople.php
@@ -80,14 +80,15 @@ class LoadPeople extends AbstractFixture implements ContainerAwareInterface, Ord
      */
     protected array $cacheUsers = [];
 
+    /**
+     * @var array|Gender[]
+     */
     protected array $cacheGenders = [];
 
     protected Generator $faker;
 
     protected NativeLoader $loader;
 
-    //    private array $genders = [GenderEnum::MALE, GenderEnum::FEMALE, GenderEnum::NEUTRAL];
-
     private array $peoples = [
         [
             'lastName' => 'Depardieu',
@@ -124,7 +125,7 @@ class LoadPeople extends AbstractFixture implements ContainerAwareInterface, Ord
             'maritalStatus' => 'ms_divorce',
         ],
         [
-            // to have a person with same birthdate of Gérard Depardieu
+            // to have a person with same birthdate as Gérard Depardieu
             'lastName' => 'Van Snick',
             'firstName' => 'Bart',
             'birthdate' => '1948-12-27',
@@ -281,7 +282,7 @@ class LoadPeople extends AbstractFixture implements ContainerAwareInterface, Ord
     public function getRandomGender(int $nullPercentage = 50): ?Gender
     {
         if (0 === \count($this->cacheGenders)) {
-            $this->cacheGenders = $this->genderRepository->findAll();
+            $this->cacheGenders = $this->genderRepository->findByActiveOrdered();
         }
 
         if (\random_int(0, 100) > $nullPercentage) {
diff --git a/src/Bundle/ChillPersonBundle/Tests/Controller/AccompanyingCoursWorkApiController/ConflictTest.php b/src/Bundle/ChillPersonBundle/Tests/Controller/AccompanyingCoursWorkApiController/ConflictTest.php
index 8f182cac5..c2097234a 100644
--- a/src/Bundle/ChillPersonBundle/Tests/Controller/AccompanyingCoursWorkApiController/ConflictTest.php
+++ b/src/Bundle/ChillPersonBundle/Tests/Controller/AccompanyingCoursWorkApiController/ConflictTest.php
@@ -11,6 +11,9 @@ declare(strict_types=1);
 
 namespace Tests\Controller\AccompanyingCoursWorkApiController;
 
+use Chill\MainBundle\Entity\Gender;
+use Chill\MainBundle\Entity\GenderEnum;
+use Chill\MainBundle\Entity\GenderIconEnum;
 use Chill\MainBundle\Repository\UserRepositoryInterface;
 use Chill\MainBundle\Test\PrepareClientTrait;
 use Chill\PersonBundle\Entity\AccompanyingPeriod;
@@ -129,8 +132,15 @@ class ConflictTest extends WebTestCase
 
         $period = new AccompanyingPeriod();
         $em->persist($period);
+
+        $gender = new Gender();
+        $gender->setGenderTranslation(GenderEnum::MALE);
+        $gender->setLabel(["fr" => "homme"]);
+        $gender->setIcon(GenderIconEnum::MALE);
+        $em->persist($gender);
+
         $period->addPerson(($p = new Person())->setFirstName('test')->setLastName('test')
-            ->setBirthdate(new \DateTime('1980-01-01'))->setGender(Person::BOTH_GENDER));
+            ->setBirthdate(new \DateTime('1980-01-01'))->setGender($gender));
         $em->persist($p);
         $issue = (new SocialIssue())->setTitle(['fr' => 'test']);
         $em->persist($issue);
diff --git a/src/Bundle/ChillPersonBundle/Tests/Controller/HouseholdApiControllerTest.php b/src/Bundle/ChillPersonBundle/Tests/Controller/HouseholdApiControllerTest.php
index acc2a09e9..97f78895b 100644
--- a/src/Bundle/ChillPersonBundle/Tests/Controller/HouseholdApiControllerTest.php
+++ b/src/Bundle/ChillPersonBundle/Tests/Controller/HouseholdApiControllerTest.php
@@ -14,6 +14,9 @@ namespace Chill\PersonBundle\Tests\Controller;
 use Chill\MainBundle\Entity\Address;
 use Chill\MainBundle\Entity\AddressReference;
 use Chill\MainBundle\Entity\Center;
+use Chill\MainBundle\Entity\Gender;
+use Chill\MainBundle\Entity\GenderEnum;
+use Chill\MainBundle\Entity\GenderIconEnum;
 use Chill\MainBundle\Entity\User;
 use Chill\MainBundle\Test\PrepareClientTrait;
 use Chill\PersonBundle\Entity\Household\Household;
@@ -51,9 +54,15 @@ final class HouseholdApiControllerTest extends WebTestCase
             ->setMaxResults(1)
             ->getQuery()->getSingleResult();
 
+        $gender = new Gender();
+        $gender->setGenderTranslation(GenderEnum::MALE);
+        $gender->setLabel(["fr" => "homme"]);
+        $gender->setIcon(GenderIconEnum::MALE);
+        $em->persist($gender);
+
         $p = new Person();
         $p->setFirstname('test')->setLastName('test lastname')
-            ->setGender(Person::BOTH_GENDER)
+            ->setGender($gender)
             ->setCenter($centerA);
         $em->persist($p);
         $h = new Household();
diff --git a/src/Bundle/ChillPersonBundle/Tests/Controller/PersonControllerUpdateTest.php b/src/Bundle/ChillPersonBundle/Tests/Controller/PersonControllerUpdateTest.php
index ee2373e11..a5f0c6e14 100644
--- a/src/Bundle/ChillPersonBundle/Tests/Controller/PersonControllerUpdateTest.php
+++ b/src/Bundle/ChillPersonBundle/Tests/Controller/PersonControllerUpdateTest.php
@@ -12,6 +12,9 @@ declare(strict_types=1);
 namespace Chill\PersonBundle\Tests\Controller;
 
 use Chill\MainBundle\Entity\Center;
+use Chill\MainBundle\Entity\Gender;
+use Chill\MainBundle\Entity\GenderEnum;
+use Chill\MainBundle\Entity\GenderIconEnum;
 use Chill\MainBundle\Repository\CenterRepositoryInterface;
 use Chill\MainBundle\Test\PrepareClientTrait;
 use Chill\PersonBundle\Entity\Person;
@@ -160,12 +163,18 @@ final class PersonControllerUpdateTest extends WebTestCase
         $em = self::getContainer()->get(EntityManagerInterface::class);
         $center = $centerRepository->findOneBy(['name' => 'Center A']);
 
+        $gender = new Gender();
+        $gender->setGenderTranslation(GenderEnum::MALE);
+        $gender->setLabel(["fr" => "homme"]);
+        $gender->setIcon(GenderIconEnum::MALE);
+        $em->persist($gender);
+
         $person = new Person();
         $person
             ->setFirstName('Foo')
             ->setLastName('Bar')
             ->setBirthdate(new \DateTime('2017-09-30'))
-            ->setGender(Person::MALE_GENDER)
+            ->setGender($gender)
             ->setCenter($center);
 
         $em->persist($person);
diff --git a/src/Bundle/ChillPersonBundle/Tests/Controller/PersonControllerViewTest.php b/src/Bundle/ChillPersonBundle/Tests/Controller/PersonControllerViewTest.php
index 5a33f88a9..bc80de9a2 100644
--- a/src/Bundle/ChillPersonBundle/Tests/Controller/PersonControllerViewTest.php
+++ b/src/Bundle/ChillPersonBundle/Tests/Controller/PersonControllerViewTest.php
@@ -11,6 +11,9 @@ declare(strict_types=1);
 
 namespace Chill\PersonBundle\Tests\Controller;
 
+use Chill\MainBundle\Entity\Gender;
+use Chill\MainBundle\Entity\GenderEnum;
+use Chill\MainBundle\Entity\GenderIconEnum;
 use Chill\MainBundle\Repository\CenterRepositoryInterface;
 use Chill\MainBundle\Test\PrepareClientTrait;
 use Chill\PersonBundle\Entity\Person;
@@ -99,12 +102,18 @@ final class PersonControllerViewTest extends WebTestCase
         $em = self::getContainer()->get(EntityManagerInterface::class);
         $center = $centerRepository->findOneBy(['name' => 'Center A']);
 
+        $gender = new Gender();
+        $gender->setGenderTranslation(GenderEnum::MALE);
+        $gender->setLabel(["fr" => "homme"]);
+        $gender->setIcon(GenderIconEnum::MALE);
+        $em->persist($gender);
+
         $person = new Person();
         $person
             ->setFirstName('Foo')
             ->setLastName('Bar')
             ->setBirthdate(new \DateTime('2017-09-30'))
-            ->setGender(Person::MALE_GENDER)
+            ->setGender($gender)
             ->setCenter($center);
 
         $em->persist($person);