diff --git a/spring-cloud-config-server/src/test/java/org/springframework/cloud/config/server/environment/JGitEnvironmentRepositoryTests.java b/spring-cloud-config-server/src/test/java/org/springframework/cloud/config/server/environment/JGitEnvironmentRepositoryTests.java
index df99a744..50ae91a0 100644
--- a/spring-cloud-config-server/src/test/java/org/springframework/cloud/config/server/environment/JGitEnvironmentRepositoryTests.java
+++ b/spring-cloud-config-server/src/test/java/org/springframework/cloud/config/server/environment/JGitEnvironmentRepositoryTests.java
@@ -109,6 +109,8 @@ public class JGitEnvironmentRepositoryTests {
 
 	private File basedir = new File("target/config");
 
+	private final ObjectId newObjectId = ObjectId.fromRaw(new int[] { 1, 2, 3, 4, 5 });
+
 	@BeforeAll
 	public static void initClass() {
 		// mock Git configuration to make tests independent of local Git configuration
@@ -600,14 +602,6 @@ public class JGitEnvironmentRepositoryTests {
 		// here is our exception we are testing
 		when(mergeCommand.call()).thenThrow(new NotMergedException());
 
-		// refresh()->return
-		// git.getRepository().findRef("HEAD").getObjectId().getName();
-		Ref headRef = mock(Ref.class);
-		when(this.database.findRef(anyString())).thenReturn(headRef);
-
-		ObjectId newObjectId = ObjectId.fromRaw(new int[] { 1, 2, 3, 4, 5 });
-		when(headRef.getObjectId()).thenReturn(newObjectId);
-
 		SearchPathLocator.Locations locations = this.repository.getLocations("bar", "staging", null);
 		assertThat(newObjectId.getName()).isEqualTo(locations.getVersion());
 
@@ -636,7 +630,17 @@ public class JGitEnvironmentRepositoryTests {
 
 			@Override
 			public RefDatabase getRefDatabase() {
-				return JGitEnvironmentRepositoryTests.this.database;
+				RefDatabase database = mock(RefDatabase.class);
+				Ref headRef = mock(Ref.class);
+				ObjectId newObjectId = ObjectId.fromRaw(new int[] { 1, 2, 3, 4, 5 });
+				when(headRef.getObjectId()).thenReturn(newObjectId);
+				try {
+					when(database.findRef(anyString())).thenReturn(headRef);
+				}
+				catch (IOException e) {
+					throw new RuntimeException(e);
+				}
+				return database;
 			}
 
 			@Override
@@ -713,13 +717,6 @@ public class JGitEnvironmentRepositoryTests {
 																		// exception we
 																		// are testing
 
-		// refresh()->return git.getRepository().findRef("HEAD").getObjectId().getName();
-		Ref headRef = mock(Ref.class);
-		when(this.database.findRef(anyString())).thenReturn(headRef);
-
-		ObjectId newObjectId = ObjectId.fromRaw(new int[] { 1, 2, 3, 4, 5 });
-		when(headRef.getObjectId()).thenReturn(newObjectId);
-
 		SearchPathLocator.Locations locations = this.repository.getLocations("bar", "staging", "master");
 		assertThat(newObjectId.getName()).isEqualTo(locations.getVersion());
 
@@ -832,14 +829,6 @@ public class JGitEnvironmentRepositoryTests {
 		when(git.reset()).thenReturn(resetCommand);
 		when(resetCommand.call()).thenReturn(ref);
 
-		// refresh()->return
-		// git.getRepository().findRef("HEAD").getObjectId().getName();
-		Ref headRef = mock(Ref.class);
-		when(this.database.findRef(anyString())).thenReturn(headRef);
-
-		ObjectId newObjectId = ObjectId.fromRaw(new int[] { 1, 2, 3, 4, 5 });
-		when(headRef.getObjectId()).thenReturn(newObjectId);
-
 		SearchPathLocator.Locations locations = this.repository.getLocations("bar", "staging", "master");
 		assertThat(newObjectId.getName()).isEqualTo(locations.getVersion());
 
@@ -1174,14 +1163,6 @@ public class JGitEnvironmentRepositoryTests {
 		when(mergeResult.getMergeStatus()).thenReturn(mergeStatus);
 		when(mergeStatus.isSuccessful()).thenReturn(true);
 
-		// refresh()->return
-		// git.getRepository().findRef("HEAD").getObjectId().getName();
-		Ref headRef = mock(Ref.class);
-		when(this.database.findRef(anyString())).thenReturn(headRef);
-
-		ObjectId newObjectId = ObjectId.fromRaw(new int[] { 1, 2, 3, 4, 5 });
-		when(headRef.getObjectId()).thenReturn(newObjectId);
-
 		SearchPathLocator.Locations locations = this.repository.getLocations("bar", "staging", "master");
 		assertThat(newObjectId.getName()).isEqualTo(locations.getVersion());