diff --git a/.travis.yml b/.travis.yml
index ecf25b12e..98a6a1b62 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -40,8 +40,8 @@ install:
   - npm run vscode:prepublish
   - if [[ "$(go version)" =~ "go version go1.8" ]]; then go get -u -v github.com/nsf/gocode; else go get -u -v github.com/mdempsky/gocode; fi
   - go get -u -v github.com/rogpeppe/godef
-  - go get -u -v github.com/zmb3/gogetdoc
-  - go get -u -v golang.org/x/lint/golint
+  - if [[ "$(go version)" =~ "go version go1.8" ]]; then echo skipping gogetdoc; else go get -u -v github.com/zmb3/gogetdoc; fi
+  - if [[ "$(go version)" =~ "go version go1.8" ]]; then echo skipping golint; else go get -u -v golang.org/x/lint/golint; fi
   - go get -u -v github.com/ramya-rao-a/go-outline
   - go get -u -v github.com/sqs/goreturns
   - go get -u -v golang.org/x/tools/cmd/gorename
diff --git a/test/go.test.ts b/test/go.test.ts
index eb8c80135..36244d82a 100644
--- a/test/go.test.ts
+++ b/test/go.test.ts
@@ -164,7 +164,7 @@ suite('Go Extension Tests', () => {
 			'docsTool': { value: 'gogetdoc' }
 		});
 		getGoVersion().then(version => {
-			if (!version || version.major > 1 || (version.major === 1 && version.minor > 5)) {
+			if (!version || version.major > 1 || (version.major === 1 && version.minor > 8)) {
 				return testDefinitionProvider(config);
 			}
 			return Promise.resolve();
@@ -207,7 +207,7 @@ It returns the number of bytes written and any write error encountered.
 			'docsTool': { value: 'gogetdoc' }
 		});
 		getGoVersion().then(version => {
-			if (!version || version.major > 1 || (version.major === 1 && version.minor > 5)) {
+			if (!version || version.major > 1 || (version.major === 1 && version.minor > 8)) {
 				return testSignatureHelpProvider(config, testCases);
 			}
 			return Promise.resolve();
@@ -263,7 +263,7 @@ It returns the number of bytes written and any write error encountered.
 			'docsTool': { value: 'gogetdoc' }
 		});
 		getGoVersion().then(version => {
-			if (!version || version.major > 1 || (version.major === 1 && version.minor > 5)) {
+			if (!version || version.major > 1 || (version.major === 1 && version.minor > 8)) {
 				return testHoverProvider(config, testCases);
 			}
 			return Promise.resolve();
@@ -283,8 +283,8 @@ It returns the number of bytes written and any write error encountered.
 			{ line: 11, severity: 'error', msg: 'undefined: prin' },
 		];
 		getGoVersion().then(version => {
-			if (version && version.major === 1 && version.minor < 6) {
-				// golint is not supported in Go 1.5, so skip the test
+			if (version && version.major === 1 && version.minor < 9) {
+				// golint supports only latest 3 versions, so skip the test
 				return Promise.resolve();
 			}
 			return check(vscode.Uri.file(path.join(fixturePath, 'errorsTest', 'errors.go')), config).then(diagnostics => {