diff --git a/test/issue361-optional-deps.sh b/test/issue361-optional-deps.sh
new file mode 100755
index 0000000..69b7f0f
--- /dev/null
+++ b/test/issue361-optional-deps.sh
@@ -0,0 +1,26 @@
+#!/bin/sh
+
+cd ${CURR_DIR}/issue361-optional-deps
+rm -rf a/.dub
+rm -rf a/b/.dub
+rm -rf main1/.dub
+rm -rf main2/.dub
+rm -f main1/dub.selections.json
+
+${DUB} build --bare --compiler=${DC} main1 || exit 1
+echo "{" > cmp.tmp
+echo "	\"fileVersion\": 1," >> cmp.tmp
+echo "	\"versions\": {" >> cmp.tmp
+echo "		\"b\": \"~master\"" >> cmp.tmp
+echo "	}" >> cmp.tmp
+echo "}" >> cmp.tmp
+diff cmp.tmp main1/dub.selections.json || exit 1
+
+${DUB} build --bare --compiler=${DC} main2 || exit 1
+echo "{" > cmp.tmp
+echo "	\"fileVersion\": 1," >> cmp.tmp
+echo "	\"versions\": {" >> cmp.tmp
+echo "		\"a\": \"~master\"" >> cmp.tmp
+echo "	}" >> cmp.tmp
+echo "}" >> cmp.tmp
+diff cmp.tmp main2/dub.selections.json || exit 1
diff --git a/test/issue361-optional-deps/.no_build b/test/issue361-optional-deps/.no_build
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/test/issue361-optional-deps/.no_build
diff --git a/test/issue361-optional-deps/a/dub.sdl b/test/issue361-optional-deps/a/dub.sdl
new file mode 100644
index 0000000..5730427
--- /dev/null
+++ b/test/issue361-optional-deps/a/dub.sdl
@@ -0,0 +1 @@
+name "a"
\ No newline at end of file
diff --git a/test/issue361-optional-deps/a/src/a.d b/test/issue361-optional-deps/a/src/a.d
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/test/issue361-optional-deps/a/src/a.d
diff --git a/test/issue361-optional-deps/b/dub.sdl b/test/issue361-optional-deps/b/dub.sdl
new file mode 100644
index 0000000..c37c6fc
--- /dev/null
+++ b/test/issue361-optional-deps/b/dub.sdl
@@ -0,0 +1 @@
+name "b"
\ No newline at end of file
diff --git a/test/issue361-optional-deps/b/src/b.d b/test/issue361-optional-deps/b/src/b.d
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/test/issue361-optional-deps/b/src/b.d
diff --git a/test/issue361-optional-deps/main1/dub.sdl b/test/issue361-optional-deps/main1/dub.sdl
new file mode 100644
index 0000000..49c30d7
--- /dev/null
+++ b/test/issue361-optional-deps/main1/dub.sdl
@@ -0,0 +1,3 @@
+name "main1"
+dependency "a" version="*" optional=true
+dependency "b" version="*" optional=true default=true
\ No newline at end of file
diff --git a/test/issue361-optional-deps/main1/src/main1.d b/test/issue361-optional-deps/main1/src/main1.d
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/test/issue361-optional-deps/main1/src/main1.d
diff --git a/test/issue361-optional-deps/main2/dub.sdl b/test/issue361-optional-deps/main2/dub.sdl
new file mode 100644
index 0000000..d098466
--- /dev/null
+++ b/test/issue361-optional-deps/main2/dub.sdl
@@ -0,0 +1,3 @@
+name "main2"
+dependency "a" version="*" optional=true
+dependency "b" version="*" optional=true default=true
\ No newline at end of file
diff --git a/test/issue361-optional-deps/main2/dub.selections.json b/test/issue361-optional-deps/main2/dub.selections.json
new file mode 100644
index 0000000..633ce9c
--- /dev/null
+++ b/test/issue361-optional-deps/main2/dub.selections.json
@@ -0,0 +1,6 @@
+{
+	"fileVersion": 1,
+	"versions": {
+		"a": "~master"
+	}
+}
diff --git a/test/issue361-optional-deps/main2/src/main2.d b/test/issue361-optional-deps/main2/src/main2.d
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/test/issue361-optional-deps/main2/src/main2.d