diff --git a/cli/test/helper.go b/cli/test/helper.go
index 2d8a907cd..21bd261df 100644
--- a/cli/test/helper.go
+++ b/cli/test/helper.go
@@ -42,8 +42,9 @@ var creds = Credentials{
 func ExecuteCliCommand(command string, args ...string) (string, error) {
 	cmd := exec.Command(command, args...)
 	output, err := cmd.CombinedOutput()
+
 	if err != nil {
-		fmt.Println(fmt.Sprint(err) + ": " + string(output))
+		fmt.Println(fmt.Sprint(err) + ": " + FilterRequestID(strings.TrimSpace(string(output))))
 		return FilterRequestID(strings.TrimSpace(string(output))), err
 	}
 	return FilterRequestID(strings.TrimSpace(string(output))), nil
@@ -70,11 +71,6 @@ func SetupCli() {
 }
 
 func FilterRequestID(input string) string {
-
-	if !strings.Contains(input, "requestId") && !strings.Contains(input, "reqId") {
-		return input
-	}
-
 	// Find the JSON part of the error message
 	start := strings.Index(input, "{")
 	end := strings.LastIndex(input, "}") + 1
diff --git a/cli/test/secrets_test.go b/cli/test/secrets_test.go
index ba7ce7382..2a92c6209 100644
--- a/cli/test/secrets_test.go
+++ b/cli/test/secrets_test.go
@@ -96,7 +96,8 @@ func TestUserAuth_SecretsGetAll(t *testing.T) {
 	// testUserAuth_SecretsGetAllWithoutConnection(t)
 }
 
-func TestUserAuth_SecretsGetAllWithoutConnection(t *testing.T) {
+// disabled for the time being
+func testUserAuth_SecretsGetAllWithoutConnection(t *testing.T) {
 	originalConfigFile, err := util.GetConfigFile()
 	if err != nil {
 		t.Fatalf("error getting config file")