diff --git a/.snyk b/.snyk
index 30aaa31ef..477760ac9 100644
--- a/.snyk
+++ b/.snyk
@@ -11,7 +11,7 @@ ignore:
   SNYK-GOLANG-GOLANGORGXCRYPTOSSHAGENT-12668891:
     - "*":
         reason: No fix available
-        expires: 2025-10-17T05:18:46.481Z
+        expires: 2025-11-17T05:18:46.481Z
         created: 2025-09-17T05:18:46.483Z
 patch: {}
 exclude:
diff --git a/cmd/kosli/getDeployment_test.go b/cmd/kosli/getDeployment_test.go
index 538678d95..9270c5137 100644
--- a/cmd/kosli/getDeployment_test.go
+++ b/cmd/kosli/getDeployment_test.go
@@ -66,10 +66,10 @@ func (suite *GetDeploymentCommandTestSuite) TestGetDeploymentCmd() {
 				"Usage: kosli get deployment EXPRESSION [flags]\n",
 		},
 		{
-			wantError: true,
-			name:      "get deployment fails when flow does not exist",
-			cmd:       `get deployment foo#1` + suite.defaultKosliArguments,
-			golden:    "Error: Flow named 'foo' does not exist for organization 'docs-cmd-test-user'. \n",
+			wantError:   true,
+			name:        "get deployment fails when flow does not exist",
+			cmd:         `get deployment foo#1` + suite.defaultKosliArguments,
+			goldenRegex: "^Error: Flow named 'foo' does not exist for organization 'docs-cmd-test-user'",
 		},
 		{
 			wantError: true,
diff --git a/cmd/kosli/getEnvironment_test.go b/cmd/kosli/getEnvironment_test.go
index 054572b88..8563b75e3 100644
--- a/cmd/kosli/getEnvironment_test.go
+++ b/cmd/kosli/getEnvironment_test.go
@@ -44,10 +44,10 @@ func (suite *GetEnvironmentCommandTestSuite) TestGetEnvironmentCmd() {
 			golden:    "",
 		},
 		{
-			wantError: true,
-			name:      "trying to get non-existing env fails",
-			cmd:       "get environment non-existing" + suite.defaultKosliArguments,
-			golden:    "Error: Environment named 'non-existing' does not exist for organization 'docs-cmd-test-user'. \n",
+			wantError:   true,
+			name:        "trying to get non-existing env fails",
+			cmd:         "get environment non-existing" + suite.defaultKosliArguments,
+			goldenRegex: "^Error: Environment named 'non-existing' does not exist for organization 'docs-cmd-test-user'",
 		},
 		{
 			wantError: true,
diff --git a/cmd/kosli/listDeployments_test.go b/cmd/kosli/listDeployments_test.go
index a401d7ee9..1b820ca01 100644
--- a/cmd/kosli/listDeployments_test.go
+++ b/cmd/kosli/listDeployments_test.go
@@ -56,10 +56,10 @@ func (suite *ListDeploymentsCommandTestSuite) TestListDeploymentsCmd() {
 			golden:    "Error: required flag(s) \"flow\" not set\n",
 		},
 		{
-			wantError: true,
-			name:      "non-existing flow causes an error",
-			cmd:       fmt.Sprintf(`list deployments --flow non-existing %s`, suite.defaultKosliArguments),
-			golden:    "Error: Flow named 'non-existing' does not exist for organization 'docs-cmd-test-user'\n",
+			wantError:   true,
+			name:        "non-existing flow causes an error",
+			cmd:         fmt.Sprintf(`list deployments --flow non-existing %s`, suite.defaultKosliArguments),
+			goldenRegex: "^Error: Flow named 'non-existing' does not exist for organization 'docs-cmd-test-user'",
 		},
 		// TODO: the correct error is overwritten by the hack flag value check in root.go
 		{
@@ -91,9 +91,9 @@ func (suite *ListDeploymentsCommandTestSuite) TestListDeploymentsCmd() {
 			golden: "No deployments were found at page number 2.\n",
 		},
 		{
-			name:   "listing deployments on an empty flow with --output json works",
-			cmd:    fmt.Sprintf(`list deployments --flow %s --output json %s`, suite.flowName1, suite.defaultKosliArguments),
-			golden: "[]\n",
+			name:       "listing deployments on an empty flow with --output json works",
+			cmd:        fmt.Sprintf(`list deployments --flow %s --output json %s`, suite.flowName1, suite.defaultKosliArguments),
+			goldenJson: []jsonCheck{{"", "[]"}},
 		},
 		{
 			name:       "listing deployments on a flow works",