diff --git a/src/main/java/org/springframework/data/keyvalue/repository/support/SimpleKeyValueRepository.java b/src/main/java/org/springframework/data/keyvalue/repository/support/SimpleKeyValueRepository.java
index de227d6..2cc4e4f 100644
--- a/src/main/java/org/springframework/data/keyvalue/repository/support/SimpleKeyValueRepository.java
+++ b/src/main/java/org/springframework/data/keyvalue/repository/support/SimpleKeyValueRepository.java
@@ -34,6 +34,7 @@ import org.springframework.util.Assert;
  * @author Christoph Strobl
  * @author Oliver Gierke
  * @author Mark Paluch
+ * @author Eugene Nikiforov
  * @param <T>
  * @param <ID>
  */
diff --git a/src/test/java/org/springframework/data/keyvalue/repository/SimpleKeyValueRepositoryUnitTests.java b/src/test/java/org/springframework/data/keyvalue/repository/SimpleKeyValueRepositoryUnitTests.java
index d4e358e..8526133 100644
--- a/src/test/java/org/springframework/data/keyvalue/repository/SimpleKeyValueRepositoryUnitTests.java
+++ b/src/test/java/org/springframework/data/keyvalue/repository/SimpleKeyValueRepositoryUnitTests.java
@@ -15,8 +15,11 @@
  */
 package org.springframework.data.keyvalue.repository;
 
+import static org.hamcrest.core.Is.*;
 import static org.junit.Assert.*;
-import static org.mockito.ArgumentMatchers.*;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.anyString;
+import static org.mockito.ArgumentMatchers.eq;
 import static org.mockito.Mockito.*;
 
 import java.io.Serializable;
@@ -39,6 +42,7 @@ import org.springframework.data.repository.core.support.ReflectionEntityInformat
 
 /**
  * @author Christoph Strobl
+ * @author Eugene Nikiforov
  */
 @RunWith(MockitoJUnitRunner.class)
 public class SimpleKeyValueRepositoryUnitTests {
@@ -126,14 +130,17 @@ public class SimpleKeyValueRepositoryUnitTests {
 	}
 
 	@Test // DATAKV-186
-	public void existsById() {
+	public void existsByIdReturnsFalseForEmptyOptional() {
+
 		when(opsMock.findById(any(Serializable.class), any(Class.class))).thenReturn(Optional.empty());
-		assertFalse(repo.existsById("one"));
+		assertThat(repo.existsById("one"), is(false));
+	}
+
+	@Test // DATAKV-186
+	public void existsByIdReturnsTrueWhenOptionalValuePresent() {
 
 		when(opsMock.findById(any(Serializable.class), any(Class.class))).thenReturn(Optional.of(new Foo()));
 		assertTrue(repo.existsById("one"));
-
-		verify(opsMock, times(2)).findById(anyString(), eq(Foo.class));
 	}
 
 	@Test // DATACMNS-525