diff --git a/packages/spacebars/spacebars.js b/packages/spacebars/spacebars.js
index 3b2e2a1f69..922d4fb49a 100644
--- a/packages/spacebars/spacebars.js
+++ b/packages/spacebars/spacebars.js
@@ -925,7 +925,7 @@ Spacebars.compile = function (inputString, options) {
        (funcInfo.usedSelf ?
         '\n' + indent + 'var self = this;' : '') +
        '\n' + indent + 'buf.write(' +
-       renderables.join(',\n' + indent) + ');\n' +
+       renderables.join(',\n' + indent + '  ') + ');\n' +
        oldIndent : '') + '}';
   };
 
diff --git a/packages/spacebars/spacebars_tests.js b/packages/spacebars/spacebars_tests.js
index 703a92cbbf..56ff4851d1 100644
--- a/packages/spacebars/spacebars_tests.js
+++ b/packages/spacebars/spacebars_tests.js
@@ -349,22 +349,24 @@ Tinytest.add("spacebars - compiler", function (test) {
   run('abc',
 
       'function (buf) {',
-      '  buf.text("abc");',
+      '  buf.write("abc");',
       '}');
 
   run('<a foo=bar>abc</a>',
 
       'function (buf) {',
-      '  buf.openTag("a", {"foo": "bar"});',
-      '  buf.text("abc");',
-      '  buf.closeTag("a");',
+      '  buf.write("<a",',
+      '    {attrs: {"foo": "bar"}},',
+      '    ">abc</a>");',
       '}');
 
   run('<a foo={{bar}}>',
 
       'function (buf) {',
       '  var self = this;',
-      '  buf.openTag("a", {"foo": function () { return String(Spacebars.call(self.lookup("bar")) || ""); }});',
+      '  buf.write("<a",',
+      '    {attrs: function () { return {"foo": Spacebars.call(self.lookup("bar"))}; }},',
+      '    ">");',
       '}');
 
   run('<a foo={{bar.baz}}>',