diff --git a/.circleci/config.yml b/.circleci/config.yml
index a6e59eb..27767f2 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -10,8 +10,8 @@ jobs:
   test-vendoring:
     executor: build-executor
     environment:
-      - GO111MODULE=on
-      - GOFLAGS=-mod=vendor
+      GO111MODULE: 'on'
+      GOFLAGS: -mod=vendor
     steps:
       - checkout
       - run: go mod tidy
@@ -76,15 +76,13 @@ jobs:
     steps:
       - checkout
       - setup_remote_docker:
-          version: 18.06.0-ce
-          docker_layer_caching: true
+          version: 18.09.3
       - run: make artifacts.tag latest.tag alpine.tag slim.tag
 
 workflows:
-  version: 2.1
   build-and-test:
     jobs:
-      - test-vendoring
+      # - test-vendoring
       - build
       - test:
           requires:
diff --git a/internal/tests/integration/basic_test.go b/internal/tests/integration/basic_test.go
index 64283d1..350eed4 100644
--- a/internal/tests/integration/basic_test.go
+++ b/internal/tests/integration/basic_test.go
@@ -1,3 +1,5 @@
+// +build integration
+
 package integration
 
 import (
diff --git a/internal/tests/integration/integration_test.go b/internal/tests/integration/integration_test.go
index 40e140d..8398c84 100644
--- a/internal/tests/integration/integration_test.go
+++ b/internal/tests/integration/integration_test.go
@@ -1,3 +1,5 @@
+// +build integration
+
 package integration
 
 import (