diff --git a/.travis.yml b/.travis.yml
index e2b0430ac..a292fca5c 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -18,8 +18,14 @@ install:
   - if [ "$TRAVIS_PULL_REQUEST" = "false" ]; then bash dist/gitcookie.sh; fi
   - go get -t ./...
   - go get golang.org/x/tools/cmd/vet
+  - go get github.com/golang/lint/golint
+  - go get github.com/gordonklaus/ineffassign
 
 script:
   - "[ -z \"$(find -name \"*.go\" | xargs gofmt -s -l)\" ] || exit 1"
+  - ineffassign .
   - go vet ./...
   - go test ./...
+
+after_script:
+  - golint ./...
diff --git a/appveyor.yml b/appveyor.yml
index b370a1135..244b9807f 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -14,13 +14,20 @@ install:
   - 7z x go1.6.windows-amd64.zip -y -oC:\ > NUL
   - go version
   - go env
-  - go get golang.org/x/tools/cmd/vet
   - go get -t ./...
+  - go get golang.org/x/tools/cmd/vet
+  - go get github.com/golang/lint/golint
+  - go get github.com/gordonklaus/ineffassign
+  - set PATH=%GOPATH%\bin;%PATH%
 
 build: off
 
 test_script:
   - go vet ./...
   - go test ./...
+  - ineffassign .
+
+after_test:
+  - golint ./...
 
 deploy: off