diff --git a/.drone.yml b/.drone.yml
index 6001ec59..5bae2b3f 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -505,8 +505,24 @@ steps:
   commands:
   - "go test -v -race -db=\"mssql\" -conn_str=\"server=mssql;user id=sa;password=yourStrong(!)Password;database=xorm_test\" -coverprofile=coverage6-1.txt -covermode=atomic"
   - "go test -v -race -db=\"mssql\" -conn_str=\"server=mssql;user id=sa;password=yourStrong(!)Password;database=xorm_test\" -cache=true -coverprofile=coverage6-2.txt -covermode=atomic"
+  when:
+    event:
+    - push
+    - pull_request
+
+- name: init_cockroach
+  pull: default
+  image: cockroachdb/cockroach:v2.0.6
+  commands:
+  - cockroach sql --insecure --execute="create database xorm_test"
+
+- name: test-cockroach
+  image: golang:1.12
+  commands:
+  - go test -v -race -db="postgres" -conn_str="postgres://postgres:@cockroach/xorm_test?sslmode=disable" -schema=xorm -coverprofile=coverage7-1.txt -covermode=atomic
+  - go test -v -race -db="postgres" -conn_str="postgres://postgres:@cockroach/xorm_test?sslmode=disable" -schema=xorm -cache=true -coverprofile=coverage7-2.txt -covermode=atomic
   - go get -u github.com/wadey/gocovmerge
-  - gocovmerge coverage1-1.txt coverage1-2.txt coverage2-1.txt coverage2-2.txt coverage2.1-1.txt coverage2.1-2.txt coverage3-1.txt coverage3-2.txt coverage4-1.txt coverage4-2.txt coverage5-1.txt coverage5-2.txt coverage6-1.txt coverage6-2.txt > coverage.txt
+  - gocovmerge coverage1-1.txt coverage1-2.txt coverage2-1.txt coverage2-2.txt coverage2.1-1.txt coverage2.1-2.txt coverage3-1.txt coverage3-2.txt coverage4-1.txt coverage4-2.txt coverage5-1.txt coverage5-2.txt coverage6-1.txt coverage6-2.txt coverage7-1.txt coverage7-2.txt > coverage.txt
   when:
     event:
     - push
@@ -548,4 +564,10 @@ services:
     event:
     - push
     - tag
-    - pull_request
\ No newline at end of file
+    - pull_request
+
+- name: cockroach
+  pull: default
+  image: cockroachdb/cockroach:v2.0.6
+  when:
+    event: [push, tag, pull_request]