diff --git a/Makefile b/Makefile
index a4726b575..c20efa09b 100644
--- a/Makefile
+++ b/Makefile
@@ -42,6 +42,10 @@ vendor: go.mod
 test:
 	go test ./... -tags='$(BUILD_TAGS)' $(TESTFLAGS)
 
+# Run test suite with race flag
+test-race:
+	go test ./... -tags='$(BUILD_TAGS)' $(TESTFLAGS) -race -timeout 30m
+
 bench:
 	go test ./... -bench=. -run=NoneZ -timeout=127m $(TESTFLAGS)
 
@@ -152,6 +156,9 @@ docker-test:
 golangci-lint: require-golangci-lint
 	golangci-lint run --skip-files '.*\.peg\.go'
 
+# Alias
+linter: golangci-lint
+
 # Run gometalinter with custom flags
 gometalinter: require-gometalinter vendor
 	GO111MODULE=off gometalinter --vendor --disable-all \