2 files changed, 3 insertions, 3 deletions

diff --git a/scripts/setup/cli.sh b/scripts/setup/cli.sh
index 94ca3c441..9808868d3 100755
--- a/scripts/setup/cli.sh
+++ b/scripts/setup/cli.sh
@@ -13,4 +13,4 @@ rm -rf ./dist/server/tools/
 
 npm run tsc -- --build ./server/tools/tsconfig.json
 
-cp -r "./server/tools/node_modules" "./dist/server/tools"
+mv "./server/tools/node_modules" "./dist/server/tools"
diff --git a/scripts/travis.sh b/scripts/travis.sh
index 454ac5e14..664d9fd6c 100755
--- a/scripts/travis.sh
+++ b/scripts/travis.sh
@@ -17,6 +17,7 @@ if [ "$1" = "misc" ]; then
         server/tests/helpers/index.ts
 elif [ "$1" = "cli" ]; then
     npm run build:server
+    CC=gcc-4.9 CXX=g++-4.9 npm run setup:cli
     mocha --timeout 5000 --exit --require ts-node/register --bail server/tests/cli/index.ts
 elif [ "$1" = "api-1" ]; then
     npm run build:server
@@ -28,8 +29,7 @@ elif [ "$1" = "api-3" ]; then
     npm run build:server
     sh ./server/tests/api/travis-3.sh 2
 elif [ "$1" = "api-4" ]; then
-    npm run setup:cli
-    npm run build-server
+    npm run build:server
     sh ./server/tests/api/travis-4.sh 2
 elif [ "$1" = "lint" ]; then
     npm run tslint -- --project ./tsconfig.json -c ./tslint.json server.ts "server/**/*.ts" "shared/**/*.ts"