diff --git a/Makefile b/Makefile
index 4c2910d6f..f72a4ba0e 100644
--- a/Makefile
+++ b/Makefile
@@ -107,9 +107,9 @@ cluster-sync-importer: cluster-sync
 cluster-sync-cloner: WHAT = cmd/cdi-cloner
 cluster-sync-cloner: cluster-sync
 
-functest: .functest-image-host
+functest:
 	./hack/build/functests.sh
 
-.functest-image-host: WHAT=tools/cdi-func-test-file-host-init
-.functest-image-host:  manifests build
-	./hack/build/build-cdi-func-test-file-host.sh
+functest-image-host: WHAT=tools/cdi-func-test-file-host-init
+functest-image-host:  manifests build
+	${DO} ./hack/build/build-cdi-func-test-file-host.sh && ./hack/build/build-docker.sh "tools/cdi-func-test-file-host-init tools/cdi-func-test-file-host-http"
diff --git a/hack/build/build-cdi-func-test-file-host.sh b/hack/build/build-cdi-func-test-file-host.sh
index f95a5330a..a2e70dde3 100755
--- a/hack/build/build-cdi-func-test-file-host.sh
+++ b/hack/build/build-cdi-func-test-file-host.sh
@@ -34,7 +34,3 @@ ${BUILD_DIR}/build-copy-artifacts.sh "${FILE_INIT_PATH}"
 OUT_PATH="${OUT_DIR}/tools"
 cp ${BUILD_DIR}/docker/${FILE_HOST}/* ${OUT_PATH}/${FILE_HOST}/
 cp "${CDI_DIR}/test/images/tinyCore.iso" "${OUT_PATH}/${FILE_INIT}/"
-
-for target in "${FILE_HOST}" "${FILE_INIT}"; do
-	${BUILD_DIR}/build-docker.sh build "tools/${target}"
-done