diff --git a/.github/workflows/js-uptodate-check.yml b/.github/workflows/lint-build-test.yml
similarity index 72%
rename from .github/workflows/js-uptodate-check.yml
rename to .github/workflows/lint-build-test.yml
index 6ab118f1e..30e5c9f2f 100644
--- a/.github/workflows/js-uptodate-check.yml
+++ b/.github/workflows/lint-build-test.yml
@@ -1,8 +1,16 @@
-name: "Check generated JavaScript"
+name: "Lint, Build & Test"
 
-on: [pull_request]
+on: [push]
 
 jobs:
+  tslint:
+    runs-on: ubuntu-latest
+
+    steps:
+    - uses: actions/checkout@v1
+    - name: tslint
+      run: npm run-script lint
+
   check-js:
     runs-on: ubuntu-latest
 
@@ -25,3 +33,11 @@ jobs:
           exit 1
         fi
         echo "Success: JavaScript files are up to date"
+
+  npm-test:
+    runs-on: ubuntu-latest
+
+    steps:
+    - uses: actions/checkout@v1
+    - name: npm run-script test
+      run: npm run-script test
\ No newline at end of file
diff --git a/.github/workflows/npm-test.yml b/.github/workflows/npm-test.yml
deleted file mode 100644
index 2407d338e..000000000
--- a/.github/workflows/npm-test.yml
+++ /dev/null
@@ -1,12 +0,0 @@
-name: "npm run-script test"
-
-on: [push]
-
-jobs:
-  npm-test:
-    runs-on: ubuntu-latest
-
-    steps:
-    - uses: actions/checkout@v1
-    - name: npm run-script test
-      run: npm run-script test
diff --git a/.github/workflows/ts-lint.yml b/.github/workflows/ts-lint.yml
deleted file mode 100644
index eaae925b3..000000000
--- a/.github/workflows/ts-lint.yml
+++ /dev/null
@@ -1,12 +0,0 @@
-name: "TSLint"
-
-on: [push]
-
-jobs:
-  tslint:
-    runs-on: ubuntu-latest
-
-    steps:
-    - uses: actions/checkout@v1
-    - name: tslint
-      run: npm run-script lint