diff --git a/src/autoscaler/eventgenerator/aggregator/metric_poller_test.go b/src/autoscaler/eventgenerator/aggregator/metric_poller_test.go
index 0becab0103..6d9229af76 100644
--- a/src/autoscaler/eventgenerator/aggregator/metric_poller_test.go
+++ b/src/autoscaler/eventgenerator/aggregator/metric_poller_test.go
@@ -70,7 +70,8 @@ var _ = Describe("MetricPoller", func() {
 
 		It("logs an error", func() {
 			//TODO this should be a prometheus counter not a log statement check
-			Eventually(logger.Buffer).Should(Say("retrieveMetric Failed"))
+			Eventually(logger.Buffer, 2*time.Second).Should(Say("retrieveMetric Failed"))
+
 		})
 
 		It("does not save any metrics", func() {
diff --git a/src/autoscaler/metricsforwarder/config/config_test.go b/src/autoscaler/metricsforwarder/config/config_test.go
index 803473cf4c..7d3797a092 100644
--- a/src/autoscaler/metricsforwarder/config/config_test.go
+++ b/src/autoscaler/metricsforwarder/config/config_test.go
@@ -242,7 +242,8 @@ db:
     max_idle_connections: 5
     connection_max_lifetime: 60s
 health:
-  port: 9999
+  server_config:
+    port: 9999
 cred_helper_impl: default
 `)
 				})
@@ -277,7 +278,8 @@ db:
     max_idle_connections: 5
     connection_max_lifetime: 60s
 health:
-  port: 8081
+  server_config:
+    port: 8081
 `)
 				})
 
diff --git a/src/autoscaler/metricsforwarder/exampleconfig/config.yml b/src/autoscaler/metricsforwarder/exampleconfig/config.yml
index 5549af3251..6ae2ee4b6f 100644
--- a/src/autoscaler/metricsforwarder/exampleconfig/config.yml
+++ b/src/autoscaler/metricsforwarder/exampleconfig/config.yml
@@ -15,7 +15,8 @@ db:
     max_idle_connections: 5
     connection_max_lifetime: 60s
 health:
-  port: 8081
+  server_config:
+    port: 8081
 rate_limit:
   max_amount: 10
   valid_duration: 1s