diff --git a/.travis.yml b/.travis.yml
index 793855d31..9e6a0af54 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -5,3 +5,7 @@ node_js:
 addons:
     code_climate:
         repo_token: 7454b1a666015e244c384d19f48c34e35d1ae58c3aa428ec542f10bbcb848358
+script:
+    - npm run lint
+    - npm run test
+    - npm run testdapp
diff --git a/package.json b/package.json
index 3e4fd0e24..fb163f727 100644
--- a/package.json
+++ b/package.json
@@ -3,7 +3,10 @@
   "version": "2.6.1",
   "description": "Embark is a framework that allows you to easily develop and deploy DApps",
   "scripts": {
-    "test": "./node_modules/.bin/eslint lib/ && mocha test/ --no-timeouts && cd test_app/ && npm install && ../bin/embark test",
+    "lint": "./node_modules/.bin/eslint lib/",
+    "test": "mocha test/ --no-timeouts",
+    "testdapp": "cd test_app/ && npm install && ../bin/embark test",
+    "fulltest": "npm run lint && npm run test && npm run testdapp",
     "prepare": "webpack"
   },
   "bin": {