diff --git a/spring-petclinic-customers-service/src/main/resources/application.properties b/spring-petclinic-customers-service/src/main/resources/application.properties
index 807c37288eb5585e5207670a7114e4311bee09d0..00b397d0063f8be4d37549f6861498ce7a71068d 100644
--- a/spring-petclinic-customers-service/src/main/resources/application.properties
+++ b/spring-petclinic-customers-service/src/main/resources/application.properties
@@ -1,5 +1,5 @@
 server.port=0
-database=hsqldb
-spring.datasource.schema=classpath*:db/${database}/schema.sql
-spring.datasource.data=classpath*:db/${database}/data.sql
+petclinic.database=hsqldb
+spring.datasource.schema=classpath*:db/${petclinic.database}/schema.sql
+spring.datasource.data=classpath*:db/${petclinic.database}/data.sql
 logging.level.org.springframework=INFO
diff --git a/spring-petclinic-customers-service/src/test/java/org/springframework/samples/petclinic/customers/web/PetResourceDatabaseTest.java b/spring-petclinic-customers-service/src/test/java/org/springframework/samples/petclinic/customers/web/PetResourceDatabaseTest.java
new file mode 100644
index 0000000000000000000000000000000000000000..cf7b5ab722099b2ba8866153e47d1f400e408d01
--- /dev/null
+++ b/spring-petclinic-customers-service/src/test/java/org/springframework/samples/petclinic/customers/web/PetResourceDatabaseTest.java
@@ -0,0 +1,45 @@
+package org.springframework.samples.petclinic.customers.web;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.autoconfigure.orm.jpa.DataJpaTest;
+import org.springframework.boot.test.mock.mockito.MockBean;
+import org.springframework.http.MediaType;
+import org.springframework.samples.petclinic.customers.model.Owner;
+import org.springframework.samples.petclinic.customers.model.OwnerRepository;
+import org.springframework.samples.petclinic.customers.model.Pet;
+import org.springframework.samples.petclinic.customers.model.PetRepository;
+import org.springframework.samples.petclinic.customers.model.PetType;
+import org.springframework.test.context.ActiveProfiles;
+import org.springframework.test.context.junit4.SpringRunner;
+import org.springframework.test.web.servlet.MockMvc;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.mockito.BDDMockito.given;
+import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.content;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.jsonPath;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
+
+/**
+ * @author Maciej Szarlinski
+ */
+@RunWith(SpringRunner.class)
+@DataJpaTest
+@ActiveProfiles("test")
+public class PetResourceDatabaseTest {
+
+    @Autowired
+    PetRepository petRepository;
+
+    @Autowired
+    OwnerRepository ownerRepository;
+
+    @Test
+    public void shouldGetAPet() throws Exception {
+        Pet pet = petRepository.findOne(2);
+        assertThat(petRepository.findAll()).contains(pet);
+    }
+}
diff --git a/spring-petclinic-customers-service/src/test/resources/application-test.yml b/spring-petclinic-customers-service/src/test/resources/application-test.yml
index 8eec317bee0d4fde152497c1b500e4dfed0a1e64..0a71b59e9aa69c73a5c55b361972b24a81018fde 100644
--- a/spring-petclinic-customers-service/src/test/resources/application-test.yml
+++ b/spring-petclinic-customers-service/src/test/resources/application-test.yml
@@ -1,9 +1,3 @@
-petclinic.database: hsqldb
-spring:
-  datasource:
-    schema: classpath*:db/${petclinic.database}/schema.sql
-    data: classpath*:db/${petclinic.database}/data.sql
-
 spring.jpa.hibernate.ddl-auto: none
 
 logging.level.org.springframework: INFO
diff --git a/spring-petclinic-vets-service/src/main/resources/application.properties b/spring-petclinic-vets-service/src/main/resources/application.properties
index b6e133831faa5610d53ee4f7b0de9d55faf6b0d3..52d0b2a2102001c732bb1dbb115ea62b6dce1cfd 100644
--- a/spring-petclinic-vets-service/src/main/resources/application.properties
+++ b/spring-petclinic-vets-service/src/main/resources/application.properties
@@ -1,7 +1,7 @@
 server.port=0
-database=hsqldb
-spring.datasource.schema=classpath*:db/${database}/schema.sql
-spring.datasource.data=classpath*:db/${database}/data.sql
+petclinic.database=hsqldb
+spring.datasource.schema=classpath*:db/${petclinic.database}/schema.sql
+spring.datasource.data=classpath*:db/${petclinic.database}/data.sql
 logging.level.org.springframework=INFO
 spring.profiles.active=production
 spring.cache.cache-names=vets
\ No newline at end of file
diff --git a/spring-petclinic-vets-service/src/test/java/org/springframework/samples/petclinic/vets/web/VetResourceDatabaseTest.java b/spring-petclinic-vets-service/src/test/java/org/springframework/samples/petclinic/vets/web/VetResourceDatabaseTest.java
new file mode 100644
index 0000000000000000000000000000000000000000..9d93e81e49d925352151f5d5ca0b80969f94c64e
--- /dev/null
+++ b/spring-petclinic-vets-service/src/test/java/org/springframework/samples/petclinic/vets/web/VetResourceDatabaseTest.java
@@ -0,0 +1,32 @@
+package org.springframework.samples.petclinic.vets.web;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.autoconfigure.orm.jpa.DataJpaTest;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.samples.petclinic.vets.model.Vet;
+import org.springframework.samples.petclinic.vets.model.VetRepository;
+import org.springframework.test.context.ActiveProfiles;
+import org.springframework.test.context.junit4.SpringRunner;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+/**
+ * @author Maciej Szarlinski
+ */
+@RunWith(SpringRunner.class)
+@DataJpaTest
+@ActiveProfiles("test")
+public class VetResourceDatabaseTest {
+
+    @Autowired
+    private VetRepository vetRepository;
+
+    @Test
+    public void shouldGetAListOfVetsInJSonFormat() throws Exception {
+        Vet vet = vetRepository.findOne(1);
+        assertThat(vetRepository.findAll()).contains(vet);
+    }
+}
diff --git a/spring-petclinic-vets-service/src/test/resources/application-test.yml b/spring-petclinic-vets-service/src/test/resources/application-test.yml
index a61009c538b95cd77d4d9bc78c54e2a24136075e..77d3ecb368690776fd04c4edb4ed74aaea77acd1 100644
--- a/spring-petclinic-vets-service/src/test/resources/application-test.yml
+++ b/spring-petclinic-vets-service/src/test/resources/application-test.yml
@@ -1,13 +1,5 @@
-petclinic.database: hsqldb
-spring:
-  datasource:
-    schema: classpath*:db/${petclinic.database}/schema.sql
-    data: classpath*:db/${petclinic.database}/data.sql
-
 spring.jpa.hibernate.ddl-auto: none
 
-logging.level.org.springframework: INFO
-
 vets:
   cache:
     ttl: 10
diff --git a/spring-petclinic-visits-service/src/main/resources/application.properties b/spring-petclinic-visits-service/src/main/resources/application.properties
index 807c37288eb5585e5207670a7114e4311bee09d0..00b397d0063f8be4d37549f6861498ce7a71068d 100644
--- a/spring-petclinic-visits-service/src/main/resources/application.properties
+++ b/spring-petclinic-visits-service/src/main/resources/application.properties
@@ -1,5 +1,5 @@
 server.port=0
-database=hsqldb
-spring.datasource.schema=classpath*:db/${database}/schema.sql
-spring.datasource.data=classpath*:db/${database}/data.sql
+petclinic.database=hsqldb
+spring.datasource.schema=classpath*:db/${petclinic.database}/schema.sql
+spring.datasource.data=classpath*:db/${petclinic.database}/data.sql
 logging.level.org.springframework=INFO
diff --git a/spring-petclinic-visits-service/src/test/java/org/springframework/samples/petclinic/visits/VisitResourceDatabaseTest.java b/spring-petclinic-visits-service/src/test/java/org/springframework/samples/petclinic/visits/VisitResourceDatabaseTest.java
new file mode 100644
index 0000000000000000000000000000000000000000..06cf259f4a227d0e58c05dced472f91f96cf3689
--- /dev/null
+++ b/spring-petclinic-visits-service/src/test/java/org/springframework/samples/petclinic/visits/VisitResourceDatabaseTest.java
@@ -0,0 +1,31 @@
+package org.springframework.samples.petclinic.visits;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.autoconfigure.orm.jpa.DataJpaTest;
+import org.springframework.samples.petclinic.visits.model.Visit;
+import org.springframework.samples.petclinic.visits.model.VisitRepository;
+import org.springframework.test.context.ActiveProfiles;
+import org.springframework.test.context.junit4.SpringRunner;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+/**
+ * @author Maciej Szarlinski
+ */
+@RunWith(SpringRunner.class)
+@DataJpaTest
+@ActiveProfiles("test")
+public class VisitResourceDatabaseTest {
+
+    @Autowired
+    private VisitRepository visitRepository;
+
+    @Test
+    public void shouldGetAListOfVetsInJSonFormat() throws Exception {
+        Visit vet = visitRepository.findOne(1);
+        assertThat(visitRepository.findAll()).contains(vet);
+    }
+}
diff --git a/spring-petclinic-visits-service/src/test/resources/application-test.yml b/spring-petclinic-visits-service/src/test/resources/application-test.yml
index 8eec317bee0d4fde152497c1b500e4dfed0a1e64..0a71b59e9aa69c73a5c55b361972b24a81018fde 100644
--- a/spring-petclinic-visits-service/src/test/resources/application-test.yml
+++ b/spring-petclinic-visits-service/src/test/resources/application-test.yml
@@ -1,9 +1,3 @@
-petclinic.database: hsqldb
-spring:
-  datasource:
-    schema: classpath*:db/${petclinic.database}/schema.sql
-    data: classpath*:db/${petclinic.database}/data.sql
-
 spring.jpa.hibernate.ddl-auto: none
 
 logging.level.org.springframework: INFO