diff --git a/solr/managed-schema/src/test/java/example/springdata/solr/SolrTestConfiguration.java b/solr/managed-schema/src/test/java/example/springdata/solr/SolrTestConfiguration.java
index 44bdeddd..6b4a3cce 100644
--- a/solr/managed-schema/src/test/java/example/springdata/solr/SolrTestConfiguration.java
+++ b/solr/managed-schema/src/test/java/example/springdata/solr/SolrTestConfiguration.java
@@ -15,17 +15,17 @@
  */
 package example.springdata.solr;
 
-import example.springdata.solr.product.ProductRepository;
-
 import javax.annotation.PreDestroy;
 
-import org.apache.solr.client.solrj.SolrServer;
-import org.apache.solr.client.solrj.impl.HttpSolrServer;
+import org.apache.solr.client.solrj.SolrClient;
+import org.apache.solr.client.solrj.impl.HttpSolrClient;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.data.solr.repository.config.EnableSolrRepositories;
 
+import example.springdata.solr.product.ProductRepository;
+
 /**
  * {@link Configuration} class enabling schema support for solr.<br />
  * <br />
@@ -41,8 +41,8 @@ public class SolrTestConfiguration {
 	@Autowired ProductRepository repo;
 
 	@Bean
-	public SolrServer solrServer() {
-		return new HttpSolrServer("http://localhost:8983/solr");
+	public SolrClient solrServer() {
+		return new HttpSolrClient("http://localhost:8983/solr");
 	}
 
 	/**
diff --git a/solr/pom.xml b/solr/pom.xml
index 43b56c9f..eed17645 100644
--- a/solr/pom.xml
+++ b/solr/pom.xml
@@ -33,6 +33,11 @@
 			<artifactId>joda-time</artifactId>
 		</dependency>
 
+		<dependency>
+			<groupId>org.apache.solr</groupId>
+			<artifactId>solr-solrj</artifactId>
+			<version>5.3.1</version>
+		</dependency>
 	</dependencies>
 
 </project>
\ No newline at end of file