diff --git a/spring-cloud-netflix-eureka-server/src/test/java/org/springframework/cloud/netflix/eureka/server/EurekaControllerReplicasTest.java b/spring-cloud-netflix-eureka-server/src/test/java/org/springframework/cloud/netflix/eureka/server/EurekaControllerReplicasTest.java
index 012b8846..798712f7 100644
--- a/spring-cloud-netflix-eureka-server/src/test/java/org/springframework/cloud/netflix/eureka/server/EurekaControllerReplicasTest.java
+++ b/spring-cloud-netflix-eureka-server/src/test/java/org/springframework/cloud/netflix/eureka/server/EurekaControllerReplicasTest.java
@@ -1,11 +1,23 @@
 package org.springframework.cloud.netflix.eureka.server;
 
 import static org.junit.Assert.*;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+import static org.springframework.cloud.netflix.eureka.server.EurekaControllerTest.setInstance;
 
+import java.util.Collections;
 import java.util.HashMap;
 import java.util.Map;
 
 
+import com.netflix.appinfo.ApplicationInfoManager;
+import com.netflix.appinfo.DataCenterInfo;
+import com.netflix.appinfo.InstanceInfo;
+import com.netflix.appinfo.MyDataCenterInfo;
+import com.netflix.eureka.cluster.PeerEurekaNode;
+import com.netflix.eureka.cluster.PeerEurekaNodes;
+import org.junit.After;
+import org.junit.Before;
 import org.junit.Test;
 
 import com.netflix.eureka.util.StatusInfo;
@@ -20,6 +32,19 @@ public class EurekaControllerReplicasTest {
 	String authList2 = authList1+",http://user2:pwd2@test2.com";
 	
 	String empty = new String();
+
+	private ApplicationInfoManager original;
+
+	@Before
+	public void setup() throws Exception {
+		this.original = ApplicationInfoManager.getInstance();
+		setInstance(mock(ApplicationInfoManager.class));
+	}
+
+	@After
+	public void teardown() throws Exception {
+		setInstance(this.original);
+	}
 	
 	@Test
 	public void testFilterReplicasNoAuth() throws Exception {
diff --git a/spring-cloud-netflix-eureka-server/src/test/java/org/springframework/cloud/netflix/eureka/server/EurekaControllerTest.java b/spring-cloud-netflix-eureka-server/src/test/java/org/springframework/cloud/netflix/eureka/server/EurekaControllerTest.java
index 59731a94..94d952b7 100644
--- a/spring-cloud-netflix-eureka-server/src/test/java/org/springframework/cloud/netflix/eureka/server/EurekaControllerTest.java
+++ b/spring-cloud-netflix-eureka-server/src/test/java/org/springframework/cloud/netflix/eureka/server/EurekaControllerTest.java
@@ -52,6 +52,7 @@ import static org.mockito.Mockito.when;
 public class EurekaControllerTest {
 
 	private ApplicationInfoManager infoManager;
+	private ApplicationInfoManager original;
 
 	@Before
 	public void setup() throws Exception {
@@ -64,6 +65,7 @@ public class EurekaControllerTest {
 				.build();
 
 		this.infoManager = mock(ApplicationInfoManager.class);
+		this.original = ApplicationInfoManager.getInstance();
 		setInstance(this.infoManager);
 		when(this.infoManager.getInfo()).thenReturn(instanceInfo);
 
@@ -90,10 +92,10 @@ public class EurekaControllerTest {
 
 	@After
 	public void teardown() throws Exception {
-		setInstance(null);
+		setInstance(this.original);
 	}
 
-	void setInstance(ApplicationInfoManager infoManager) throws IllegalAccessException {
+	static void setInstance(ApplicationInfoManager infoManager) throws IllegalAccessException {
 		Field instance = ReflectionUtils.findField(ApplicationInfoManager.class, "instance");
 		ReflectionUtils.makeAccessible(instance);
 		instance.set(null, infoManager);