diff --git a/pkg/universe.dagger.io/yarn/test/testdata2/package.json b/pkg/universe.dagger.io/yarn/test/data/bar/package.json
similarity index 100%
rename from pkg/universe.dagger.io/yarn/test/testdata2/package.json
rename to pkg/universe.dagger.io/yarn/test/data/bar/package.json
diff --git a/pkg/universe.dagger.io/yarn/test/testdata/package.json b/pkg/universe.dagger.io/yarn/test/data/foo/package.json
similarity index 100%
rename from pkg/universe.dagger.io/yarn/test/testdata/package.json
rename to pkg/universe.dagger.io/yarn/test/data/foo/package.json
diff --git a/pkg/universe.dagger.io/yarn/test/yarn.bats b/pkg/universe.dagger.io/yarn/test/test.bats
similarity index 54%
rename from pkg/universe.dagger.io/yarn/test/yarn.bats
rename to pkg/universe.dagger.io/yarn/test/test.bats
index 3a6f2c03..3491a2e6 100644
--- a/pkg/universe.dagger.io/yarn/test/yarn.bats
+++ b/pkg/universe.dagger.io/yarn/test/test.bats
@@ -4,6 +4,6 @@ setup() {
     common_setup
 }
 
-@test "yarn.#Build" {
-    dagger up ./yarn-test.cue
+@test "yarn" {
+    dagger up
 }
diff --git a/pkg/universe.dagger.io/yarn/test/yarn-test.cue b/pkg/universe.dagger.io/yarn/test/test.cue
similarity index 91%
rename from pkg/universe.dagger.io/yarn/test/yarn-test.cue
rename to pkg/universe.dagger.io/yarn/test/test.cue
index b33a5a3b..fa5ed054 100644
--- a/pkg/universe.dagger.io/yarn/test/yarn-test.cue
+++ b/pkg/universe.dagger.io/yarn/test/test.cue
@@ -9,12 +9,13 @@ import (
 
 dagger.#Plan & {
 	inputs: directories: {
-		testdata: path:  "./testdata"
-		testdata2: path: "./testdata2"
+		testdata: path:  "./data/foo"
+		testdata2: path: "./data/bar"
 	}
 
 	actions: tests: {
 
+		// Run yarn.#Build
 		simple: {
 			build: yarn.#Build & {
 				source: inputs.directories.testdata.contents