diff --git a/metrics/metrics_test.go b/metrics/metrics_test.go
index 3075f199..89117b9e 100644
--- a/metrics/metrics_test.go
+++ b/metrics/metrics_test.go
@@ -2,6 +2,7 @@ package metrics_test
 
 import (
 	"bytes"
+	"context"
 	"io/ioutil"
 	"log"
 	"net/http"
@@ -13,7 +14,7 @@ import (
 
 func TestPrometheusMetrics(t *testing.T) {
 	server := metrics.SetupPrometheus(0)
-	defer server.Shutdown(nil)
+	defer server.Shutdown(context.Background())
 	log.Println(server.Addr)
 
 	metricReader, err := http.Get("http://" + server.Addr + "/metrics")
diff --git a/travis b/travis
index c4f3bafa..3eda04b2 160000
--- a/travis
+++ b/travis
@@ -1 +1 @@
-Subproject commit c4f3bafae45db64799080f8ebcdefd323d61ff5e
+Subproject commit 3eda04b22d0d0b4ca33620f92c0ff223ebdb1c50