diff --git a/src/main/java/org/springframework/samples/petclinic/controller/OwnerController.java b/src/main/java/org/springframework/samples/petclinic/controller/OwnerController.java
index 35807aac5..b34261e56 100644
--- a/src/main/java/org/springframework/samples/petclinic/controller/OwnerController.java
+++ b/src/main/java/org/springframework/samples/petclinic/controller/OwnerController.java
@@ -46,7 +46,6 @@ class OwnerController {
 	private final OwnerService ownerService;
 	private final VisitService visitService;
 
-	@Autowired
 	OwnerController(OwnerService ownerService, VisitService visitService) {
 		this.ownerService = ownerService;
 		this.visitService = visitService;
diff --git a/src/main/java/org/springframework/samples/petclinic/controller/VisitController.java b/src/main/java/org/springframework/samples/petclinic/controller/VisitController.java
index c7dc9dc9f..1e0d411e8 100644
--- a/src/main/java/org/springframework/samples/petclinic/controller/VisitController.java
+++ b/src/main/java/org/springframework/samples/petclinic/controller/VisitController.java
@@ -82,7 +82,7 @@ class VisitController {
 
 	// Spring MVC calls method loadPetWithVisit(...) before processNewVisitForm is called
 	@PostMapping("/owners/{ownerId}/pets/{petId}/visits/new")
-	public String processNewVisitForm(@Valid VisitDTO visit, BindingResult result) {
+	public String processNewVisitForm(@ModelAttribute("visit") @Valid VisitDTO visit, BindingResult result) {
 		if (result.hasErrors()) {
 			return "pets/createOrUpdateVisitForm";
 		}
diff --git a/src/test/java/org/springframework/samples/petclinic/controller/PetControllerTests.java b/src/test/java/org/springframework/samples/petclinic/controller/PetControllerTests.java
index 87008e6e5..5222af95b 100644
--- a/src/test/java/org/springframework/samples/petclinic/controller/PetControllerTests.java
+++ b/src/test/java/org/springframework/samples/petclinic/controller/PetControllerTests.java
@@ -71,9 +71,9 @@ class PetControllerTests {
 		cat.setId(3);
 		cat.setName("hamster");
 
-		given(this.petTypeService.findPetTypes()).willReturn(Lists.newArrayList(cat));
 		given(this.ownerService.findById(TEST_OWNER_ID)).willReturn(new OwnerDTO());
 		given(this.petService.findById(TEST_PET_ID)).willReturn(new PetDTO());
+		given(this.petTypeService.findPetTypes()).willReturn(Lists.newArrayList(cat));
 	}
 
 	@Test
diff --git a/src/test/java/org/springframework/samples/petclinic/controller/VisitControllerTests.java b/src/test/java/org/springframework/samples/petclinic/controller/VisitControllerTests.java
index eec30afb8..7bc0e5f4d 100644
--- a/src/test/java/org/springframework/samples/petclinic/controller/VisitControllerTests.java
+++ b/src/test/java/org/springframework/samples/petclinic/controller/VisitControllerTests.java
@@ -59,8 +59,9 @@ class VisitControllerTests {
 
 	@Test
 	void testInitNewVisitForm() throws Exception {
-		mockMvc.perform(get("/owners/*/pets/{petId}/visits/new", TEST_PET_ID)).andExpect(status().isOk())
-				.andExpect(view().name("pets/createOrUpdateVisitForm"));
+		mockMvc.perform(get("/owners/*/pets/{petId}/visits/new", TEST_PET_ID))
+			.andExpect(status().isOk())
+			.andExpect(view().name("pets/createOrUpdateVisitForm"));
 	}
 
 	@Test