diff --git a/spring-data-solr/pom.xml b/spring-data-solr/pom.xml
index e43b3ff774..2aa9f86a96 100644
--- a/spring-data-solr/pom.xml
+++ b/spring-data-solr/pom.xml
@@ -51,6 +51,12 @@
             <version>${spring.version}</version>
             <scope>test</scope>
         </dependency>
+        <!-- This is included in spring-data-solr above, no need to include twice 
+        <dependency>
+  			<groupId>org.apache.solr</groupId>
+  			<artifactId>solr-solrj</artifactId>
+  			<version>5.5.0</version>
+		</dependency-->
     </dependencies>
 
     <build>
diff --git a/spring-data-solr/src/test/java/com/baeldung/solrjava/SolrJavaIntegrationTest.java b/spring-data-solr/src/test/java/com/baeldung/solrjava/SolrJavaIntegrationTest.java
new file mode 100644
index 0000000000..1613ba5480
--- /dev/null
+++ b/spring-data-solr/src/test/java/com/baeldung/solrjava/SolrJavaIntegrationTest.java
@@ -0,0 +1,70 @@
+package com.baeldung.solrjava;
+
+import static org.junit.Assert.assertEquals;
+
+import java.io.IOException;
+
+import org.apache.solr.client.solrj.SolrQuery;
+import org.apache.solr.client.solrj.SolrServerException;
+import org.apache.solr.client.solrj.impl.HttpSolrClient;
+import org.apache.solr.client.solrj.impl.XMLResponseParser;
+import org.apache.solr.client.solrj.response.QueryResponse;
+import org.apache.solr.common.SolrDocument;
+import org.apache.solr.common.SolrDocumentList;
+import org.apache.solr.common.SolrInputDocument;
+import org.junit.Before;
+import org.junit.Test;
+
+public class SolrJavaIntegrationTest {
+
+    private HttpSolrClient solr;
+
+    @Before
+    public void setUp() throws Exception {
+
+        solr = new HttpSolrClient("http://localhost:8983/solr/bigboxstore");
+        solr.setParser(new XMLResponseParser());
+    }
+
+    @Test
+    public void givenAdd_thenVerifyAdded() throws SolrServerException, IOException {
+
+        SolrInputDocument document = new SolrInputDocument();
+        document.addField("id", "123456");
+        document.addField("name", "Kenmore Dishwasher");
+        document.addField("price", "599.99");
+
+        solr.add(document);
+        solr.commit();
+
+        SolrQuery query = new SolrQuery();
+        query.set("q", "id:123456");
+        QueryResponse response = null;
+
+        response = solr.query(query);
+
+        SolrDocumentList docList = response.getResults();
+        assertEquals(docList.getNumFound(), 1);
+
+        for (SolrDocument doc : docList) {
+            assertEquals((String) doc.getFieldValue("id"), "123456");
+            assertEquals((Double) doc.getFieldValue("price"), (Double) 599.99);
+        }
+    }
+
+    @Test
+    public void givenDelete_thenVerifyDeleted() throws SolrServerException, IOException {
+
+        solr.deleteById("123456");
+        solr.commit();
+
+        SolrQuery query = new SolrQuery();
+        query.set("q", "id:123456");
+        QueryResponse response = null;
+
+        response = solr.query(query);
+
+        SolrDocumentList docList = response.getResults();
+        assertEquals(docList.getNumFound(), 0);
+    }
+}