diff --git a/.vscode/launch.json b/.vscode/launch.json
index f0d804528f9ab44f58776f500600a1408f79fa5c..8b975f91aed5ca11d5cd06075ca755dbad4a3075 100644
--- a/.vscode/launch.json
+++ b/.vscode/launch.json
@@ -18,6 +18,23 @@
                 }
             ],
             "preLaunchTask": "build"
+        },
+        {
+            "name": "tests",
+            "type": "cppdbg",
+            "request": "launch",
+            "program": "${workspaceFolder}/build/opendht_unit_tests",
+            "cwd": "${workspaceFolder}/build",
+            "environment": [],
+            "MIMode": "gdb",
+            "setupCommands": [
+                {
+                    "description": "Enable pretty-printing for gdb",
+                    "text": "-enable-pretty-printing",
+                    "ignoreFailures": true
+                }
+            ],
+            "preLaunchTask": "build"
         }
     ]
 }
diff --git a/.vscode/tasks.json b/.vscode/tasks.json
index 90624d9fd2fbf493f0d751d032c002028131c195..e8574d91aeaa506ed8bd1088f297e2ac850e6f98 100644
--- a/.vscode/tasks.json
+++ b/.vscode/tasks.json
@@ -23,6 +23,7 @@
                 "-DCMAKE_BUILD_TYPE=Debug",
                 "-DOPENDHT_PROXY_CLIENT=On",
                 "-DOPENDHT_PROXY_SERVER=On",
+                "-DOPENDHT_TESTS=On",
                 "-DOPENDHT_C=On"
             ],
             "dependsOn": "builddir"