diff --git a/org.eclipse.mylyn.context.tests/src/org/eclipse/mylyn/context/tests/EditorStateParticipantTest.java b/org.eclipse.mylyn.context.tests/src/org/eclipse/mylyn/context/tests/EditorStateParticipantTest.java
index 0c6a01f..f11332c 100644
--- a/org.eclipse.mylyn.context.tests/src/org/eclipse/mylyn/context/tests/EditorStateParticipantTest.java
+++ b/org.eclipse.mylyn.context.tests/src/org/eclipse/mylyn/context/tests/EditorStateParticipantTest.java
@@ -211,8 +211,15 @@
 		OutputStream out = new ByteArrayOutputStream();
 		OutputStreamWriter writer = new OutputStreamWriter(out);
 		memento.save(writer);
+		String s = out.toString();
 		// when reading from disk new lines are escaped
-		return out.toString().replaceAll("&#x0A;", "\n").replaceAll("WORKSPACE", workspace.getAbsolutePath());
+		s = s.replaceAll("&#x0D;", "\r");
+		s = s.replaceAll("&#x0A;", "\n");
+		// always use LF as line separator
+		s = s.replaceAll("\r\n", "\n");
+		// resolve workspace variable
+		s = s.replaceAll("WORKSPACE", workspace.getAbsolutePath());
+		return s;
 	}
 
 	/**