diff --git a/build/root/.bazelrc b/build/root/.bazelrc
index fc36b294e2d..75da97cd8ef 100644
--- a/build/root/.bazelrc
+++ b/build/root/.bazelrc
@@ -1,3 +1,5 @@
+startup --expand_configs_in_place
+
 # Show us information about failures.
 build --verbose_failures
 test --test_output=errors
@@ -13,4 +15,10 @@ build --sandbox_tmpfs_path=/tmp
 build --sandbox_fake_username
 
 # Enable go race detection.
-test --features=race
+test:unit --features=race
+test:unit --test_tag_filters=-e2e,-integration
+test:unit --flaky_test_attempts=3
+
+build:integration --build_tag_filters=integration
+test:integration --jobs 4
+test:integration --test_tag_filters=integration
diff --git a/build/root/Makefile b/build/root/Makefile
index 3f5f7450776..f26f07d1a5d 100644
--- a/build/root/Makefile
+++ b/build/root/Makefile
@@ -544,7 +544,7 @@ else
 # We don't want to build any of the release artifacts when running tests.
 # Some things in vendor don't build due to empty target lists for cross-platform rules.
 bazel-test:
-	bazel test --build_tag_filters=-e2e,-integration --test_tag_filters=-e2e,-integration --flaky_test_attempts=3 -- \
+	bazel test --config=unit -- \
 	  //... \
 	  //hack:verify-all \
 	  -//build/... \
@@ -562,7 +562,8 @@ bazel-test-integration:
 	@echo "$$BAZEL_TEST_INTEGRATION_HELP_INFO"
 else
 bazel-test-integration:
-	bazel test //test/integration/...
+	bazel build --config integration //test/integration/...
+	bazel test --config integration //test/integration/...
 endif
 
 ifeq ($(PRINT_HELP),y)
diff --git a/build/root/WORKSPACE b/build/root/WORKSPACE
index 6c46fbe1885..aa3ade68d36 100644
--- a/build/root/WORKSPACE
+++ b/build/root/WORKSPACE
@@ -38,7 +38,7 @@ http_archive(
 
 load("@bazel_skylib//:lib.bzl", "versions")
 
-versions.check(minimum_bazel_version = "0.8.0")
+versions.check(minimum_bazel_version = "0.10.0")
 
 load("@io_bazel_rules_go//go:def.bzl", "go_rules_dependencies", "go_register_toolchains", "go_download_sdk")
 load("@io_bazel_rules_docker//docker:docker.bzl", "docker_repositories", "docker_pull")