diff --git a/employees/src/main/java/ch/etml/es/payroll/controllers/EmployeeController.java b/employees/src/main/java/ch/etml/es/payroll/controllers/EmployeeController.java
index a94a1b3..54c0a5e 100644
--- a/employees/src/main/java/ch/etml/es/payroll/controllers/EmployeeController.java
+++ b/employees/src/main/java/ch/etml/es/payroll/controllers/EmployeeController.java
@@ -43,8 +43,8 @@ Employee one(@PathVariable Long id){
             -d "{\"name\": \"Russel George\", \"role\": \"gardener\"}"
     */
     @PostMapping("")
-    public ResponseEntity<Employee> hireEmployee(@RequestBody Employee employee) {
-        Employee created = EmployeeService.hire(employee);
+    public ResponseEntity<Employee> createEmployee(@RequestBody Employee employee) {
+        Employee created = EmployeeService.create(employee);
 
         URI location = ServletUriComponentsBuilder
                 .fromCurrentRequest()
diff --git a/employees/src/main/java/ch/etml/es/payroll/services/EmployeeService.java b/employees/src/main/java/ch/etml/es/payroll/services/EmployeeService.java
index 8cb47f6..9e64a7c 100644
--- a/employees/src/main/java/ch/etml/es/payroll/services/EmployeeService.java
+++ b/employees/src/main/java/ch/etml/es/payroll/services/EmployeeService.java
@@ -14,7 +14,7 @@ public EmployeeService(EmployeeRepository repository) {
         EmployeeService.repository = repository;
     }
 
-    public static Employee hire(Employee employee) {
+    public static Employee create(Employee employee) {
         Employee existing = repository.findByName(employee.getName())
                 .orElse(null);
 
diff --git a/employees/src/test/java/ch/etml/es/payroll/controllers/EmployeePostTest.java b/employees/src/test/java/ch/etml/es/payroll/controllers/EmployeePostTest.java
index 3baa1f9..96ae9f6 100644
--- a/employees/src/test/java/ch/etml/es/payroll/controllers/EmployeePostTest.java
+++ b/employees/src/test/java/ch/etml/es/payroll/controllers/EmployeePostTest.java
@@ -40,7 +40,7 @@ void given_an_empty_employee_database() {
     }
 
     @Test
-    void when_hiring_new_employee_then_employee_is_created_and_persisted() {
+    void when_posting_new_employee_then_employee_is_created_and_persisted() {
         // GIVEN
         Employee newEmployee = new Employee("Doe", "Supervisor");
 
@@ -71,7 +71,7 @@ void when_hiring_new_employee_then_employee_is_created_and_persisted() {
     }
 
     @Test
-    void when_hiring_existing_employee_then_conflict_is_returned() {
+    void when_posting_existing_employee_then_conflict_is_returned() {
         // GIVEN
         Employee existingEmployee = new Employee("Doe", "Supervisor");
         employeeRepository.save(existingEmployee);
diff --git a/employees/src/test/java/ch/etml/es/payroll/controllers/EmployeePutTest.java b/employees/src/test/java/ch/etml/es/payroll/controllers/EmployeePutTest.java
new file mode 100644
index 0000000..30f6c95
--- /dev/null
+++ b/employees/src/test/java/ch/etml/es/payroll/controllers/EmployeePutTest.java
@@ -0,0 +1,106 @@
+package ch.etml.es.payroll.controllers;
+
+import ch.etml.es.payroll.entities.Employee;
+import ch.etml.es.payroll.PayrollApplication;
+import ch.etml.es.payroll.repositories.EmployeeRepository;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.boot.test.web.client.TestRestTemplate;
+import org.springframework.http.HttpEntity;
+import org.springframework.http.HttpMethod;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
+import org.springframework.test.annotation.DirtiesContext;
+import org.springframework.test.context.ActiveProfiles;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+@SpringBootTest(
+        classes = PayrollApplication.class,
+        webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT
+)
+@ActiveProfiles("test")
+@DirtiesContext(classMode = DirtiesContext.ClassMode.AFTER_CLASS)
+class EmployeePutTest {
+
+    @Autowired
+    private TestRestTemplate restTemplate;
+
+    @Autowired
+    private EmployeeRepository employeeRepository;
+
+    private Employee existingEmployee;
+
+    @BeforeEach
+    void given_an_existing_employee() {
+        employeeRepository.deleteAll();
+        employeeRepository.flush();
+
+        Employee employee = new Employee("Doe", "Supervisor");
+        existingEmployee = employeeRepository.saveAndFlush(employee);
+    }
+
+    @Test
+    void when_updating_existing_employee_then_success() {
+        // GIVEN
+        Employee updatedInfo = new Employee("Doe", "Manager"); // change role
+        HttpEntity<Employee> request = new HttpEntity<>(updatedInfo);
+
+        // WHEN
+        ResponseEntity<Employee> response =
+                restTemplate.exchange(
+                        "/v1/employees/{id}",
+                        HttpMethod.PUT,
+                        request,
+                        Employee.class,
+                        existingEmployee.getId()
+                );
+
+        // THEN (HTTP)
+        assertThat(response.getStatusCode()).isEqualTo(HttpStatus.OK);
+
+        // THEN (body)
+        Employee updatedEmployee = response.getBody();
+        assertThat(updatedEmployee).isNotNull();
+        assertThat(updatedEmployee.getId()).isEqualTo(existingEmployee.getId());
+        assertThat(updatedEmployee.getRole()).isNotNull();
+
+        // THEN (database)
+        Employee dbEmployee = employeeRepository.findById(existingEmployee.getId()).orElseThrow();
+        assertThat(dbEmployee.getRole()).isEqualTo("MANAGER");
+    }
+
+    @Test
+    void when_updating_nonexistent_employee_then_created() {
+        // GIVEN
+        Long nonExistentId = Long.MAX_VALUE;
+        Employee newEmployee = new Employee("Smith", "Engineer");
+        HttpEntity<Employee> request = new HttpEntity<>(newEmployee);
+
+        // WHEN
+        ResponseEntity<Employee> response =
+                restTemplate.exchange(
+                        "/v1/employees/{id}",
+                        HttpMethod.PUT,
+                        request,
+                        Employee.class,
+                        nonExistentId
+                );
+
+        // THEN (HTTP)
+        assertThat(response.getStatusCode()).isEqualTo(HttpStatus.CREATED);
+
+        // THEN (body)
+        Employee createdEmployee = response.getBody();
+        assertThat(createdEmployee).isNotNull();
+        assertThat(createdEmployee.getId()).isNotNull();
+        assertThat(createdEmployee.getName()).isEqualTo("Smith");
+        assertThat(createdEmployee.getRole()).isEqualTo("ENGINEER");
+
+        // THEN (database)
+        Employee dbEmployee = employeeRepository.findById(createdEmployee.getId()).orElseThrow();
+        assertThat(dbEmployee.getName()).isEqualTo("Smith");
+    }
+}
\ No newline at end of file