diff --git a/.circleci/config.yml b/.circleci/config.yml
index 28472643..fcab6582 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -28,14 +28,21 @@ jobs:
           SA_PASSWORD: yourStrong(!)Password
           MSSQL_PID: Developer
 
-      - image: microsoft/mssql-tools
-
     working_directory: /go/src/github.com/go-xorm/xorm
     steps:
+      - run:
+          name: Wait for MSSQL
+          command: >
+            c=0;
+            for i in `seq 30`; do
+              echo "Waiting for mssql"
+              sqlcmd -H localhost -U sa -P "yourStrong(!)Password" -Q "CREATE DATABASE xorm_test" > /dev/null > /dev/null && c=0 && break || c=$? && sleep 1
+            done;
+            exit $c
+            
       - checkout
 
       - run: go get -t -d -v ./...
-      - run: sqlcmd -S mssql -U sa -P "yourStrong(!)Password" -Q "CREATE DATABASE xorm_test"
       - run: go get -u github.com/go-xorm/core
       - run: go get -u github.com/go-xorm/builder
       - run: go build -v