diff --git a/src/main/java/org/springframework/samples/petclinic/service/ClinicServiceExtImpl.java b/src/main/java/org/springframework/samples/petclinic/service/ClinicServiceExtImpl.java
index f35e0a27b..aec6023f3 100644
--- a/src/main/java/org/springframework/samples/petclinic/service/ClinicServiceExtImpl.java
+++ b/src/main/java/org/springframework/samples/petclinic/service/ClinicServiceExtImpl.java
@@ -22,6 +22,7 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 @Service
+@Qualifier("ClinicServiceExt")
 public class ClinicServiceExtImpl implements ClinicServiceExt {
 		
 	private SpecialtyRepositoryExt specialtyRepositoryExt;
diff --git a/src/main/java/org/springframework/samples/petclinic/service/ClinicServiceImpl.java b/src/main/java/org/springframework/samples/petclinic/service/ClinicServiceImpl.java
index a233b76e4..21d0675f8 100644
--- a/src/main/java/org/springframework/samples/petclinic/service/ClinicServiceImpl.java
+++ b/src/main/java/org/springframework/samples/petclinic/service/ClinicServiceImpl.java
@@ -40,6 +40,7 @@ import org.springframework.transaction.annotation.Transactional;
  * @author Michael Isvy
  */
 @Service
+@Qualifier("ClinicService")
 public class ClinicServiceImpl implements ClinicService {
 
     private PetRepository petRepository;
diff --git a/src/test/java/org/springframework/samples/petclinic/service/AbstractClinicServiceTests.java b/src/test/java/org/springframework/samples/petclinic/service/AbstractClinicServiceTests.java
index 8573ab7e1..2a8065a5a 100644
--- a/src/test/java/org/springframework/samples/petclinic/service/AbstractClinicServiceTests.java
+++ b/src/test/java/org/springframework/samples/petclinic/service/AbstractClinicServiceTests.java
@@ -22,6 +22,7 @@ import java.util.Date;
 
 import org.junit.Test;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.samples.petclinic.model.Owner;
 import org.springframework.samples.petclinic.model.Pet;
 import org.springframework.samples.petclinic.model.PetType;
@@ -53,6 +54,7 @@ import org.springframework.transaction.annotation.Transactional;
 public abstract class AbstractClinicServiceTests {
 
     @Autowired
+    @Qualifier("ClinicService")
     protected ClinicService clinicService;
 
     @Test