diff --git a/test/autotests/codegen/codegen-addStaticVar/expected.js b/test/autotests/codegen/codegen-addStaticVar/expected.js
index b9d865b7d..93943c938 100644
--- a/test/autotests/codegen/codegen-addStaticVar/expected.js
+++ b/test/autotests/codegen/codegen-addStaticVar/expected.js
@@ -2,6 +2,8 @@ var marko_template = module.exports = require("marko/html").t(__filename),
     foo = "Hello World";
 
 function render(input, out) {
+  var data = input;
+
   out.w("<div></div>");
 }
 
diff --git a/test/autotests/codegen/codegen-addVar/expected.js b/test/autotests/codegen/codegen-addVar/expected.js
index 960632212..8768f1757 100644
--- a/test/autotests/codegen/codegen-addVar/expected.js
+++ b/test/autotests/codegen/codegen-addVar/expected.js
@@ -1,6 +1,8 @@
 var marko_template = module.exports = require("marko/html").t(__filename);
 
 function render(input, out) {
+  var data = input;
+
   var foo = "Hello World";
 
   out.w("<div></div>");
diff --git a/test/autotests/codegen/context-addStaticVar-dedupe/expected.js b/test/autotests/codegen/context-addStaticVar-dedupe/expected.js
index b9d865b7d..93943c938 100644
--- a/test/autotests/codegen/context-addStaticVar-dedupe/expected.js
+++ b/test/autotests/codegen/context-addStaticVar-dedupe/expected.js
@@ -2,6 +2,8 @@ var marko_template = module.exports = require("marko/html").t(__filename),
     foo = "Hello World";
 
 function render(input, out) {
+  var data = input;
+
   out.w("<div></div>");
 }
 
diff --git a/test/autotests/codegen/context-addStaticVar/expected.js b/test/autotests/codegen/context-addStaticVar/expected.js
index b9d865b7d..93943c938 100644
--- a/test/autotests/codegen/context-addStaticVar/expected.js
+++ b/test/autotests/codegen/context-addStaticVar/expected.js
@@ -2,6 +2,8 @@ var marko_template = module.exports = require("marko/html").t(__filename),
     foo = "Hello World";
 
 function render(input, out) {
+  var data = input;
+
   out.w("<div></div>");
 }
 
diff --git a/test/autotests/codegen/context-addVar-addStaticVar/expected.js b/test/autotests/codegen/context-addVar-addStaticVar/expected.js
index ebc4b3b2c..039519810 100644
--- a/test/autotests/codegen/context-addVar-addStaticVar/expected.js
+++ b/test/autotests/codegen/context-addVar-addStaticVar/expected.js
@@ -3,6 +3,8 @@ var marko_template = module.exports = require("marko/html").t(__filename),
     barStatic = "Hello Bar";
 
 function render(input, out) {
+  var data = input;
+
   var foo = "Hello Foo",
       bar = "Hello Bar";
 
diff --git a/test/autotests/codegen/context-addVar/expected.js b/test/autotests/codegen/context-addVar/expected.js
index 960632212..8768f1757 100644
--- a/test/autotests/codegen/context-addVar/expected.js
+++ b/test/autotests/codegen/context-addVar/expected.js
@@ -1,6 +1,8 @@
 var marko_template = module.exports = require("marko/html").t(__filename);
 
 function render(input, out) {
+  var data = input;
+
   var foo = "Hello World";
 
   out.w("<div></div>");
diff --git a/test/autotests/codegen/forEach/expected.js b/test/autotests/codegen/forEach/expected.js
index 726dc6be3..052dab10e 100644
--- a/test/autotests/codegen/forEach/expected.js
+++ b/test/autotests/codegen/forEach/expected.js
@@ -4,6 +4,8 @@ var marko_template = module.exports = require("marko/html").t(__filename),
     marko_escapeXml = marko_helpers.x;
 
 function render(input, out) {
+  var data = input;
+
   marko_forEach(data.colors, function(color) {
     out.w(marko_escapeXml(color));
   });
diff --git a/test/autotests/codegen/forEachProps/expected.js b/test/autotests/codegen/forEachProps/expected.js
index 1dd577d55..09128feee 100644
--- a/test/autotests/codegen/forEachProps/expected.js
+++ b/test/autotests/codegen/forEachProps/expected.js
@@ -2,6 +2,8 @@ var marko_template = module.exports = require("marko/html").t(__filename),
     marko_forEachProp = require("marko/runtime/helper-forEachProperty");
 
 function render(input, out) {
+  var data = input;
+
   marko_forEachProp(myObject, function(k, v) {
     console.log("k:", k, "v:", v);
   });
diff --git a/test/autotests/codegen/marko-template/expected.js b/test/autotests/codegen/marko-template/expected.js
index 2f61e47dd..a4e25b85f 100644
--- a/test/autotests/codegen/marko-template/expected.js
+++ b/test/autotests/codegen/marko-template/expected.js
@@ -3,6 +3,8 @@ var marko_template = module.exports = require("marko/html").t(__filename),
     marko_escapeXml = marko_helpers.x;
 
 function render(input, out) {
+  var data = input;
+
   out.w("Hello" +
     data.name +
     "!");
diff --git a/test/autotests/codegen/meta-dependencies/expected.js b/test/autotests/codegen/meta-dependencies/expected.js
index 9b8c79a54..7c88333ec 100644
--- a/test/autotests/codegen/meta-dependencies/expected.js
+++ b/test/autotests/codegen/meta-dependencies/expected.js
@@ -1,6 +1,8 @@
 var marko_template = module.exports = require("marko/html").t(__filename);
 
 function render(input, out) {
+  var data = input;
+
   out.w("<div></div>");
 }
 
diff --git a/test/autotests/codegen/meta-unique/expected.js b/test/autotests/codegen/meta-unique/expected.js
index e88d2c869..a79a5104a 100644
--- a/test/autotests/codegen/meta-unique/expected.js
+++ b/test/autotests/codegen/meta-unique/expected.js
@@ -1,6 +1,8 @@
 var marko_template = module.exports = require("marko/html").t(__filename);
 
 function render(input, out) {
+  var data = input;
+
   out.w("<div></div>");
 }
 
diff --git a/test/autotests/codegen/templateRoot-prependChild/expected.js b/test/autotests/codegen/templateRoot-prependChild/expected.js
index 6e20d48c0..02a35ae53 100644
--- a/test/autotests/codegen/templateRoot-prependChild/expected.js
+++ b/test/autotests/codegen/templateRoot-prependChild/expected.js
@@ -1,6 +1,8 @@
 var marko_template = module.exports = require("marko/html").t(__filename);
 
 function render(input, out) {
+  var data = input;
+
   var foo = "bar";
 
   out.w("<div></div>");
diff --git a/test/autotests/codegen/templateRoot/expected.js b/test/autotests/codegen/templateRoot/expected.js
index ae7be3a78..86ce81289 100644
--- a/test/autotests/codegen/templateRoot/expected.js
+++ b/test/autotests/codegen/templateRoot/expected.js
@@ -1,6 +1,8 @@
 var marko_template = module.exports = require("marko/html").t(__filename);
 
 function render(input, out) {
+  var data = input;
+
   var foo = "bar";
 
   out.w("<div class=\"foo\"><span class=\"bar\"></span></div>");
diff --git a/test/autotests/compiler-browser/include/expected.js b/test/autotests/compiler-browser/include/expected.js
index 8b31e147e..f2aee87c0 100644
--- a/test/autotests/compiler-browser/include/expected.js
+++ b/test/autotests/compiler-browser/include/expected.js
@@ -5,6 +5,8 @@ var marko_template = module.exports = require("marko/vdom").t(),
     include_tag = marko_loadTag(require("marko/taglibs/core/include-tag"));
 
 function render(input, out) {
+  var data = input;
+
   include_tag({
       _target: include_target_template,
       foo: "bar"
diff --git a/test/autotests/compiler-browser/simple/expected.js b/test/autotests/compiler-browser/simple/expected.js
index aaa5646ac..9b73f2ac1 100644
--- a/test/autotests/compiler-browser/simple/expected.js
+++ b/test/autotests/compiler-browser/simple/expected.js
@@ -10,6 +10,8 @@ var marko_template = module.exports = require("marko/vdom").t(),
       .t("No colors!");
 
 function render(input, out) {
+  var data = input;
+
   out.t("Hello ");
 
   out.t(input.name);
diff --git a/test/autotests/vdom-compiler/attr-class-expression/expected.js b/test/autotests/vdom-compiler/attr-class-expression/expected.js
index 5d340921d..ff09555f7 100644
--- a/test/autotests/vdom-compiler/attr-class-expression/expected.js
+++ b/test/autotests/vdom-compiler/attr-class-expression/expected.js
@@ -4,6 +4,8 @@ var marko_template = module.exports = require("marko/vdom").t(),
     marko_classAttr = marko_helpers.ca;
 
 function render(input, out) {
+  var data = input;
+
   out.e("div", {
       "class": marko_classAttr(marko_classList([
         "foo",
diff --git a/test/autotests/vdom-compiler/attrs-dynamic-object-literal/expected.js b/test/autotests/vdom-compiler/attrs-dynamic-object-literal/expected.js
index f50ceac4e..55428c269 100644
--- a/test/autotests/vdom-compiler/attrs-dynamic-object-literal/expected.js
+++ b/test/autotests/vdom-compiler/attrs-dynamic-object-literal/expected.js
@@ -1,6 +1,8 @@
 var marko_template = module.exports = require("marko/vdom").t();
 
 function render(input, out) {
+  var data = input;
+
   out.e("div", {
       foo: "bar",
       hello: "world"
diff --git a/test/autotests/vdom-compiler/attrs-dynamic/expected.js b/test/autotests/vdom-compiler/attrs-dynamic/expected.js
index 4daad3861..bc0c08ada 100644
--- a/test/autotests/vdom-compiler/attrs-dynamic/expected.js
+++ b/test/autotests/vdom-compiler/attrs-dynamic/expected.js
@@ -1,6 +1,8 @@
 var marko_template = module.exports = require("marko/vdom").t();
 
 function render(input, out) {
+  var data = input;
+
   var attrs = {
           foo: "bar",
           hello: "world"
diff --git a/test/autotests/vdom-compiler/custom-tag/expected.js b/test/autotests/vdom-compiler/custom-tag/expected.js
index 718710f3d..c066c70eb 100644
--- a/test/autotests/vdom-compiler/custom-tag/expected.js
+++ b/test/autotests/vdom-compiler/custom-tag/expected.js
@@ -11,6 +11,8 @@ var marko_template = module.exports = require("marko/vdom").t(),
       .t("Body content");
 
 function render(input, out) {
+  var data = input;
+
   out.be("div");
 
   test_hello_tag({
diff --git a/test/autotests/vdom-compiler/doctype/expected.js b/test/autotests/vdom-compiler/doctype/expected.js
index 5fcde109c..3b12cf321 100644
--- a/test/autotests/vdom-compiler/doctype/expected.js
+++ b/test/autotests/vdom-compiler/doctype/expected.js
@@ -6,6 +6,8 @@ var marko_template = module.exports = require("marko/vdom").t(),
     marko_node0 = marko_createElement("div", null, 0, marko_const_nextId());
 
 function render(input, out) {
+  var data = input;
+
   out.n(marko_node0);
 }
 
diff --git a/test/autotests/vdom-compiler/dynamic-body-text/expected.js b/test/autotests/vdom-compiler/dynamic-body-text/expected.js
index a35b90068..697d18a20 100644
--- a/test/autotests/vdom-compiler/dynamic-body-text/expected.js
+++ b/test/autotests/vdom-compiler/dynamic-body-text/expected.js
@@ -4,6 +4,8 @@ var marko_template = module.exports = require("marko/vdom").t(),
       };
 
 function render(input, out) {
+  var data = input;
+
   out.e("div", marko_attrs0, 3)
     .t("Hello ")
     .t(name)
diff --git a/test/autotests/vdom-compiler/no-escape/expected.js b/test/autotests/vdom-compiler/no-escape/expected.js
index 10d1835af..1c8a32b8a 100644
--- a/test/autotests/vdom-compiler/no-escape/expected.js
+++ b/test/autotests/vdom-compiler/no-escape/expected.js
@@ -1,6 +1,8 @@
 var marko_template = module.exports = require("marko/vdom").t();
 
 function render(input, out) {
+  var data = input;
+
   out.t("Hello ");
 
   out.t(name);
diff --git a/test/autotests/vdom-compiler/simple/expected.js b/test/autotests/vdom-compiler/simple/expected.js
index bfd5a4f7e..a9fdfb4bd 100644
--- a/test/autotests/vdom-compiler/simple/expected.js
+++ b/test/autotests/vdom-compiler/simple/expected.js
@@ -8,6 +8,8 @@ var marko_template = module.exports = require("marko/vdom").t(),
       .t("No colors!");
 
 function render(input, out) {
+  var data = input;
+
   out.e("h1", null, 3)
     .t("Hello ")
     .t(input.name)
diff --git a/test/autotests/vdom-compiler/static-element-nested/expected.js b/test/autotests/vdom-compiler/static-element-nested/expected.js
index 6b84939ea..d2ee03a78 100644
--- a/test/autotests/vdom-compiler/static-element-nested/expected.js
+++ b/test/autotests/vdom-compiler/static-element-nested/expected.js
@@ -10,6 +10,8 @@ var marko_template = module.exports = require("marko/vdom").t(),
       .t("Welcome!");
 
 function render(input, out) {
+  var data = input;
+
   out.e("span", null, 2)
     .e("h1", null, 3)
       .t("Hello ")
diff --git a/test/autotests/vdom-compiler/static-element-root/expected.js b/test/autotests/vdom-compiler/static-element-root/expected.js
index f148606c2..406216e08 100644
--- a/test/autotests/vdom-compiler/static-element-root/expected.js
+++ b/test/autotests/vdom-compiler/static-element-root/expected.js
@@ -10,6 +10,8 @@ var marko_template = module.exports = require("marko/vdom").t(),
       .t("Hello World!");
 
 function render(input, out) {
+  var data = input;
+
   out.n(marko_node0);
 }
 
diff --git a/test/autotests/vdom-compiler/tag-body/expected.js b/test/autotests/vdom-compiler/tag-body/expected.js
index cfae37902..63247f756 100644
--- a/test/autotests/vdom-compiler/tag-body/expected.js
+++ b/test/autotests/vdom-compiler/tag-body/expected.js
@@ -4,6 +4,8 @@ var marko_template = module.exports = require("marko/vdom").t(),
     test_hello_tag = marko_loadTag(require("./tags/test-hello/renderer"));
 
 function render(input, out) {
+  var data = input;
+
   test_hello_tag({
       name: "World",
       renderBody: function renderBody(out) {
diff --git a/test/codegen-test.js b/test/codegen-test.js
index a93233ea4..60af072f0 100644
--- a/test/codegen-test.js
+++ b/test/codegen-test.js
@@ -10,8 +10,6 @@ var compiler = require('../compiler');
 var builder = compiler.createBuilder();
 var autotest = require('./autotest');
 
-var stripVarData = require('./util/stripVarData');
-
 var CompileContext = require('../compiler/CompileContext');
 var CodeGenerator = require('../compiler/CodeGenerator');
 var CodeWriter = require('../compiler/CodeWriter');
@@ -42,8 +40,6 @@ describe('compiler/codegen', function() {
 
         var actualSrc = codeWriter.getCode();
 
-        actualSrc = stripVarData(actualSrc);
-
         helpers.compare(actualSrc, '.js');
         done();
     });
diff --git a/test/compiler-browser-test.js b/test/compiler-browser-test.js
index a2e2e8320..43a37f895 100644
--- a/test/compiler-browser-test.js
+++ b/test/compiler-browser-test.js
@@ -10,8 +10,6 @@ var fs = require('fs');
 
 require('marko/node-require').install();
 
-var stripVarData = require('./util/stripVarData');
-
 describe('compiler (browser target)', function() {
     var autoTestDir = path.join(__dirname, 'autotests/compiler-browser');
 
@@ -49,7 +47,6 @@ describe('compiler (browser target)', function() {
                 main.checkTemplate(compiledTemplate);
             } else {
                 var actualSrc = compiledTemplate.code;
-                actualSrc = stripVarData(actualSrc);
 
                 helpers.compare(actualSrc, '.js');
             }
diff --git a/test/vdom-compiler-test.js b/test/vdom-compiler-test.js
index 67bceeb0e..241a5f079 100644
--- a/test/vdom-compiler-test.js
+++ b/test/vdom-compiler-test.js
@@ -10,8 +10,6 @@ var fs = require('fs');
 
 require('marko/node-require').install();
 
-var stripVarData = require('./util/stripVarData');
-
 describe('compiler (vdom)', function() {
     var autoTestDir = path.join(__dirname, 'autotests/vdom-compiler');
 
@@ -45,7 +43,6 @@ describe('compiler (vdom)', function() {
         } else {
             var compiledTemplate = compiler.compileFileForBrowser(templatePath, Object.assign(compilerOptions, main && main.compilerOptions));
             var actualSrc = compiledTemplate.code;
-            actualSrc = stripVarData(actualSrc);
             helpers.compare(actualSrc, '.js');
             done();
         }