diff --git a/src/test/java/org/springframework/data/elasticsearch/config/ElasticsearchConfigurationSupportUnitTests.java b/src/test/java/org/springframework/data/elasticsearch/config/ElasticsearchConfigurationSupportUnitTests.java
index 6102c494a..1eafe5c53 100644
--- a/src/test/java/org/springframework/data/elasticsearch/config/ElasticsearchConfigurationSupportUnitTests.java
+++ b/src/test/java/org/springframework/data/elasticsearch/config/ElasticsearchConfigurationSupportUnitTests.java
@@ -24,6 +24,7 @@ import java.util.Collections;
 import org.apache.commons.lang.ClassUtils;
 import org.elasticsearch.client.RestHighLevelClient;
 import org.junit.Test;
+
 import org.springframework.context.annotation.AnnotationConfigApplicationContext;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
@@ -39,7 +40,10 @@ import org.springframework.data.elasticsearch.core.convert.ElasticsearchConverte
 import org.springframework.data.elasticsearch.core.mapping.SimpleElasticsearchMappingContext;
 
 /**
+ * Unit tests for {@link ElasticsearchConfigurationSupport}.
+ *
  * @author Christoph Strobl
+ * @author Peter-Josef Meisch
  */
 public class ElasticsearchConfigurationSupportUnitTests {
 
@@ -86,16 +90,11 @@ public class ElasticsearchConfigurationSupportUnitTests {
 	}
 
 	@Test // DATAES-563
-	public void restConfigContainsElasticsearchOperationsByName() {
+	public void restConfigContainsElasticsearchOperationsByNameAndAlias() {
 
 		AbstractApplicationContext context = new AnnotationConfigApplicationContext(RestConfig.class);
+
 		assertThat(context.getBean("elasticsearchOperations")).isNotNull();
-	}
-
-	@Test // DATAES-563
-	public void restConfigContainsElasticsearchTemplateByName() {
-
-		AbstractApplicationContext context = new AnnotationConfigApplicationContext(RestConfig.class);
 		assertThat(context.getBean("elasticsearchTemplate")).isNotNull();
 	}
 
diff --git a/src/test/java/org/springframework/data/elasticsearch/config/ElasticsearchConfigurationTests.java b/src/test/java/org/springframework/data/elasticsearch/config/ElasticsearchConfigurationTests.java
index 59ad664e6..2a44f47ef 100644
--- a/src/test/java/org/springframework/data/elasticsearch/config/ElasticsearchConfigurationTests.java
+++ b/src/test/java/org/springframework/data/elasticsearch/config/ElasticsearchConfigurationTests.java
@@ -22,6 +22,7 @@ import static org.mockito.Mockito.*;
 import org.elasticsearch.client.RestHighLevelClient;
 import org.junit.Test;
 import org.junit.runner.RunWith;
+
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.data.elasticsearch.repositories.existing.index.CreateIndexFalseRepository;
@@ -30,6 +31,8 @@ import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 
 /**
+ * Tests for {@link AbstractElasticsearchConfiguration}.
+ *
  * @author Peter-Josef Meisch
  */
 @RunWith(SpringJUnit4ClassRunner.class)