diff --git a/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/test/integration/mappingcontext/MappingContextIntegrationTests.java b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/test/integration/mappingcontext/MappingContextIntegrationTests.java
index 11ab552b4..cb95a0e41 100644
--- a/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/test/integration/mappingcontext/MappingContextIntegrationTests.java
+++ b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/test/integration/mappingcontext/MappingContextIntegrationTests.java
@@ -1,6 +1,5 @@
 package org.springframework.data.cassandra.test.integration.mappingcontext;
 
-import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertTrue;
@@ -10,6 +9,7 @@ import org.springframework.data.cassandra.mapping.CassandraPersistentEntity;
 import org.springframework.data.cassandra.mapping.DefaultCassandraMappingContext;
 import org.springframework.data.cassandra.mapping.PrimaryKey;
 import org.springframework.data.cassandra.mapping.Table;
+import org.springframework.data.mapping.model.MappingException;
 
 public class MappingContextIntegrationTests {
 
@@ -30,16 +30,11 @@ public class MappingContextIntegrationTests {
 
 	DefaultCassandraMappingContext ctx = new DefaultCassandraMappingContext();
 
-	@Test
-	// TODO: (expected = MappingException.class)
+	@Test(expected = MappingException.class)
 	public void testGetPersistentEntityOfTransientType() {
 
-		// TODO: when entity verification is added (DATACASS-85), this should throw a MappingException
 		CassandraPersistentEntity<?> entity = ctx.getPersistentEntity(Transient.class);
 
-		// TODO: remove following lines after DATACASS-85
-		assertNotNull(entity);
-		assertEquals(Transient.class.getSimpleName().toLowerCase(), entity.getTableName());
 	}
 
 	@Test