diff --git a/.travis.yml b/.travis.yml
index e759a30ee7..d745a2e1e5 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -54,8 +54,20 @@ before_install:
 
 script:
   - |
+    # Instal tools
     cd Tools
     npm install
+
+    # Run test units
+    cd CliClient
+    npm install
+    ./run_test.sh
+    testResult=$?
+    if [ $testResult -ne 0 ]; then
+      exit $testResult
+    fi
+
+    # Prepare the Electron app and build it
     cd ../ElectronClient/app
     rsync -aP --delete ../../ReactNativeClient/lib/ lib/
     npm install && USE_HARD_LINKS=false yarn dist
diff --git a/CliClient/run_test.sh b/CliClient/run_test.sh
index dcdf495436..a62369d086 100755
--- a/CliClient/run_test.sh
+++ b/CliClient/run_test.sh
@@ -21,27 +21,27 @@ function finish {
 trap finish EXIT
 
 cd "$ROOT_DIR"
-npm test tests-build/ArrayUtils.js
-npm test tests-build/encryption.js
-npm test tests-build/EnexToMd.js
-npm test tests-build/HtmlToMd.js
-npm test tests-build/markdownUtils.js
-npm test tests-build/models_BaseItem.js
-npm test tests-build/models_Folder.js
-npm test tests-build/models_ItemChange.js
-npm test tests-build/models_Note.js
-npm test tests-build/models_Resource.js
-npm test tests-build/models_Revision.js
-npm test tests-build/models_Setting.js
-npm test tests-build/models_Tag.js
-npm test tests-build/pathUtils.js
-npm test tests-build/services_InteropService.js
-npm test tests-build/services_KvStore.js
-npm test tests-build/services_ResourceService.js
-npm test tests-build/services_rest_Api.js
-npm test tests-build/services_SearchEngine.js
-npm test tests-build/services_Revision.js
-npm test tests-build/StringUtils.js
-npm test tests-build/TaskQueue.js
-npm test tests-build/synchronizer.js
+npm test tests-build/ArrayUtils.js && \
+npm test tests-build/encryption.js && \
+npm test tests-build/EnexToMd.js && \
+npm test tests-build/HtmlToMd.js && \
+npm test tests-build/markdownUtils.js && \
+npm test tests-build/models_BaseItem.js && \
+npm test tests-build/models_Folder.js && \
+npm test tests-build/models_ItemChange.js && \
+npm test tests-build/models_Note.js && \
+npm test tests-build/models_Resource.js && \
+npm test tests-build/models_Revision.js && \
+npm test tests-build/models_Setting.js && \
+npm test tests-build/models_Tag.js && \
+npm test tests-build/pathUtils.js && \
+npm test tests-build/services_InteropService.js && \
+npm test tests-build/services_KvStore.js && \
+npm test tests-build/services_ResourceService.js && \
+npm test tests-build/services_rest_Api.js && \
+npm test tests-build/services_SearchEngine.js && \
+npm test tests-build/services_Revision.js && \
+npm test tests-build/StringUtils.js && \
+npm test tests-build/TaskQueue.js && \
+npm test tests-build/synchronizer.js && \
 npm test tests-build/urlUtils.js
\ No newline at end of file
diff --git a/joplin.code-workspace b/joplin.code-workspace
index 772fe445ed..e66469e31c 100644
--- a/joplin.code-workspace
+++ b/joplin.code-workspace
@@ -45,6 +45,8 @@
 			"CliClient/tests/fuzzing/": true,
 			"CliClient/tests/src/": true,
 			"CliClient/tests/sync/": true,
+			"CliClient/tests/tmp/": true,
+			"CliClient/tests/logs/": true,
 			"Clipper/joplin-webclipper/dist/": true,
 			"Clipper/joplin-webclipper/popup/build/": true,
 			"ElectronClient/app/dist/": true,
@@ -66,7 +68,6 @@
 			"ReactNativeClient/node_modules/": true,
 			"Server/db*.sqlite/": true,
 			"Server/dist/": true,
-			"tests/logs/": true,
 		}
 	},
 }
\ No newline at end of file