diff --git a/src/app/tabs/styles/test-tab-styles.js b/src/app/tabs/styles/test-tab-styles.js
index cc79dc8f18..7a3c663a79 100644
--- a/src/app/tabs/styles/test-tab-styles.js
+++ b/src/app/tabs/styles/test-tab-styles.js
@@ -45,6 +45,8 @@ var css = csjs`
   .buttons {
     ${styles.rightPanel.testTab.box_listTests};
     margin: 2%;
+    display: flex;
+    align-items: center;
   }
   .runButton {
     ${styles.rightPanel.testTab.button_runTests};
@@ -58,6 +60,9 @@ var css = csjs`
     font-weight: bold;
     margin-bottom: 1em;
   }
+  .label {
+    display: flex;
+    align-items: center;
+  }
 `
-
 module.exports = css
diff --git a/src/app/tabs/test-tab.js b/src/app/tabs/test-tab.js
index bb85ba84a2..7aab707694 100644
--- a/src/app/tabs/test-tab.js
+++ b/src/app/tabs/test-tab.js
@@ -101,7 +101,7 @@ module.exports = class TestTab {
 
     self._deps.filePanel.event.register('newTestFileCreated', file => {
       var testList = document.querySelector("[class^='testList']")
-      var test = yo`<label><input onchange=${(e) => toggleCheckbox(e, file)} type="checkbox" checked="true">${file}</label>`
+      var test = yo`<label><input class="singleTest" onchange=${(e) => toggleCheckbox(e, file)} type="checkbox" checked="true">${file}</label>`
       testList.appendChild(test)
       self.data.allTests.push(file)
       self.data.selectedTests.push(file)
@@ -133,13 +133,29 @@ module.exports = class TestTab {
 
     function listTests () {
       var tests = self.data.allTests
-      return tests.map(test => yo`<label><input onchange =${(e) => toggleCheckbox(e, test)} type="checkbox" checked="true">${test} </label>`)
+      return tests.map(test => yo`<label><input class="singleTest" onchange =${(e) => toggleCheckbox(e, test)} type="checkbox" checked="true">${test} </label>`)
     }
 
     function toggleCheckbox (e, test) {
       var selectedTests = self.data.selectedTests
       selectedTests = e.target.checked ? [...selectedTests, test] : selectedTests.filter(el => el !== test)
       self.data.selectedTests = selectedTests
+      var selectAll = document.querySelector('[id="checkAllTests"]')
+      if (e.target.checked) {
+        selectAll.checked = true
+      }
+    }
+
+    function checkAll (event) {
+      var all = self.testList.children
+     
+      var checkBoxes = document.querySelectorAll('input.singleTest')
+      var isAnySelected = document.querySelectorAll('input.singleTest:checked').length != 0
+      // checks/unchecks all
+      checkBoxes.forEach (function(checkBox) {
+        checkBox.checked = !isAnySelected
+      })
+      event.target.checked = !isAnySelected
     }
 
     var runTests = function () {
@@ -182,7 +198,15 @@ module.exports = class TestTab {
         <div class="${css.tests}">
           ${self.testList}
           <div class=${css.buttons}>
-            <div class=${css.runButton} onclick=${runTests}>Run Tests</div>
+            <div class=${css.runButton}  onclick=${runTests}>Run Tests</div>
+            <label class="${css.label}" for="checkAllTests">
+              <input id="checkAllTests"
+                type="checkbox"
+                onclick="${function (event) { checkAll(event) }}"
+                checked="true"
+              >
+              Check/Uncheck all
+            </label>
           </div>
           ${testsOutput}
           ${testsSummary}