diff --git a/.travis.yml b/.travis.yml
index 5194eaa9..eadf2652 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -18,9 +18,3 @@ deploy:
     node: '4'
     tags: true
     repo: thelounge/lounge
-
-script:
-- npm run test:mocha
-- npm run lint:js
-- npm run lint:css
-
diff --git a/appveyor.yml b/appveyor.yml
index cc5c6d78..333c4abf 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -18,9 +18,6 @@ test_script:
   - node --version
   - npm --version
   - npm test
-  - npm run test:mocha
-  - npm run lint:js
-  - npm run lint:css
 
 # cache npm modules
 cache:
diff --git a/package.json b/package.json
index fff69c96..68ab10fd 100644
--- a/package.json
+++ b/package.json
@@ -17,9 +17,9 @@
     "build:font-awesome": "node scripts/build-fontawesome.js",
     "build:grunt": "grunt",
     "build:handlebars": "handlebars client/views/ -e tpl -f client/js/lounge.templates.js",
-    "test": "(npm run test:mocha || true) && npm run lint",
+    "test": "npm-run-all -c test:mocha lint",
     "test:mocha": "mocha -r test/fixtures/env.js test/**/*.js",
-    "lint": "(npm run lint:js || true) && (npm run lint:css || true)",
+    "lint": "npm-run-all -c lint:js lint:css",
     "lint:js": "eslint .",
     "lint:css": "stylelint \"**/*.css\"",
     "prepublish": "npm run build"
@@ -63,6 +63,7 @@
     "grunt-contrib-watch": "1.0.0",
     "handlebars": "4.0.5",
     "mocha": "2.4.5",
+    "npm-run-all": "2.1.1",
     "stylelint": "6.2.2"
   }
 }