diff --git a/docs/release-notes/release-notes-0.16.0.md b/docs/release-notes/release-notes-0.16.0.md
index da96b8f46..7757b8d47 100644
--- a/docs/release-notes/release-notes-0.16.0.md
+++ b/docs/release-notes/release-notes-0.16.0.md
@@ -228,6 +228,9 @@ data.
 * [Add Custom Message to the fuzz testsuite
 in the lnwire package](https://github.com/lightningnetwork/lnd/pull/7303)
 
+* [Remove non-existent Cleanup calls from etcd test code in the `kvdb` 
+  package](https://github.com/lightningnetwork/lnd/pull/7352)
+
 ## `lncli`
 
 * [Add an `insecure` flag to skip tls auth as well as a `metadata` string slice
diff --git a/kvdb/etcd/db_test.go b/kvdb/etcd/db_test.go
index 2bbd7df5c..59e29fc94 100644
--- a/kvdb/etcd/db_test.go
+++ b/kvdb/etcd/db_test.go
@@ -81,7 +81,6 @@ func TestNewEtcdClient(t *testing.T) {
 	t.Parallel()
 
 	f := NewEtcdTestFixture(t)
-	defer f.Cleanup()
 
 	client, ctx, cancel, err := NewEtcdClient(
 		context.Background(), f.BackendConfig(),
diff --git a/kvdb/etcd_test.go b/kvdb/etcd_test.go
index aae165318..ec8e93f74 100644
--- a/kvdb/etcd_test.go
+++ b/kvdb/etcd_test.go
@@ -158,7 +158,6 @@ func TestEtcd(t *testing.T) {
 				t.Parallel()
 
 				f := etcd.NewEtcdTestFixture(t)
-				defer f.Cleanup()
 
 				test.test(t, f.NewBackend(doRwLock))