diff --git a/spec/css/keyframes.hrx b/spec/css/keyframes.hrx
index 97e61c90fe..7773865def 100644
--- a/spec/css/keyframes.hrx
+++ b/spec/css/keyframes.hrx
@@ -28,6 +28,9 @@ a {
 }
 
 <===> bubble/empty/output.css
+@keyframes { /**/ }
+
+<===> bubble/empty/output-libsass.css
 @keyframes {
   /**/
 }
diff --git a/spec/directives/use/css/order.hrx b/spec/directives/use/css/order.hrx
index 5050569238..668a0cdaa0 100644
--- a/spec/directives/use/css/order.hrx
+++ b/spec/directives/use/css/order.hrx
@@ -451,6 +451,25 @@ a {file: midstream}
 
 <===> import_order/comments_and_imports/output.css
 /* upstream comment before import */
+@import "upstream.css";
+/* midstream comment before use */
+/* midstream comment before first import */
+@import "midstream1.css";
+/* midstream comment before second import */
+@import "midstream2.css";
+/* input comment before use */
+/* input comment before import */
+@import "input.css";
+/* upstream comment after import */
+/* midstream comment after imports */
+a {
+  file: midstream;
+}
+
+/* input comment after import */
+
+<===> import_order/comments_and_imports/output-libsass.css
+/* upstream comment before import */
 
 @import "upstream.css";
 
diff --git a/spec/libsass-closed-issues/issue_1007.hrx b/spec/libsass-closed-issues/issue_1007.hrx
index 626f26132a..05c7e92b41 100644
--- a/spec/libsass-closed-issues/issue_1007.hrx
+++ b/spec/libsass-closed-issues/issue_1007.hrx
@@ -4,6 +4,13 @@
 } /* end */
 <===> output.css
 /* start */
+foo baz {
+  /* before */
+  margin: 0; /* after */
+} /* end */
+
+<===> output-libsass.css
+/* start */
 foo baz {
   /* before */
   margin: 0;
diff --git a/spec/libsass-closed-issues/issue_1294.hrx b/spec/libsass-closed-issues/issue_1294.hrx
index f476603f9a..a4b1af59cd 100644
--- a/spec/libsass-closed-issues/issue_1294.hrx
+++ b/spec/libsass-closed-issues/issue_1294.hrx
@@ -11,6 +11,14 @@ foo {
 /*------------------------------------*\
   #BUTTONS
 \*------------------------------------*/
+foo {
+  display: inline-block; /* [1] */
+}
+
+<===> output-libsass.css
+/*------------------------------------*\
+  #BUTTONS
+\*------------------------------------*/
 foo {
   display: inline-block;
   /* [1] */
diff --git a/spec/libsass-closed-issues/issue_1567.hrx b/spec/libsass-closed-issues/issue_1567.hrx
index 102c18e422..7a3558b321 100644
--- a/spec/libsass-closed-issues/issue_1567.hrx
+++ b/spec/libsass-closed-issues/issue_1567.hrx
@@ -7,6 +7,14 @@
 
 <===> output.css
 /* any */
+@media screen, not print { /* whatever */
+  body {
+    line-height: 1.2;
+  }
+}
+
+<===> output-libsass.css
+/* any */
 @media screen, not print {
   /* whatever */
   body {
diff --git a/spec/libsass-closed-issues/issue_894.hrx b/spec/libsass-closed-issues/issue_894.hrx
index ea458355f0..6e2cddc9a0 100644
--- a/spec/libsass-closed-issues/issue_894.hrx
+++ b/spec/libsass-closed-issues/issue_894.hrx
@@ -2,9 +2,7 @@
 a {/**/}
 b {content: 'something so I have a non-empty expected output'}
 <===> output.css
-a {
-  /**/
-}
+a { /**/ }
 
 b {
   content: "something so I have a non-empty expected output";
diff --git a/spec/libsass-closed-issues/issue_941.hrx b/spec/libsass-closed-issues/issue_941.hrx
index fdcd88e11c..72e49460c7 100644
--- a/spec/libsass-closed-issues/issue_941.hrx
+++ b/spec/libsass-closed-issues/issue_941.hrx
@@ -6,6 +6,12 @@
 
 <===> output.css
 .one,
+.two { /* 3 */
+  color: #F00; /* 4 */
+}
+
+<===> output-libsass.css
+.one,
 .two {
   /* 3 */
   color: #F00;
diff --git a/spec/non_conformant/basic/06_nesting_and_comments.hrx b/spec/non_conformant/basic/06_nesting_and_comments.hrx
index 43ff0fd61a..f7f0680e3f 100644
--- a/spec/non_conformant/basic/06_nesting_and_comments.hrx
+++ b/spec/non_conformant/basic/06_nesting_and_comments.hrx
@@ -25,10 +25,10 @@ div {
       bloo: bloo;
     }
   }
-  p {
+  p { /* comment after open brace goes in */
     padding: 10px 8%;
     -webkit-box-sizing: $blux;
-  }
+  } /* comment after close brace goes out */
   margin: 10px 5px;
   h1 {
     color: $blip;
@@ -36,7 +36,7 @@ div {
 }
 /* last comment, top level again --
    compare the indentation! */
-   
+
 div {
   f: g;
   empty {
@@ -58,6 +58,55 @@ div {
   color: red;
   background: blue;
   /* the next selector should be indented two spaces */
+  /* comment after close brace goes out */
+  margin: 10px 5px;
+}
+div span {
+  font-weight: bold;
+  /* yet another comment that should be preserved */
+  display: inline-block;
+}
+div span a {
+  text-decoration: none; /* where will this comment go? */
+  color: green;
+  /* what about this comment? */
+  border: 1px bloo blee red;
+}
+div empty not_empty {
+  blah: blah;
+  bloo: bloo;
+}
+div p { /* comment after open brace goes in */
+  padding: 10px 8%;
+  -webkit-box-sizing: hux;
+}
+div h1 {
+  color: "a 'red' and \"blue\" value";
+}
+
+/* last comment, top level again --
+   compare the indentation! */
+div {
+  f: g;
+}
+div empty span {
+  a: b;
+}
+div empty_with_comment {
+  /* hey now */
+}
+div empty_with_comment span {
+  c: d;
+}
+
+<===> output-libsass.css
+/* top level comment -- should be preserved */
+div {
+  /* another comment that should be preserved */
+  color: red;
+  background: blue;
+  /* the next selector should be indented two spaces */
+  /* comment after close brace goes out */
   margin: 10px 5px;
 }
 div span {
@@ -77,6 +126,7 @@ div empty not_empty {
   bloo: bloo;
 }
 div p {
+  /* comment after open brace goes in */
   padding: 10px 8%;
   -webkit-box-sizing: hux;
 }