diff --git a/.travis.yml b/.travis.yml
index cdf6766096..4eb8148574 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -51,12 +51,10 @@ install:
   - yarn
 
 script:
-  - node_modules/.bin/gulp hygiene
   - node_modules/.bin/gulp electron --silent
   - node_modules/.bin/gulp compile --silent --max_old_space_size=4096
   - node_modules/.bin/gulp optimize-vscode --silent --max_old_space_size=4096
   - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then ./scripts/test.sh --coverage --reporter dot; else ./scripts/test.sh --reporter dot; fi
-  - ./scripts/test-integration.sh
 
 after_success:
   - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then node_modules/.bin/coveralls < .build/coverage/lcov.info; fi
diff --git a/build/yarn.lock b/build/yarn.lock
index 9e7096dbb0..8fe4ca422f 100644
--- a/build/yarn.lock
+++ b/build/yarn.lock
@@ -390,7 +390,7 @@ dashdash@^1.12.0:
   dependencies:
     assert-plus "^1.0.0"
 
-"dataprotocol-client@file:./../dataprotocol-client":
+"dataprotocol-client@file:../dataprotocol-client":
   version "1.0.0"
   dependencies:
     vscode "1.1.5"
@@ -585,7 +585,7 @@ extend@~1.2.1:
 "extensions-modules@file:../extensions-modules":
   version "0.1.0"
   dependencies:
-    dataprotocol-client "file:./../../../../../Users/karlb/AppData/Local/Yarn/cache/v1/dataprotocol-client"
+    dataprotocol-client "file:../../../../Library/Caches/Yarn/v1/dataprotocol-client"
     decompress "^4.2.0"
     fs-extra-promise "^1.0.1"
     http-proxy-agent "^2.0.0"
diff --git a/extensions-modules/yarn.lock b/extensions-modules/yarn.lock
index 05ab7abbb1..22932657f3 100644
--- a/extensions-modules/yarn.lock
+++ b/extensions-modules/yarn.lock
@@ -374,7 +374,7 @@ dashdash@^1.12.0:
   dependencies:
     assert-plus "^1.0.0"
 
-"dataprotocol-client@file:./../dataprotocol-client":
+"dataprotocol-client@file:../dataprotocol-client":
   version "1.0.0"
   dependencies:
     vscode "1.1.5"
diff --git a/extensions/yarn.lock b/extensions/yarn.lock
index 3df7c7ef6c..5a17ecf7f0 100644
--- a/extensions/yarn.lock
+++ b/extensions/yarn.lock
@@ -315,7 +315,7 @@ dashdash@^1.12.0:
   dependencies:
     assert-plus "^1.0.0"
 
-"dataprotocol-client@file:./../dataprotocol-client":
+"dataprotocol-client@file:../dataprotocol-client":
   version "1.0.0"
   dependencies:
     vscode "1.1.5"
@@ -493,7 +493,7 @@ extend@^3.0.0, extend@~3.0.0, extend@~3.0.1:
 "extensions-modules@file:../extensions-modules":
   version "0.1.0"
   dependencies:
-    dataprotocol-client "file:./../../../../../Users/karlb/AppData/Local/Yarn/cache/v1/dataprotocol-client"
+    dataprotocol-client "file:../../../../Library/Caches/Yarn/v1/dataprotocol-client"
     decompress "^4.2.0"
     fs-extra-promise "^1.0.1"
     http-proxy-agent "^2.0.0"
diff --git a/scripts/test.sh b/scripts/test.sh
index d88a28c5e2..e7c9ad1997 100755
--- a/scripts/test.sh
+++ b/scripts/test.sh
@@ -29,9 +29,9 @@ export ELECTRON_ENABLE_LOGGING=1
 if [[ "$OSTYPE" == "darwin"* ]]; then
 	cd $ROOT ; ulimit -n 4096 ; \
 		"$CODE" \
-		test/electron/index.js "$@"
+		node_modules/mocha/bin/_mocha "$@"
 else
 	cd $ROOT ; \
 		"$CODE" \
-		test/electron/index.js "$@"
+		node_modules/mocha/bin/_mocha "$@"
 fi