diff --git a/.travis.yml b/.travis.yml
index e43b4d12..d76c75d1 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -8,12 +8,10 @@ env:
     - MINIKUBE_WANTUPDATENOTIFICATION=false
     - MINIKUBE_WANTREPORTERRORPROMPT=false
     - MINIKUBE_HOME=$HOME
-    - CHANGE_MINIKUBE_NONE_USER=true
     - KUBECONFIG=$HOME/.kube/config
 
 go:
 - 1.12.x
-- master
 
 matrix:
   fast_finish: true
@@ -23,20 +21,9 @@ matrix:
 before_install:
 - make go-dependencies
 
-before_script:
-# Download kubectl, which is a requirement for using minikube.
-- curl -Lo kubectl https://storage.googleapis.com/kubernetes-release/release/v1.12.9/bin/linux/amd64/kubectl && chmod +x kubectl && sudo mv kubectl /usr/local/bin/
-# Download minikube.
-- curl -Lo minikube https://storage.googleapis.com/minikube/releases/v1.2.0/minikube-linux-amd64 && chmod +x minikube && sudo mv minikube /usr/local/bin/
-- curl -Lo operator-sdk https://github.com/operator-framework/operator-sdk/releases/download/v0.10.0/operator-sdk-v0.10.0-x86_64-linux-gnu && chmod +x operator-sdk && sudo mv operator-sdk /usr/local/bin/
-- mkdir -p $HOME/.kube $HOME/.minikube
-- touch $KUBECONFIG
-- sudo minikube start --vm-driver=none --kubernetes-version=v1.12.9
-- "sudo chown -R travis: /home/travis/.minikube/"
-
 script:
-- kubectl cluster-info
 - make verify
+- make travis-prepare
 - make build e2e
 
 cache:
diff --git a/Makefile b/Makefile
index 577dc389..450b1054 100644
--- a/Makefile
+++ b/Makefile
@@ -438,3 +438,20 @@ indocker: minikube-start image ## Run make in a docker container
 		-e DOCKER_HOST=$(DOCKER_HOST_IP) \
 		-e MINIKUBE_IP=$(MINIKUBE_IP) \
 		jenkins-operator/runner
+
+.PHONY: travis-prepare
+travis-prepare:
+ifndef TRAVIS
+	@echo "+ $@ - This goal only works on Travis CI"
+else
+	@echo "+ $@"
+	# Download kubectl, which is a requirement for using minikube.
+	curl -Lo kubectl https://storage.googleapis.com/kubernetes-release/release/$(MINIKUBE_KUBERNETES_VERSION)/bin/linux/amd64/kubectl && chmod +x kubectl && sudo mv kubectl /usr/local/bin/
+	# Download minikube.
+	curl -Lo minikube https://storage.googleapis.com/minikube/releases/$(MINIKUBE_VERSION)/minikube-linux-amd64 && chmod +x minikube && sudo mv minikube /usr/local/bin/
+	curl -Lo operator-sdk https://github.com/operator-framework/operator-sdk/releases/download/$(OPERATOR_SDK_VERSION)/operator-sdk-$(OPERATOR_SDK_VERSION)-x86_64-linux-gnu && chmod +x operator-sdk && sudo mv operator-sdk /usr/local/bin/
+	mkdir -p $HOME/.kube $HOME/.minikube
+	touch $KUBECONFIG
+	sudo minikube start --vm-driver=none --kubernetes-version=v1.12.9
+	sudo chown -R travis: /home/travis/.minikube/
+endif
\ No newline at end of file