diff --git a/.travis.yml b/.travis.yml
index 758b785d7..f6a58300d 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -2,34 +2,26 @@ language: node_js
 dist: xenial
 cache: yarn
 
+stages:
+  - Static Tests
+  - test
+
+node_js:
+  - 10
+  - 12
+  - 14
+env:
+  - TEST_SUITE=test
+  - TEST_SUITE=test:e2e
+script: "yarn run $TEST_SUITE"
+
 jobs:
   include:
     - stage: Static Tests
       name: eslint
-      node_js:
-        - 10
       script:
-        - yarn run eslint
+        - yarn run lint
     - name: ShellCheck
       script:
         - shellcheck bin/heroku bin/setup
       language: generic
-    - name: json-lint
-      addons:
-        apt:
-          packages:
-          - jq
-      script:
-        - yarn run jsonlint
-      language: generic
-    - stage: Dynamic Tests
-      name: Node.js 10
-      node_js:
-        - 10
-      script:
-        - yarn run mocha-suite
-    - name: Node.js 12
-      node_js:
-        - 12
-      script:
-        - yarn run mocha-suite
diff --git a/package.json b/package.json
index 113b00c18..41bb7c760 100644
--- a/package.json
+++ b/package.json
@@ -13,7 +13,8 @@
     "start:dev": "nest start --watch",
     "start:debug": "nest start --debug --watch",
     "start:prod": "node dist/main",
-    "lint": "eslint \"{src,apps,libs,test}/**/*.ts\" --fix",
+    "lint": "eslint \"{src,apps,libs,test}/**/*.ts\"",
+    "lint:fix": "eslint \"{src,apps,libs,test}/**/*.ts\" --fix",
     "test": "jest",
     "test:watch": "jest --watch",
     "test:cov": "jest --coverage",