diff --git a/Makefile b/Makefile
index d635783bae32..dd41a0cb0918 100644
--- a/Makefile
+++ b/Makefile
@@ -84,9 +84,11 @@ build-no-bundle-ci: bootstrap-only
 watch: build-no-bundle
 	BABEL_ENV=development $(YARN) gulp watch
 
-code-quality-ci: flowcheck-ci lint-ci
+code-quality-ci: build-no-bundle-ci
+	$(MAKE) flowcheck-ci & $(MAKE) lint-ci
 
-flowcheck-ci: bootstrap-flowcheck
+
+flowcheck-ci:
 	$(MAKE) flow
 
 code-quality: flow lint
@@ -94,17 +96,15 @@ code-quality: flow lint
 flow:
 	$(YARN) flow check --strip-root
 
-bootstrap-flowcheck: build-no-bundle-ci
-
 lint-ci: lint-js-ci lint-ts-ci check-compat-data-ci
 
-lint-js-ci: bootstrap-only
+lint-js-ci:
 	$(MAKE) lint-js
 
-lint-ts-ci: bootstrap-flowcheck
+lint-ts-ci:
 	$(MAKE) lint-ts
 
-check-compat-data-ci: build-no-bundle-ci
+check-compat-data-ci:
 	$(MAKE) check-compat-data
 
 lint: lint-js lint-ts