diff --git a/pkg/libdevfile/testdata/child-devfile-commands-only.yaml b/pkg/libdevfile/testdata/child-devfile-commands-only.yaml
index 06f503bb3fc..294786f9af4 100644
--- a/pkg/libdevfile/testdata/child-devfile-commands-only.yaml
+++ b/pkg/libdevfile/testdata/child-devfile-commands-only.yaml
@@ -2,7 +2,7 @@ schemaVersion: 2.1.0
 metadata:
   name: child
 parent:
-  uri: parent/parent-devfile-components-only.yaml
+  uri: parent/components-only/parent-devfile-components-only.yaml
 commands:
 - exec:
     commandLine: GOCACHE=${PROJECT_SOURCE}/.cache go build main.go
diff --git a/pkg/libdevfile/testdata/child-devfile-complete.yaml b/pkg/libdevfile/testdata/child-devfile-complete.yaml
index 54f9c873278..c4a6b0bf18c 100644
--- a/pkg/libdevfile/testdata/child-devfile-complete.yaml
+++ b/pkg/libdevfile/testdata/child-devfile-complete.yaml
@@ -31,4 +31,4 @@ metadata:
   name: my-go-app
 schemaVersion: 2.1.0
 parent:
-  uri: parent/parent-devfile-empty.yaml
+  uri: parent/empty/parent-devfile-empty.yaml
diff --git a/pkg/libdevfile/testdata/child-devfile-components-only.yaml b/pkg/libdevfile/testdata/child-devfile-components-only.yaml
index fcc0bcd2231..3e7227b129c 100644
--- a/pkg/libdevfile/testdata/child-devfile-components-only.yaml
+++ b/pkg/libdevfile/testdata/child-devfile-components-only.yaml
@@ -2,7 +2,7 @@ schemaVersion: 2.1.0
 metadata:
   name: child
 parent:
-  uri: "parent/parent-devfile-commands-only.yaml"
+  uri: "parent/commands-only/parent-devfile-commands-only.yaml"
 components:
 - container:
     endpoints:
diff --git a/pkg/libdevfile/testdata/child-devfile.yaml b/pkg/libdevfile/testdata/child-devfile.yaml
index 30d8df54325..8153a5d1248 100644
--- a/pkg/libdevfile/testdata/child-devfile.yaml
+++ b/pkg/libdevfile/testdata/child-devfile.yaml
@@ -2,4 +2,4 @@ schemaVersion: 2.1.0
 metadata:
   name: child
 parent:
-  uri: "parent/parent-devfile.yaml"
\ No newline at end of file
+  uri: "parent/complete/parent-devfile.yaml"
\ No newline at end of file
diff --git a/pkg/libdevfile/testdata/parent/parent-devfile-commands-only.yaml b/pkg/libdevfile/testdata/parent/commands-only/parent-devfile-commands-only.yaml
similarity index 100%
rename from pkg/libdevfile/testdata/parent/parent-devfile-commands-only.yaml
rename to pkg/libdevfile/testdata/parent/commands-only/parent-devfile-commands-only.yaml
diff --git a/pkg/libdevfile/testdata/parent/parent-devfile.yaml b/pkg/libdevfile/testdata/parent/complete/parent-devfile.yaml
similarity index 100%
rename from pkg/libdevfile/testdata/parent/parent-devfile.yaml
rename to pkg/libdevfile/testdata/parent/complete/parent-devfile.yaml
diff --git a/pkg/libdevfile/testdata/parent/parent-devfile-components-only.yaml b/pkg/libdevfile/testdata/parent/components-only/parent-devfile-components-only.yaml
similarity index 100%
rename from pkg/libdevfile/testdata/parent/parent-devfile-components-only.yaml
rename to pkg/libdevfile/testdata/parent/components-only/parent-devfile-components-only.yaml
diff --git a/pkg/libdevfile/testdata/parent/parent-devfile-empty.yaml b/pkg/libdevfile/testdata/parent/empty/parent-devfile-empty.yaml
similarity index 100%
rename from pkg/libdevfile/testdata/parent/parent-devfile-empty.yaml
rename to pkg/libdevfile/testdata/parent/empty/parent-devfile-empty.yaml
diff --git a/pkg/libdevfile/uris_test.go b/pkg/libdevfile/uris_test.go
index 3ff7b1ab4c9..2b535de2be6 100644
--- a/pkg/libdevfile/uris_test.go
+++ b/pkg/libdevfile/uris_test.go
@@ -294,7 +294,7 @@ func TestGetReferencedLocalFiles(t *testing.T) {
 			},
 			wantResult: []string{
 				"manifest.yaml", // TODO should be parent/manifest.yaml (see https://github.com/devfile/api/issues/904)
-				"parent/parent-devfile.yaml",
+				"parent/complete/parent-devfile.yaml",
 			},
 			wantErr: false,
 		},
@@ -311,7 +311,7 @@ func TestGetReferencedLocalFiles(t *testing.T) {
 			},
 			wantResult: []string{
 				"manifest.yaml", // TODO should be parent/manifest.yaml (see https://github.com/devfile/api/issues/904)
-				"parent/parent-devfile-commands-only.yaml",
+				"parent/commands-only/parent-devfile-commands-only.yaml",
 			},
 			wantErr: false,
 		},
@@ -328,7 +328,7 @@ func TestGetReferencedLocalFiles(t *testing.T) {
 			},
 			wantResult: []string{
 				"manifest.yaml", // TODO should be parent/manifest.yaml (see https://github.com/devfile/api/issues/904)
-				"parent/parent-devfile-components-only.yaml",
+				"parent/components-only/parent-devfile-components-only.yaml",
 			},
 			wantErr: false,
 		},