diff --git a/server/events/vcs/bitbucketcloud/client_test.go b/server/events/vcs/bitbucketcloud/client_test.go
index e7def22b66..833e022d11 100644
--- a/server/events/vcs/bitbucketcloud/client_test.go
+++ b/server/events/vcs/bitbucketcloud/client_test.go
@@ -6,6 +6,7 @@ import (
 	"net/http/httptest"
 	"os"
 	"path/filepath"
+	"strings"
 	"testing"
 
 	"github.com/runatlantis/atlantis/server/events/models"
@@ -365,3 +366,152 @@ func TestClient_MarkdownPullLink(t *testing.T) {
 	exp := "#1"
 	Equals(t, exp, s)
 }
+
+func TestClient_GetMyUUID(t *testing.T) {
+	json, err := os.ReadFile(filepath.Join("testdata", "user.json"))
+	Ok(t, err)
+
+	testServer := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+		switch r.RequestURI {
+		case "/2.0/user":
+			w.Write([]byte(json)) // nolint: errcheck
+			return
+		default:
+			t.Errorf("got unexpected request at %q", r.RequestURI)
+			http.Error(w, "not found", http.StatusNotFound)
+			return
+		}
+	}))
+	defer testServer.Close()
+
+	client := bitbucketcloud.NewClient(http.DefaultClient, "user", "pass", "runatlantis.io")
+	client.BaseURL = testServer.URL
+	v, _ := client.GetMyUUID()
+	Equals(t, v, "{00000000-0000-0000-0000-000000000001}")
+}
+
+func TestClient_GetComment(t *testing.T) {
+	json, err := os.ReadFile(filepath.Join("testdata", "comments.json"))
+	Ok(t, err)
+
+	testServer := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+		switch r.RequestURI {
+		case "/2.0/repositories/myorg/myrepo/pullrequests/5/comments":
+			w.Write([]byte(json)) // nolint: errcheck
+			return
+		default:
+			t.Errorf("got unexpected request at %q", r.RequestURI)
+			http.Error(w, "not found", http.StatusNotFound)
+			return
+		}
+	}))
+	defer testServer.Close()
+
+	client := bitbucketcloud.NewClient(http.DefaultClient, "user", "pass", "runatlantis.io")
+	client.BaseURL = testServer.URL
+	v, _ := client.GetPullRequestComments(
+		models.Repo{
+			FullName:          "myorg/myrepo",
+			Owner:             "owner",
+			Name:              "myrepo",
+			CloneURL:          "",
+			SanitizedCloneURL: "",
+			VCSHost: models.VCSHost{
+				Type:     models.BitbucketCloud,
+				Hostname: "bitbucket.org",
+			},
+		}, 5)
+
+	Equals(t, len(v), 5)
+	exp := "Plan"
+	Assert(t, strings.Contains(v[1].Content.Raw, exp), "Comment should contain word \"%s\", has \"%s\"", exp, v[1].Content.Raw)
+}
+
+func TestClient_DeleteComment(t *testing.T) {
+	testServer := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+		switch r.RequestURI {
+		case "/2.0/repositories/myorg/myrepo/pullrequests/5/comments/1":
+			w.Write([]byte("")) // nolint: errcheck
+			return
+		default:
+			t.Errorf("got unexpected request at %q", r.RequestURI)
+			http.Error(w, "not found", http.StatusNotFound)
+			return
+		}
+	}))
+	defer testServer.Close()
+
+	client := bitbucketcloud.NewClient(http.DefaultClient, "user", "pass", "runatlantis.io")
+	client.BaseURL = testServer.URL
+	err := client.DeletePullRequestComment(
+		models.Repo{
+			FullName:          "myorg/myrepo",
+			Owner:             "owner",
+			Name:              "myrepo",
+			CloneURL:          "",
+			SanitizedCloneURL: "",
+			VCSHost: models.VCSHost{
+				Type:     models.BitbucketCloud,
+				Hostname: "bitbucket.org",
+			},
+		}, 5, 1)
+	Ok(t, err)
+}
+
+func TestClient_HidePRComments(t *testing.T) {
+	logger := logging.NewNoopLogger(t)
+	comments, err := os.ReadFile(filepath.Join("testdata", "comments.json"))
+	Ok(t, err)
+	json, err := os.ReadFile(filepath.Join("testdata", "user.json"))
+	Ok(t, err)
+
+	called := 0
+
+	testServer := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+		switch r.RequestURI {
+		// we have two comments in the test file
+		// The code is going to delete them all and then create a new one
+		case "/2.0/repositories/myorg/myrepo/pullrequests/5/comments/498931882":
+			w.Write([]byte(""))
+			called += 1
+			return
+			// This is the second one
+		case "/2.0/repositories/myorg/myrepo/pullrequests/5/comments/498931784":
+			w.Write([]byte("")) // nolint: errcheck
+			called += 1
+			return
+		case "/2.0/repositories/myorg/myrepo/pullrequests/5/comments/49893111":
+			Assert(t, r.Method != "DELETE", "Shouldn't delete this one")
+			return
+		case "/2.0/repositories/myorg/myrepo/pullrequests/5/comments":
+			w.Write([]byte(comments)) // nolint: errcheck
+			return
+		case "/2.0/user":
+			w.Write([]byte(json)) // nolint: errcheck
+			return
+		default:
+			t.Errorf("got unexpected request at %q", r.RequestURI)
+			http.Error(w, "not found", http.StatusNotFound)
+			return
+		}
+	}))
+	defer testServer.Close()
+
+	client := bitbucketcloud.NewClient(http.DefaultClient, "user", "pass", "runatlantis.io")
+	client.BaseURL = testServer.URL
+	err = client.HidePrevCommandComments(logger,
+		models.Repo{
+			FullName:          "myorg/myrepo",
+			Owner:             "owner",
+			Name:              "myrepo",
+			CloneURL:          "",
+			SanitizedCloneURL: "",
+			VCSHost: models.VCSHost{
+				Type:     models.BitbucketCloud,
+				Hostname: "bitbucket.org",
+			},
+		}, 5, "plan", "")
+	Ok(t, err)
+	Equals(t, 2, called)
+}
+
diff --git a/server/events/vcs/bitbucketcloud/testdata/comments.json b/server/events/vcs/bitbucketcloud/testdata/comments.json
new file mode 100644
index 0000000000..a697b1ab00
--- /dev/null
+++ b/server/events/vcs/bitbucketcloud/testdata/comments.json
@@ -0,0 +1,272 @@
+{
+  "values": [
+    {
+      "id": 498931784,
+      "created_on": "2024-05-07T12:21:45.858898+00:00",
+      "updated_on": "2024-05-07T12:21:45.859011+00:00",
+      "content": {
+        "type": "rendered",
+        "raw": "atlantis plan",
+        "markup": "markdown",
+        "html": "<p>atlantis plan</p>"
+      },
+      "user": {
+        "display_name": "Ragne",
+        "links": {
+          "self": {
+            "href": "https://api.bitbucket.org/2.0/users/%7B00000000-0000-0000-0000-000000000001%7D"
+          },
+          "avatar": {
+            "href": "https://avatar-management--avatars.us-west-2.prod.public.atl-paas.net/initials/EM-3.png"
+          },
+          "html": {
+            "href": "https://bitbucket.org/%7B00000000-0000-0000-0000-000000000001%7D/"
+          }
+        },
+        "type": "user",
+        "uuid": "{00000000-0000-0000-0000-000000000001}",
+        "account_id": "000000:00000000-0000-0000-0000-000000000001",
+        "nickname": "Ragne"
+      },
+      "deleted": false,
+      "pending": false,
+      "type": "pullrequest_comment",
+      "links": {
+        "self": {
+          "href": "https://api.bitbucket.org/2.0/repositories/myworkspace/myrepo/pullrequests/5/comments/498931784"
+        },
+        "html": {
+          "href": "https://bitbucket.org/myworkspace/myrepo/pull-requests/5/_/diff#comment-498931784"
+        }
+      },
+      "pullrequest": {
+        "type": "pullrequest",
+        "id": 5,
+        "title": "for test",
+        "links": {
+          "self": {
+            "href": "https://api.bitbucket.org/2.0/repositories/myworkspace/myrepo/pullrequests/5"
+          },
+          "html": {
+            "href": "https://bitbucket.org/myworkspace/myrepo/pull-requests/5"
+          }
+        }
+      }
+    },
+    {
+      "id": 498931802,
+      "created_on": "2024-05-07T12:21:48.737851+00:00",
+      "updated_on": "2024-05-07T12:21:48.737927+00:00",
+      "content": {
+        "type": "rendered",
+        "raw": "Ran Plan for 0 projects:",
+        "markup": "markdown",
+        "html": "<p>Ran Plan for 0 projects:</p>"
+      },
+      "user": {
+        "display_name": "bb bot",
+        "links": {
+          "self": {
+            "href": "https://api.bitbucket.org/2.0/users/%7B600000000-0000-0000-0000-000000000000%7D"
+          },
+          "avatar": {
+            "href": "https://secure.gravatar.com/avatar/d5c4bac76953df92f47d1dea43fcdba0?d=https%3A%2F%2Favatar-management--avatars.us-west-2.prod.public.atl-paas.net%2Finitials%2FKB-4.png"
+          },
+          "html": {
+            "href": "https://bitbucket.org/%7B600000000-0000-0000-0000-000000000000%7D/"
+          }
+        },
+        "type": "user",
+        "uuid": "{600000000-0000-0000-0000-000000000000}",
+        "account_id": "00000000-0000-0000-0000-000000000000",
+        "nickname": "bb bot"
+      },
+      "deleted": false,
+      "pending": false,
+      "type": "pullrequest_comment",
+      "links": {
+        "self": {
+          "href": "https://api.bitbucket.org/2.0/repositories/myworkspace/myrepo/pullrequests/5/comments/498931802"
+        },
+        "html": {
+          "href": "https://bitbucket.org/myworkspace/myrepo/pull-requests/5/_/diff#comment-498931802"
+        }
+      },
+      "pullrequest": {
+        "type": "pullrequest",
+        "id": 5,
+        "title": "for test",
+        "links": {
+          "self": {
+            "href": "https://api.bitbucket.org/2.0/repositories/myworkspace/myrepo/pullrequests/5"
+          },
+          "html": {
+            "href": "https://bitbucket.org/myworkspace/myrepo/pull-requests/5"
+          }
+        }
+      }
+    },
+    {
+      "id": 498931882,
+      "created_on": "2024-05-07T12:22:01.870344+00:00",
+      "updated_on": "2024-05-07T12:22:01.870462+00:00",
+      "content": {
+        "type": "rendered",
+        "raw": "atlantis plan",
+        "markup": "markdown",
+        "html": "<p>atlantis plan</p>"
+      },
+      "user": {
+        "display_name": "Ragne",
+        "links": {
+          "self": {
+            "href": "https://api.bitbucket.org/2.0/users/%7B00000000-0000-0000-0000-000000000001%7D"
+          },
+          "avatar": {
+            "href": "https://avatar-management--avatars.us-west-2.prod.public.atl-paas.net/initials/EM-3.png"
+          },
+          "html": {
+            "href": "https://bitbucket.org/%7B00000000-0000-0000-0000-000000000001%7D/"
+          }
+        },
+        "type": "user",
+        "uuid": "{00000000-0000-0000-0000-000000000001}",
+        "account_id": "000000:00000000-0000-0000-0000-000000000001",
+        "nickname": "Ragne"
+      },
+      "deleted": false,
+      "pending": false,
+      "type": "pullrequest_comment",
+      "links": {
+        "self": {
+          "href": "https://api.bitbucket.org/2.0/repositories/myworkspace/myrepo/pullrequests/5/comments/498931882"
+        },
+        "html": {
+          "href": "https://bitbucket.org/myworkspace/myrepo/pull-requests/5/_/diff#comment-498931882"
+        }
+      },
+      "pullrequest": {
+        "type": "pullrequest",
+        "id": 5,
+        "title": "for test",
+        "links": {
+          "self": {
+            "href": "https://api.bitbucket.org/2.0/repositories/myworkspace/myrepo/pullrequests/5"
+          },
+          "html": {
+            "href": "https://bitbucket.org/myworkspace/myrepo/pull-requests/5"
+          }
+        }
+      }
+    },
+    {
+      "id": 498931901,
+      "created_on": "2024-05-07T12:22:04.981415+00:00",
+      "updated_on": "2024-05-07T12:22:04.981490+00:00",
+      "content": {
+        "type": "rendered",
+        "raw": "Ran Plan for 0 projects:",
+        "markup": "markdown",
+        "html": "<p>Ran Plan for 0 projects:</p>"
+      },
+      "user": {
+        "display_name": "bb bot",
+        "links": {
+          "self": {
+            "href": "https://api.bitbucket.org/2.0/users/%7B600000000-0000-0000-0000-000000000000%7D"
+          },
+          "avatar": {
+            "href": "https://secure.gravatar.com/avatar/d5c4bac76953df92f47d1dea43fcdba0?d=https%3A%2F%2Favatar-management--avatars.us-west-2.prod.public.atl-paas.net%2Finitials%2FKB-4.png"
+          },
+          "html": {
+            "href": "https://bitbucket.org/%7B600000000-0000-0000-0000-000000000000%7D/"
+          }
+        },
+        "type": "user",
+        "uuid": "{600000000-0000-0000-0000-000000000000}",
+        "account_id": "00000000-0000-0000-0000-000000000000",
+        "nickname": "bb bot"
+      },
+      "deleted": false,
+      "pending": false,
+      "type": "pullrequest_comment",
+      "links": {
+        "self": {
+          "href": "https://api.bitbucket.org/2.0/repositories/myworkspace/myrepo/pullrequests/5/comments/498931901"
+        },
+        "html": {
+          "href": "https://bitbucket.org/myworkspace/myrepo/pull-requests/5/_/diff#comment-498931901"
+        }
+      },
+      "pullrequest": {
+        "type": "pullrequest",
+        "id": 5,
+        "title": "for test",
+        "links": {
+          "self": {
+            "href": "https://api.bitbucket.org/2.0/repositories/myworkspace/myrepo/pullrequests/5"
+          },
+          "html": {
+            "href": "https://bitbucket.org/myworkspace/myrepo/pull-requests/5"
+          }
+        }
+      }
+    },
+    {
+      "id": 49893111,
+      "created_on": "2024-05-07T12:22:05.981415+00:00",
+      "updated_on": "2024-05-07T12:22:05.981490+00:00",
+      "content": {
+        "type": "rendered",
+        "raw": "Ran Apply for 0 projects:",
+        "markup": "markdown",
+        "html": "<p>Ran Apply for 0 projects:</p>"
+      },
+      "user": {
+        "display_name": "bb bot",
+        "links": {
+          "self": {
+            "href": "https://api.bitbucket.org/2.0/users/%7B600000000-0000-0000-0000-000000000000%7D"
+          },
+          "avatar": {
+            "href": "https://secure.gravatar.com/avatar/d5c4bac76953df92f47d1dea43fcdba0?d=https%3A%2F%2Favatar-management--avatars.us-west-2.prod.public.atl-paas.net%2Finitials%2FKB-4.png"
+          },
+          "html": {
+            "href": "https://bitbucket.org/%7B600000000-0000-0000-0000-000000000000%7D/"
+          }
+        },
+        "type": "user",
+        "uuid": "{600000000-0000-0000-0000-000000000000}",
+        "account_id": "00000000-0000-0000-0000-000000000000",
+        "nickname": "bb bot"
+      },
+      "deleted": false,
+      "pending": false,
+      "type": "pullrequest_comment",
+      "links": {
+        "self": {
+          "href": "https://api.bitbucket.org/2.0/repositories/myworkspace/myrepo/pullrequests/5/comments/498931901"
+        },
+        "html": {
+          "href": "https://bitbucket.org/myworkspace/myrepo/pull-requests/5/_/diff#comment-498931901"
+        }
+      },
+      "pullrequest": {
+        "type": "pullrequest",
+        "id": 5,
+        "title": "for test",
+        "links": {
+          "self": {
+            "href": "https://api.bitbucket.org/2.0/repositories/myworkspace/myrepo/pullrequests/5"
+          },
+          "html": {
+            "href": "https://bitbucket.org/myworkspace/myrepo/pull-requests/5"
+          }
+        }
+      }
+    }
+  ],
+  "pagelen": 10,
+  "size": 4,
+  "page": 1
+}
\ No newline at end of file
diff --git a/server/events/vcs/bitbucketcloud/testdata/user.json b/server/events/vcs/bitbucketcloud/testdata/user.json
new file mode 100644
index 0000000000..336f27832a
--- /dev/null
+++ b/server/events/vcs/bitbucketcloud/testdata/user.json
@@ -0,0 +1,33 @@
+{
+  "display_name": "bb bot",
+  "links": {
+    "self": {
+      "href": "https://api.bitbucket.org/2.0/users/%7B00000000-0000-0000-0000-000000000001%7D"
+    },
+    "avatar": {
+      "href": "https://avatar-management--avatars.us-west-2.prod.public.atl-paas.net/initials/RR-3.png"
+    },
+    "repositories": {
+      "href": "https://api.bitbucket.org/2.0/repositories/%7B00000000-0000-0000-0000-000000000001%7D"
+    },
+    "snippets": {
+      "href": "https://api.bitbucket.org/2.0/snippets/%7B00000000-0000-0000-0000-000000000001%7D"
+    },
+    "html": {
+      "href": "https://bitbucket.org/%7B00000000-0000-0000-0000-000000000001%7D/"
+    },
+    "hooks": {
+      "href": "https://api.bitbucket.org/2.0/workspaces/%7B00000000-0000-0000-0000-000000000001%7D/hooks"
+    }
+  },
+  "created_on": "2024-02-01T12:08:46.355300+00:00",
+  "type": "user",
+  "uuid": "{00000000-0000-0000-0000-000000000001}",
+  "has_2fa_enabled": null,
+  "username": "bb-bot",
+  "is_staff": false,
+  "account_id": "000000:00000000-0000-0000-0000-000000000001",
+  "nickname": "bb bot",
+  "account_status": "active",
+  "location": null
+}