diff --git a/Makefile b/Makefile
index a25599a8..7ab24e3d 100644
--- a/Makefile
+++ b/Makefile
@@ -40,10 +40,8 @@ GOLIST := go list $(PKG)/... | grep -v '/vendor/'
 GOLISTCOVER := $(shell go list -f '{{.ImportPath}}' ./... | sed -e 's/^$(ESCPKG)/./')
 GOLISTLINT := $(shell go list -f '{{.Dir}}' ./... | grep -v 'lnrpc')
 
-include make/testing_flags.mk
-
 COVER = for dir in $(GOLISTCOVER); do \
-		$(GOTEST) -tags="$(TEST_TAGS)" \
+		$(GOTEST) $(TEST_FLAGS) \
 			-covermode=count \
 			-coverprofile=$$dir/profile.tmp $$dir; \
 		\
@@ -82,6 +80,7 @@ define print
 	echo $(GREEN)$1$(NC)
 endef
 
+include make/testing_flags.mk
 
 default: scratch