diff --git a/bundle/config/mutator/capture_schema_dependency_test.go b/bundle/config/mutator/capture_schema_dependency_test.go
index 0a94e7748..3f7f1ced9 100644
--- a/bundle/config/mutator/capture_schema_dependency_test.go
+++ b/bundle/config/mutator/capture_schema_dependency_test.go
@@ -13,29 +13,11 @@ import (
 	"github.com/stretchr/testify/require"
 )
 
-func TestCaptureSchemaDependencyForVolume(t *testing.T) {
+func TestCaptureSchemaDependencyForVolumeWithEmptySchemas(t *testing.T) {
 	b := &bundle.Bundle{
 		Config: config.Root{
 			Resources: config.Resources{
 				Schemas: map[string]*resources.Schema{
-					"schema1": {
-						CreateSchema: &catalog.CreateSchema{
-							CatalogName: "catalog1",
-							Name:        "foobar",
-						},
-					},
-					"schema2": {
-						CreateSchema: &catalog.CreateSchema{
-							CatalogName: "catalog2",
-							Name:        "foobar",
-						},
-					},
-					"schema3": {
-						CreateSchema: &catalog.CreateSchema{
-							CatalogName: "catalog1",
-							Name:        "barfoo",
-						},
-					},
 					"nilschema":   nil,
 					"emptyschema": {},
 				},
@@ -46,30 +28,6 @@ func TestCaptureSchemaDependencyForVolume(t *testing.T) {
 							SchemaName:  "foobar",
 						},
 					},
-					"volume2": {
-						CreateVolumeRequestContent: &catalog.CreateVolumeRequestContent{
-							CatalogName: "catalog2",
-							SchemaName:  "foobar",
-						},
-					},
-					"volume3": {
-						CreateVolumeRequestContent: &catalog.CreateVolumeRequestContent{
-							CatalogName: "catalog1",
-							SchemaName:  "barfoo",
-						},
-					},
-					"volume4": {
-						CreateVolumeRequestContent: &catalog.CreateVolumeRequestContent{
-							CatalogName: "catalogX",
-							SchemaName:  "foobar",
-						},
-					},
-					"volume5": {
-						CreateVolumeRequestContent: &catalog.CreateVolumeRequestContent{
-							CatalogName: "catalog1",
-							SchemaName:  "schemaX",
-						},
-					},
 					"nilVolume":   nil,
 					"emptyVolume": {},
 				},
@@ -80,39 +38,16 @@ func TestCaptureSchemaDependencyForVolume(t *testing.T) {
 	d := bundle.Apply(context.Background(), b, CaptureSchemaDependency())
 	require.Nil(t, d)
 
-	assert.Equal(t, "${resources.schemas.schema1.name}", b.Config.Resources.Volumes["volume1"].CreateVolumeRequestContent.SchemaName)
-	assert.Equal(t, "${resources.schemas.schema2.name}", b.Config.Resources.Volumes["volume2"].CreateVolumeRequestContent.SchemaName)
-	assert.Equal(t, "${resources.schemas.schema3.name}", b.Config.Resources.Volumes["volume3"].CreateVolumeRequestContent.SchemaName)
-	assert.Equal(t, "foobar", b.Config.Resources.Volumes["volume4"].CreateVolumeRequestContent.SchemaName)
-	assert.Equal(t, "schemaX", b.Config.Resources.Volumes["volume5"].CreateVolumeRequestContent.SchemaName)
-
+	assert.Equal(t, "foobar", b.Config.Resources.Volumes["volume1"].CreateVolumeRequestContent.SchemaName)
 	assert.Nil(t, b.Config.Resources.Volumes["nilVolume"])
 	assert.Nil(t, b.Config.Resources.Volumes["emptyVolume"].CreateVolumeRequestContent)
 }
 
-func TestCaptureSchemaDependencyForPipelinesWithTarget(t *testing.T) {
+func TestCaptureSchemaDependencyForPipelinesWithEmptySchemas(t *testing.T) {
 	b := &bundle.Bundle{
 		Config: config.Root{
 			Resources: config.Resources{
 				Schemas: map[string]*resources.Schema{
-					"schema1": {
-						CreateSchema: &catalog.CreateSchema{
-							CatalogName: "catalog1",
-							Name:        "foobar",
-						},
-					},
-					"schema2": {
-						CreateSchema: &catalog.CreateSchema{
-							CatalogName: "catalog2",
-							Name:        "foobar",
-						},
-					},
-					"schema3": {
-						CreateSchema: &catalog.CreateSchema{
-							CatalogName: "catalog1",
-							Name:        "barfoo",
-						},
-					},
 					"nilschema":   nil,
 					"emptyschema": {},
 				},
@@ -123,43 +58,6 @@ func TestCaptureSchemaDependencyForPipelinesWithTarget(t *testing.T) {
 							Schema:  "foobar",
 						},
 					},
-					"pipeline2": {
-						PipelineSpec: &pipelines.PipelineSpec{
-							Catalog: "catalog2",
-							Schema:  "foobar",
-						},
-					},
-					"pipeline3": {
-						PipelineSpec: &pipelines.PipelineSpec{
-							Catalog: "catalog1",
-							Schema:  "barfoo",
-						},
-					},
-					"pipeline4": {
-						PipelineSpec: &pipelines.PipelineSpec{
-							Catalog: "catalogX",
-							Schema:  "foobar",
-						},
-					},
-					"pipeline5": {
-						PipelineSpec: &pipelines.PipelineSpec{
-							Catalog: "catalog1",
-							Schema:  "schemaX",
-						},
-					},
-					"pipeline6": {
-						PipelineSpec: &pipelines.PipelineSpec{
-							Catalog: "",
-							Schema:  "foobar",
-						},
-					},
-					"pipeline7": {
-						PipelineSpec: &pipelines.PipelineSpec{
-							Catalog: "",
-							Schema:  "",
-							Name:    "whatever",
-						},
-					},
 					"nilPipeline":   nil,
 					"emptyPipeline": {},
 				},
@@ -170,108 +68,7 @@ func TestCaptureSchemaDependencyForPipelinesWithTarget(t *testing.T) {
 	d := bundle.Apply(context.Background(), b, CaptureSchemaDependency())
 	require.Nil(t, d)
 
-	assert.Equal(t, "${resources.schemas.schema1.name}", b.Config.Resources.Pipelines["pipeline1"].Schema)
-	assert.Equal(t, "${resources.schemas.schema2.name}", b.Config.Resources.Pipelines["pipeline2"].Schema)
-	assert.Equal(t, "${resources.schemas.schema3.name}", b.Config.Resources.Pipelines["pipeline3"].Schema)
-	assert.Equal(t, "foobar", b.Config.Resources.Pipelines["pipeline4"].Schema)
-	assert.Equal(t, "schemaX", b.Config.Resources.Pipelines["pipeline5"].Schema)
-	assert.Equal(t, "foobar", b.Config.Resources.Pipelines["pipeline6"].Schema)
-	assert.Equal(t, "", b.Config.Resources.Pipelines["pipeline7"].Schema)
-
+	assert.Equal(t, "foobar", b.Config.Resources.Pipelines["pipeline1"].Schema)
 	assert.Nil(t, b.Config.Resources.Pipelines["nilPipeline"])
 	assert.Nil(t, b.Config.Resources.Pipelines["emptyPipeline"].PipelineSpec)
-
-	for _, k := range []string{"pipeline1", "pipeline2", "pipeline3", "pipeline4", "pipeline5", "pipeline6", "pipeline7"} {
-		assert.Empty(t, b.Config.Resources.Pipelines[k].Target)
-	}
-}
-
-func TestCaptureSchemaDependencyForPipelinesWithSchema(t *testing.T) {
-	b := &bundle.Bundle{
-		Config: config.Root{
-			Resources: config.Resources{
-				Schemas: map[string]*resources.Schema{
-					"schema1": {
-						CreateSchema: &catalog.CreateSchema{
-							CatalogName: "catalog1",
-							Name:        "foobar",
-						},
-					},
-					"schema2": {
-						CreateSchema: &catalog.CreateSchema{
-							CatalogName: "catalog2",
-							Name:        "foobar",
-						},
-					},
-					"schema3": {
-						CreateSchema: &catalog.CreateSchema{
-							CatalogName: "catalog1",
-							Name:        "barfoo",
-						},
-					},
-					"nilschema":   nil,
-					"emptyschema": {},
-				},
-				Pipelines: map[string]*resources.Pipeline{
-					"pipeline1": {
-						PipelineSpec: &pipelines.PipelineSpec{
-							Catalog: "catalog1",
-							Target:  "foobar",
-						},
-					},
-					"pipeline2": {
-						PipelineSpec: &pipelines.PipelineSpec{
-							Catalog: "catalog2",
-							Target:  "foobar",
-						},
-					},
-					"pipeline3": {
-						PipelineSpec: &pipelines.PipelineSpec{
-							Catalog: "catalog1",
-							Target:  "barfoo",
-						},
-					},
-					"pipeline4": {
-						PipelineSpec: &pipelines.PipelineSpec{
-							Catalog: "catalogX",
-							Target:  "foobar",
-						},
-					},
-					"pipeline5": {
-						PipelineSpec: &pipelines.PipelineSpec{
-							Catalog: "catalog1",
-							Target:  "schemaX",
-						},
-					},
-					"pipeline6": {
-						PipelineSpec: &pipelines.PipelineSpec{
-							Catalog: "",
-							Target:  "foobar",
-						},
-					},
-					"pipeline7": {
-						PipelineSpec: &pipelines.PipelineSpec{
-							Catalog: "",
-							Target:  "",
-							Name:    "whatever",
-						},
-					},
-				},
-			},
-		},
-	}
-
-	d := bundle.Apply(context.Background(), b, CaptureSchemaDependency())
-	require.Nil(t, d)
-	assert.Equal(t, "${resources.schemas.schema1.name}", b.Config.Resources.Pipelines["pipeline1"].Target)
-	assert.Equal(t, "${resources.schemas.schema2.name}", b.Config.Resources.Pipelines["pipeline2"].Target)
-	assert.Equal(t, "${resources.schemas.schema3.name}", b.Config.Resources.Pipelines["pipeline3"].Target)
-	assert.Equal(t, "foobar", b.Config.Resources.Pipelines["pipeline4"].Target)
-	assert.Equal(t, "schemaX", b.Config.Resources.Pipelines["pipeline5"].Target)
-	assert.Equal(t, "foobar", b.Config.Resources.Pipelines["pipeline6"].Target)
-	assert.Equal(t, "", b.Config.Resources.Pipelines["pipeline7"].Target)
-
-	for _, k := range []string{"pipeline1", "pipeline2", "pipeline3", "pipeline4", "pipeline5", "pipeline6", "pipeline7"} {
-		assert.Empty(t, b.Config.Resources.Pipelines[k].Schema)
-	}
 }