diff --git a/.vscode/launch.json b/.vscode/launch.json
index 68b50fad0a..7d7cef13d8 100644
--- a/.vscode/launch.json
+++ b/.vscode/launch.json
@@ -34,8 +34,24 @@
             "name": "Integration Tests",
             "type": "node",
             "request": "launch",
-            "console": "externalTerminal",
-            "runtimeArgs": ["${workspaceRoot}/node_modules/.bin/jest", "--runInBand", "integration"],
+            "console": "integratedTerminal",
+            "runtimeArgs": [
+                "${workspaceFolder}/node_modules/.bin/jest",
+                "--runInBand",
+                "integration"
+            ],
         },
+        {
+            "name": "Unit Tests",
+            "type": "node",
+            "request": "launch",
+            "internalConsoleOptions": "openOnSessionStart",
+            "program": "${workspaceFolder}/node_modules/jest/bin/jest.js",
+            "args": [
+                "--env=jsdom",
+                "-i",
+                "src"
+            ]
+        }
     ],
 }
diff --git a/.vscode/tasks.json b/.vscode/tasks.json
index 9ceaedc70d..03a7b306f7 100644
--- a/.vscode/tasks.json
+++ b/.vscode/tasks.json
@@ -3,25 +3,6 @@
     // for the documentation about the tasks.json format
     "version": "2.0.0",
     "tasks": [
-        {
-            "type": "shell",
-            "label": "dev-server-renderer",
-            "group": "build",
-            "command": "yarn",
-            "args": [
-                "run",
-                "dev:renderer",
-                "&"
-            ],
-            "isBackground": true,
-            "problemMatcher": {
-                "background": {
-                    "activeOnStart": false,
-                    "beginsPattern": "Compiling\\.\\.\\.$",
-                    "endsPattern": "^No issues found\\.$"
-                }
-            }
-        },
         {
             "type": "shell",
             "group": "build",
@@ -30,9 +11,6 @@
                 "debug-build"
             ],
             "problemMatcher": [],
-            // "dependsOn": [
-            //     "dev-server-renderer"
-            // ],
             "label": "compile-dev",
             "detail": "Compiles main and extension types"
         }