diff --git a/lib/utils.js b/lib/utils.js
index 2afa811..bc5f2ae 100644
--- a/lib/utils.js
+++ b/lib/utils.js
@@ -1,5 +1,5 @@
 const fs = require("fs");
-const parser = require("solidity-parser-diligence");
+const parser = require("@solidity-parser/parser");
 const request = require("request-promise-native");
 const path = require("path");
 const read = require("fs-readdir-recursive");
diff --git a/mock/package.json b/mock/package.json
index e433d7d..7051c0b 100644
--- a/mock/package.json
+++ b/mock/package.json
@@ -35,6 +35,7 @@
   },
   "dependencies": {
     "@ethersproject/abi": "^5.0.0-beta.146",
+    "@solidity-parser/parser": "^0.5.2",
     "cli-table3": "^0.5.0",
     "colors": "^1.1.2",
     "ethereumjs-util": "6.2.0",
@@ -47,7 +48,6 @@
     "request": "^2.88.0",
     "request-promise-native": "^1.0.5",
     "sha1": "^1.1.1",
-    "solidity-parser-diligence": "^0.4.17",
     "sync-request": "^6.0.0"
   },
   "devDependencies": {
diff --git a/package-lock.json b/package-lock.json
index 2453aac..1f24c4d 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -912,6 +912,11 @@
       "integrity": "sha512-9NET910DNaIPngYnLLPeg+Ogzqsi9uM4mSboU5y6p8S5DzMTVEsJZrawi+BoDNUVBa2DhJqQYUFvMDfgU062LQ==",
       "dev": true
     },
+    "@solidity-parser/parser": {
+      "version": "0.5.2",
+      "resolved": "https://registry.npmjs.org/@solidity-parser/parser/-/parser-0.5.2.tgz",
+      "integrity": "sha512-uRyvnvVYmgNmTBpWDbBsH/0kPESQhQpEc4KsvMRLVzFJ1o1s0uIv0Y6Y9IB5vI1Dwz2CbS4X/y4Wyw/75cTFnQ=="
+    },
     "@szmarczak/http-timer": {
       "version": "1.1.2",
       "resolved": "https://registry.npmjs.org/@szmarczak/http-timer/-/http-timer-1.1.2.tgz",
@@ -10600,11 +10605,6 @@
       "integrity": "sha512-4jtxasNGmyC0midtjH/lTFPZYvTTUMy6agYcF+HoMnzW8+cqo3piFrINb4ZCzpPW+7tTVFCGa5ubP34zOzeuMg==",
       "dev": true
     },
-    "solidity-parser-diligence": {
-      "version": "0.4.17",
-      "resolved": "https://registry.npmjs.org/solidity-parser-diligence/-/solidity-parser-diligence-0.4.17.tgz",
-      "integrity": "sha512-zEAwnzNytUVVPO+DqlYKQb2i+JiUq2OhQUlaGVYxxa4m2h9zcqQnKsQwmZRgsR7h1G2bc7YR56t5V55M9qlDzg=="
-    },
     "sort-keys": {
       "version": "1.1.2",
       "resolved": "https://registry.npmjs.org/sort-keys/-/sort-keys-1.1.2.tgz",
diff --git a/package.json b/package.json
index e433d7d..7051c0b 100644
--- a/package.json
+++ b/package.json
@@ -35,6 +35,7 @@
   },
   "dependencies": {
     "@ethersproject/abi": "^5.0.0-beta.146",
+    "@solidity-parser/parser": "^0.5.2",
     "cli-table3": "^0.5.0",
     "colors": "^1.1.2",
     "ethereumjs-util": "6.2.0",
@@ -47,7 +48,6 @@
     "request": "^2.88.0",
     "request-promise-native": "^1.0.5",
     "sha1": "^1.1.1",
-    "solidity-parser-diligence": "^0.4.17",
     "sync-request": "^6.0.0"
   },
   "devDependencies": {
diff --git a/scripts/ci.sh b/scripts/ci.sh
index 05e681f..ce1e95c 100755
--- a/scripts/ci.sh
+++ b/scripts/ci.sh
@@ -31,11 +31,11 @@ elif [ "$TEST" = "colony" ]; then
   SLUG="$TRAVIS_REPO_SLUG"
   BRANCH="$TRAVIS_BRANCH"
 
-  if test -z "$TRAVIS_PULL_REQUEST_SLUG"; then
+  if [ -n "$TRAVIS_PULL_REQUEST_SLUG" ]; then
     SLUG="$TRAVIS_PULL_REQUEST_SLUG"
   fi
 
-  if test -z "$TRAVIS_PULL_REQUEST_BRANCH"; then
+  if [ -n "$TRAVIS_PULL_REQUEST_BRANCH" ]; then
     BRANCH="$TRAVIS_PULL_REQUEST_BRANCH"
   fi