diff --git a/spring-data-rest-querydsl/pom.xml b/spring-data-rest-querydsl/pom.xml
index 3b31e1835c..e4832e1552 100644
--- a/spring-data-rest-querydsl/pom.xml
+++ b/spring-data-rest-querydsl/pom.xml
@@ -94,4 +94,8 @@
             </plugin>
         </plugins>
     </build>
+<<<<<<< HEAD
 </project>
+=======
+</project>
+>>>>>>> 19a1633c35d6d49f9c51b8ecc3dbe127c91d75c3
diff --git a/spring-data-rest-querydsl/src/main/resources/application.yml b/spring-data-rest-querydsl/src/main/resources/application.yml
index fe9dae345d..f25c6ea0e3 100644
--- a/spring-data-rest-querydsl/src/main/resources/application.yml
+++ b/spring-data-rest-querydsl/src/main/resources/application.yml
@@ -5,7 +5,7 @@ spring:
             pool-name: hikari-pool
         url: jdbc:mysql://localhost:3306/baeldung?verifyServerCertificate=false&useSSL=false&requireSSL=false
         username: root
-        password: admin
+
     jpa:
         hibernate:
             ddl-auto: create
diff --git a/spring-data-rest-querydsl/src/test/java/com/baeldung/springdatarestquerydsl/IntegrationTest.java b/spring-data-rest-querydsl/src/test/java/com/baeldung/springdatarestquerydsl/IntegrationTest.java
new file mode 100644
index 0000000000..ef86c2f36d
--- /dev/null
+++ b/spring-data-rest-querydsl/src/test/java/com/baeldung/springdatarestquerydsl/IntegrationTest.java
@@ -0,0 +1,52 @@
+package com.baeldung.springdatarestquerydsl;
+
+import com.baeldung.Application;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.http.MediaType;
+import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+import org.springframework.test.context.web.WebAppConfiguration;
+import org.springframework.test.web.servlet.MockMvc;
+import org.springframework.test.web.servlet.setup.MockMvcBuilders;
+import org.springframework.web.context.WebApplicationContext;
+
+import java.nio.charset.Charset;
+
+import static org.hamcrest.Matchers.hasSize;
+import static org.hamcrest.Matchers.is;
+import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.*;
+
+@RunWith(SpringJUnit4ClassRunner.class) @SpringBootTest(classes = Application.class) @WebAppConfiguration
+public class IntegrationTest {
+
+    final MediaType contentType =
+            new MediaType(MediaType.APPLICATION_JSON.getType(), MediaType.APPLICATION_JSON.getSubtype(), Charset.forName("utf8"));
+
+    @Autowired private WebApplicationContext webApplicationContext;
+
+    private MockMvc mockMvc;
+
+    @Before public void setupMockMvc() {
+        mockMvc = MockMvcBuilders.webAppContextSetup(webApplicationContext).build();
+    }
+
+    @Test public void givenRequestHasBeenMade_whenQueryOverNameAttribute_thenGetJohn() throws Exception {
+        // Get John
+        mockMvc.perform(get("/personQuery?name=John")).andExpect(status().isOk()).andExpect(content().contentType(contentType))
+                .andExpect(jsonPath("$", hasSize(1))).andExpect(jsonPath("$[0].name", is("John")))
+                .andExpect(jsonPath("$[0].address.address", is("Fake Street 1")))
+                .andExpect(jsonPath("$[0].address.country", is("Fake Country")));
+    }
+
+    @Test public void givenRequestHasBeenMade_whenQueryOverNameAttribute_thenGetLisa() throws Exception {
+        // Get Lisa
+        mockMvc.perform(get("/personQuery?name=Lisa")).andExpect(status().isOk()).andExpect(content().contentType(contentType))
+                .andExpect(jsonPath("$", hasSize(1))).andExpect(jsonPath("$[0].name", is("Lisa")))
+                .andExpect(jsonPath("$[0].address.address", is("Real Street 1")))
+                .andExpect(jsonPath("$[0].address.country", is("Real Country")));
+    }
+}