diff --git a/Makefile.core.mk b/Makefile.core.mk
index 8a9947d226..134deb6054 100644
--- a/Makefile.core.mk
+++ b/Makefile.core.mk
@@ -153,13 +153,12 @@ init: preinit
 ifndef TAG
 	$(eval TAG := ${ISTIO_IMAGE_VERSION}.${ISTIO_LONG_SHA})
 endif
-	@echo "TAG=${TAG}"
 # If a variant is defined, update the tag accordingly
 ifdef VARIANT
 	$(eval TAG=${TAG}-${VARIANT})
 endif
 	@export TAG
-	@echo "final TAG=${TAG}"
+	@echo "TAG=${TAG}"
 
 include tests/tests.mk
 
diff --git a/tests/tests.mk b/tests/tests.mk
index 3361d748ea..4a61535dbc 100644
--- a/tests/tests.mk
+++ b/tests/tests.mk
@@ -41,30 +41,11 @@ test.kube.presubmit: init | $(JUNIT_REPORT)
 test.kube.postsubmit: test.kube.presubmit
 	SNIPPETS_GCS_PATH="istio-snippets/$(shell git rev-parse HEAD)" prow/upload-istioio-snippets.sh
 
-test.kube.configuration: init | $(JUNIT_REPORT)
-	PATH=${PATH}:${ISTIO_OUT} $(GO) test -p 1 ${T} ./tests/configuration/... -timeout 30m \
+test.kube.%: init | $(JUNIT_REPORT)
+	$(eval INTEGRATION_TEST_FLAGS += --istio.test.tag=$(TAG))
+	PATH=${PATH}:${ISTIO_OUT} $(GO) test -p 1 ${T} ./tests/$(subst .,/,$*)/... -timeout 30m \
 	--istio.test.select -postsubmit,-flaky \
 	--istio.test.env kube \
 	${_INTEGRATION_TEST_FLAGS} \
 	2>&1 | tee >($(JUNIT_REPORT) > $(JUNIT_OUT))
 
-test.kube.examples: init | $(JUNIT_REPORT)
-	PATH=${PATH}:${ISTIO_OUT} $(GO) test -p 1 ${T} ./tests/examples/... -timeout 30m \
-	--istio.test.select -postsubmit,-flaky \
-	--istio.test.env kube \
-	${_INTEGRATION_TEST_FLAGS} \
-	2>&1 | tee >($(JUNIT_REPORT) > $(JUNIT_OUT))
-
-test.kube.security: init | $(JUNIT_REPORT)
-	PATH=${PATH}:${ISTIO_OUT} $(GO) test -p 1 ${T} ./tests/security/... -timeout 30m \
-	--istio.test.select -postsubmit,-flaky \
-	--istio.test.env kube \
-	${_INTEGRATION_TEST_FLAGS} \
-	2>&1 | tee >($(JUNIT_REPORT) > $(JUNIT_OUT))
-
-test.kube.trafficmanagement: init | $(JUNIT_REPORT)
-	PATH=${PATH}:${ISTIO_OUT} $(GO) test -p 1 ${T} ./tests/trafficmanagement/... -timeout 30m \
-	--istio.test.select -postsubmit,-flaky \
-	--istio.test.env kube \
-	${_INTEGRATION_TEST_FLAGS} \
-	2>&1 | tee >($(JUNIT_REPORT) > $(JUNIT_OUT))