diff --git a/spec/libsass-todo-issues/issue_1233/expected_output.css b/spec/libsass-closed-issues/issue_1233/expected_output.css
similarity index 100%
rename from spec/libsass-todo-issues/issue_1233/expected_output.css
rename to spec/libsass-closed-issues/issue_1233/expected_output.css
diff --git a/spec/libsass-todo-issues/issue_1233/input.scss b/spec/libsass-closed-issues/issue_1233/input.scss
similarity index 100%
rename from spec/libsass-todo-issues/issue_1233/input.scss
rename to spec/libsass-closed-issues/issue_1233/input.scss
diff --git a/spec/libsass-todo-issues/issue_1583/expected_output.css b/spec/libsass-closed-issues/issue_1583/expected_output.css
similarity index 100%
rename from spec/libsass-todo-issues/issue_1583/expected_output.css
rename to spec/libsass-closed-issues/issue_1583/expected_output.css
diff --git a/spec/libsass-todo-issues/issue_1583/input.scss b/spec/libsass-closed-issues/issue_1583/input.scss
similarity index 100%
rename from spec/libsass-todo-issues/issue_1583/input.scss
rename to spec/libsass-closed-issues/issue_1583/input.scss
diff --git a/spec/libsass-todo-issues/issue_1960/expected_output.css b/spec/libsass-closed-issues/issue_1960/expected_output.css
similarity index 100%
rename from spec/libsass-todo-issues/issue_1960/expected_output.css
rename to spec/libsass-closed-issues/issue_1960/expected_output.css
diff --git a/spec/libsass-todo-issues/issue_1960/input.scss b/spec/libsass-closed-issues/issue_1960/input.scss
similarity index 100%
rename from spec/libsass-todo-issues/issue_1960/input.scss
rename to spec/libsass-closed-issues/issue_1960/input.scss
diff --git a/spec/libsass-todo-issues/issue_2017/expected_output.css b/spec/libsass-closed-issues/issue_2017/expected_output.css
similarity index 100%
rename from spec/libsass-todo-issues/issue_2017/expected_output.css
rename to spec/libsass-closed-issues/issue_2017/expected_output.css
diff --git a/spec/libsass-todo-issues/issue_2017/input.scss b/spec/libsass-closed-issues/issue_2017/input.scss
similarity index 100%
rename from spec/libsass-todo-issues/issue_2017/input.scss
rename to spec/libsass-closed-issues/issue_2017/input.scss
diff --git a/spec/libsass-todo-issues/issue_1583/options.yml b/spec/libsass-todo-issues/issue_1583/options.yml
deleted file mode 100644
index 32792ae3c6..0000000000
--- a/spec/libsass-todo-issues/issue_1583/options.yml
+++ /dev/null
@@ -1,3 +0,0 @@
----
-:todo:
-- libsass
diff --git a/spec/libsass-todo-tests/libsass/moz-document/basic/expected_output.css b/spec/libsass/moz-document/basic/expected_output.css
similarity index 100%
rename from spec/libsass-todo-tests/libsass/moz-document/basic/expected_output.css
rename to spec/libsass/moz-document/basic/expected_output.css
diff --git a/spec/libsass-todo-tests/libsass/moz-document/basic/input.scss b/spec/libsass/moz-document/basic/input.scss
similarity index 100%
rename from spec/libsass-todo-tests/libsass/moz-document/basic/input.scss
rename to spec/libsass/moz-document/basic/input.scss
diff --git a/spec/libsass-todo-tests/libsass/moz-document/interpolated/expected_output.css b/spec/libsass/moz-document/interpolated/expected_output.css
similarity index 100%
rename from spec/libsass-todo-tests/libsass/moz-document/interpolated/expected_output.css
rename to spec/libsass/moz-document/interpolated/expected_output.css
diff --git a/spec/libsass-todo-tests/libsass/moz-document/interpolated/input.scss b/spec/libsass/moz-document/interpolated/input.scss
similarity index 100%
rename from spec/libsass-todo-tests/libsass/moz-document/interpolated/input.scss
rename to spec/libsass/moz-document/interpolated/input.scss
diff --git a/spec/output_styles/compact/libsass-closed-issues/issue_1583/options.yml b/spec/output_styles/compact/libsass-closed-issues/issue_1583/options.yml
deleted file mode 100644
index 32792ae3c6..0000000000
--- a/spec/output_styles/compact/libsass-closed-issues/issue_1583/options.yml
+++ /dev/null
@@ -1,3 +0,0 @@
----
-:todo:
-- libsass
diff --git a/spec/output_styles/compressed/libsass-closed-issues/issue_1583/options.yml b/spec/output_styles/compressed/libsass-closed-issues/issue_1583/options.yml
deleted file mode 100644
index 32792ae3c6..0000000000
--- a/spec/output_styles/compressed/libsass-closed-issues/issue_1583/options.yml
+++ /dev/null
@@ -1,3 +0,0 @@
----
-:todo:
-- libsass
diff --git a/spec/output_styles/expanded/libsass-closed-issues/issue_1583/options.yml b/spec/output_styles/expanded/libsass-closed-issues/issue_1583/options.yml
deleted file mode 100644
index 32792ae3c6..0000000000
--- a/spec/output_styles/expanded/libsass-closed-issues/issue_1583/options.yml
+++ /dev/null
@@ -1,3 +0,0 @@
----
-:todo:
-- libsass
diff --git a/spec/libsass-todo-tests/scss-tests/127_test_moz_document_interpolation/expected_output.css b/spec/scss-tests/127_test_moz_document_interpolation/expected_output.css
similarity index 100%
rename from spec/libsass-todo-tests/scss-tests/127_test_moz_document_interpolation/expected_output.css
rename to spec/scss-tests/127_test_moz_document_interpolation/expected_output.css
diff --git a/spec/libsass-todo-tests/scss-tests/127_test_moz_document_interpolation/input.scss b/spec/scss-tests/127_test_moz_document_interpolation/input.scss
similarity index 100%
rename from spec/libsass-todo-tests/scss-tests/127_test_moz_document_interpolation/input.scss
rename to spec/scss-tests/127_test_moz_document_interpolation/input.scss