diff --git a/Makefile b/Makefile
index f6a306287d..6f690cfc1f 100644
--- a/Makefile
+++ b/Makefile
@@ -24,7 +24,8 @@ ifeq ($(NO_DOCKER), 1)
   DOCKER_CMD =
   IMAGE_BUILD_CMD = imagebuilder
 else
-  DOCKER_CMD := docker run --env GO111MODULE=$(GO111MODULE) --env GOFLAGS=$(GOFLAGS) --rm -v "$(PWD)":/go/src/github.com/openshift/machine-api-operator:Z -w /go/src/github.com/openshift/machine-api-operator golang:1.13
+  DOCKER_CMD := docker run --env GO111MODULE=$(GO111MODULE) --env GOFLAGS=$(GOFLAGS) --rm -v "$(PWD)":/go/src/github.com/openshift/machine-api-operator:Z -w /go/src/github.com/openshift/machine-api-operator golang:1.15
+#  DOCKER_CMD := docker run --env GO111MODULE=$(GO111MODULE) --env GOFLAGS=$(GOFLAGS) --rm -v "$(PWD)":/go/src/github.com/openshift/machine-api-operator:Z -w /go/src/github.com/openshift/machine-api-operator registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.15-openshift-4.6
   IMAGE_BUILD_CMD = docker build
 endif
 
@@ -112,7 +113,7 @@ deploy-kubemark:
 .PHONY: test
 test: ## Run tests
 	@echo -e "\033[32mTesting...\033[0m"
-	$(DOCKER_CMD) KUBEBUILDER_CONTROLPLANE_START_TIMEOUT=10m hack/ci-test.sh
+	$(DOCKER_CMD) hack/ci-test.sh
 
 unit:
 	$(DOCKER_CMD) go test ./pkg/... ./cmd/...
diff --git a/hack/ci-test.sh b/hack/ci-test.sh
index fb6aaebd64..4a5e79be46 100755
--- a/hack/ci-test.sh
+++ b/hack/ci-test.sh
@@ -24,4 +24,4 @@ cd $REPO_ROOT && \
 	source ./hack/fetch_ext_bins.sh && \
 	fetch_tools && \
 	setup_envs && \
-	make unit
+	NO_DOCKER=1 make unit
diff --git a/hack/fetch_ext_bins.sh b/hack/fetch_ext_bins.sh
index 8c505000ed..1fb28143cb 100755
--- a/hack/fetch_ext_bins.sh
+++ b/hack/fetch_ext_bins.sh
@@ -97,10 +97,14 @@ function fetch_tools {
   kb_tools_download_url="https://storage.googleapis.com/kubebuilder-tools/$kb_tools_archive_name"
 
   kb_tools_archive_path="$tmp_root/$kb_tools_archive_name"
+  echo "download url: ${kb_tools_download_url}"
   if [ ! -f $kb_tools_archive_path ]; then
+    echo "downloading kubebuilder"
+    echo "archive path: $kb_tools_archive_path"
     curl -fsL ${kb_tools_download_url} -o "$kb_tools_archive_path"
   fi
-
+  ls $tmp_root/
+  echo "temp root: $tmp_root"
   tar -zvxf "$kb_tools_archive_path" -C "$tmp_root/"
 }