diff --git a/base/collection_n1ql_common.go b/base/collection_n1ql_common.go
index fa223ea296..778a538240 100644
--- a/base/collection_n1ql_common.go
+++ b/base/collection_n1ql_common.go
@@ -497,7 +497,6 @@ func (i *gocbRawIterator) Next(ctx context.Context, valuePtr interface{}) bool {
 		return false
 	}
 
-	ctx := context.TODO() // fix in sg-bucket
 	err := JSONUnmarshal(nextBytes, &valuePtr)
 	if err != nil {
 		WarnfCtx(ctx, "Unable to marshal view result row into value: %v", err)
diff --git a/base/config_persistence_test.go b/base/config_persistence_test.go
index e9380fbb1e..78b014d362 100644
--- a/base/config_persistence_test.go
+++ b/base/config_persistence_test.go
@@ -157,7 +157,6 @@ func TestXattrConfigPersistence(t *testing.T) {
 	_, reinsertErr := cp.insertConfig(c, configKey, configBody)
 	require.Equal(t, ErrAlreadyExists, reinsertErr)
 
-	ctx := TestCtx(t)
 	// Retrieve the config, cas should still match insertCas
 	var loadedConfig map[string]interface{}
 	loadCas, loadErr := cp.loadConfig(ctx, c, configKey, &loadedConfig)
diff --git a/db/background_mgr_resync_dcp_test.go b/db/background_mgr_resync_dcp_test.go
index 8b90988359..dc387db993 100644
--- a/db/background_mgr_resync_dcp_test.go
+++ b/db/background_mgr_resync_dcp_test.go
@@ -362,7 +362,7 @@ func TestResyncImportComputeStat(t *testing.T) {
 
 	err = WaitForConditionWithOptions(t, func() bool {
 		var status BackgroundManagerStatus
-		rawStatus, _ := resycMgr.GetStatus()
+		rawStatus, _ := resycMgr.GetStatus(ctx)
 		_ = json.Unmarshal(rawStatus, &status)
 		return status.State == BackgroundProcessStateCompleted
 	}, 200, 200)