diff --git a/api/src/experiments/experiments.service.spec.ts b/api/src/experiments/experiments.service.spec.ts
index 4ff6cbf202ce6248f3cee88498929bcf4d4bfe6a..3a49c6819c0b21eba5fe97808409c80120810af2 100644
--- a/api/src/experiments/experiments.service.spec.ts
+++ b/api/src/experiments/experiments.service.spec.ts
@@ -1,7 +1,7 @@
 import { ForbiddenException, NotFoundException } from '@nestjs/common';
 import { Test, TestingModule } from '@nestjs/testing';
 import { getRepositoryToken } from '@nestjs/typeorm';
-import { User } from 'src/users/models/user.model';
+import { User } from '../users/models/user.model';
 import { Repository } from 'typeorm';
 import { Experiment } from '../engine/models/experiment/experiment.model';
 import { ExperimentsService } from './experiments.service';
@@ -9,6 +9,7 @@ import { ExperimentCreateInput } from './models/input/experiment-create.input';
 
 type MockRepository<T = any> = Partial<Record<keyof Repository<T>, jest.Mock>>;
 const createMockRepository = <T = any>(): MockRepository<T> => ({
+  findOneBy: jest.fn(),
   findOne: jest.fn(),
   findAndCount: jest.fn(),
   create: jest.fn(),
@@ -48,7 +49,7 @@ describe('ExperimentsService', () => {
         const experimentId = '1';
         const expectedExperiment = {};
 
-        experimentRepository.findOne.mockReturnValue(expectedExperiment);
+        experimentRepository.findOneBy.mockReturnValue(expectedExperiment);
         const experiment = await service.findOne(experimentId);
         expect(experiment).toEqual(expectedExperiment);
       });
@@ -64,7 +65,7 @@ describe('ExperimentsService', () => {
           id: 'dummyid',
         };
 
-        experimentRepository.findOne.mockReturnValue(expectedExperiment);
+        experimentRepository.findOneBy.mockReturnValue(expectedExperiment);
 
         try {
           await service.findOne(experimentId, user);
@@ -76,7 +77,7 @@ describe('ExperimentsService', () => {
     describe('otherwise', () => {
       it('should throw the "NotFoundException"', async () => {
         const experimentId = '1';
-        experimentRepository.findOne.mockReturnValue(undefined);
+        experimentRepository.findOneBy.mockReturnValue(undefined);
 
         try {
           await service.findOne(experimentId);
@@ -165,7 +166,7 @@ describe('ExperimentsService', () => {
 
       const updateData = { name: 'test' };
 
-      experimentRepository.findOne.mockReturnValue({
+      experimentRepository.findOneBy.mockReturnValue({
         author: {
           ...user,
         },
diff --git a/api/src/experiments/experiments.service.ts b/api/src/experiments/experiments.service.ts
index e452228979667e98903967f5c09d181c91a0173d..f2168ca65e4d536bcf59957f1dccf4a53d828609 100644
--- a/api/src/experiments/experiments.service.ts
+++ b/api/src/experiments/experiments.service.ts
@@ -8,7 +8,7 @@ import {
   Experiment,
   ExperimentStatus,
 } from '../engine/models/experiment/experiment.model';
-import { User } from 'src/users/models/user.model';
+import { User } from '../users/models/user.model';
 import { FindManyOptions, Like, Repository } from 'typeorm';
 import { ExperimentCreateInput } from './models/input/experiment-create.input';
 import { PaginationArgsInput } from './models/input/pagination-args.input';
@@ -59,7 +59,7 @@ export class ExperimentsService {
    */
   async findOne(id: string, user: User): Promise<Experiment>;
   async findOne(id: string, user?: User): Promise<Experiment> {
-    const experiment = await this.experimentRepository.findOne(id);
+    const experiment = await this.experimentRepository.findOneBy({ id });
 
     if (!experiment) throw new NotFoundException(`Experiment #${id} not found`);
 
diff --git a/api/src/users/users.service.spec.ts b/api/src/users/users.service.spec.ts
index aaad4fb993600d43786cf2b407b963715dea0b32..47fa24b93094f81116aa6d5657b322dc16b15db2 100644
--- a/api/src/users/users.service.spec.ts
+++ b/api/src/users/users.service.spec.ts
@@ -10,6 +10,7 @@ type MockRepository<T = any> = Partial<Record<keyof Repository<T>, jest.Mock>>;
 
 const createMockRepository = <T = any>(): MockRepository<T> => ({
   findOne: jest.fn(),
+  findOneBy: jest.fn(),
   save: jest.fn(),
 });
 
@@ -44,7 +45,7 @@ describe('UsersService', () => {
   describe('getUser', () => {
     describe('when user exist', () => {
       it('Should return a user', async () => {
-        usersRepository.findOne.mockReturnValue(user);
+        usersRepository.findOneBy.mockReturnValue(user);
         const result = await service.findOne('idThatExist');
 
         expect(result).toStrictEqual(user);
@@ -53,7 +54,7 @@ describe('UsersService', () => {
 
     describe('otherwise', () => {
       it('Should return a NotFoundException', async () => {
-        usersRepository.findOne.mockReturnValue(undefined);
+        usersRepository.findOneBy.mockReturnValue(undefined);
 
         try {
           await service.findOne('IdThatDoesNotExist');
@@ -87,7 +88,7 @@ describe('UsersService', () => {
         agreeNDA: true,
       };
 
-      usersRepository.findOne.mockReturnValue(expectedUser);
+      usersRepository.findOneBy.mockReturnValue(expectedUser);
 
       await service.extendedUser(localUser);
 
diff --git a/api/src/users/users.service.ts b/api/src/users/users.service.ts
index 04b951092bef81489ddc08e28f8bb04f4e4d7abe..773a77019e755044f1de87f4daba20d6939d4b22 100644
--- a/api/src/users/users.service.ts
+++ b/api/src/users/users.service.ts
@@ -24,7 +24,7 @@ export class UsersService {
    * @returns The user object.
    */
   async findOne(id: string): Promise<InternalUser> {
-    const user = await this.userRepository.findOne(id);
+    const user = await this.userRepository.findOneBy({ id });
 
     if (!user) throw new NotFoundException(`User cannot be found in database.`);