diff --git a/src/main/java/org/springframework/data/elasticsearch/config/AbstractElasticsearchConfiguration.java b/src/main/java/org/springframework/data/elasticsearch/config/AbstractElasticsearchConfiguration.java
index 5b5000a53..b33319b6c 100644
--- a/src/main/java/org/springframework/data/elasticsearch/config/AbstractElasticsearchConfiguration.java
+++ b/src/main/java/org/springframework/data/elasticsearch/config/AbstractElasticsearchConfiguration.java
@@ -22,6 +22,7 @@ import org.springframework.data.elasticsearch.core.ElasticsearchRestTemplate;
 
 /**
  * @author Christoph Strobl
+ * @author Peter-Josef Meisch
  * @since 3.2
  * @see ElasticsearchConfigurationSupport
  */
@@ -41,7 +42,7 @@ public abstract class AbstractElasticsearchConfiguration extends ElasticsearchCo
 	 *
 	 * @return never {@literal null}.
 	 */
-	@Bean
+	@Bean(name = {"elasticsearchOperations", "elasticsearchTemplate"})
 	public ElasticsearchOperations elasticsearchOperations() {
 		return new ElasticsearchRestTemplate(elasticsearchClient(), elasticsearchConverter(), resultsMapper());
 	}
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 44f8a5b5e..6102c494a 100644
--- a/src/test/java/org/springframework/data/elasticsearch/config/ElasticsearchConfigurationSupportUnitTests.java
+++ b/src/test/java/org/springframework/data/elasticsearch/config/ElasticsearchConfigurationSupportUnitTests.java
@@ -85,6 +85,20 @@ public class ElasticsearchConfigurationSupportUnitTests {
 		assertThat(context.getBean(ElasticsearchRestTemplate.class)).isNotNull();
 	}
 
+	@Test // DATAES-563
+	public void restConfigContainsElasticsearchOperationsByName() {
+
+		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();
+	}
+
 	@Test // DATAES-504
 	public void reactiveConfigContainsReactiveElasticsearchTemplate() {
 
diff --git a/src/test/java/org/springframework/data/elasticsearch/config/ElasticsearchConfigurationTests.java b/src/test/java/org/springframework/data/elasticsearch/config/ElasticsearchConfigurationTests.java
new file mode 100644
index 000000000..59ad664e6
--- /dev/null
+++ b/src/test/java/org/springframework/data/elasticsearch/config/ElasticsearchConfigurationTests.java
@@ -0,0 +1,62 @@
+/*
+ * Copyright 2019 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.springframework.data.elasticsearch.config;
+
+import static org.hamcrest.CoreMatchers.*;
+import static org.junit.Assert.*;
+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;
+import org.springframework.data.elasticsearch.repository.config.EnableElasticsearchRepositories;
+import org.springframework.test.context.ContextConfiguration;
+import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+
+/**
+ * @author Peter-Josef Meisch
+ */
+@RunWith(SpringJUnit4ClassRunner.class)
+@ContextConfiguration
+public class ElasticsearchConfigurationTests {
+
+	/*
+	 * using a repository with an entity that is set to createIndex = false as we have no elastic running for this test
+	 * and just check that all the necessary beans are created.
+	 */
+	@Autowired private CreateIndexFalseRepository repository;
+
+	@Configuration
+	@EnableElasticsearchRepositories(
+			basePackages = { "org.springframework.data.elasticsearch.repositories.existing.index",
+					"org.springframework.data.elasticsearch.config" })
+	static class Config extends AbstractElasticsearchConfiguration {
+
+		@Override
+		public RestHighLevelClient elasticsearchClient() {
+			return mock(RestHighLevelClient.class);
+		}
+
+	}
+
+	@Test // DATAES-563
+	public void bootstrapsRepository() {
+		assertThat(repository, is(notNullValue()));
+	}
+}