diff --git a/test/issue586-subpack-dep.sh b/test/issue586-subpack-dep.sh
index 9afd453..efd42ce 100755
--- a/test/issue586-subpack-dep.sh
+++ b/test/issue586-subpack-dep.sh
@@ -3,6 +3,6 @@
 cd ${CURR_DIR}/issue586-subpack-dep
 rm -rf a/.dub
 rm -rf a/b/.dub
-rm -rf c/.dub
+rm -rf main/.dub
 ${DUB} build --bare --compiler=${COMPILER} main || exit 1
 ${DUB} run --bare --compiler=${COMPILER} main || exit 1
diff --git a/test/issue586-subpack-dep/c/dub.sdl b/test/issue586-subpack-dep/c/dub.sdl
deleted file mode 100644
index 20a711e..0000000
--- a/test/issue586-subpack-dep/c/dub.sdl
+++ /dev/null
@@ -1,3 +0,0 @@
-name "c"
-dependency "a" version="*"
-targetType "executable"
\ No newline at end of file
diff --git a/test/issue586-subpack-dep/c/dub.selections.json b/test/issue586-subpack-dep/c/dub.selections.json
deleted file mode 100644
index 633ce9c..0000000
--- a/test/issue586-subpack-dep/c/dub.selections.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-	"fileVersion": 1,
-	"versions": {
-		"a": "~master"
-	}
-}
diff --git a/test/issue586-subpack-dep/c/source/c.d b/test/issue586-subpack-dep/c/source/c.d
deleted file mode 100644
index 14a3abe..0000000
--- a/test/issue586-subpack-dep/c/source/c.d
+++ /dev/null
@@ -1,8 +0,0 @@
-module c;
-
-import a;
-
-void main()
-{
-	assert(afun() == 3);
-}
diff --git a/test/issue586-subpack-dep/main/dub.sdl b/test/issue586-subpack-dep/main/dub.sdl
new file mode 100644
index 0000000..b5c43c1
--- /dev/null
+++ b/test/issue586-subpack-dep/main/dub.sdl
@@ -0,0 +1,3 @@
+name "main"
+dependency "a" version="*"
+targetType "executable"
\ No newline at end of file
diff --git a/test/issue586-subpack-dep/main/dub.selections.json b/test/issue586-subpack-dep/main/dub.selections.json
new file mode 100644
index 0000000..633ce9c
--- /dev/null
+++ b/test/issue586-subpack-dep/main/dub.selections.json
@@ -0,0 +1,6 @@
+{
+	"fileVersion": 1,
+	"versions": {
+		"a": "~master"
+	}
+}
diff --git a/test/issue586-subpack-dep/main/source/c.d b/test/issue586-subpack-dep/main/source/c.d
new file mode 100644
index 0000000..14a3abe
--- /dev/null
+++ b/test/issue586-subpack-dep/main/source/c.d
@@ -0,0 +1,8 @@
+module c;
+
+import a;
+
+void main()
+{
+	assert(afun() == 3);
+}