diff --git a/.travis.yml b/.travis.yml
index 8ae7045929..f7e80b0a90 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,13 +1,5 @@
-language: go
-go:
-- 1.5.1
-install:
-- go get github.com/mattn/goveralls
-script:
-- make dco
-- make fmt
-# - make lint
-- make vet
-- make test-short
-- make test-long
-- make coverage-send
+sudo: required
+dist: trusty
+language: bash
+services: docker
+script: USE_CONTAINER=true make dco fmt vet test-short test-long coverage-send
diff --git a/Makefile b/Makefile
index 7705f02021..33de5f3687 100644
--- a/Makefile
+++ b/Makefile
@@ -29,6 +29,8 @@ test: .ignore
 				-e TARGET_OS \
 				-e TARGET_ARCH \
 				-e PREFIX \
+				-e TRAVIS_JOB_ID \
+				-e TRAVIS_PULL_REQUEST \
 				$(DOCKER_IMAGE_NAME) \
 				make $@