diff --git a/spring-cloud-config-server/src/test/java/org/springframework/cloud/config/server/environment/JGitEnvironmentRepositoryIntegrationTests.java b/spring-cloud-config-server/src/test/java/org/springframework/cloud/config/server/environment/JGitEnvironmentRepositoryIntegrationTests.java
index d2ef0c2f..6430b67d 100644
--- a/spring-cloud-config-server/src/test/java/org/springframework/cloud/config/server/environment/JGitEnvironmentRepositoryIntegrationTests.java
+++ b/spring-cloud-config-server/src/test/java/org/springframework/cloud/config/server/environment/JGitEnvironmentRepositoryIntegrationTests.java
@@ -174,13 +174,15 @@ public class JGitEnvironmentRepositoryIntegrationTests {
 		git.add().addFilepattern(".").call();
 		git.commit().setMessage("Conflicting commit.").call();
 		git.push().setForce(true).call();
+		String conflictingCommit = git.log().setMaxCount(1).call().iterator()
+				.next().getName();
 
 		// Reset to the raw branch.
 		git.reset().setMode(ResetType.HARD).setRef(commitToRevertBeforePull).call();
 
 		// Triggers the repository refresh.
 		locations = repository.getLocations("bar", "test", "raw");
-		assertEquals(locations.getVersion(), commitToRevertBeforePull);
+		assertEquals(locations.getVersion(), conflictingCommit);
 
 		assertTrue("Local repository is not cleaned after retrieving resources.",
 				git.status().call().isClean());