diff --git a/eureka-core/src/test/java/com/netflix/eureka/GzipEncodingEnforcingFilterTest.java b/eureka-core/src/test/java/com/netflix/eureka/GzipEncodingEnforcingFilterTest.java
index 58869251cd..597181d0ed 100644
--- a/eureka-core/src/test/java/com/netflix/eureka/GzipEncodingEnforcingFilterTest.java
+++ b/eureka-core/src/test/java/com/netflix/eureka/GzipEncodingEnforcingFilterTest.java
@@ -89,7 +89,6 @@ public void testForceGzip() throws Exception {
     @Test
     public void testForceGzipOtherHeader() throws Exception {
         noneGzipRequest();
-        when(request.getHeader("Test")).thenReturn("ok");
         when(request.getHeaders("Test")).thenReturn(new Enumeration() {
             private int c = 0;
 
diff --git a/eureka-test-utils/src/main/java/com/netflix/discovery/shared/transport/ClusterSampleData.java b/eureka-test-utils/src/main/java/com/netflix/discovery/shared/transport/ClusterSampleData.java
index 0b2bd2b2b6..07bacc4e23 100644
--- a/eureka-test-utils/src/main/java/com/netflix/discovery/shared/transport/ClusterSampleData.java
+++ b/eureka-test-utils/src/main/java/com/netflix/discovery/shared/transport/ClusterSampleData.java
@@ -99,8 +99,8 @@ public static ReplicationInstance newReplicationInstanceOf(Action action, Instan
                         instance.getAppName(),
                         instance.getId(),
                         System.currentTimeMillis(),
-                        InstanceStatus.OUT_OF_SERVICE.name(),
                         null,
+                        InstanceStatus.OUT_OF_SERVICE.name(),
                         null,
                         action
                 );
@@ -110,7 +110,7 @@ public static ReplicationInstance newReplicationInstanceOf(Action action, Instan
                         instance.getId(),
                         System.currentTimeMillis(),
                         InstanceStatus.OUT_OF_SERVICE.name(),
-                        null,
+                        InstanceStatus.UP.name(),
                         null,
                         action
                 );