diff --git a/.github/workflows/cake-build.yml b/.github/workflows/cake-build.yml
index 09be4b49..00d01cd1 100644
--- a/.github/workflows/cake-build.yml
+++ b/.github/workflows/cake-build.yml
@@ -30,4 +30,9 @@ jobs:
         corepack enable
         corepack install --global pnpm@8.6.7
         dotnet cake
+
+    - name: UI Integration Tests
+      run: |
+        cd src
+        dotnet cake --target Test
         
diff --git a/src/Cody.VisualStudio.Tests/CodyPackageTests.cs b/src/Cody.VisualStudio.Tests/CodyPackageTests.cs
index 448d01a5..cbbc7e4f 100644
--- a/src/Cody.VisualStudio.Tests/CodyPackageTests.cs
+++ b/src/Cody.VisualStudio.Tests/CodyPackageTests.cs
@@ -40,7 +40,8 @@ public async Task CodyToolWindow_Activated()
             var codyPackage = await GetPackageAsync();
 
             // when
-            codyPackage.ShowToolWindow(this, EventArgs.Empty);
+            await codyPackage.ShowToolWindowAsync();
+            await Task.Delay(TimeSpan.FromSeconds(10)); // TODO: waiting for the agent to fully initialize WebView
 
             // then
             Assert.NotNull(codyPackage.MainView);
diff --git a/src/Cody.VisualStudio.Tests/PlaywrightTestsBase.cs b/src/Cody.VisualStudio.Tests/PlaywrightTestsBase.cs
index 6f3173dc..db2a5caa 100644
--- a/src/Cody.VisualStudio.Tests/PlaywrightTestsBase.cs
+++ b/src/Cody.VisualStudio.Tests/PlaywrightTestsBase.cs
@@ -22,7 +22,7 @@ private async Task InitializeAsync()
             CodyPackage = await GetPackageAsync();
             CodyPackage.Logger.Debug("CodyPackage loaded.");
 
-            CodyPackage.ShowToolWindow(this, EventArgs.Empty);
+            await CodyPackage.ShowToolWindowAsync();
             CodyPackage.Logger.Debug("Tool Window activated.");
 
             Playwright = await Microsoft.Playwright.Playwright.CreateAsync();
diff --git a/src/Cody.VisualStudio/CodyPackage.cs b/src/Cody.VisualStudio/CodyPackage.cs
index b5f75d5c..35ff7993 100644
--- a/src/Cody.VisualStudio/CodyPackage.cs
+++ b/src/Cody.VisualStudio/CodyPackage.cs
@@ -135,6 +135,11 @@ private async Task InitOleMenu()
         }
 
         public async void ShowToolWindow(object sender, EventArgs eventArgs)
+        {
+            await ShowToolWindowAsync();
+        }
+
+        public async Task ShowToolWindowAsync()
         {
             try
             {
diff --git a/src/build.cake b/src/build.cake
index bbc1ca57..087d216b 100644
--- a/src/build.cake
+++ b/src/build.cake
@@ -140,10 +140,28 @@ Task("Build")
 	MSBuild("./Cody.sln", new MSBuildSettings
 	{
 		Configuration = configuration,
-		PlatformTarget = PlatformTarget.MSIL
+		PlatformTarget = PlatformTarget.MSIL,
+		Verbosity = Verbosity.Minimal
 	});
 });
 
+Task("Test")
+	.Does(() =>
+{
+	MSBuild("./Cody.sln", new MSBuildSettings
+	{
+		Configuration = "Debug",
+		PlatformTarget = PlatformTarget.MSIL,
+		Verbosity = Verbosity.Minimal
+	});
+
+	DotNetTest("./Cody.VisualStudio.Tests/bin/Debug/Cody.VisualStudio.Tests.dll", new DotNetTestSettings 
+    {
+        NoBuild = true,
+        NoRestore = true
+    });
+});
+
 Task("Restore")
     .Does(() =>
 {
@@ -180,13 +198,6 @@ Task("Clean")
 	//todo
 });
 
-Task("Test")
-	.IsDependentOn("Build")
-	.Does(() =>
-{
-	//todo
-});
-
 //////////////////////////////////////////////////////////////////////
 // EXECUTION
 //////////////////////////////////////////////////////////////////////