diff --git a/.gitignore b/.gitignore
index 247901be6..8334ef326 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,6 @@
 /build
 /lib
 /node_modules
-/test/actual/
+/test/actual
 /test/results
 image.png
diff --git a/test/compare.js b/test/compare.js
index 1f9dc234e..12a46f5cd 100644
--- a/test/compare.js
+++ b/test/compare.js
@@ -1,5 +1,4 @@
 var spawn = require('child_process').spawn;
-var fs = require('fs');
 
 function compare(actual, expected, diff, t, callback) {
     var compare = spawn('compare', ['-metric', 'MAE', actual, expected, diff]);
diff --git a/test/expected/expected.png b/test/expected/expected.png
deleted file mode 100644
index a18f56aff..000000000
Binary files a/test/expected/expected.png and /dev/null differ
diff --git a/test/render.test.js b/test/render.test.js
index b8de68a86..0dea16a9d 100644
--- a/test/render.test.js
+++ b/test/render.test.js
@@ -9,8 +9,6 @@ var path = require('path');
 var mkdirp = require('mkdirp');
 var compare = require('./compare.js');
 var suitePath = path.dirname(require.resolve('mapbox-gl-test-suite/package.json'));
-var actualDir = 'test/actual';
-var expectedDir = 'test/expected';
 
 function template(name) {
     return fs.readFileSync(require.resolve('mapbox-gl-test-suite/templates/' + name + '.html.tmpl')).toString();
@@ -28,6 +26,7 @@ function format(tmpl, kwargs) {
 }
 
 function renderTest(style, info, base, key) {
+    var dir = path.join(suitePath, 'tests', base, key);
     return function(t) {
         var watchdog = setTimeout(function() {
             t.fail('timed out after 20 seconds');
@@ -53,12 +52,11 @@ function renderTest(style, info, base, key) {
             t.error(err);
             mbgl.compressPNG(image, function(err, image) {
                 t.error(err);
-                mkdirp.sync(actualDir);
-                mkdirp.sync(expectedDir);
+                mkdirp.sync(dir);
 
-                var expected = path.join(expectedDir, 'expected.png');
-                var actual = path.join(actualDir, 'actual.png');
-                var diff = path.join(actualDir, 'diff.png');
+                var expected = path.join(dir, 'expected.png');
+                var actual = path.join(dir, 'actual.png');
+                var diff = path.join(dir, 'diff.png');
 
                 if (process.env.UPDATE) {
                     fs.writeFile(expected, image, function(err) {