diff --git a/package.json b/package.json
index 0d214316..5b41fa7e 100644
--- a/package.json
+++ b/package.json
@@ -33,12 +33,12 @@
     "C++"
   ],
   "activationEvents": [
-    "*",
+    "onLanguage:cpp",
     "onCommand:arduino.verify",
     "onCommand:arduino.upload",
     "onCommand:arduino.cliUpload",
     "onCommand:arduino.uploadUsingProgrammer",
-    "onCommand:arduiono.cliUploadUsingProgrammer",
+    "onCommand:arduino.cliUploadUsingProgrammer",
     "onCommand:arduino.rebuildIntelliSenseConfig",
     "onCommand:arduino.selectProgrammer",
     "onCommand:arduino.selectSerialPort",
diff --git a/test/commands.test.ts b/test/commands.test.ts
index 5f07f069..ddf2e227 100644
--- a/test/commands.test.ts
+++ b/test/commands.test.ts
@@ -13,7 +13,9 @@ suite("Arduino: Commands Tests", () => {
        const extension = vscode.extensions.getExtension("vsciot-vscode.vscode-arduino");
        if (!extension.isActive) {
             extension.activate().then((api) => {
-                done();
+                // The extension waits 100ms before registering some commands,
+                // so add a longer delay here before running tests.
+                setTimeout(() => done(), 200);
             }, () => {
                 done("Failed to activate extension");
             });