diff --git a/spec/libsass-todo-issues/issue_2156/debug/error b/spec/libsass-todo-issues/issue_2156/debug/error
new file mode 100644
index 0000000000..e0d081a9d2
--- /dev/null
+++ b/spec/libsass-todo-issues/issue_2156/debug/error
@@ -0,0 +1,5 @@
+/sass/spec/libsass-issues/issue_2156/input.scss:1 DEBUG: "foo"
+/sass/spec/libsass-issues/issue_2156/input.scss:2 DEBUG: "foo"
+/sass/spec/libsass-issues/issue_2156/input.scss:3 DEBUG: "foo
+/sass/spec/libsass-issues/issue_2156/input.scss:4 DEBUG: "foo"bar
+/sass/spec/libsass-issues/issue_2156/input.scss:5 DEBUG: "foo" and "bar"
diff --git a/spec/libsass-todo-issues/issue_2156/debug/expected_output.css b/spec/libsass-todo-issues/issue_2156/debug/expected_output.css
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/spec/libsass-todo-issues/issue_2156/debug/input.scss b/spec/libsass-todo-issues/issue_2156/debug/input.scss
new file mode 100644
index 0000000000..660ca574a6
--- /dev/null
+++ b/spec/libsass-todo-issues/issue_2156/debug/input.scss
@@ -0,0 +1,5 @@
+@debug "\"foo\"" + "";
+@debug "" + "\"foo\"";
+@debug "" + "\"foo";
+@debug "\"foo\"" + "bar";
+@debug unquote("\"foo\" and \"bar\"");
diff --git a/spec/libsass-todo-issues/issue_2156/error/error b/spec/libsass-todo-issues/issue_2156/error/error
new file mode 100644
index 0000000000..387b9c9521
--- /dev/null
+++ b/spec/libsass-todo-issues/issue_2156/error/error
@@ -0,0 +1,3 @@
+Error: "foo" and "bar"
+        on line 1 of /sass/spec/libsass-issues/issue_2156/input.scss
+  Use --trace for backtrace.
diff --git a/spec/libsass-todo-issues/issue_2156/error/expected_output.css b/spec/libsass-todo-issues/issue_2156/error/expected_output.css
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/spec/libsass-todo-issues/issue_2156/error/input.scss b/spec/libsass-todo-issues/issue_2156/error/input.scss
new file mode 100644
index 0000000000..3345307182
--- /dev/null
+++ b/spec/libsass-todo-issues/issue_2156/error/input.scss
@@ -0,0 +1 @@
+@error unquote("\"foo\" and \"bar\"");
diff --git a/spec/libsass-todo-issues/issue_2156/error/status b/spec/libsass-todo-issues/issue_2156/error/status
new file mode 100644
index 0000000000..b44fe09a7a
--- /dev/null
+++ b/spec/libsass-todo-issues/issue_2156/error/status
@@ -0,0 +1 @@
+65
\ No newline at end of file
diff --git a/spec/libsass-todo-issues/issue_2156/warn/error b/spec/libsass-todo-issues/issue_2156/warn/error
new file mode 100644
index 0000000000..d9b833e1d2
--- /dev/null
+++ b/spec/libsass-todo-issues/issue_2156/warn/error
@@ -0,0 +1,14 @@
+WARNING: "foo"
+         on line 7 of /sass/spec/libsass-issues/issue_2156/input.scss
+
+WARNING: "foo"
+         on line 8 of /sass/spec/libsass-issues/issue_2156/input.scss
+
+WARNING: "foo
+         on line 9 of /sass/spec/libsass-issues/issue_2156/input.scss
+
+WARNING: "foo"bar
+         on line 10 of /sass/spec/libsass-issues/issue_2156/input.scss
+
+WARNING: "foo" and "bar"
+         on line 11 of /sass/spec/libsass-issues/issue_2156/input.scss
diff --git a/spec/libsass-todo-issues/issue_2156/warn/expected_output.css b/spec/libsass-todo-issues/issue_2156/warn/expected_output.css
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/spec/libsass-todo-issues/issue_2156/warn/input.scss b/spec/libsass-todo-issues/issue_2156/warn/input.scss
new file mode 100644
index 0000000000..72f2722537
--- /dev/null
+++ b/spec/libsass-todo-issues/issue_2156/warn/input.scss
@@ -0,0 +1,5 @@
+@warn "\"foo\"" + "";
+@warn "" + "\"foo\"";
+@warn "" + "\"foo";
+@warn "\"foo\"" + "bar";
+@warn unquote("\"foo\" and \"bar\"");