diff --git a/compiler/ast/HtmlAttribute/html/generateCode.js b/compiler/ast/HtmlAttribute/html/generateCode.js
index 66a018bd5..6fc97ca63 100644
--- a/compiler/ast/HtmlAttribute/html/generateCode.js
+++ b/compiler/ast/HtmlAttribute/html/generateCode.js
@@ -49,6 +49,7 @@ function flattenAttrConcats(node) {
 
 function generateCodeForExpressionAttr(name, value, escape, codegen) {
     var flattenedConcats = flattenAttrConcats(value);
+
     var hasLiteral = false;
     var builder = codegen.builder;
     var finalNodes = [];
@@ -64,7 +65,7 @@ function generateCodeForExpressionAttr(name, value, escape, codegen) {
 
 
     for (let i=0; i<flattenedConcats.length; i++) {
-        if (flattenedConcats[i].type === 'Literal') {
+        if (flattenedConcats[i].type === 'Literal' || flattenedConcats[i].type === 'AttributePlaceholder') {
             hasLiteral = true;
             break;
         }
@@ -140,4 +141,4 @@ module.exports = function generateCode(node, codegen) {
         // Attribute with no value is a boolean attribute
         return builder.htmlLiteral(' ' + name);
     }
-};
\ No newline at end of file
+};
diff --git a/compiler/ast/HtmlElement/vdom/HtmlElementVDOM.js b/compiler/ast/HtmlElement/vdom/HtmlElementVDOM.js
index 032c4940c..e71c3fa20 100644
--- a/compiler/ast/HtmlElement/vdom/HtmlElementVDOM.js
+++ b/compiler/ast/HtmlElement/vdom/HtmlElementVDOM.js
@@ -65,6 +65,8 @@ class HtmlElementVDOM extends Node {
                     } else if (typeof literalValue === 'number') {
                         value.value = literalValue.toString();
                     }
+                } else if (value.type === 'AttributePlaceholder') {
+                    value = codegen.builder.functionCall(context.helper('str'), [value]);
                 }
 
                 attributesArg[name] = value;
@@ -183,4 +185,4 @@ class HtmlElementVDOM extends Node {
     }
 }
 
-module.exports = HtmlElementVDOM;
\ No newline at end of file
+module.exports = HtmlElementVDOM;
diff --git a/compiler/ast/HtmlElement/vdom/generateCode.js b/compiler/ast/HtmlElement/vdom/generateCode.js
index 34b0ac8b6..030ed7421 100644
--- a/compiler/ast/HtmlElement/vdom/generateCode.js
+++ b/compiler/ast/HtmlElement/vdom/generateCode.js
@@ -85,4 +85,4 @@ module.exports = function(node, codegen, vdomUtil) {
         htmlElVDOM.body = null;
         return [htmlElVDOM].concat(body, new EndElementVDOM());
     }
-};
\ No newline at end of file
+};
diff --git a/test/autotests/compiler/attr-escape/expected.js b/test/autotests/compiler/attr-escape/expected.js
index 563007c79..628a13733 100644
--- a/test/autotests/compiler/attr-escape/expected.js
+++ b/test/autotests/compiler/attr-escape/expected.js
@@ -1,15 +1,15 @@
 var marko_template = module.exports = require("marko/html").t(__filename),
     marko_helpers = require("marko/runtime/html/helpers"),
     marko_classAttr = marko_helpers.ca,
-    marko_attr = marko_helpers.a,
-    marko_escapeXmlAttr = marko_helpers.xa,
-    marko_str = marko_helpers.s;
+    marko_str = marko_helpers.s,
+    marko_escapeXmlAttr = marko_helpers.xa;
 
 function render(data, out) {
   out.w("<div" +
     marko_classAttr(data.className) +
-    marko_attr("class2", data.className, false) +
-    " foo=\"a" +
+    " class2=\"" +
+    marko_str(data.className) +
+    "\" foo=\"a" +
     marko_escapeXmlAttr(data.foo) +
     "b\" bar=\"a " +
     marko_escapeXmlAttr(data.foo) +
diff --git a/test/autotests/render/attr-boolean-placeholder/template.marko b/test/autotests/render/attr-boolean-placeholder/template.marko
index d1b79113f..1d2864d69 100644
--- a/test/autotests/render/attr-boolean-placeholder/template.marko
+++ b/test/autotests/render/attr-boolean-placeholder/template.marko
@@ -1,13 +1,13 @@
-<input type="checkbox" checked="${data.checked}">
+<input type="checkbox" checked=data.checked>
 
 <button disabled>Button</button>
 
 <select>
     <option value="${option.value}"
-        selected="${option.selected}"
+        selected=option.selected
         for(option in data.options)>
 
         ${option.value}
 
     </option>
-</select>
\ No newline at end of file
+</select>
diff --git a/test/autotests/render/attr-empty-dynamic/expected.html b/test/autotests/render/attr-empty-dynamic/expected.html
index b9b0e7fd6..ad73fadb5 100644
--- a/test/autotests/render/attr-empty-dynamic/expected.html
+++ b/test/autotests/render/attr-empty-dynamic/expected.html
@@ -1 +1 @@
-<img alt>
\ No newline at end of file
+<img alt>
diff --git a/test/autotests/render/attr-empty-dynamic/template.marko b/test/autotests/render/attr-empty-dynamic/template.marko
index 577243509..1aeb1e782 100644
--- a/test/autotests/render/attr-empty-dynamic/template.marko
+++ b/test/autotests/render/attr-empty-dynamic/template.marko
@@ -1 +1 @@
-<img alt="${data.myAlt || true}">
\ No newline at end of file
+<img alt=(data.myAlt || true)>
diff --git a/test/autotests/render/attr-value-obj/expected.html b/test/autotests/render/attr-value-obj/expected.html
new file mode 100644
index 000000000..2bd0182a4
--- /dev/null
+++ b/test/autotests/render/attr-value-obj/expected.html
@@ -0,0 +1 @@
+<div data-foo="Frank"></div><div data-foo='{"name":"Frank"}'></div>
diff --git a/test/autotests/render/attr-value-obj/template.marko b/test/autotests/render/attr-value-obj/template.marko
new file mode 100644
index 000000000..e8c860aad
--- /dev/null
+++ b/test/autotests/render/attr-value-obj/template.marko
@@ -0,0 +1,9 @@
+var foo = {
+    name: 'Frank',
+    toString: function() {
+        return this.name;
+    }
+};
+
+<div data-foo="${foo}"/>
+<div data-foo=foo/>
diff --git a/test/autotests/render/attr-value-obj/test.js b/test/autotests/render/attr-value-obj/test.js
new file mode 100644
index 000000000..c4013b344
--- /dev/null
+++ b/test/autotests/render/attr-value-obj/test.js
@@ -0,0 +1 @@
+exports.templateData = {};
diff --git a/test/autotests/render/tabs-tab-new/tags/test-tabs-new/template.marko b/test/autotests/render/tabs-tab-new/tags/test-tabs-new/template.marko
index e6d044728..2937d20c5 100644
--- a/test/autotests/render/tabs-tab-new/tags/test-tabs-new/template.marko
+++ b/test/autotests/render/tabs-tab-new/tags/test-tabs-new/template.marko
@@ -2,15 +2,15 @@
 
 <div class="tabs">
     <ul class="nav nav-tabs">
-        <li class="${tab.liClass}" for(tab in tabs)>
+        <li class=tab.liClass for(tab in tabs)>
             <a href="#${tab.id}" data-toggle="tab">
                 ${tab.title}
             </a>
         </li>
     </ul>
     <div class="tab-content">
-        <div id="${tab.id}" class="${tab.divClass}" for(tab in tabs)>
+        <div id=tab.id class=tab.divClass for(tab in tabs)>
             <invoke tab.renderBody(out) if(tab.renderBody) />
         </div>
     </div>
-</div>
\ No newline at end of file
+</div>
diff --git a/test/autotests/render/tabs-tab/tags/test-tabs/template.marko b/test/autotests/render/tabs-tab/tags/test-tabs/template.marko
index 49e49558a..50e2020f5 100644
--- a/test/autotests/render/tabs-tab/tags/test-tabs/template.marko
+++ b/test/autotests/render/tabs-tab/tags/test-tabs/template.marko
@@ -2,7 +2,7 @@
 
 <div class="tabs">
     <ul class="nav nav-tabs">
-        <li class="${tab.liClass}" for(tab in tabs)>
+        <li class=tab.liClass for(tab in tabs)>
             <a href="#${tab.id}" data-toggle="tab">
                 ${tab.title}
             </a>
@@ -13,4 +13,4 @@
             <invoke tab.renderBody(out) />
         </div>
     </div>
-</div>
\ No newline at end of file
+</div>