diff --git a/src/test/java/org/springframework/data/elasticsearch/entities/SampleDateMappingEntity.java b/src/test/java/org/springframework/data/elasticsearch/entities/SampleDateMappingEntity.java
index 45088354f..ec7c53fda 100644
--- a/src/test/java/org/springframework/data/elasticsearch/entities/SampleDateMappingEntity.java
+++ b/src/test/java/org/springframework/data/elasticsearch/entities/SampleDateMappingEntity.java
@@ -20,7 +20,7 @@ public class SampleDateMappingEntity {
 	@Id
 	private String id;
 
-	@Field(type = String, index = not_analyzed, store = true, searchAnalyzer = "standard", indexAnalyzer = "standard")
+	@Field(type = String, index = not_analyzed, store = true, analyzer = "standard")
 	private String message;
 
 	@Field(type = Date, format = DateFormat.custom, pattern = "dd.MM.yyyy hh:mm")
diff --git a/src/test/java/org/springframework/data/elasticsearch/entities/SampleInheritedEntity.java b/src/test/java/org/springframework/data/elasticsearch/entities/SampleInheritedEntity.java
index 9584bfebf..18e1b8d23 100644
--- a/src/test/java/org/springframework/data/elasticsearch/entities/SampleInheritedEntity.java
+++ b/src/test/java/org/springframework/data/elasticsearch/entities/SampleInheritedEntity.java
@@ -27,7 +27,7 @@ import org.springframework.data.elasticsearch.annotations.Field;
 @Document(indexName = "test-inherited-mapping", type = "mapping", shards = 1, replicas = 0, refreshInterval = "-1")
 public class SampleInheritedEntity extends AbstractInheritedEntity {
 
-	@Field(type = String, index = not_analyzed, store = true, searchAnalyzer = "standard", indexAnalyzer = "standard")
+	@Field(type = String, index = not_analyzed, store = true, analyzer = "standard")
 	private String message;
 
 	public String getMessage() {