diff --git a/.travis.yml b/.travis.yml
index b0574535..da6a7922 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -9,14 +9,14 @@ go_import_path: github.com/kubernetes/kompose
 
 matrix:
   include:
-    - go: 1.7
+    - go: "1.9"
       env: 
         # Only build docs once
         - BUILD_DOCS=yes
         # Test cross-compile as well
         - CROSS_COMPILE=yes
-    - go: 1.8
-    - go: 1.9
+    - go: "1.10"
+    - go: "1.11"
 
 install:
   - true
diff --git a/Makefile b/Makefile
index 8580ef4e..57635536 100644
--- a/Makefile
+++ b/Makefile
@@ -103,7 +103,7 @@ test-dep:
 	go get github.com/modocache/gover
 	go get github.com/Masterminds/glide
 	go get github.com/sgotti/glide-vc
-	go get github.com/golang/lint/golint
+	go get golang.org/x/lint/golint
 	go get github.com/mitchellh/gox