diff --git a/.travis.yml b/.travis.yml
index 820e778bf..c711c4047 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -7,6 +7,7 @@ language: go
 
 go:
 - 1.8
+- 1.9
 - tip
 
 matrix:
@@ -15,7 +16,7 @@ matrix:
 
 before_install:
 - go get github.com/mattn/goveralls
-- go get -u github.com/alecthomas/gometalinter
+- go get github.com/alecthomas/gometalinter
 
 install:
 - gometalinter --install
diff --git a/registry/txt.go b/registry/txt.go
index b359f3171..08e79ad47 100644
--- a/registry/txt.go
+++ b/registry/txt.go
@@ -28,11 +28,14 @@ import (
 	"github.com/kubernetes-incubator/external-dns/provider"
 )
 
-var (
-	txtLabelRegex  = regexp.MustCompile("^\"heritage=external-dns,external-dns/owner=(.+)\"")
+const (
 	txtLabelFormat = "\"heritage=external-dns,external-dns/owner=%s\""
 )
 
+var (
+	txtLabelRegex = regexp.MustCompile("^\"heritage=external-dns,external-dns/owner=(.+)\"")
+)
+
 // TXTRegistry implements registry interface with ownership implemented via associated TXT records
 type TXTRegistry struct {
 	provider provider.Provider
diff --git a/source/fake.go b/source/fake.go
index 71d375b15..34029a372 100644
--- a/source/fake.go
+++ b/source/fake.go
@@ -66,13 +66,13 @@ func (sc *fakeSource) Endpoints() ([]*endpoint.Endpoint, error) {
 }
 
 func (sc *fakeSource) generateEndpoint() (*endpoint.Endpoint, error) {
-	endpoint := endpoint.NewEndpoint(
+	ep := endpoint.NewEndpoint(
 		generateDNSName(4, sc.dnsName),
 		generateIPAddress(),
 		endpoint.RecordTypeA,
 	)
 
-	return endpoint, nil
+	return ep, nil
 }
 
 func generateIPAddress() string {