diff --git a/org.eclipse.jgit.java7.test/src/org/eclipse/jgit/symlinks/SymlinksTest.java b/org.eclipse.jgit.java7.test/src/org/eclipse/jgit/symlinks/SymlinksTest.java
index 366ab9e90..49627db35 100644
--- a/org.eclipse.jgit.java7.test/src/org/eclipse/jgit/symlinks/SymlinksTest.java
+++ b/org.eclipse.jgit.java7.test/src/org/eclipse/jgit/symlinks/SymlinksTest.java
@@ -260,4 +260,78 @@ public void fileModeTestSymlinkThenMissing() throws Exception {
 		assertEquals(FileMode.MISSING, scan.get(0).getNewMode());
 		assertEquals(FileMode.SYMLINK, scan.get(0).getOldMode());
 	}
+
+	@Test
+	public void createSymlinkAfterTarget() throws Exception {
+		Git git = new Git(db);
+		writeTrashFile("a", "start");
+		git.add().addFilepattern("a").call();
+		RevCommit base = git.commit().setMessage("init").call();
+		writeTrashFile("target", "someData");
+		FileUtils.createSymLink(new File(db.getWorkTree(), "link"), "target");
+		git.add().addFilepattern("target").addFilepattern("link").call();
+		git.commit().setMessage("add target").call();
+		assertEquals(4, db.getWorkTree().list().length); // self-check
+		git.checkout().setName(base.name()).call();
+		assertEquals(2, db.getWorkTree().list().length); // self-check
+		git.checkout().setName("master").call();
+		assertEquals(4, db.getWorkTree().list().length);
+		String data = read(new File(db.getWorkTree(), "target"));
+		assertEquals(8, new File(db.getWorkTree(), "target").length());
+		assertEquals("someData", data);
+		data = read(new File(db.getWorkTree(), "link"));
+		assertEquals("target",
+				FileUtils.readSymLink(new File(db.getWorkTree(), "link")));
+		;
+		assertEquals("someData", data);
+	}
+
+	@Test
+	public void createFileSymlinkBeforeTarget() throws Exception {
+		Git git = new Git(db);
+		writeTrashFile("a", "start");
+		git.add().addFilepattern("a").call();
+		RevCommit base = git.commit().setMessage("init").call();
+		writeTrashFile("target", "someData");
+		FileUtils.createSymLink(new File(db.getWorkTree(), "tlink"), "target");
+		git.add().addFilepattern("target").addFilepattern("tlink").call();
+		git.commit().setMessage("add target").call();
+		assertEquals(4, db.getWorkTree().list().length); // self-check
+		git.checkout().setName(base.name()).call();
+		assertEquals(2, db.getWorkTree().list().length); // self-check
+		git.checkout().setName("master").call();
+		assertEquals(4, db.getWorkTree().list().length);
+		String data = read(new File(db.getWorkTree(), "target"));
+		assertEquals(8, new File(db.getWorkTree(), "target").length());
+		assertEquals("someData", data);
+		data = read(new File(db.getWorkTree(), "tlink"));
+		assertEquals("target",
+				FileUtils.readSymLink(new File(db.getWorkTree(), "tlink")));
+		assertEquals("someData", data);
+	}
+
+	@Test
+	public void createDirSymlinkBeforeTarget() throws Exception {
+		Git git = new Git(db);
+		writeTrashFile("a", "start");
+		git.add().addFilepattern("a").call();
+		RevCommit base = git.commit().setMessage("init").call();
+		FileUtils.createSymLink(new File(db.getWorkTree(), "link"), "target");
+		FileUtils.mkdir(new File(db.getWorkTree(), "target"));
+		writeTrashFile("target/file", "someData");
+		git.add().addFilepattern("target").addFilepattern("link").call();
+		git.commit().setMessage("add target").call();
+		assertEquals(4, db.getWorkTree().list().length); // self-check
+		git.checkout().setName(base.name()).call();
+		assertEquals(2, db.getWorkTree().list().length); // self-check
+		git.checkout().setName("master").call();
+		assertEquals(4, db.getWorkTree().list().length);
+		String data = read(new File(db.getWorkTree(), "target/file"));
+		assertEquals(8, new File(db.getWorkTree(), "target/file").length());
+		assertEquals("someData", data);
+		data = read(new File(db.getWorkTree(), "link/file"));
+		assertEquals("target",
+				FileUtils.readSymLink(new File(db.getWorkTree(), "link")));
+		assertEquals("someData", data);
+	}
 }