diff --git a/tests/ops/subdir/invalid/path/main.cue b/tests/ops/subdir/invalid/path/main.cue
new file mode 100644
index 00000000..4b61a118
--- /dev/null
+++ b/tests/ops/subdir/invalid/path/main.cue
@@ -0,0 +1,26 @@
+package testing
+
+import "dagger.io/dagger/op"
+
+TestInvalidPathSubdir: {
+	string
+
+	#up: [
+		op.#FetchContainer & {
+			ref: "alpine"
+		},
+		op.#Exec & {
+			args: ["mkdir", "-p", "/tmp/foo"]
+		},
+		op.#Exec & {
+			args: ["sh", "-c", "echo -n world > /tmp/foo/hello"]
+		},
+		op.#Subdir & {
+			dir: "/directorynotfound"
+		},
+		op.#Export & {
+			source: "./hello"
+			format: "string"
+		},
+	]
+}
diff --git a/tests/ops/subdir/valid/container/main.cue b/tests/ops/subdir/valid/container/main.cue
new file mode 100644
index 00000000..13219f2d
--- /dev/null
+++ b/tests/ops/subdir/valid/container/main.cue
@@ -0,0 +1,44 @@
+package testing
+
+import "dagger.io/dagger/op"
+
+#TestContainer: #up: [
+	op.#FetchContainer & {
+		ref: "alpine"
+	},
+	op.#Exec & {
+		args: ["mkdir", "-p", "/tmp/foo"]
+	},
+	op.#Exec & {
+		args: ["sh", "-c", "echo -n world > /tmp/foo/hello"]
+	},
+	op.#Subdir & {
+		dir: "/tmp/foo"
+	},
+]
+
+TestSubdirMount: {
+	string
+
+	#up: [
+		op.#FetchContainer & {
+			ref: "alpine"
+		},
+
+		// Check number of file in /source (should contains only hello)
+		op.#Exec & {
+			args: ["sh", "-c", "test $(ls /source | wc -l) = 1"]
+			mount: "/source": from: #TestContainer
+		},
+
+		op.#Exec & {
+			args: ["sh", "-c", "cat /source/hello > /out"]
+			mount: "/source": from: #TestContainer
+		},
+
+		op.#Export & {
+			source: "/out"
+			format: "string"
+		},
+	]
+}