diff --git a/.travis.yml b/.travis.yml
index 04cf8add..6cf93c46 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -17,14 +17,9 @@ env:
     - V=1
 before_script:
   - make bootstrap
-jobs:
-  include:
-    - stage: lint
-      script: make lint
-    - script:
-        - make test
-        - make build
-        - make artifacts
+script:
+  - make
+  - make artifacts
 after_success:
   - bash <(curl -s https://codecov.io/bash) -t "$CODECOV_TOKEN" || echo "Codecov did
     not collect coverage reports"
diff --git a/make/docker.mk b/make/docker.mk
index 117b7cc2..1c932d74 100644
--- a/make/docker.mk
+++ b/make/docker.mk
@@ -57,8 +57,7 @@ define DOCKER_BUILDX
 endef
 
 # For non-master builds don't build the docker containers.
-docker-branch: docker-prepare
-	$(call DOCKER_BUILDX,$(VERSION),)
+docker-branch:
 
 # For master builds don't build the docker containers.
 docker-master: