diff --git a/Makefile b/Makefile
index 737ca96c..6eea67c9 100644
--- a/Makefile
+++ b/Makefile
@@ -10,6 +10,12 @@ GOFILES := $(shell find . -name "*.go" -type f)
 
 PACKAGES ?= $(shell GO111MODULE=on $(GO) list ./...)
 
+TEST_COCKROACH_HOST ?= cockroach:26257
+TEST_COCKROACH_SCHEMA ?=
+TEST_COCKROACH_DBNAME ?= xorm_test
+TEST_COCKROACH_USERNAME ?= postgres
+TEST_COCKROACH_PASSWORD ?= 
+
 TEST_MSSQL_HOST ?= mssql:1433
 TEST_MSSQL_DBNAME ?= gitea
 TEST_MSSQL_USERNAME ?= sa
@@ -115,6 +121,18 @@ misspell-check:
 .PHONY: test
 test: test-sqlite
 
+.PNONY: test-cockroach
+test-cockroach: go-check
+	$(GO) test -race -db=postgres -schema='$(TEST_COCKROACH_SCHEMA)' -cache=$(TEST_CACHE_ENABLE) \
+	-conn_str="postgres://$(TEST_COCKROACH_USERNAME):$(TEST_COCKROACH_PASSWORD)@$(TEST_COCKROACH_HOST)/$(TEST_COCKROACH_DBNAME)?sslmode=disable" \
+	-coverprofile=cockroach.$(TEST_COCKROACH_SCHEMA).$(TEST_CACHE_ENABLE).coverage.out -covermode=atomic
+
+.PHONY: test-cockroach\#%
+test-cockroach\#%: go-check
+	$(GO) test -race -run $* -db=postgres -schema='$(TEST_COCKROACH_SCHEMA)' -cache=$(TEST_CACHE_ENABLE) \
+	-conn_str="postgres://$(TEST_COCKROACH_USERNAME):$(TEST_COCKROACH_PASSWORD)@$(TEST_COCKROACH_HOST)/$(TEST_COCKROACH_DBNAME)?sslmode=disable" \
+	-coverprofile=cockroach.$(TEST_COCKROACH_SCHEMA).$(TEST_CACHE_ENABLE).coverage.out -covermode=atomic
+
 .PNONY: test-mssql
 test-mssql: go-check
 	$(GO) test -v -race -db=mssql -cache=$(TEST_CACHE_ENABLE) \
diff --git a/test_cockroach.sh b/test_cockroach.sh
deleted file mode 100755
index 27c61089..00000000
--- a/test_cockroach.sh
+++ /dev/null
@@ -1 +0,0 @@
-go test -db=postgres -conn_str="user=root port=26257 dbname=xorm_test sslmode=disable"
\ No newline at end of file