diff --git a/Makefile b/Makefile index 9dfd3a3141..34b20fc60c 100644 --- a/Makefile +++ b/Makefile @@ -25,7 +25,7 @@ test-travis: test-browser: make build node bin/generate-browser-test >dist/6to5-test.js - test -n "`which open`" && open test/browser/index.html + test -n "`which open`" && open test/browser.html build: mkdir -p dist diff --git a/README.md b/README.md index 9ec42fa44a..99acf75968 100644 --- a/README.md +++ b/README.md @@ -205,8 +205,7 @@ To test 6to5 in your browser run: $ make test-browser -And open `test/browser/index.html` in your browser if it doesn't open -automatically. +And open `test/browser.html` in your browser if it doesn't open automatically. ## Modules diff --git a/test/_helper.js b/test/_helper.js index 75940b5ff5..8583e2c3ec 100644 --- a/test/_helper.js +++ b/test/_helper.js @@ -1,7 +1,7 @@ var fs = require("fs"); var _ = require("lodash"); -var fixturesDir = __dirname + "/syntax-fixtures"; +var fixturesDir = __dirname + "/fixtures/syntax"; var humanise = function (val) { return val.replace(/-/g, " "); diff --git a/test/bin.js b/test/bin.js index db9502d70c..02facbc9b8 100644 --- a/test/bin.js +++ b/test/bin.js @@ -7,7 +7,7 @@ var path = require("path"); var fs = require("fs"); var _ = require("lodash"); -var fixtureLoc = __dirname + "/bin-fixtures"; +var fixtureLoc = __dirname + "/fixtures/bin"; var tmpLoc = __dirname + "/tmp"; var readFile = function (filename) { diff --git a/test/browser.html b/test/browser.html new file mode 100644 index 0000000000..fc6320b9a5 --- /dev/null +++ b/test/browser.html @@ -0,0 +1,20 @@ + + + + Mocha + + + +
+ + + + + + + + + diff --git a/test/browser/index.html b/test/browser/index.html deleted file mode 100644 index 26164cb54d..0000000000 --- a/test/browser/index.html +++ /dev/null @@ -1,20 +0,0 @@ - - - - Mocha - - - -
- - - - - - - - - diff --git a/test/bin-fixtures/6to5-node/--eval/options.json b/test/fixtures/bin/6to5-node/--eval/options.json similarity index 100% rename from test/bin-fixtures/6to5-node/--eval/options.json rename to test/fixtures/bin/6to5-node/--eval/options.json diff --git a/test/bin-fixtures/6to5-node/--print/options.json b/test/fixtures/bin/6to5-node/--print/options.json similarity index 100% rename from test/bin-fixtures/6to5-node/--print/options.json rename to test/fixtures/bin/6to5-node/--print/options.json diff --git a/test/bin-fixtures/6to5-node/directory/in-files/foo/index.js b/test/fixtures/bin/6to5-node/directory/in-files/foo/index.js similarity index 100% rename from test/bin-fixtures/6to5-node/directory/in-files/foo/index.js rename to test/fixtures/bin/6to5-node/directory/in-files/foo/index.js diff --git a/test/bin-fixtures/6to5-node/directory/options.json b/test/fixtures/bin/6to5-node/directory/options.json similarity index 100% rename from test/bin-fixtures/6to5-node/directory/options.json rename to test/fixtures/bin/6to5-node/directory/options.json diff --git a/test/bin-fixtures/6to5-node/directory/stdout.txt b/test/fixtures/bin/6to5-node/directory/stdout.txt similarity index 100% rename from test/bin-fixtures/6to5-node/directory/stdout.txt rename to test/fixtures/bin/6to5-node/directory/stdout.txt diff --git a/test/bin-fixtures/6to5-node/filename/in-files/foo.js b/test/fixtures/bin/6to5-node/filename/in-files/foo.js similarity index 100% rename from test/bin-fixtures/6to5-node/filename/in-files/foo.js rename to test/fixtures/bin/6to5-node/filename/in-files/foo.js diff --git a/test/bin-fixtures/6to5-node/filename/options.json b/test/fixtures/bin/6to5-node/filename/options.json similarity index 100% rename from test/bin-fixtures/6to5-node/filename/options.json rename to test/fixtures/bin/6to5-node/filename/options.json diff --git a/test/bin-fixtures/6to5-node/filename/stdout.txt b/test/fixtures/bin/6to5-node/filename/stdout.txt similarity index 100% rename from test/bin-fixtures/6to5-node/filename/stdout.txt rename to test/fixtures/bin/6to5-node/filename/stdout.txt diff --git a/test/bin-fixtures/6to5-node/filenames/in-files/bar.js b/test/fixtures/bin/6to5-node/filenames/in-files/bar.js similarity index 100% rename from test/bin-fixtures/6to5-node/filenames/in-files/bar.js rename to test/fixtures/bin/6to5-node/filenames/in-files/bar.js diff --git a/test/bin-fixtures/6to5-node/filenames/in-files/foo.js b/test/fixtures/bin/6to5-node/filenames/in-files/foo.js similarity index 100% rename from test/bin-fixtures/6to5-node/filenames/in-files/foo.js rename to test/fixtures/bin/6to5-node/filenames/in-files/foo.js diff --git a/test/bin-fixtures/6to5-node/filenames/options.json b/test/fixtures/bin/6to5-node/filenames/options.json similarity index 100% rename from test/bin-fixtures/6to5-node/filenames/options.json rename to test/fixtures/bin/6to5-node/filenames/options.json diff --git a/test/bin-fixtures/6to5-node/filenames/stdout.txt b/test/fixtures/bin/6to5-node/filenames/stdout.txt similarity index 100% rename from test/bin-fixtures/6to5-node/filenames/stdout.txt rename to test/fixtures/bin/6to5-node/filenames/stdout.txt diff --git a/test/bin-fixtures/6to5-node/require/in-files/bar.js b/test/fixtures/bin/6to5-node/require/in-files/bar.js similarity index 100% rename from test/bin-fixtures/6to5-node/require/in-files/bar.js rename to test/fixtures/bin/6to5-node/require/in-files/bar.js diff --git a/test/bin-fixtures/6to5-node/require/in-files/foo.js b/test/fixtures/bin/6to5-node/require/in-files/foo.js similarity index 100% rename from test/bin-fixtures/6to5-node/require/in-files/foo.js rename to test/fixtures/bin/6to5-node/require/in-files/foo.js diff --git a/test/bin-fixtures/6to5-node/require/options.json b/test/fixtures/bin/6to5-node/require/options.json similarity index 100% rename from test/bin-fixtures/6to5-node/require/options.json rename to test/fixtures/bin/6to5-node/require/options.json diff --git a/test/bin-fixtures/6to5-node/require/stdout.txt b/test/fixtures/bin/6to5-node/require/stdout.txt similarity index 100% rename from test/bin-fixtures/6to5-node/require/stdout.txt rename to test/fixtures/bin/6to5-node/require/stdout.txt diff --git a/test/bin-fixtures/6to5/--blacklist/options.json b/test/fixtures/bin/6to5/--blacklist/options.json similarity index 100% rename from test/bin-fixtures/6to5/--blacklist/options.json rename to test/fixtures/bin/6to5/--blacklist/options.json diff --git a/test/bin-fixtures/6to5/--blacklist/stdin.txt b/test/fixtures/bin/6to5/--blacklist/stdin.txt similarity index 100% rename from test/bin-fixtures/6to5/--blacklist/stdin.txt rename to test/fixtures/bin/6to5/--blacklist/stdin.txt diff --git a/test/bin-fixtures/6to5/--blacklist/stdout.txt b/test/fixtures/bin/6to5/--blacklist/stdout.txt similarity index 100% rename from test/bin-fixtures/6to5/--blacklist/stdout.txt rename to test/fixtures/bin/6to5/--blacklist/stdout.txt diff --git a/test/bin-fixtures/6to5/--whitelist/options.json b/test/fixtures/bin/6to5/--whitelist/options.json similarity index 100% rename from test/bin-fixtures/6to5/--whitelist/options.json rename to test/fixtures/bin/6to5/--whitelist/options.json diff --git a/test/bin-fixtures/6to5/--whitelist/stdin.txt b/test/fixtures/bin/6to5/--whitelist/stdin.txt similarity index 100% rename from test/bin-fixtures/6to5/--whitelist/stdin.txt rename to test/fixtures/bin/6to5/--whitelist/stdin.txt diff --git a/test/bin-fixtures/6to5/--whitelist/stdout.txt b/test/fixtures/bin/6to5/--whitelist/stdout.txt similarity index 100% rename from test/bin-fixtures/6to5/--whitelist/stdout.txt rename to test/fixtures/bin/6to5/--whitelist/stdout.txt diff --git a/test/bin-fixtures/6to5/dir --out-dir --source-maps-inline/in-files/src/bar/bar.js b/test/fixtures/bin/6to5/dir --out-dir --source-maps-inline/in-files/src/bar/bar.js similarity index 100% rename from test/bin-fixtures/6to5/dir --out-dir --source-maps-inline/in-files/src/bar/bar.js rename to test/fixtures/bin/6to5/dir --out-dir --source-maps-inline/in-files/src/bar/bar.js diff --git a/test/bin-fixtures/6to5/dir --out-dir --source-maps-inline/in-files/src/foo.js b/test/fixtures/bin/6to5/dir --out-dir --source-maps-inline/in-files/src/foo.js similarity index 100% rename from test/bin-fixtures/6to5/dir --out-dir --source-maps-inline/in-files/src/foo.js rename to test/fixtures/bin/6to5/dir --out-dir --source-maps-inline/in-files/src/foo.js diff --git a/test/bin-fixtures/6to5/dir --out-dir --source-maps-inline/options.json b/test/fixtures/bin/6to5/dir --out-dir --source-maps-inline/options.json similarity index 100% rename from test/bin-fixtures/6to5/dir --out-dir --source-maps-inline/options.json rename to test/fixtures/bin/6to5/dir --out-dir --source-maps-inline/options.json diff --git a/test/bin-fixtures/6to5/dir --out-dir --source-maps-inline/out-files/lib/bar/bar.js b/test/fixtures/bin/6to5/dir --out-dir --source-maps-inline/out-files/lib/bar/bar.js similarity index 100% rename from test/bin-fixtures/6to5/dir --out-dir --source-maps-inline/out-files/lib/bar/bar.js rename to test/fixtures/bin/6to5/dir --out-dir --source-maps-inline/out-files/lib/bar/bar.js diff --git a/test/bin-fixtures/6to5/dir --out-dir --source-maps-inline/out-files/lib/foo.js b/test/fixtures/bin/6to5/dir --out-dir --source-maps-inline/out-files/lib/foo.js similarity index 100% rename from test/bin-fixtures/6to5/dir --out-dir --source-maps-inline/out-files/lib/foo.js rename to test/fixtures/bin/6to5/dir --out-dir --source-maps-inline/out-files/lib/foo.js diff --git a/test/bin-fixtures/6to5/dir --out-dir --source-maps-inline/stdout.txt b/test/fixtures/bin/6to5/dir --out-dir --source-maps-inline/stdout.txt similarity index 100% rename from test/bin-fixtures/6to5/dir --out-dir --source-maps-inline/stdout.txt rename to test/fixtures/bin/6to5/dir --out-dir --source-maps-inline/stdout.txt diff --git a/test/bin-fixtures/6to5/dir --out-dir --source-maps/in-files/src/bar/bar.js b/test/fixtures/bin/6to5/dir --out-dir --source-maps/in-files/src/bar/bar.js similarity index 100% rename from test/bin-fixtures/6to5/dir --out-dir --source-maps/in-files/src/bar/bar.js rename to test/fixtures/bin/6to5/dir --out-dir --source-maps/in-files/src/bar/bar.js diff --git a/test/bin-fixtures/6to5/dir --out-dir --source-maps/in-files/src/foo.js b/test/fixtures/bin/6to5/dir --out-dir --source-maps/in-files/src/foo.js similarity index 100% rename from test/bin-fixtures/6to5/dir --out-dir --source-maps/in-files/src/foo.js rename to test/fixtures/bin/6to5/dir --out-dir --source-maps/in-files/src/foo.js diff --git a/test/bin-fixtures/6to5/dir --out-dir --source-maps/options.json b/test/fixtures/bin/6to5/dir --out-dir --source-maps/options.json similarity index 100% rename from test/bin-fixtures/6to5/dir --out-dir --source-maps/options.json rename to test/fixtures/bin/6to5/dir --out-dir --source-maps/options.json diff --git a/test/bin-fixtures/6to5/dir --out-dir --source-maps/out-files/lib/bar/bar.js b/test/fixtures/bin/6to5/dir --out-dir --source-maps/out-files/lib/bar/bar.js similarity index 100% rename from test/bin-fixtures/6to5/dir --out-dir --source-maps/out-files/lib/bar/bar.js rename to test/fixtures/bin/6to5/dir --out-dir --source-maps/out-files/lib/bar/bar.js diff --git a/test/bin-fixtures/6to5/dir --out-dir --source-maps/out-files/lib/bar/bar.js.map b/test/fixtures/bin/6to5/dir --out-dir --source-maps/out-files/lib/bar/bar.js.map similarity index 100% rename from test/bin-fixtures/6to5/dir --out-dir --source-maps/out-files/lib/bar/bar.js.map rename to test/fixtures/bin/6to5/dir --out-dir --source-maps/out-files/lib/bar/bar.js.map diff --git a/test/bin-fixtures/6to5/dir --out-dir --source-maps/out-files/lib/foo.js b/test/fixtures/bin/6to5/dir --out-dir --source-maps/out-files/lib/foo.js similarity index 100% rename from test/bin-fixtures/6to5/dir --out-dir --source-maps/out-files/lib/foo.js rename to test/fixtures/bin/6to5/dir --out-dir --source-maps/out-files/lib/foo.js diff --git a/test/bin-fixtures/6to5/dir --out-dir --source-maps/out-files/lib/foo.js.map b/test/fixtures/bin/6to5/dir --out-dir --source-maps/out-files/lib/foo.js.map similarity index 100% rename from test/bin-fixtures/6to5/dir --out-dir --source-maps/out-files/lib/foo.js.map rename to test/fixtures/bin/6to5/dir --out-dir --source-maps/out-files/lib/foo.js.map diff --git a/test/bin-fixtures/6to5/dir --out-dir --source-maps/stdout.txt b/test/fixtures/bin/6to5/dir --out-dir --source-maps/stdout.txt similarity index 100% rename from test/bin-fixtures/6to5/dir --out-dir --source-maps/stdout.txt rename to test/fixtures/bin/6to5/dir --out-dir --source-maps/stdout.txt diff --git a/test/bin-fixtures/6to5/dir --out-dir/in-files/src/bar/bar.js b/test/fixtures/bin/6to5/dir --out-dir/in-files/src/bar/bar.js similarity index 100% rename from test/bin-fixtures/6to5/dir --out-dir/in-files/src/bar/bar.js rename to test/fixtures/bin/6to5/dir --out-dir/in-files/src/bar/bar.js diff --git a/test/bin-fixtures/6to5/dir --out-dir/in-files/src/foo.js b/test/fixtures/bin/6to5/dir --out-dir/in-files/src/foo.js similarity index 100% rename from test/bin-fixtures/6to5/dir --out-dir/in-files/src/foo.js rename to test/fixtures/bin/6to5/dir --out-dir/in-files/src/foo.js diff --git a/test/bin-fixtures/6to5/dir --out-dir/options.json b/test/fixtures/bin/6to5/dir --out-dir/options.json similarity index 100% rename from test/bin-fixtures/6to5/dir --out-dir/options.json rename to test/fixtures/bin/6to5/dir --out-dir/options.json diff --git a/test/bin-fixtures/6to5/dir --out-dir/out-files/lib/bar/bar.js b/test/fixtures/bin/6to5/dir --out-dir/out-files/lib/bar/bar.js similarity index 100% rename from test/bin-fixtures/6to5/dir --out-dir/out-files/lib/bar/bar.js rename to test/fixtures/bin/6to5/dir --out-dir/out-files/lib/bar/bar.js diff --git a/test/bin-fixtures/6to5/dir --out-dir/out-files/lib/foo.js b/test/fixtures/bin/6to5/dir --out-dir/out-files/lib/foo.js similarity index 100% rename from test/bin-fixtures/6to5/dir --out-dir/out-files/lib/foo.js rename to test/fixtures/bin/6to5/dir --out-dir/out-files/lib/foo.js diff --git a/test/bin-fixtures/6to5/dir --out-dir/stdout.txt b/test/fixtures/bin/6to5/dir --out-dir/stdout.txt similarity index 100% rename from test/bin-fixtures/6to5/dir --out-dir/stdout.txt rename to test/fixtures/bin/6to5/dir --out-dir/stdout.txt diff --git a/test/bin-fixtures/6to5/filename --out-file --source-maps-inline/in-files/script.js b/test/fixtures/bin/6to5/filename --out-file --source-maps-inline/in-files/script.js similarity index 100% rename from test/bin-fixtures/6to5/filename --out-file --source-maps-inline/in-files/script.js rename to test/fixtures/bin/6to5/filename --out-file --source-maps-inline/in-files/script.js diff --git a/test/bin-fixtures/6to5/filename --out-file --source-maps-inline/options.json b/test/fixtures/bin/6to5/filename --out-file --source-maps-inline/options.json similarity index 100% rename from test/bin-fixtures/6to5/filename --out-file --source-maps-inline/options.json rename to test/fixtures/bin/6to5/filename --out-file --source-maps-inline/options.json diff --git a/test/bin-fixtures/6to5/filename --out-file --source-maps-inline/out-files/script2.js b/test/fixtures/bin/6to5/filename --out-file --source-maps-inline/out-files/script2.js similarity index 100% rename from test/bin-fixtures/6to5/filename --out-file --source-maps-inline/out-files/script2.js rename to test/fixtures/bin/6to5/filename --out-file --source-maps-inline/out-files/script2.js diff --git a/test/bin-fixtures/6to5/filename --out-file/in-files/script.js b/test/fixtures/bin/6to5/filename --out-file/in-files/script.js similarity index 100% rename from test/bin-fixtures/6to5/filename --out-file/in-files/script.js rename to test/fixtures/bin/6to5/filename --out-file/in-files/script.js diff --git a/test/bin-fixtures/6to5/filename --out-file/options.json b/test/fixtures/bin/6to5/filename --out-file/options.json similarity index 100% rename from test/bin-fixtures/6to5/filename --out-file/options.json rename to test/fixtures/bin/6to5/filename --out-file/options.json diff --git a/test/bin-fixtures/6to5/filename --out-file/out-files/script2.js b/test/fixtures/bin/6to5/filename --out-file/out-files/script2.js similarity index 100% rename from test/bin-fixtures/6to5/filename --out-file/out-files/script2.js rename to test/fixtures/bin/6to5/filename --out-file/out-files/script2.js diff --git a/test/bin-fixtures/6to5/filenames --out-file --source-maps-inline/in-files/script.js b/test/fixtures/bin/6to5/filenames --out-file --source-maps-inline/in-files/script.js similarity index 100% rename from test/bin-fixtures/6to5/filenames --out-file --source-maps-inline/in-files/script.js rename to test/fixtures/bin/6to5/filenames --out-file --source-maps-inline/in-files/script.js diff --git a/test/bin-fixtures/6to5/filenames --out-file --source-maps-inline/in-files/script2.js b/test/fixtures/bin/6to5/filenames --out-file --source-maps-inline/in-files/script2.js similarity index 100% rename from test/bin-fixtures/6to5/filenames --out-file --source-maps-inline/in-files/script2.js rename to test/fixtures/bin/6to5/filenames --out-file --source-maps-inline/in-files/script2.js diff --git a/test/bin-fixtures/6to5/filenames --out-file --source-maps-inline/options.json b/test/fixtures/bin/6to5/filenames --out-file --source-maps-inline/options.json similarity index 100% rename from test/bin-fixtures/6to5/filenames --out-file --source-maps-inline/options.json rename to test/fixtures/bin/6to5/filenames --out-file --source-maps-inline/options.json diff --git a/test/bin-fixtures/6to5/filenames --out-file --source-maps-inline/out-files/script3.js b/test/fixtures/bin/6to5/filenames --out-file --source-maps-inline/out-files/script3.js similarity index 100% rename from test/bin-fixtures/6to5/filenames --out-file --source-maps-inline/out-files/script3.js rename to test/fixtures/bin/6to5/filenames --out-file --source-maps-inline/out-files/script3.js diff --git a/test/bin-fixtures/6to5/filenames --out-file --source-maps/in-files/script.js b/test/fixtures/bin/6to5/filenames --out-file --source-maps/in-files/script.js similarity index 100% rename from test/bin-fixtures/6to5/filenames --out-file --source-maps/in-files/script.js rename to test/fixtures/bin/6to5/filenames --out-file --source-maps/in-files/script.js diff --git a/test/bin-fixtures/6to5/filenames --out-file --source-maps/in-files/script2.js b/test/fixtures/bin/6to5/filenames --out-file --source-maps/in-files/script2.js similarity index 100% rename from test/bin-fixtures/6to5/filenames --out-file --source-maps/in-files/script2.js rename to test/fixtures/bin/6to5/filenames --out-file --source-maps/in-files/script2.js diff --git a/test/bin-fixtures/6to5/filenames --out-file --source-maps/options.json b/test/fixtures/bin/6to5/filenames --out-file --source-maps/options.json similarity index 100% rename from test/bin-fixtures/6to5/filenames --out-file --source-maps/options.json rename to test/fixtures/bin/6to5/filenames --out-file --source-maps/options.json diff --git a/test/bin-fixtures/6to5/filenames --out-file --source-maps/out-files/script3.js b/test/fixtures/bin/6to5/filenames --out-file --source-maps/out-files/script3.js similarity index 100% rename from test/bin-fixtures/6to5/filenames --out-file --source-maps/out-files/script3.js rename to test/fixtures/bin/6to5/filenames --out-file --source-maps/out-files/script3.js diff --git a/test/bin-fixtures/6to5/filenames --out-file --source-maps/out-files/script3.js.map b/test/fixtures/bin/6to5/filenames --out-file --source-maps/out-files/script3.js.map similarity index 100% rename from test/bin-fixtures/6to5/filenames --out-file --source-maps/out-files/script3.js.map rename to test/fixtures/bin/6to5/filenames --out-file --source-maps/out-files/script3.js.map diff --git a/test/bin-fixtures/6to5/filenames --out-file/in-files/script.js b/test/fixtures/bin/6to5/filenames --out-file/in-files/script.js similarity index 100% rename from test/bin-fixtures/6to5/filenames --out-file/in-files/script.js rename to test/fixtures/bin/6to5/filenames --out-file/in-files/script.js diff --git a/test/bin-fixtures/6to5/filenames --out-file/in-files/script2.js b/test/fixtures/bin/6to5/filenames --out-file/in-files/script2.js similarity index 100% rename from test/bin-fixtures/6to5/filenames --out-file/in-files/script2.js rename to test/fixtures/bin/6to5/filenames --out-file/in-files/script2.js diff --git a/test/bin-fixtures/6to5/filenames --out-file/options.json b/test/fixtures/bin/6to5/filenames --out-file/options.json similarity index 100% rename from test/bin-fixtures/6to5/filenames --out-file/options.json rename to test/fixtures/bin/6to5/filenames --out-file/options.json diff --git a/test/bin-fixtures/6to5/filenames --out-file/out-files/script3.js b/test/fixtures/bin/6to5/filenames --out-file/out-files/script3.js similarity index 100% rename from test/bin-fixtures/6to5/filenames --out-file/out-files/script3.js rename to test/fixtures/bin/6to5/filenames --out-file/out-files/script3.js diff --git a/test/bin-fixtures/6to5/stdin --filename/options.json b/test/fixtures/bin/6to5/stdin --filename/options.json similarity index 100% rename from test/bin-fixtures/6to5/stdin --filename/options.json rename to test/fixtures/bin/6to5/stdin --filename/options.json diff --git a/test/bin-fixtures/6to5/stdin --filename/stderr.txt b/test/fixtures/bin/6to5/stdin --filename/stderr.txt similarity index 100% rename from test/bin-fixtures/6to5/stdin --filename/stderr.txt rename to test/fixtures/bin/6to5/stdin --filename/stderr.txt diff --git a/test/bin-fixtures/6to5/stdin --filename/stdin.txt b/test/fixtures/bin/6to5/stdin --filename/stdin.txt similarity index 100% rename from test/bin-fixtures/6to5/stdin --filename/stdin.txt rename to test/fixtures/bin/6to5/stdin --filename/stdin.txt diff --git a/test/bin-fixtures/6to5/stdin --out-file --source-maps/options.json b/test/fixtures/bin/6to5/stdin --out-file --source-maps/options.json similarity index 100% rename from test/bin-fixtures/6to5/stdin --out-file --source-maps/options.json rename to test/fixtures/bin/6to5/stdin --out-file --source-maps/options.json diff --git a/test/bin-fixtures/6to5/stdin --out-file --source-maps/out-files/test.js b/test/fixtures/bin/6to5/stdin --out-file --source-maps/out-files/test.js similarity index 100% rename from test/bin-fixtures/6to5/stdin --out-file --source-maps/out-files/test.js rename to test/fixtures/bin/6to5/stdin --out-file --source-maps/out-files/test.js diff --git a/test/bin-fixtures/6to5/stdin --out-file --source-maps/out-files/test.js.map b/test/fixtures/bin/6to5/stdin --out-file --source-maps/out-files/test.js.map similarity index 100% rename from test/bin-fixtures/6to5/stdin --out-file --source-maps/out-files/test.js.map rename to test/fixtures/bin/6to5/stdin --out-file --source-maps/out-files/test.js.map diff --git a/test/bin-fixtures/6to5/stdin --out-file --source-maps/stdin.txt b/test/fixtures/bin/6to5/stdin --out-file --source-maps/stdin.txt similarity index 100% rename from test/bin-fixtures/6to5/stdin --out-file --source-maps/stdin.txt rename to test/fixtures/bin/6to5/stdin --out-file --source-maps/stdin.txt diff --git a/test/bin-fixtures/6to5/stdin --out-file/options.json b/test/fixtures/bin/6to5/stdin --out-file/options.json similarity index 100% rename from test/bin-fixtures/6to5/stdin --out-file/options.json rename to test/fixtures/bin/6to5/stdin --out-file/options.json diff --git a/test/bin-fixtures/6to5/stdin --out-file/out-files/script.js b/test/fixtures/bin/6to5/stdin --out-file/out-files/script.js similarity index 100% rename from test/bin-fixtures/6to5/stdin --out-file/out-files/script.js rename to test/fixtures/bin/6to5/stdin --out-file/out-files/script.js diff --git a/test/bin-fixtures/6to5/stdin --out-file/stdin.txt b/test/fixtures/bin/6to5/stdin --out-file/stdin.txt similarity index 100% rename from test/bin-fixtures/6to5/stdin --out-file/stdin.txt rename to test/fixtures/bin/6to5/stdin --out-file/stdin.txt diff --git a/test/bin-fixtures/6to5/stdin --source-maps-inline/options.json b/test/fixtures/bin/6to5/stdin --source-maps-inline/options.json similarity index 100% rename from test/bin-fixtures/6to5/stdin --source-maps-inline/options.json rename to test/fixtures/bin/6to5/stdin --source-maps-inline/options.json diff --git a/test/bin-fixtures/6to5/stdin --source-maps-inline/stdin.txt b/test/fixtures/bin/6to5/stdin --source-maps-inline/stdin.txt similarity index 100% rename from test/bin-fixtures/6to5/stdin --source-maps-inline/stdin.txt rename to test/fixtures/bin/6to5/stdin --source-maps-inline/stdin.txt diff --git a/test/bin-fixtures/6to5/stdin --source-maps-inline/stdout.txt b/test/fixtures/bin/6to5/stdin --source-maps-inline/stdout.txt similarity index 100% rename from test/bin-fixtures/6to5/stdin --source-maps-inline/stdout.txt rename to test/fixtures/bin/6to5/stdin --source-maps-inline/stdout.txt diff --git a/test/bin-fixtures/6to5/stdin/stdin.txt b/test/fixtures/bin/6to5/stdin/stdin.txt similarity index 100% rename from test/bin-fixtures/6to5/stdin/stdin.txt rename to test/fixtures/bin/6to5/stdin/stdin.txt diff --git a/test/bin-fixtures/6to5/stdin/stdout.txt b/test/fixtures/bin/6to5/stdin/stdout.txt similarity index 100% rename from test/bin-fixtures/6to5/stdin/stdout.txt rename to test/fixtures/bin/6to5/stdin/stdout.txt diff --git a/test/syntax-fixtures/api/blacklist/actual.js b/test/fixtures/syntax/api/blacklist/actual.js similarity index 100% rename from test/syntax-fixtures/api/blacklist/actual.js rename to test/fixtures/syntax/api/blacklist/actual.js diff --git a/test/syntax-fixtures/api/blacklist/expected.js b/test/fixtures/syntax/api/blacklist/expected.js similarity index 100% rename from test/syntax-fixtures/api/blacklist/expected.js rename to test/fixtures/syntax/api/blacklist/expected.js diff --git a/test/syntax-fixtures/api/blacklist/options.json b/test/fixtures/syntax/api/blacklist/options.json similarity index 100% rename from test/syntax-fixtures/api/blacklist/options.json rename to test/fixtures/syntax/api/blacklist/options.json diff --git a/test/syntax-fixtures/api/whitelist/actual.js b/test/fixtures/syntax/api/whitelist/actual.js similarity index 100% rename from test/syntax-fixtures/api/whitelist/actual.js rename to test/fixtures/syntax/api/whitelist/actual.js diff --git a/test/syntax-fixtures/api/whitelist/expected.js b/test/fixtures/syntax/api/whitelist/expected.js similarity index 100% rename from test/syntax-fixtures/api/whitelist/expected.js rename to test/fixtures/syntax/api/whitelist/expected.js diff --git a/test/syntax-fixtures/api/whitelist/options.json b/test/fixtures/syntax/api/whitelist/options.json similarity index 100% rename from test/syntax-fixtures/api/whitelist/options.json rename to test/fixtures/syntax/api/whitelist/options.json diff --git a/test/syntax-fixtures/array-comprehension/multiple-if/actual.js b/test/fixtures/syntax/array-comprehension/multiple-if/actual.js similarity index 100% rename from test/syntax-fixtures/array-comprehension/multiple-if/actual.js rename to test/fixtures/syntax/array-comprehension/multiple-if/actual.js diff --git a/test/syntax-fixtures/array-comprehension/multiple-if/expected.js b/test/fixtures/syntax/array-comprehension/multiple-if/expected.js similarity index 100% rename from test/syntax-fixtures/array-comprehension/multiple-if/expected.js rename to test/fixtures/syntax/array-comprehension/multiple-if/expected.js diff --git a/test/syntax-fixtures/array-comprehension/multiple/actual.js b/test/fixtures/syntax/array-comprehension/multiple/actual.js similarity index 100% rename from test/syntax-fixtures/array-comprehension/multiple/actual.js rename to test/fixtures/syntax/array-comprehension/multiple/actual.js diff --git a/test/syntax-fixtures/array-comprehension/multiple/expected.js b/test/fixtures/syntax/array-comprehension/multiple/expected.js similarity index 100% rename from test/syntax-fixtures/array-comprehension/multiple/expected.js rename to test/fixtures/syntax/array-comprehension/multiple/expected.js diff --git a/test/syntax-fixtures/array-comprehension/no-in/actual.js b/test/fixtures/syntax/array-comprehension/no-in/actual.js similarity index 100% rename from test/syntax-fixtures/array-comprehension/no-in/actual.js rename to test/fixtures/syntax/array-comprehension/no-in/actual.js diff --git a/test/syntax-fixtures/array-comprehension/no-in/options.json b/test/fixtures/syntax/array-comprehension/no-in/options.json similarity index 100% rename from test/syntax-fixtures/array-comprehension/no-in/options.json rename to test/fixtures/syntax/array-comprehension/no-in/options.json diff --git a/test/syntax-fixtures/array-comprehension/single-if/actual.js b/test/fixtures/syntax/array-comprehension/single-if/actual.js similarity index 100% rename from test/syntax-fixtures/array-comprehension/single-if/actual.js rename to test/fixtures/syntax/array-comprehension/single-if/actual.js diff --git a/test/syntax-fixtures/array-comprehension/single-if/expected.js b/test/fixtures/syntax/array-comprehension/single-if/expected.js similarity index 100% rename from test/syntax-fixtures/array-comprehension/single-if/expected.js rename to test/fixtures/syntax/array-comprehension/single-if/expected.js diff --git a/test/syntax-fixtures/array-comprehension/single/actual.js b/test/fixtures/syntax/array-comprehension/single/actual.js similarity index 100% rename from test/syntax-fixtures/array-comprehension/single/actual.js rename to test/fixtures/syntax/array-comprehension/single/actual.js diff --git a/test/syntax-fixtures/array-comprehension/single/expected.js b/test/fixtures/syntax/array-comprehension/single/expected.js similarity index 100% rename from test/syntax-fixtures/array-comprehension/single/expected.js rename to test/fixtures/syntax/array-comprehension/single/expected.js diff --git a/test/syntax-fixtures/arrow-functions/arguments/actual.js b/test/fixtures/syntax/arrow-functions/arguments/actual.js similarity index 100% rename from test/syntax-fixtures/arrow-functions/arguments/actual.js rename to test/fixtures/syntax/arrow-functions/arguments/actual.js diff --git a/test/syntax-fixtures/arrow-functions/arguments/expected.js b/test/fixtures/syntax/arrow-functions/arguments/expected.js similarity index 100% rename from test/syntax-fixtures/arrow-functions/arguments/expected.js rename to test/fixtures/syntax/arrow-functions/arguments/expected.js diff --git a/test/syntax-fixtures/arrow-functions/empty-arguments/actual.js b/test/fixtures/syntax/arrow-functions/empty-arguments/actual.js similarity index 100% rename from test/syntax-fixtures/arrow-functions/empty-arguments/actual.js rename to test/fixtures/syntax/arrow-functions/empty-arguments/actual.js diff --git a/test/syntax-fixtures/arrow-functions/empty-arguments/expected.js b/test/fixtures/syntax/arrow-functions/empty-arguments/expected.js similarity index 100% rename from test/syntax-fixtures/arrow-functions/empty-arguments/expected.js rename to test/fixtures/syntax/arrow-functions/empty-arguments/expected.js diff --git a/test/syntax-fixtures/arrow-functions/empty-block/actual.js b/test/fixtures/syntax/arrow-functions/empty-block/actual.js similarity index 100% rename from test/syntax-fixtures/arrow-functions/empty-block/actual.js rename to test/fixtures/syntax/arrow-functions/empty-block/actual.js diff --git a/test/syntax-fixtures/arrow-functions/empty-block/expected.js b/test/fixtures/syntax/arrow-functions/empty-block/expected.js similarity index 100% rename from test/syntax-fixtures/arrow-functions/empty-block/expected.js rename to test/fixtures/syntax/arrow-functions/empty-block/expected.js diff --git a/test/syntax-fixtures/arrow-functions/expression/actual.js b/test/fixtures/syntax/arrow-functions/expression/actual.js similarity index 100% rename from test/syntax-fixtures/arrow-functions/expression/actual.js rename to test/fixtures/syntax/arrow-functions/expression/actual.js diff --git a/test/syntax-fixtures/arrow-functions/expression/expected.js b/test/fixtures/syntax/arrow-functions/expression/expected.js similarity index 100% rename from test/syntax-fixtures/arrow-functions/expression/expected.js rename to test/fixtures/syntax/arrow-functions/expression/expected.js diff --git a/test/syntax-fixtures/arrow-functions/inside-call/actual.js b/test/fixtures/syntax/arrow-functions/inside-call/actual.js similarity index 100% rename from test/syntax-fixtures/arrow-functions/inside-call/actual.js rename to test/fixtures/syntax/arrow-functions/inside-call/actual.js diff --git a/test/syntax-fixtures/arrow-functions/inside-call/expected.js b/test/fixtures/syntax/arrow-functions/inside-call/expected.js similarity index 100% rename from test/syntax-fixtures/arrow-functions/inside-call/expected.js rename to test/fixtures/syntax/arrow-functions/inside-call/expected.js diff --git a/test/syntax-fixtures/arrow-functions/multiple-arguments/actual.js b/test/fixtures/syntax/arrow-functions/multiple-arguments/actual.js similarity index 100% rename from test/syntax-fixtures/arrow-functions/multiple-arguments/actual.js rename to test/fixtures/syntax/arrow-functions/multiple-arguments/actual.js diff --git a/test/syntax-fixtures/arrow-functions/multiple-arguments/expected.js b/test/fixtures/syntax/arrow-functions/multiple-arguments/expected.js similarity index 100% rename from test/syntax-fixtures/arrow-functions/multiple-arguments/expected.js rename to test/fixtures/syntax/arrow-functions/multiple-arguments/expected.js diff --git a/test/syntax-fixtures/arrow-functions/paran-insertion/actual.js b/test/fixtures/syntax/arrow-functions/paran-insertion/actual.js similarity index 100% rename from test/syntax-fixtures/arrow-functions/paran-insertion/actual.js rename to test/fixtures/syntax/arrow-functions/paran-insertion/actual.js diff --git a/test/syntax-fixtures/arrow-functions/paran-insertion/expected.js b/test/fixtures/syntax/arrow-functions/paran-insertion/expected.js similarity index 100% rename from test/syntax-fixtures/arrow-functions/paran-insertion/expected.js rename to test/fixtures/syntax/arrow-functions/paran-insertion/expected.js diff --git a/test/syntax-fixtures/arrow-functions/single-argument/actual.js b/test/fixtures/syntax/arrow-functions/single-argument/actual.js similarity index 100% rename from test/syntax-fixtures/arrow-functions/single-argument/actual.js rename to test/fixtures/syntax/arrow-functions/single-argument/actual.js diff --git a/test/syntax-fixtures/arrow-functions/single-argument/expected.js b/test/fixtures/syntax/arrow-functions/single-argument/expected.js similarity index 100% rename from test/syntax-fixtures/arrow-functions/single-argument/expected.js rename to test/fixtures/syntax/arrow-functions/single-argument/expected.js diff --git a/test/syntax-fixtures/arrow-functions/statement/actual.js b/test/fixtures/syntax/arrow-functions/statement/actual.js similarity index 100% rename from test/syntax-fixtures/arrow-functions/statement/actual.js rename to test/fixtures/syntax/arrow-functions/statement/actual.js diff --git a/test/syntax-fixtures/arrow-functions/statement/expected.js b/test/fixtures/syntax/arrow-functions/statement/expected.js similarity index 100% rename from test/syntax-fixtures/arrow-functions/statement/expected.js rename to test/fixtures/syntax/arrow-functions/statement/expected.js diff --git a/test/syntax-fixtures/arrow-functions/this-usage/actual.js b/test/fixtures/syntax/arrow-functions/this-usage/actual.js similarity index 100% rename from test/syntax-fixtures/arrow-functions/this-usage/actual.js rename to test/fixtures/syntax/arrow-functions/this-usage/actual.js diff --git a/test/syntax-fixtures/arrow-functions/this-usage/expected.js b/test/fixtures/syntax/arrow-functions/this-usage/expected.js similarity index 100% rename from test/syntax-fixtures/arrow-functions/this-usage/expected.js rename to test/fixtures/syntax/arrow-functions/this-usage/expected.js diff --git a/test/syntax-fixtures/block-binding/block-multiple-let-inside/actual.js b/test/fixtures/syntax/block-binding/block-multiple-let-inside/actual.js similarity index 100% rename from test/syntax-fixtures/block-binding/block-multiple-let-inside/actual.js rename to test/fixtures/syntax/block-binding/block-multiple-let-inside/actual.js diff --git a/test/syntax-fixtures/block-binding/block-multiple-let-inside/expected.js b/test/fixtures/syntax/block-binding/block-multiple-let-inside/expected.js similarity index 100% rename from test/syntax-fixtures/block-binding/block-multiple-let-inside/expected.js rename to test/fixtures/syntax/block-binding/block-multiple-let-inside/expected.js diff --git a/test/syntax-fixtures/block-binding/block-single-let-inside/actual.js b/test/fixtures/syntax/block-binding/block-single-let-inside/actual.js similarity index 100% rename from test/syntax-fixtures/block-binding/block-single-let-inside/actual.js rename to test/fixtures/syntax/block-binding/block-single-let-inside/actual.js diff --git a/test/syntax-fixtures/block-binding/block-single-let-inside/expected.js b/test/fixtures/syntax/block-binding/block-single-let-inside/expected.js similarity index 100% rename from test/syntax-fixtures/block-binding/block-single-let-inside/expected.js rename to test/fixtures/syntax/block-binding/block-single-let-inside/expected.js diff --git a/test/syntax-fixtures/block-binding/closure-ignore-children/actual.js b/test/fixtures/syntax/block-binding/closure-ignore-children/actual.js similarity index 100% rename from test/syntax-fixtures/block-binding/closure-ignore-children/actual.js rename to test/fixtures/syntax/block-binding/closure-ignore-children/actual.js diff --git a/test/syntax-fixtures/block-binding/closure-ignore-children/expected.js b/test/fixtures/syntax/block-binding/closure-ignore-children/expected.js similarity index 100% rename from test/syntax-fixtures/block-binding/closure-ignore-children/expected.js rename to test/fixtures/syntax/block-binding/closure-ignore-children/expected.js diff --git a/test/syntax-fixtures/block-binding/for-in-break-multiple/actual.js b/test/fixtures/syntax/block-binding/for-in-break-multiple/actual.js similarity index 100% rename from test/syntax-fixtures/block-binding/for-in-break-multiple/actual.js rename to test/fixtures/syntax/block-binding/for-in-break-multiple/actual.js diff --git a/test/syntax-fixtures/block-binding/for-in-break-multiple/expected.js b/test/fixtures/syntax/block-binding/for-in-break-multiple/expected.js similarity index 100% rename from test/syntax-fixtures/block-binding/for-in-break-multiple/expected.js rename to test/fixtures/syntax/block-binding/for-in-break-multiple/expected.js diff --git a/test/syntax-fixtures/block-binding/for-in-break/actual.js b/test/fixtures/syntax/block-binding/for-in-break/actual.js similarity index 100% rename from test/syntax-fixtures/block-binding/for-in-break/actual.js rename to test/fixtures/syntax/block-binding/for-in-break/actual.js diff --git a/test/syntax-fixtures/block-binding/for-in-break/expected.js b/test/fixtures/syntax/block-binding/for-in-break/expected.js similarity index 100% rename from test/syntax-fixtures/block-binding/for-in-break/expected.js rename to test/fixtures/syntax/block-binding/for-in-break/expected.js diff --git a/test/syntax-fixtures/block-binding/for-in-continue/actual.js b/test/fixtures/syntax/block-binding/for-in-continue/actual.js similarity index 100% rename from test/syntax-fixtures/block-binding/for-in-continue/actual.js rename to test/fixtures/syntax/block-binding/for-in-continue/actual.js diff --git a/test/syntax-fixtures/block-binding/for-in-continue/expected.js b/test/fixtures/syntax/block-binding/for-in-continue/expected.js similarity index 100% rename from test/syntax-fixtures/block-binding/for-in-continue/expected.js rename to test/fixtures/syntax/block-binding/for-in-continue/expected.js diff --git a/test/syntax-fixtures/block-binding/for-in-multiple/actual.js b/test/fixtures/syntax/block-binding/for-in-multiple/actual.js similarity index 100% rename from test/syntax-fixtures/block-binding/for-in-multiple/actual.js rename to test/fixtures/syntax/block-binding/for-in-multiple/actual.js diff --git a/test/syntax-fixtures/block-binding/for-in-multiple/expected.js b/test/fixtures/syntax/block-binding/for-in-multiple/expected.js similarity index 100% rename from test/syntax-fixtures/block-binding/for-in-multiple/expected.js rename to test/fixtures/syntax/block-binding/for-in-multiple/expected.js diff --git a/test/syntax-fixtures/block-binding/for-in/actual.js b/test/fixtures/syntax/block-binding/for-in/actual.js similarity index 100% rename from test/syntax-fixtures/block-binding/for-in/actual.js rename to test/fixtures/syntax/block-binding/for-in/actual.js diff --git a/test/syntax-fixtures/block-binding/for-in/expected.js b/test/fixtures/syntax/block-binding/for-in/expected.js similarity index 100% rename from test/syntax-fixtures/block-binding/for-in/expected.js rename to test/fixtures/syntax/block-binding/for-in/expected.js diff --git a/test/syntax-fixtures/block-binding/for/actual.js b/test/fixtures/syntax/block-binding/for/actual.js similarity index 100% rename from test/syntax-fixtures/block-binding/for/actual.js rename to test/fixtures/syntax/block-binding/for/actual.js diff --git a/test/syntax-fixtures/block-binding/for/expected.js b/test/fixtures/syntax/block-binding/for/expected.js similarity index 100% rename from test/syntax-fixtures/block-binding/for/expected.js rename to test/fixtures/syntax/block-binding/for/expected.js diff --git a/test/syntax-fixtures/block-binding/hoist-multiple/actual.js b/test/fixtures/syntax/block-binding/hoist-multiple/actual.js similarity index 100% rename from test/syntax-fixtures/block-binding/hoist-multiple/actual.js rename to test/fixtures/syntax/block-binding/hoist-multiple/actual.js diff --git a/test/syntax-fixtures/block-binding/hoist-multiple/expected.js b/test/fixtures/syntax/block-binding/hoist-multiple/expected.js similarity index 100% rename from test/syntax-fixtures/block-binding/hoist-multiple/expected.js rename to test/fixtures/syntax/block-binding/hoist-multiple/expected.js diff --git a/test/syntax-fixtures/block-binding/hoist/actual.js b/test/fixtures/syntax/block-binding/hoist/actual.js similarity index 100% rename from test/syntax-fixtures/block-binding/hoist/actual.js rename to test/fixtures/syntax/block-binding/hoist/actual.js diff --git a/test/syntax-fixtures/block-binding/hoist/expected.js b/test/fixtures/syntax/block-binding/hoist/expected.js similarity index 100% rename from test/syntax-fixtures/block-binding/hoist/expected.js rename to test/fixtures/syntax/block-binding/hoist/expected.js diff --git a/test/syntax-fixtures/block-binding/program/actual.js b/test/fixtures/syntax/block-binding/program/actual.js similarity index 100% rename from test/syntax-fixtures/block-binding/program/actual.js rename to test/fixtures/syntax/block-binding/program/actual.js diff --git a/test/syntax-fixtures/block-binding/program/expected.js b/test/fixtures/syntax/block-binding/program/expected.js similarity index 100% rename from test/syntax-fixtures/block-binding/program/expected.js rename to test/fixtures/syntax/block-binding/program/expected.js diff --git a/test/syntax-fixtures/block-binding/return/actual.js b/test/fixtures/syntax/block-binding/return/actual.js similarity index 100% rename from test/syntax-fixtures/block-binding/return/actual.js rename to test/fixtures/syntax/block-binding/return/actual.js diff --git a/test/syntax-fixtures/block-binding/return/expected.js b/test/fixtures/syntax/block-binding/return/expected.js similarity index 100% rename from test/syntax-fixtures/block-binding/return/expected.js rename to test/fixtures/syntax/block-binding/return/expected.js diff --git a/test/syntax-fixtures/block-binding/this-usage/actual.js b/test/fixtures/syntax/block-binding/this-usage/actual.js similarity index 100% rename from test/syntax-fixtures/block-binding/this-usage/actual.js rename to test/fixtures/syntax/block-binding/this-usage/actual.js diff --git a/test/syntax-fixtures/block-binding/this-usage/expected.js b/test/fixtures/syntax/block-binding/this-usage/expected.js similarity index 100% rename from test/syntax-fixtures/block-binding/this-usage/expected.js rename to test/fixtures/syntax/block-binding/this-usage/expected.js diff --git a/test/syntax-fixtures/classes/accessing-super-class/actual.js b/test/fixtures/syntax/classes/accessing-super-class/actual.js similarity index 100% rename from test/syntax-fixtures/classes/accessing-super-class/actual.js rename to test/fixtures/syntax/classes/accessing-super-class/actual.js diff --git a/test/syntax-fixtures/classes/accessing-super-class/expected.js b/test/fixtures/syntax/classes/accessing-super-class/expected.js similarity index 100% rename from test/syntax-fixtures/classes/accessing-super-class/expected.js rename to test/fixtures/syntax/classes/accessing-super-class/expected.js diff --git a/test/syntax-fixtures/classes/accessing-super-properties/actual.js b/test/fixtures/syntax/classes/accessing-super-properties/actual.js similarity index 100% rename from test/syntax-fixtures/classes/accessing-super-properties/actual.js rename to test/fixtures/syntax/classes/accessing-super-properties/actual.js diff --git a/test/syntax-fixtures/classes/accessing-super-properties/expected.js b/test/fixtures/syntax/classes/accessing-super-properties/expected.js similarity index 100% rename from test/syntax-fixtures/classes/accessing-super-properties/expected.js rename to test/fixtures/syntax/classes/accessing-super-properties/expected.js diff --git a/test/syntax-fixtures/classes/calling-super-properties/actual.js b/test/fixtures/syntax/classes/calling-super-properties/actual.js similarity index 100% rename from test/syntax-fixtures/classes/calling-super-properties/actual.js rename to test/fixtures/syntax/classes/calling-super-properties/actual.js diff --git a/test/syntax-fixtures/classes/calling-super-properties/expected.js b/test/fixtures/syntax/classes/calling-super-properties/expected.js similarity index 100% rename from test/syntax-fixtures/classes/calling-super-properties/expected.js rename to test/fixtures/syntax/classes/calling-super-properties/expected.js diff --git a/test/syntax-fixtures/classes/constructor/actual.js b/test/fixtures/syntax/classes/constructor/actual.js similarity index 100% rename from test/syntax-fixtures/classes/constructor/actual.js rename to test/fixtures/syntax/classes/constructor/actual.js diff --git a/test/syntax-fixtures/classes/constructor/expected.js b/test/fixtures/syntax/classes/constructor/expected.js similarity index 100% rename from test/syntax-fixtures/classes/constructor/expected.js rename to test/fixtures/syntax/classes/constructor/expected.js diff --git a/test/syntax-fixtures/classes/defining-constructor-as-a-mutator/actual.js b/test/fixtures/syntax/classes/defining-constructor-as-a-mutator/actual.js similarity index 100% rename from test/syntax-fixtures/classes/defining-constructor-as-a-mutator/actual.js rename to test/fixtures/syntax/classes/defining-constructor-as-a-mutator/actual.js diff --git a/test/syntax-fixtures/classes/defining-constructor-as-a-mutator/options.json b/test/fixtures/syntax/classes/defining-constructor-as-a-mutator/options.json similarity index 100% rename from test/syntax-fixtures/classes/defining-constructor-as-a-mutator/options.json rename to test/fixtures/syntax/classes/defining-constructor-as-a-mutator/options.json diff --git a/test/syntax-fixtures/classes/instance-getter-and-setter/actual.js b/test/fixtures/syntax/classes/instance-getter-and-setter/actual.js similarity index 100% rename from test/syntax-fixtures/classes/instance-getter-and-setter/actual.js rename to test/fixtures/syntax/classes/instance-getter-and-setter/actual.js diff --git a/test/syntax-fixtures/classes/instance-getter-and-setter/expected.js b/test/fixtures/syntax/classes/instance-getter-and-setter/expected.js similarity index 100% rename from test/syntax-fixtures/classes/instance-getter-and-setter/expected.js rename to test/fixtures/syntax/classes/instance-getter-and-setter/expected.js diff --git a/test/syntax-fixtures/classes/instance-getter/actual.js b/test/fixtures/syntax/classes/instance-getter/actual.js similarity index 100% rename from test/syntax-fixtures/classes/instance-getter/actual.js rename to test/fixtures/syntax/classes/instance-getter/actual.js diff --git a/test/syntax-fixtures/classes/instance-getter/expected.js b/test/fixtures/syntax/classes/instance-getter/expected.js similarity index 100% rename from test/syntax-fixtures/classes/instance-getter/expected.js rename to test/fixtures/syntax/classes/instance-getter/expected.js diff --git a/test/syntax-fixtures/classes/instance-method/actual.js b/test/fixtures/syntax/classes/instance-method/actual.js similarity index 100% rename from test/syntax-fixtures/classes/instance-method/actual.js rename to test/fixtures/syntax/classes/instance-method/actual.js diff --git a/test/syntax-fixtures/classes/instance-method/expected.js b/test/fixtures/syntax/classes/instance-method/expected.js similarity index 100% rename from test/syntax-fixtures/classes/instance-method/expected.js rename to test/fixtures/syntax/classes/instance-method/expected.js diff --git a/test/syntax-fixtures/classes/instance-setter/actual.js b/test/fixtures/syntax/classes/instance-setter/actual.js similarity index 100% rename from test/syntax-fixtures/classes/instance-setter/actual.js rename to test/fixtures/syntax/classes/instance-setter/actual.js diff --git a/test/syntax-fixtures/classes/instance-setter/expected.js b/test/fixtures/syntax/classes/instance-setter/expected.js similarity index 100% rename from test/syntax-fixtures/classes/instance-setter/expected.js rename to test/fixtures/syntax/classes/instance-setter/expected.js diff --git a/test/syntax-fixtures/classes/plain-class/actual.js b/test/fixtures/syntax/classes/plain-class/actual.js similarity index 100% rename from test/syntax-fixtures/classes/plain-class/actual.js rename to test/fixtures/syntax/classes/plain-class/actual.js diff --git a/test/syntax-fixtures/classes/plain-class/expected.js b/test/fixtures/syntax/classes/plain-class/expected.js similarity index 100% rename from test/syntax-fixtures/classes/plain-class/expected.js rename to test/fixtures/syntax/classes/plain-class/expected.js diff --git a/test/syntax-fixtures/classes/statement/actual.js b/test/fixtures/syntax/classes/statement/actual.js similarity index 100% rename from test/syntax-fixtures/classes/statement/actual.js rename to test/fixtures/syntax/classes/statement/actual.js diff --git a/test/syntax-fixtures/classes/statement/expected.js b/test/fixtures/syntax/classes/statement/expected.js similarity index 100% rename from test/syntax-fixtures/classes/statement/expected.js rename to test/fixtures/syntax/classes/statement/expected.js diff --git a/test/syntax-fixtures/classes/static/actual.js b/test/fixtures/syntax/classes/static/actual.js similarity index 100% rename from test/syntax-fixtures/classes/static/actual.js rename to test/fixtures/syntax/classes/static/actual.js diff --git a/test/syntax-fixtures/classes/static/expected.js b/test/fixtures/syntax/classes/static/expected.js similarity index 100% rename from test/syntax-fixtures/classes/static/expected.js rename to test/fixtures/syntax/classes/static/expected.js diff --git a/test/syntax-fixtures/classes/super-class-member-expression/actual.js b/test/fixtures/syntax/classes/super-class-member-expression/actual.js similarity index 100% rename from test/syntax-fixtures/classes/super-class-member-expression/actual.js rename to test/fixtures/syntax/classes/super-class-member-expression/actual.js diff --git a/test/syntax-fixtures/classes/super-class-member-expression/expected.js b/test/fixtures/syntax/classes/super-class-member-expression/expected.js similarity index 100% rename from test/syntax-fixtures/classes/super-class-member-expression/expected.js rename to test/fixtures/syntax/classes/super-class-member-expression/expected.js diff --git a/test/syntax-fixtures/classes/super-class-non-identifiers/actual.js b/test/fixtures/syntax/classes/super-class-non-identifiers/actual.js similarity index 100% rename from test/syntax-fixtures/classes/super-class-non-identifiers/actual.js rename to test/fixtures/syntax/classes/super-class-non-identifiers/actual.js diff --git a/test/syntax-fixtures/classes/super-class-non-identifiers/expected.js b/test/fixtures/syntax/classes/super-class-non-identifiers/expected.js similarity index 100% rename from test/syntax-fixtures/classes/super-class-non-identifiers/expected.js rename to test/fixtures/syntax/classes/super-class-non-identifiers/expected.js diff --git a/test/syntax-fixtures/classes/super-class/actual.js b/test/fixtures/syntax/classes/super-class/actual.js similarity index 100% rename from test/syntax-fixtures/classes/super-class/actual.js rename to test/fixtures/syntax/classes/super-class/actual.js diff --git a/test/syntax-fixtures/classes/super-class/expected.js b/test/fixtures/syntax/classes/super-class/expected.js similarity index 100% rename from test/syntax-fixtures/classes/super-class/expected.js rename to test/fixtures/syntax/classes/super-class/expected.js diff --git a/test/syntax-fixtures/classes/super-fallback/actual.js b/test/fixtures/syntax/classes/super-fallback/actual.js similarity index 100% rename from test/syntax-fixtures/classes/super-fallback/actual.js rename to test/fixtures/syntax/classes/super-fallback/actual.js diff --git a/test/syntax-fixtures/classes/super-fallback/expected.js b/test/fixtures/syntax/classes/super-fallback/expected.js similarity index 100% rename from test/syntax-fixtures/classes/super-fallback/expected.js rename to test/fixtures/syntax/classes/super-fallback/expected.js diff --git a/test/syntax-fixtures/comments/preserve-multi-line/actual.js b/test/fixtures/syntax/comments/preserve-multi-line/actual.js similarity index 100% rename from test/syntax-fixtures/comments/preserve-multi-line/actual.js rename to test/fixtures/syntax/comments/preserve-multi-line/actual.js diff --git a/test/syntax-fixtures/comments/preserve-multi-line/expected.js b/test/fixtures/syntax/comments/preserve-multi-line/expected.js similarity index 100% rename from test/syntax-fixtures/comments/preserve-multi-line/expected.js rename to test/fixtures/syntax/comments/preserve-multi-line/expected.js diff --git a/test/syntax-fixtures/comments/preserve-single-line/actual.js b/test/fixtures/syntax/comments/preserve-single-line/actual.js similarity index 100% rename from test/syntax-fixtures/comments/preserve-single-line/actual.js rename to test/fixtures/syntax/comments/preserve-single-line/actual.js diff --git a/test/syntax-fixtures/comments/preserve-single-line/expected.js b/test/fixtures/syntax/comments/preserve-single-line/expected.js similarity index 100% rename from test/syntax-fixtures/comments/preserve-single-line/expected.js rename to test/fixtures/syntax/comments/preserve-single-line/expected.js diff --git a/test/syntax-fixtures/computed-property-names/method/actual.js b/test/fixtures/syntax/computed-property-names/method/actual.js similarity index 100% rename from test/syntax-fixtures/computed-property-names/method/actual.js rename to test/fixtures/syntax/computed-property-names/method/actual.js diff --git a/test/syntax-fixtures/computed-property-names/method/expected.js b/test/fixtures/syntax/computed-property-names/method/expected.js similarity index 100% rename from test/syntax-fixtures/computed-property-names/method/expected.js rename to test/fixtures/syntax/computed-property-names/method/expected.js diff --git a/test/syntax-fixtures/computed-property-names/mixed/actual.js b/test/fixtures/syntax/computed-property-names/mixed/actual.js similarity index 100% rename from test/syntax-fixtures/computed-property-names/mixed/actual.js rename to test/fixtures/syntax/computed-property-names/mixed/actual.js diff --git a/test/syntax-fixtures/computed-property-names/mixed/expected.js b/test/fixtures/syntax/computed-property-names/mixed/expected.js similarity index 100% rename from test/syntax-fixtures/computed-property-names/mixed/expected.js rename to test/fixtures/syntax/computed-property-names/mixed/expected.js diff --git a/test/syntax-fixtures/computed-property-names/multiple/actual.js b/test/fixtures/syntax/computed-property-names/multiple/actual.js similarity index 100% rename from test/syntax-fixtures/computed-property-names/multiple/actual.js rename to test/fixtures/syntax/computed-property-names/multiple/actual.js diff --git a/test/syntax-fixtures/computed-property-names/multiple/expected.js b/test/fixtures/syntax/computed-property-names/multiple/expected.js similarity index 100% rename from test/syntax-fixtures/computed-property-names/multiple/expected.js rename to test/fixtures/syntax/computed-property-names/multiple/expected.js diff --git a/test/syntax-fixtures/computed-property-names/single/actual.js b/test/fixtures/syntax/computed-property-names/single/actual.js similarity index 100% rename from test/syntax-fixtures/computed-property-names/single/actual.js rename to test/fixtures/syntax/computed-property-names/single/actual.js diff --git a/test/syntax-fixtures/computed-property-names/single/expected.js b/test/fixtures/syntax/computed-property-names/single/expected.js similarity index 100% rename from test/syntax-fixtures/computed-property-names/single/expected.js rename to test/fixtures/syntax/computed-property-names/single/expected.js diff --git a/test/syntax-fixtures/computed-property-names/this/actual.js b/test/fixtures/syntax/computed-property-names/this/actual.js similarity index 100% rename from test/syntax-fixtures/computed-property-names/this/actual.js rename to test/fixtures/syntax/computed-property-names/this/actual.js diff --git a/test/syntax-fixtures/computed-property-names/this/expected.js b/test/fixtures/syntax/computed-property-names/this/expected.js similarity index 100% rename from test/syntax-fixtures/computed-property-names/this/expected.js rename to test/fixtures/syntax/computed-property-names/this/expected.js diff --git a/test/syntax-fixtures/constants/block-statement/actual.js b/test/fixtures/syntax/constants/block-statement/actual.js similarity index 100% rename from test/syntax-fixtures/constants/block-statement/actual.js rename to test/fixtures/syntax/constants/block-statement/actual.js diff --git a/test/syntax-fixtures/constants/block-statement/expected.js b/test/fixtures/syntax/constants/block-statement/expected.js similarity index 100% rename from test/syntax-fixtures/constants/block-statement/expected.js rename to test/fixtures/syntax/constants/block-statement/expected.js diff --git a/test/syntax-fixtures/constants/no-assignment/actual.js b/test/fixtures/syntax/constants/no-assignment/actual.js similarity index 100% rename from test/syntax-fixtures/constants/no-assignment/actual.js rename to test/fixtures/syntax/constants/no-assignment/actual.js diff --git a/test/syntax-fixtures/constants/no-assignment/options.json b/test/fixtures/syntax/constants/no-assignment/options.json similarity index 100% rename from test/syntax-fixtures/constants/no-assignment/options.json rename to test/fixtures/syntax/constants/no-assignment/options.json diff --git a/test/syntax-fixtures/constants/no-declaration/actual.js b/test/fixtures/syntax/constants/no-declaration/actual.js similarity index 100% rename from test/syntax-fixtures/constants/no-declaration/actual.js rename to test/fixtures/syntax/constants/no-declaration/actual.js diff --git a/test/syntax-fixtures/constants/no-declaration/options.json b/test/fixtures/syntax/constants/no-declaration/options.json similarity index 100% rename from test/syntax-fixtures/constants/no-declaration/options.json rename to test/fixtures/syntax/constants/no-declaration/options.json diff --git a/test/syntax-fixtures/constants/program/actual.js b/test/fixtures/syntax/constants/program/actual.js similarity index 100% rename from test/syntax-fixtures/constants/program/actual.js rename to test/fixtures/syntax/constants/program/actual.js diff --git a/test/syntax-fixtures/constants/program/expected.js b/test/fixtures/syntax/constants/program/expected.js similarity index 100% rename from test/syntax-fixtures/constants/program/expected.js rename to test/fixtures/syntax/constants/program/expected.js diff --git a/test/syntax-fixtures/default-parameters/multiple/actual.js b/test/fixtures/syntax/default-parameters/multiple/actual.js similarity index 100% rename from test/syntax-fixtures/default-parameters/multiple/actual.js rename to test/fixtures/syntax/default-parameters/multiple/actual.js diff --git a/test/syntax-fixtures/default-parameters/multiple/expected.js b/test/fixtures/syntax/default-parameters/multiple/expected.js similarity index 100% rename from test/syntax-fixtures/default-parameters/multiple/expected.js rename to test/fixtures/syntax/default-parameters/multiple/expected.js diff --git a/test/syntax-fixtures/default-parameters/single/actual.js b/test/fixtures/syntax/default-parameters/single/actual.js similarity index 100% rename from test/syntax-fixtures/default-parameters/single/actual.js rename to test/fixtures/syntax/default-parameters/single/actual.js diff --git a/test/syntax-fixtures/default-parameters/single/expected.js b/test/fixtures/syntax/default-parameters/single/expected.js similarity index 100% rename from test/syntax-fixtures/default-parameters/single/expected.js rename to test/fixtures/syntax/default-parameters/single/expected.js diff --git a/test/syntax-fixtures/destructuring/array/actual.js b/test/fixtures/syntax/destructuring/array/actual.js similarity index 100% rename from test/syntax-fixtures/destructuring/array/actual.js rename to test/fixtures/syntax/destructuring/array/actual.js diff --git a/test/syntax-fixtures/destructuring/array/expected.js b/test/fixtures/syntax/destructuring/array/expected.js similarity index 100% rename from test/syntax-fixtures/destructuring/array/expected.js rename to test/fixtures/syntax/destructuring/array/expected.js diff --git a/test/syntax-fixtures/destructuring/assignment/actual.js b/test/fixtures/syntax/destructuring/assignment/actual.js similarity index 100% rename from test/syntax-fixtures/destructuring/assignment/actual.js rename to test/fixtures/syntax/destructuring/assignment/actual.js diff --git a/test/syntax-fixtures/destructuring/assignment/expected.js b/test/fixtures/syntax/destructuring/assignment/expected.js similarity index 100% rename from test/syntax-fixtures/destructuring/assignment/expected.js rename to test/fixtures/syntax/destructuring/assignment/expected.js diff --git a/test/syntax-fixtures/destructuring/for-in/actual.js b/test/fixtures/syntax/destructuring/for-in/actual.js similarity index 100% rename from test/syntax-fixtures/destructuring/for-in/actual.js rename to test/fixtures/syntax/destructuring/for-in/actual.js diff --git a/test/syntax-fixtures/destructuring/for-in/expected.js b/test/fixtures/syntax/destructuring/for-in/expected.js similarity index 100% rename from test/syntax-fixtures/destructuring/for-in/expected.js rename to test/fixtures/syntax/destructuring/for-in/expected.js diff --git a/test/syntax-fixtures/destructuring/for-of/actual.js b/test/fixtures/syntax/destructuring/for-of/actual.js similarity index 100% rename from test/syntax-fixtures/destructuring/for-of/actual.js rename to test/fixtures/syntax/destructuring/for-of/actual.js diff --git a/test/syntax-fixtures/destructuring/for-of/expected.js b/test/fixtures/syntax/destructuring/for-of/expected.js similarity index 100% rename from test/syntax-fixtures/destructuring/for-of/expected.js rename to test/fixtures/syntax/destructuring/for-of/expected.js diff --git a/test/syntax-fixtures/destructuring/mixed/actual.js b/test/fixtures/syntax/destructuring/mixed/actual.js similarity index 100% rename from test/syntax-fixtures/destructuring/mixed/actual.js rename to test/fixtures/syntax/destructuring/mixed/actual.js diff --git a/test/syntax-fixtures/destructuring/mixed/expected.js b/test/fixtures/syntax/destructuring/mixed/expected.js similarity index 100% rename from test/syntax-fixtures/destructuring/mixed/expected.js rename to test/fixtures/syntax/destructuring/mixed/expected.js diff --git a/test/syntax-fixtures/destructuring/multiple/actual.js b/test/fixtures/syntax/destructuring/multiple/actual.js similarity index 100% rename from test/syntax-fixtures/destructuring/multiple/actual.js rename to test/fixtures/syntax/destructuring/multiple/actual.js diff --git a/test/syntax-fixtures/destructuring/multiple/expected.js b/test/fixtures/syntax/destructuring/multiple/expected.js similarity index 100% rename from test/syntax-fixtures/destructuring/multiple/expected.js rename to test/fixtures/syntax/destructuring/multiple/expected.js diff --git a/test/syntax-fixtures/destructuring/object-advanced/actual.js b/test/fixtures/syntax/destructuring/object-advanced/actual.js similarity index 100% rename from test/syntax-fixtures/destructuring/object-advanced/actual.js rename to test/fixtures/syntax/destructuring/object-advanced/actual.js diff --git a/test/syntax-fixtures/destructuring/object-advanced/expected.js b/test/fixtures/syntax/destructuring/object-advanced/expected.js similarity index 100% rename from test/syntax-fixtures/destructuring/object-advanced/expected.js rename to test/fixtures/syntax/destructuring/object-advanced/expected.js diff --git a/test/syntax-fixtures/destructuring/object-basic/actual.js b/test/fixtures/syntax/destructuring/object-basic/actual.js similarity index 100% rename from test/syntax-fixtures/destructuring/object-basic/actual.js rename to test/fixtures/syntax/destructuring/object-basic/actual.js diff --git a/test/syntax-fixtures/destructuring/object-basic/expected.js b/test/fixtures/syntax/destructuring/object-basic/expected.js similarity index 100% rename from test/syntax-fixtures/destructuring/object-basic/expected.js rename to test/fixtures/syntax/destructuring/object-basic/expected.js diff --git a/test/syntax-fixtures/destructuring/parameters/actual.js b/test/fixtures/syntax/destructuring/parameters/actual.js similarity index 100% rename from test/syntax-fixtures/destructuring/parameters/actual.js rename to test/fixtures/syntax/destructuring/parameters/actual.js diff --git a/test/syntax-fixtures/destructuring/parameters/expected.js b/test/fixtures/syntax/destructuring/parameters/expected.js similarity index 100% rename from test/syntax-fixtures/destructuring/parameters/expected.js rename to test/fixtures/syntax/destructuring/parameters/expected.js diff --git a/test/syntax-fixtures/errors/constants/actual.js b/test/fixtures/syntax/errors/constants/actual.js similarity index 100% rename from test/syntax-fixtures/errors/constants/actual.js rename to test/fixtures/syntax/errors/constants/actual.js diff --git a/test/syntax-fixtures/errors/constants/options.json b/test/fixtures/syntax/errors/constants/options.json similarity index 100% rename from test/syntax-fixtures/errors/constants/options.json rename to test/fixtures/syntax/errors/constants/options.json diff --git a/test/syntax-fixtures/errors/syntax/actual.js b/test/fixtures/syntax/errors/syntax/actual.js similarity index 100% rename from test/syntax-fixtures/errors/syntax/actual.js rename to test/fixtures/syntax/errors/syntax/actual.js diff --git a/test/syntax-fixtures/errors/syntax/options.json b/test/fixtures/syntax/errors/syntax/options.json similarity index 100% rename from test/syntax-fixtures/errors/syntax/options.json rename to test/fixtures/syntax/errors/syntax/options.json diff --git a/test/syntax-fixtures/for-of/let/actual.js b/test/fixtures/syntax/for-of/let/actual.js similarity index 100% rename from test/syntax-fixtures/for-of/let/actual.js rename to test/fixtures/syntax/for-of/let/actual.js diff --git a/test/syntax-fixtures/for-of/let/expected.js b/test/fixtures/syntax/for-of/let/expected.js similarity index 100% rename from test/syntax-fixtures/for-of/let/expected.js rename to test/fixtures/syntax/for-of/let/expected.js diff --git a/test/syntax-fixtures/for-of/multiple/actual.js b/test/fixtures/syntax/for-of/multiple/actual.js similarity index 100% rename from test/syntax-fixtures/for-of/multiple/actual.js rename to test/fixtures/syntax/for-of/multiple/actual.js diff --git a/test/syntax-fixtures/for-of/multiple/expected.js b/test/fixtures/syntax/for-of/multiple/expected.js similarity index 100% rename from test/syntax-fixtures/for-of/multiple/expected.js rename to test/fixtures/syntax/for-of/multiple/expected.js diff --git a/test/syntax-fixtures/for-of/var/actual.js b/test/fixtures/syntax/for-of/var/actual.js similarity index 100% rename from test/syntax-fixtures/for-of/var/actual.js rename to test/fixtures/syntax/for-of/var/actual.js diff --git a/test/syntax-fixtures/for-of/var/expected.js b/test/fixtures/syntax/for-of/var/expected.js similarity index 100% rename from test/syntax-fixtures/for-of/var/expected.js rename to test/fixtures/syntax/for-of/var/expected.js diff --git a/test/syntax-fixtures/modules/exports-default/actual.js b/test/fixtures/syntax/modules/exports-default/actual.js similarity index 100% rename from test/syntax-fixtures/modules/exports-default/actual.js rename to test/fixtures/syntax/modules/exports-default/actual.js diff --git a/test/syntax-fixtures/modules/exports-default/expected.js b/test/fixtures/syntax/modules/exports-default/expected.js similarity index 100% rename from test/syntax-fixtures/modules/exports-default/expected.js rename to test/fixtures/syntax/modules/exports-default/expected.js diff --git a/test/syntax-fixtures/modules/exports-from/actual.js b/test/fixtures/syntax/modules/exports-from/actual.js similarity index 100% rename from test/syntax-fixtures/modules/exports-from/actual.js rename to test/fixtures/syntax/modules/exports-from/actual.js diff --git a/test/syntax-fixtures/modules/exports-from/expected.js b/test/fixtures/syntax/modules/exports-from/expected.js similarity index 100% rename from test/syntax-fixtures/modules/exports-from/expected.js rename to test/fixtures/syntax/modules/exports-from/expected.js diff --git a/test/syntax-fixtures/modules/exports-named/actual.js b/test/fixtures/syntax/modules/exports-named/actual.js similarity index 100% rename from test/syntax-fixtures/modules/exports-named/actual.js rename to test/fixtures/syntax/modules/exports-named/actual.js diff --git a/test/syntax-fixtures/modules/exports-named/expected.js b/test/fixtures/syntax/modules/exports-named/expected.js similarity index 100% rename from test/syntax-fixtures/modules/exports-named/expected.js rename to test/fixtures/syntax/modules/exports-named/expected.js diff --git a/test/syntax-fixtures/modules/exports-variable/actual.js b/test/fixtures/syntax/modules/exports-variable/actual.js similarity index 100% rename from test/syntax-fixtures/modules/exports-variable/actual.js rename to test/fixtures/syntax/modules/exports-variable/actual.js diff --git a/test/syntax-fixtures/modules/exports-variable/expected.js b/test/fixtures/syntax/modules/exports-variable/expected.js similarity index 100% rename from test/syntax-fixtures/modules/exports-variable/expected.js rename to test/fixtures/syntax/modules/exports-variable/expected.js diff --git a/test/syntax-fixtures/modules/hoist-function-exports/actual.js b/test/fixtures/syntax/modules/hoist-function-exports/actual.js similarity index 100% rename from test/syntax-fixtures/modules/hoist-function-exports/actual.js rename to test/fixtures/syntax/modules/hoist-function-exports/actual.js diff --git a/test/syntax-fixtures/modules/hoist-function-exports/expected.js b/test/fixtures/syntax/modules/hoist-function-exports/expected.js similarity index 100% rename from test/syntax-fixtures/modules/hoist-function-exports/expected.js rename to test/fixtures/syntax/modules/hoist-function-exports/expected.js diff --git a/test/syntax-fixtures/modules/imports-default/actual.js b/test/fixtures/syntax/modules/imports-default/actual.js similarity index 100% rename from test/syntax-fixtures/modules/imports-default/actual.js rename to test/fixtures/syntax/modules/imports-default/actual.js diff --git a/test/syntax-fixtures/modules/imports-default/expected.js b/test/fixtures/syntax/modules/imports-default/expected.js similarity index 100% rename from test/syntax-fixtures/modules/imports-default/expected.js rename to test/fixtures/syntax/modules/imports-default/expected.js diff --git a/test/syntax-fixtures/modules/imports-glob/actual.js b/test/fixtures/syntax/modules/imports-glob/actual.js similarity index 100% rename from test/syntax-fixtures/modules/imports-glob/actual.js rename to test/fixtures/syntax/modules/imports-glob/actual.js diff --git a/test/syntax-fixtures/modules/imports-glob/expected.js b/test/fixtures/syntax/modules/imports-glob/expected.js similarity index 100% rename from test/syntax-fixtures/modules/imports-glob/expected.js rename to test/fixtures/syntax/modules/imports-glob/expected.js diff --git a/test/syntax-fixtures/modules/imports-mixing/actual.js b/test/fixtures/syntax/modules/imports-mixing/actual.js similarity index 100% rename from test/syntax-fixtures/modules/imports-mixing/actual.js rename to test/fixtures/syntax/modules/imports-mixing/actual.js diff --git a/test/syntax-fixtures/modules/imports-mixing/expected.js b/test/fixtures/syntax/modules/imports-mixing/expected.js similarity index 100% rename from test/syntax-fixtures/modules/imports-mixing/expected.js rename to test/fixtures/syntax/modules/imports-mixing/expected.js diff --git a/test/syntax-fixtures/modules/imports-named/actual.js b/test/fixtures/syntax/modules/imports-named/actual.js similarity index 100% rename from test/syntax-fixtures/modules/imports-named/actual.js rename to test/fixtures/syntax/modules/imports-named/actual.js diff --git a/test/syntax-fixtures/modules/imports-named/expected.js b/test/fixtures/syntax/modules/imports-named/expected.js similarity index 100% rename from test/syntax-fixtures/modules/imports-named/expected.js rename to test/fixtures/syntax/modules/imports-named/expected.js diff --git a/test/syntax-fixtures/modules/imports/actual.js b/test/fixtures/syntax/modules/imports/actual.js similarity index 100% rename from test/syntax-fixtures/modules/imports/actual.js rename to test/fixtures/syntax/modules/imports/actual.js diff --git a/test/syntax-fixtures/modules/imports/expected.js b/test/fixtures/syntax/modules/imports/expected.js similarity index 100% rename from test/syntax-fixtures/modules/imports/expected.js rename to test/fixtures/syntax/modules/imports/expected.js diff --git a/test/syntax-fixtures/modules/overview/actual.js b/test/fixtures/syntax/modules/overview/actual.js similarity index 100% rename from test/syntax-fixtures/modules/overview/actual.js rename to test/fixtures/syntax/modules/overview/actual.js diff --git a/test/syntax-fixtures/modules/overview/expected.js b/test/fixtures/syntax/modules/overview/expected.js similarity index 100% rename from test/syntax-fixtures/modules/overview/expected.js rename to test/fixtures/syntax/modules/overview/expected.js diff --git a/test/syntax-fixtures/property-methods-assignment/getter-and-setter/actual.js b/test/fixtures/syntax/property-methods-assignment/getter-and-setter/actual.js similarity index 100% rename from test/syntax-fixtures/property-methods-assignment/getter-and-setter/actual.js rename to test/fixtures/syntax/property-methods-assignment/getter-and-setter/actual.js diff --git a/test/syntax-fixtures/property-methods-assignment/getter-and-setter/expected.js b/test/fixtures/syntax/property-methods-assignment/getter-and-setter/expected.js similarity index 100% rename from test/syntax-fixtures/property-methods-assignment/getter-and-setter/expected.js rename to test/fixtures/syntax/property-methods-assignment/getter-and-setter/expected.js diff --git a/test/syntax-fixtures/property-methods-assignment/getter/actual.js b/test/fixtures/syntax/property-methods-assignment/getter/actual.js similarity index 100% rename from test/syntax-fixtures/property-methods-assignment/getter/actual.js rename to test/fixtures/syntax/property-methods-assignment/getter/actual.js diff --git a/test/syntax-fixtures/property-methods-assignment/getter/expected.js b/test/fixtures/syntax/property-methods-assignment/getter/expected.js similarity index 100% rename from test/syntax-fixtures/property-methods-assignment/getter/expected.js rename to test/fixtures/syntax/property-methods-assignment/getter/expected.js diff --git a/test/syntax-fixtures/property-methods-assignment/method/actual.js b/test/fixtures/syntax/property-methods-assignment/method/actual.js similarity index 100% rename from test/syntax-fixtures/property-methods-assignment/method/actual.js rename to test/fixtures/syntax/property-methods-assignment/method/actual.js diff --git a/test/syntax-fixtures/property-methods-assignment/method/expected.js b/test/fixtures/syntax/property-methods-assignment/method/expected.js similarity index 100% rename from test/syntax-fixtures/property-methods-assignment/method/expected.js rename to test/fixtures/syntax/property-methods-assignment/method/expected.js diff --git a/test/syntax-fixtures/property-methods-assignment/setter/actual.js b/test/fixtures/syntax/property-methods-assignment/setter/actual.js similarity index 100% rename from test/syntax-fixtures/property-methods-assignment/setter/actual.js rename to test/fixtures/syntax/property-methods-assignment/setter/actual.js diff --git a/test/syntax-fixtures/property-methods-assignment/setter/expected.js b/test/fixtures/syntax/property-methods-assignment/setter/expected.js similarity index 100% rename from test/syntax-fixtures/property-methods-assignment/setter/expected.js rename to test/fixtures/syntax/property-methods-assignment/setter/expected.js diff --git a/test/syntax-fixtures/property-name-shorthand/mixed/actual.js b/test/fixtures/syntax/property-name-shorthand/mixed/actual.js similarity index 100% rename from test/syntax-fixtures/property-name-shorthand/mixed/actual.js rename to test/fixtures/syntax/property-name-shorthand/mixed/actual.js diff --git a/test/syntax-fixtures/property-name-shorthand/mixed/expected.js b/test/fixtures/syntax/property-name-shorthand/mixed/expected.js similarity index 100% rename from test/syntax-fixtures/property-name-shorthand/mixed/expected.js rename to test/fixtures/syntax/property-name-shorthand/mixed/expected.js diff --git a/test/syntax-fixtures/property-name-shorthand/multiple/actual.js b/test/fixtures/syntax/property-name-shorthand/multiple/actual.js similarity index 100% rename from test/syntax-fixtures/property-name-shorthand/multiple/actual.js rename to test/fixtures/syntax/property-name-shorthand/multiple/actual.js diff --git a/test/syntax-fixtures/property-name-shorthand/multiple/expected.js b/test/fixtures/syntax/property-name-shorthand/multiple/expected.js similarity index 100% rename from test/syntax-fixtures/property-name-shorthand/multiple/expected.js rename to test/fixtures/syntax/property-name-shorthand/multiple/expected.js diff --git a/test/syntax-fixtures/property-name-shorthand/single/actual.js b/test/fixtures/syntax/property-name-shorthand/single/actual.js similarity index 100% rename from test/syntax-fixtures/property-name-shorthand/single/actual.js rename to test/fixtures/syntax/property-name-shorthand/single/actual.js diff --git a/test/syntax-fixtures/property-name-shorthand/single/expected.js b/test/fixtures/syntax/property-name-shorthand/single/expected.js similarity index 100% rename from test/syntax-fixtures/property-name-shorthand/single/expected.js rename to test/fixtures/syntax/property-name-shorthand/single/expected.js diff --git a/test/syntax-fixtures/rest-parameters/multiple/actual.js b/test/fixtures/syntax/rest-parameters/multiple/actual.js similarity index 100% rename from test/syntax-fixtures/rest-parameters/multiple/actual.js rename to test/fixtures/syntax/rest-parameters/multiple/actual.js diff --git a/test/syntax-fixtures/rest-parameters/multiple/expected.js b/test/fixtures/syntax/rest-parameters/multiple/expected.js similarity index 100% rename from test/syntax-fixtures/rest-parameters/multiple/expected.js rename to test/fixtures/syntax/rest-parameters/multiple/expected.js diff --git a/test/syntax-fixtures/rest-parameters/single/actual.js b/test/fixtures/syntax/rest-parameters/single/actual.js similarity index 100% rename from test/syntax-fixtures/rest-parameters/single/actual.js rename to test/fixtures/syntax/rest-parameters/single/actual.js diff --git a/test/syntax-fixtures/rest-parameters/single/expected.js b/test/fixtures/syntax/rest-parameters/single/expected.js similarity index 100% rename from test/syntax-fixtures/rest-parameters/single/expected.js rename to test/fixtures/syntax/rest-parameters/single/expected.js diff --git a/test/syntax-fixtures/source-maps/arrow-function/actual.js b/test/fixtures/syntax/source-maps/arrow-function/actual.js similarity index 100% rename from test/syntax-fixtures/source-maps/arrow-function/actual.js rename to test/fixtures/syntax/source-maps/arrow-function/actual.js diff --git a/test/syntax-fixtures/source-maps/arrow-function/expected.js b/test/fixtures/syntax/source-maps/arrow-function/expected.js similarity index 100% rename from test/syntax-fixtures/source-maps/arrow-function/expected.js rename to test/fixtures/syntax/source-maps/arrow-function/expected.js diff --git a/test/syntax-fixtures/source-maps/arrow-function/source-mappings.json b/test/fixtures/syntax/source-maps/arrow-function/source-mappings.json similarity index 100% rename from test/syntax-fixtures/source-maps/arrow-function/source-mappings.json rename to test/fixtures/syntax/source-maps/arrow-function/source-mappings.json diff --git a/test/syntax-fixtures/source-maps/class/actual.js b/test/fixtures/syntax/source-maps/class/actual.js similarity index 100% rename from test/syntax-fixtures/source-maps/class/actual.js rename to test/fixtures/syntax/source-maps/class/actual.js diff --git a/test/syntax-fixtures/source-maps/class/expected.js b/test/fixtures/syntax/source-maps/class/expected.js similarity index 100% rename from test/syntax-fixtures/source-maps/class/expected.js rename to test/fixtures/syntax/source-maps/class/expected.js diff --git a/test/syntax-fixtures/source-maps/class/source-mappings.json b/test/fixtures/syntax/source-maps/class/source-mappings.json similarity index 100% rename from test/syntax-fixtures/source-maps/class/source-mappings.json rename to test/fixtures/syntax/source-maps/class/source-mappings.json diff --git a/test/syntax-fixtures/spread/arguments/actual.js b/test/fixtures/syntax/spread/arguments/actual.js similarity index 100% rename from test/syntax-fixtures/spread/arguments/actual.js rename to test/fixtures/syntax/spread/arguments/actual.js diff --git a/test/syntax-fixtures/spread/arguments/expected.js b/test/fixtures/syntax/spread/arguments/expected.js similarity index 100% rename from test/syntax-fixtures/spread/arguments/expected.js rename to test/fixtures/syntax/spread/arguments/expected.js diff --git a/test/syntax-fixtures/spread/array-literals/actual.js b/test/fixtures/syntax/spread/array-literals/actual.js similarity index 100% rename from test/syntax-fixtures/spread/array-literals/actual.js rename to test/fixtures/syntax/spread/array-literals/actual.js diff --git a/test/syntax-fixtures/spread/array-literals/expected.js b/test/fixtures/syntax/spread/array-literals/expected.js similarity index 100% rename from test/syntax-fixtures/spread/array-literals/expected.js rename to test/fixtures/syntax/spread/array-literals/expected.js diff --git a/test/syntax-fixtures/spread/contexted-method-call-multiple-args/actual.js b/test/fixtures/syntax/spread/contexted-method-call-multiple-args/actual.js similarity index 100% rename from test/syntax-fixtures/spread/contexted-method-call-multiple-args/actual.js rename to test/fixtures/syntax/spread/contexted-method-call-multiple-args/actual.js diff --git a/test/syntax-fixtures/spread/contexted-method-call-multiple-args/expected.js b/test/fixtures/syntax/spread/contexted-method-call-multiple-args/expected.js similarity index 100% rename from test/syntax-fixtures/spread/contexted-method-call-multiple-args/expected.js rename to test/fixtures/syntax/spread/contexted-method-call-multiple-args/expected.js diff --git a/test/syntax-fixtures/spread/contexted-method-call-single-arg/actual.js b/test/fixtures/syntax/spread/contexted-method-call-single-arg/actual.js similarity index 100% rename from test/syntax-fixtures/spread/contexted-method-call-single-arg/actual.js rename to test/fixtures/syntax/spread/contexted-method-call-single-arg/actual.js diff --git a/test/syntax-fixtures/spread/contexted-method-call-single-arg/expected.js b/test/fixtures/syntax/spread/contexted-method-call-single-arg/expected.js similarity index 100% rename from test/syntax-fixtures/spread/contexted-method-call-single-arg/expected.js rename to test/fixtures/syntax/spread/contexted-method-call-single-arg/expected.js diff --git a/test/syntax-fixtures/spread/method-call-array-literal/actual.js b/test/fixtures/syntax/spread/method-call-array-literal/actual.js similarity index 100% rename from test/syntax-fixtures/spread/method-call-array-literal/actual.js rename to test/fixtures/syntax/spread/method-call-array-literal/actual.js diff --git a/test/syntax-fixtures/spread/method-call-array-literal/expected.js b/test/fixtures/syntax/spread/method-call-array-literal/expected.js similarity index 100% rename from test/syntax-fixtures/spread/method-call-array-literal/expected.js rename to test/fixtures/syntax/spread/method-call-array-literal/expected.js diff --git a/test/syntax-fixtures/spread/method-call-multiple-args/actual.js b/test/fixtures/syntax/spread/method-call-multiple-args/actual.js similarity index 100% rename from test/syntax-fixtures/spread/method-call-multiple-args/actual.js rename to test/fixtures/syntax/spread/method-call-multiple-args/actual.js diff --git a/test/syntax-fixtures/spread/method-call-multiple-args/expected.js b/test/fixtures/syntax/spread/method-call-multiple-args/expected.js similarity index 100% rename from test/syntax-fixtures/spread/method-call-multiple-args/expected.js rename to test/fixtures/syntax/spread/method-call-multiple-args/expected.js diff --git a/test/syntax-fixtures/spread/method-call-single-arg/actual.js b/test/fixtures/syntax/spread/method-call-single-arg/actual.js similarity index 100% rename from test/syntax-fixtures/spread/method-call-single-arg/actual.js rename to test/fixtures/syntax/spread/method-call-single-arg/actual.js diff --git a/test/syntax-fixtures/spread/method-call-single-arg/expected.js b/test/fixtures/syntax/spread/method-call-single-arg/expected.js similarity index 100% rename from test/syntax-fixtures/spread/method-call-single-arg/expected.js rename to test/fixtures/syntax/spread/method-call-single-arg/expected.js diff --git a/test/syntax-fixtures/template-literals/escape-quotes/actual.js b/test/fixtures/syntax/template-literals/escape-quotes/actual.js similarity index 100% rename from test/syntax-fixtures/template-literals/escape-quotes/actual.js rename to test/fixtures/syntax/template-literals/escape-quotes/actual.js diff --git a/test/syntax-fixtures/template-literals/escape-quotes/expected.js b/test/fixtures/syntax/template-literals/escape-quotes/expected.js similarity index 100% rename from test/syntax-fixtures/template-literals/escape-quotes/expected.js rename to test/fixtures/syntax/template-literals/escape-quotes/expected.js diff --git a/test/syntax-fixtures/template-literals/functions/actual.js b/test/fixtures/syntax/template-literals/functions/actual.js similarity index 100% rename from test/syntax-fixtures/template-literals/functions/actual.js rename to test/fixtures/syntax/template-literals/functions/actual.js diff --git a/test/syntax-fixtures/template-literals/functions/expected.js b/test/fixtures/syntax/template-literals/functions/expected.js similarity index 100% rename from test/syntax-fixtures/template-literals/functions/expected.js rename to test/fixtures/syntax/template-literals/functions/expected.js diff --git a/test/syntax-fixtures/template-literals/multiline/actual.js b/test/fixtures/syntax/template-literals/multiline/actual.js similarity index 100% rename from test/syntax-fixtures/template-literals/multiline/actual.js rename to test/fixtures/syntax/template-literals/multiline/actual.js diff --git a/test/syntax-fixtures/template-literals/multiline/expected.js b/test/fixtures/syntax/template-literals/multiline/expected.js similarity index 100% rename from test/syntax-fixtures/template-literals/multiline/expected.js rename to test/fixtures/syntax/template-literals/multiline/expected.js diff --git a/test/syntax-fixtures/template-literals/multiple/actual.js b/test/fixtures/syntax/template-literals/multiple/actual.js similarity index 100% rename from test/syntax-fixtures/template-literals/multiple/actual.js rename to test/fixtures/syntax/template-literals/multiple/actual.js diff --git a/test/syntax-fixtures/template-literals/multiple/expected.js b/test/fixtures/syntax/template-literals/multiple/expected.js similarity index 100% rename from test/syntax-fixtures/template-literals/multiple/expected.js rename to test/fixtures/syntax/template-literals/multiple/expected.js diff --git a/test/syntax-fixtures/template-literals/none/actual.js b/test/fixtures/syntax/template-literals/none/actual.js similarity index 100% rename from test/syntax-fixtures/template-literals/none/actual.js rename to test/fixtures/syntax/template-literals/none/actual.js diff --git a/test/syntax-fixtures/template-literals/none/expected.js b/test/fixtures/syntax/template-literals/none/expected.js similarity index 100% rename from test/syntax-fixtures/template-literals/none/expected.js rename to test/fixtures/syntax/template-literals/none/expected.js diff --git a/test/syntax-fixtures/template-literals/only/actual.js b/test/fixtures/syntax/template-literals/only/actual.js similarity index 100% rename from test/syntax-fixtures/template-literals/only/actual.js rename to test/fixtures/syntax/template-literals/only/actual.js diff --git a/test/syntax-fixtures/template-literals/only/expected.js b/test/fixtures/syntax/template-literals/only/expected.js similarity index 100% rename from test/syntax-fixtures/template-literals/only/expected.js rename to test/fixtures/syntax/template-literals/only/expected.js diff --git a/test/syntax-fixtures/template-literals/single/actual.js b/test/fixtures/syntax/template-literals/single/actual.js similarity index 100% rename from test/syntax-fixtures/template-literals/single/actual.js rename to test/fixtures/syntax/template-literals/single/actual.js diff --git a/test/syntax-fixtures/template-literals/single/expected.js b/test/fixtures/syntax/template-literals/single/expected.js similarity index 100% rename from test/syntax-fixtures/template-literals/single/expected.js rename to test/fixtures/syntax/template-literals/single/expected.js diff --git a/test/syntax-fixtures/template-literals/statement/actual.js b/test/fixtures/syntax/template-literals/statement/actual.js similarity index 100% rename from test/syntax-fixtures/template-literals/statement/actual.js rename to test/fixtures/syntax/template-literals/statement/actual.js diff --git a/test/syntax-fixtures/template-literals/statement/expected.js b/test/fixtures/syntax/template-literals/statement/expected.js similarity index 100% rename from test/syntax-fixtures/template-literals/statement/expected.js rename to test/fixtures/syntax/template-literals/statement/expected.js diff --git a/test/syntax-fixtures/template-literals/tag/actual.js b/test/fixtures/syntax/template-literals/tag/actual.js similarity index 100% rename from test/syntax-fixtures/template-literals/tag/actual.js rename to test/fixtures/syntax/template-literals/tag/actual.js diff --git a/test/syntax-fixtures/template-literals/tag/expected.js b/test/fixtures/syntax/template-literals/tag/expected.js similarity index 100% rename from test/syntax-fixtures/template-literals/tag/expected.js rename to test/fixtures/syntax/template-literals/tag/expected.js diff --git a/test/syntax-fixtures/unicode-regex/basic/actual.js b/test/fixtures/syntax/unicode-regex/basic/actual.js similarity index 100% rename from test/syntax-fixtures/unicode-regex/basic/actual.js rename to test/fixtures/syntax/unicode-regex/basic/actual.js diff --git a/test/syntax-fixtures/unicode-regex/basic/expected.js b/test/fixtures/syntax/unicode-regex/basic/expected.js similarity index 100% rename from test/syntax-fixtures/unicode-regex/basic/expected.js rename to test/fixtures/syntax/unicode-regex/basic/expected.js