diff --git a/src/test/java/com/thinkaurelius/titan/graphdb/TitanGraphTest.java b/src/test/java/com/thinkaurelius/titan/graphdb/TitanGraphTest.java
index <HASH>..<HASH> 100644
--- a/src/test/java/com/thinkaurelius/titan/graphdb/TitanGraphTest.java
+++ b/src/test/java/com/thinkaurelius/titan/graphdb/TitanGraphTest.java
@@ -241,6 +241,32 @@ public abstract class TitanGraphTest extends TitanGraphTestCommon {
 	}
 	
 	@Test
+	public void testPropertyIndexPersistence() {
+		final String propName = "favorite_color";
+		final String sharedValue = "blue";
+		
+		makeStringPropertyKey(propName);
+		
+		TitanVertex alice = tx.addVertex();
+		TitanVertex bob = tx.addVertex();
+		
+		alice.addProperty(propName, sharedValue);
+		
+		clopen();
+
+		alice = tx.getVertex(alice.getID());
+		bob = tx.getVertex(bob.getID());
+		
+		assertEquals(sharedValue, alice.getProperty(propName));
+		assertEquals(null, bob.getProperty(propName));
+		
+		alice.removeProperty(propName);
+		bob.addProperty(propName, sharedValue);
+		
+		clopen();
+	}
+	
+	@Test
 	public void testIndexRetrieval() {
 		TitanKey id = makeIntegerUIDPropertyKey("uid");
 		TitanKey name = makeStringPropertyKey("name");
Add test case to catch future regressions on #<I>

Consider an indexed but non-unique property p and some associated
value v of p.  When p=v is both removed from some vertex and added to
a different vertex in the same transaction, a NullPointerException
would be guaranteed in commits prior to
<I>a0a<I>f<I>d6ef6c<I>f<I>ab9.  This unit test method added
by this commit exists to watch for regression..