diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 205463ff0985dd50de7554cea190da9ca30e4891..0c282ccf870f7a454136df1edd4eeadd144e64fd 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -8,6 +8,17 @@ before_script:
 - ln -sfv "$(pwd -P)" "$GODIR"
 - cd "$GODIR"
 
-test:
+test:1.5:
+  image: golang:1.5
+  script:
+  - make verify-lite
+
+test:1.6:
+  image: golang:1.6
+  script:
+  - make verify
+
+test:1.7:
+  image: golang:1.7
   script:
   - make verify
diff --git a/Makefile b/Makefile
index 3ad0447d877438b68cc4a945c4042aa5bfe4db30..21ccf07b7ec7ccb83d33c879cfff7b3c1bfc0c05 100644
--- a/Makefile
+++ b/Makefile
@@ -21,7 +21,8 @@ gitlab-pages: $(GO_FILES)
 update:
 	godep save ./...
 
-verify: fmt vet lint complexity test
+verify-lite: fmt vet complexity test # lint does not work on go1.5 any more
+verify: verify-lite lint
 
 fmt:
 	go fmt ./... | awk '{ print "Please run go fmt"; exit 1 }'