diff --git a/components/ws-manager/pkg/manager/probe.go b/components/ws-manager/pkg/manager/probe.go
index 557f86783314e0..39fdbfc29aa0d7 100644
--- a/components/ws-manager/pkg/manager/probe.go
+++ b/components/ws-manager/pkg/manager/probe.go
@@ -42,7 +42,7 @@ type WorkspaceReadyProbe struct {
 
 // NewWorkspaceReadyProbe creates a new workspace probe
 func NewWorkspaceReadyProbe(workspaceID string, workspaceURL url.URL) WorkspaceReadyProbe {
-	workspaceURL.Path += "/_supervisor/v1/status/ide/wait/true"
+	workspaceURL.Path += "/_supervisor/v1/status/ide"
 	readyURL := workspaceURL.String()
 
 	return WorkspaceReadyProbe{
diff --git a/test/pkg/integration/integration.go b/test/pkg/integration/integration.go
index 2b3d4fdbd0bf0d..93db6f484387f7 100644
--- a/test/pkg/integration/integration.go
+++ b/test/pkg/integration/integration.go
@@ -308,7 +308,7 @@ func Instrument(component ComponentType, agentName string, namespace string, kub
 	closer = append(closer, func() error {
 		if res != nil {
 			err := res.Call(MethodTestAgentShutdown, new(TestAgentShutdownRequest), new(TestAgentShutdownResponse))
-			if err != nil && strings.Contains(err.Error(), "connection is shut down") {
+			if err != nil && (strings.Contains(err.Error(), "connection is shut down") || strings.Contains(err.Error(), "the client connection is closing")) {
 				return nil
 			}
 
diff --git a/test/tests/components/ws-daemon/cpu_burst_test.go b/test/tests/components/ws-daemon/cpu_burst_test.go
index 0fd743198b30de..16b0944ec62127 100644
--- a/test/tests/components/ws-daemon/cpu_burst_test.go
+++ b/test/tests/components/ws-daemon/cpu_burst_test.go
@@ -26,8 +26,8 @@ import (
 type DaemonConfig struct {
 	CpuLimitConfig struct {
 		Enabled    bool  `json:"enabled"`
-		Limit      int64 `json:"limit,string"`
-		BurstLimit int64 `json:"burstLimit,string"`
+		Limit      int64 `json:"limit"`
+		BurstLimit int64 `json:"burstLimit"`
 	} `json:"cpuLimit"`
 }