diff --git a/.drone.yml b/.drone.yml
index 5ab58d11..f38d0c45 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -22,6 +22,8 @@ steps:
 - name: test-sqlite
   pull: default
   image: golang:1.10
+  depends_on:
+    - build
   commands:
   - "go test -v -race -db=\"sqlite3\" -conn_str=\"./test.db\" -coverprofile=coverage1-1.txt -covermode=atomic"
   - "go test -v -race -db=\"sqlite3\" -conn_str=\"./test.db\" -cache=true -coverprofile=coverage1-2.txt -covermode=atomic"
@@ -33,6 +35,8 @@ steps:
 - name: test-mysql
   pull: default
   image: golang:1.10
+  depends_on:
+    - build
   commands:
   - "go test -v -race -db=\"mysql\" -conn_str=\"root:@tcp(mysql)/xorm_test\" -coverprofile=coverage2-1.txt -covermode=atomic"
   - "go test -v -race -db=\"mysql\" -conn_str=\"root:@tcp(mysql)/xorm_test\" -cache=true -coverprofile=coverage2-2.txt -covermode=atomic"
@@ -44,6 +48,8 @@ steps:
 - name: test-mysql-utf8mb4
   pull: default
   image: golang:1.10
+  depends_on:
+    - test-mysql
   commands:
   - "go test -v -race -db=\"mysql\" -conn_str=\"root:@tcp(mysql)/xorm_test?charset=utf8mb4\" -coverprofile=coverage2.1-1.txt -covermode=atomic"
   - "go test -v -race -db=\"mysql\" -conn_str=\"root:@tcp(mysql)/xorm_test?charset=utf8mb4\" -cache=true -coverprofile=coverage2.1-2.txt -covermode=atomic"
@@ -55,6 +61,8 @@ steps:
 - name: test-mymysql
   pull: default
   image: golang:1.10
+  depends_on:
+    - test-mysql-utf8mb4
   commands:
   - "go test -v -race -db=\"mymysql\" -conn_str=\"tcp:mysql:3306*xorm_test/root/\" -coverprofile=coverage3-1.txt -covermode=atomic"
   - "go test -v -race -db=\"mymysql\" -conn_str=\"tcp:mysql:3306*xorm_test/root/\" -cache=true -coverprofile=coverage3-2.txt -covermode=atomic"
@@ -66,6 +74,8 @@ steps:
 - name: test-postgres
   pull: default
   image: golang:1.10
+  depends_on:
+    - build
   commands:
   - "go test -v -race -db=\"postgres\" -conn_str=\"postgres://postgres:@pgsql/xorm_test?sslmode=disable\" -coverprofile=coverage4-1.txt -covermode=atomic"
   - "go test -v -race -db=\"postgres\" -conn_str=\"postgres://postgres:@pgsql/xorm_test?sslmode=disable\" -cache=true -coverprofile=coverage4-2.txt -covermode=atomic"
@@ -77,6 +87,8 @@ steps:
 - name: test-postgres-schema
   pull: default
   image: golang:1.10
+  depends_on:
+    - test-postgres-schema
   commands:
   - "go test -v -race -db=\"postgres\" -conn_str=\"postgres://postgres:@pgsql/xorm_test?sslmode=disable\" -schema=xorm -coverprofile=coverage5-1.txt -covermode=atomic"
   - "go test -v -race -db=\"postgres\" -conn_str=\"postgres://postgres:@pgsql/xorm_test?sslmode=disable\" -schema=xorm -cache=true -coverprofile=coverage5-2.txt -covermode=atomic"
@@ -88,6 +100,8 @@ steps:
 - name: test-mssql
   pull: default
   image: golang:1.10
+  depends_on:
+    - build
   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"
@@ -99,6 +113,8 @@ steps:
 - name: test-tidb
   pull: default
   image: golang:1.10
+  depends_on:
+    - build
   commands:
   - "go test -v -race -db=\"mysql\" -conn_str=\"root:@tcp(tidb:4000)/xorm_test\" -ignore_select_update=true -coverprofile=coverage7-1.txt -covermode=atomic"
   - "go test -v -race -db=\"mysql\" -conn_str=\"root:@tcp(tidb:4000)/xorm_test\" -ignore_select_update=true -cache=true -coverprofile=coverage7-2.txt -covermode=atomic"
@@ -107,11 +123,10 @@ steps:
     - push
     - pull_request
 
-- name: test-echo
+- name: test-end
   pull: default
   image: golang:1.10
   depends_on:
-  - build
   - test-sqlite
   - test-mysql
   - test-mysql-utf8mb4