diff --git a/src/babel/transformation/transformers/es6/block-scoping-tdz.js b/src/babel/transformation/transformers/es6/spec.block-scoping.js
similarity index 100%
rename from src/babel/transformation/transformers/es6/block-scoping-tdz.js
rename to src/babel/transformation/transformers/es6/spec.block-scoping.js
diff --git a/src/babel/transformation/transformers/index.js b/src/babel/transformation/transformers/index.js
index 211542f00d..9b0d847ea4 100644
--- a/src/babel/transformation/transformers/index.js
+++ b/src/babel/transformation/transformers/index.js
@@ -72,7 +72,7 @@ export default {
   "es6.blockScoping":                      require("./es6/block-scoping"),
 
   // needs to be after `es6.blockScoping` due to needing `letReferences` set on blocks
-  "es6.blockScopingTDZ":                   require("./es6/block-scoping-tdz"),
+  "es6.spec.blockScoping":                 require("./es6/block-scoping-tdz"),
 
   // needs to be after `es6.parameters.*` and `es6.blockScoping` due to needing pure
   // identifiers in parameters and variable declarators
diff --git a/test/core/fixtures/transformation/es6.block-scoping-tdz-pass/options.json b/test/core/fixtures/transformation/es6.block-scoping-tdz-pass/options.json
deleted file mode 100644
index 725a1cc809..0000000000
--- a/test/core/fixtures/transformation/es6.block-scoping-tdz-pass/options.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-  "optional": "es6.blockScopingTDZ"
-}
diff --git a/test/core/fixtures/transformation/es6.block-scoping-tdz-fail/assignment.js b/test/core/fixtures/transformation/es6.spec.block-scoping-fail/assignment.js
similarity index 100%
rename from test/core/fixtures/transformation/es6.block-scoping-tdz-fail/assignment.js
rename to test/core/fixtures/transformation/es6.spec.block-scoping-fail/assignment.js
diff --git a/test/core/fixtures/transformation/es6.block-scoping-tdz-fail/call-2.js b/test/core/fixtures/transformation/es6.spec.block-scoping-fail/call-2.js
similarity index 100%
rename from test/core/fixtures/transformation/es6.block-scoping-tdz-fail/call-2.js
rename to test/core/fixtures/transformation/es6.spec.block-scoping-fail/call-2.js
diff --git a/test/core/fixtures/transformation/es6.block-scoping-tdz-fail/call-3.js b/test/core/fixtures/transformation/es6.spec.block-scoping-fail/call-3.js
similarity index 100%
rename from test/core/fixtures/transformation/es6.block-scoping-tdz-fail/call-3.js
rename to test/core/fixtures/transformation/es6.spec.block-scoping-fail/call-3.js
diff --git a/test/core/fixtures/transformation/es6.block-scoping-tdz-fail/call.js b/test/core/fixtures/transformation/es6.spec.block-scoping-fail/call.js
similarity index 100%
rename from test/core/fixtures/transformation/es6.block-scoping-tdz-fail/call.js
rename to test/core/fixtures/transformation/es6.spec.block-scoping-fail/call.js
diff --git a/test/core/fixtures/transformation/es6.block-scoping-tdz-fail/defaults.js b/test/core/fixtures/transformation/es6.spec.block-scoping-fail/defaults.js
similarity index 100%
rename from test/core/fixtures/transformation/es6.block-scoping-tdz-fail/defaults.js
rename to test/core/fixtures/transformation/es6.spec.block-scoping-fail/defaults.js
diff --git a/test/core/fixtures/transformation/es6.block-scoping-tdz-fail/destructuring.js b/test/core/fixtures/transformation/es6.spec.block-scoping-fail/destructuring.js
similarity index 100%
rename from test/core/fixtures/transformation/es6.block-scoping-tdz-fail/destructuring.js
rename to test/core/fixtures/transformation/es6.spec.block-scoping-fail/destructuring.js
diff --git a/test/core/fixtures/transformation/es6.block-scoping-tdz-fail/export.js b/test/core/fixtures/transformation/es6.spec.block-scoping-fail/export.js
similarity index 100%
rename from test/core/fixtures/transformation/es6.block-scoping-tdz-fail/export.js
rename to test/core/fixtures/transformation/es6.spec.block-scoping-fail/export.js
diff --git a/test/core/fixtures/transformation/es6.block-scoping-tdz-fail/options.json b/test/core/fixtures/transformation/es6.spec.block-scoping-fail/options.json
similarity index 58%
rename from test/core/fixtures/transformation/es6.block-scoping-tdz-fail/options.json
rename to test/core/fixtures/transformation/es6.spec.block-scoping-fail/options.json
index 835e6ee178..9bf3d7cd6e 100644
--- a/test/core/fixtures/transformation/es6.block-scoping-tdz-fail/options.json
+++ b/test/core/fixtures/transformation/es6.spec.block-scoping-fail/options.json
@@ -1,4 +1,4 @@
 {
-  "optional": "es6.blockScopingTDZ",
+  "optional": "es6.spec.blockScoping",
   "throws": "is not defined - temporal dead zone"
 }
diff --git a/test/core/fixtures/transformation/es6.block-scoping-tdz-fail/update.js b/test/core/fixtures/transformation/es6.spec.block-scoping-fail/update.js
similarity index 100%
rename from test/core/fixtures/transformation/es6.block-scoping-tdz-fail/update.js
rename to test/core/fixtures/transformation/es6.spec.block-scoping-fail/update.js
diff --git a/test/core/fixtures/transformation/es6.block-scoping-tdz-pass/assignment.js b/test/core/fixtures/transformation/es6.spec.block-scoping-pass/assignment.js
similarity index 100%
rename from test/core/fixtures/transformation/es6.block-scoping-tdz-pass/assignment.js
rename to test/core/fixtures/transformation/es6.spec.block-scoping-pass/assignment.js
diff --git a/test/core/fixtures/transformation/es6.block-scoping-tdz-pass/call.js b/test/core/fixtures/transformation/es6.spec.block-scoping-pass/call.js
similarity index 100%
rename from test/core/fixtures/transformation/es6.block-scoping-tdz-pass/call.js
rename to test/core/fixtures/transformation/es6.spec.block-scoping-pass/call.js
diff --git a/test/core/fixtures/transformation/es6.block-scoping-tdz-pass/defaults.js b/test/core/fixtures/transformation/es6.spec.block-scoping-pass/defaults.js
similarity index 100%
rename from test/core/fixtures/transformation/es6.block-scoping-tdz-pass/defaults.js
rename to test/core/fixtures/transformation/es6.spec.block-scoping-pass/defaults.js
diff --git a/test/core/fixtures/transformation/es6.block-scoping-tdz-pass/destructuring.js b/test/core/fixtures/transformation/es6.spec.block-scoping-pass/destructuring.js
similarity index 100%
rename from test/core/fixtures/transformation/es6.block-scoping-tdz-pass/destructuring.js
rename to test/core/fixtures/transformation/es6.spec.block-scoping-pass/destructuring.js
diff --git a/test/core/fixtures/transformation/es6.block-scoping-tdz-pass/export.js b/test/core/fixtures/transformation/es6.spec.block-scoping-pass/export.js
similarity index 100%
rename from test/core/fixtures/transformation/es6.block-scoping-tdz-pass/export.js
rename to test/core/fixtures/transformation/es6.spec.block-scoping-pass/export.js
diff --git a/test/core/fixtures/transformation/es6.spec.block-scoping-pass/options.json b/test/core/fixtures/transformation/es6.spec.block-scoping-pass/options.json
new file mode 100644
index 0000000000..37caa06731
--- /dev/null
+++ b/test/core/fixtures/transformation/es6.spec.block-scoping-pass/options.json
@@ -0,0 +1,3 @@
+{
+  "optional": "es6.spec.blockScoping"
+}
diff --git a/test/core/fixtures/transformation/es6.block-scoping-tdz-pass/update.js b/test/core/fixtures/transformation/es6.spec.block-scoping-pass/update.js
similarity index 100%
rename from test/core/fixtures/transformation/es6.block-scoping-tdz-pass/update.js
rename to test/core/fixtures/transformation/es6.spec.block-scoping-pass/update.js
diff --git a/test/core/fixtures/transformation/es6.spec.symbols/options.json b/test/core/fixtures/transformation/es6.spec.symbols/options.json
index b0bf4c5146..2d94fb1fb3 100644
--- a/test/core/fixtures/transformation/es6.spec.symbols/options.json
+++ b/test/core/fixtures/transformation/es6.spec.symbols/options.json
@@ -1,3 +1,3 @@
 {
-  "optional": ["es6.symbols"]
+  "optional": ["es6.spec.symbols"]
 }
diff --git a/test/core/kangax.js b/test/core/kangax.js
index 9240bf614b..bde4fd4f6a 100644
--- a/test/core/kangax.js
+++ b/test/core/kangax.js
@@ -48,7 +48,7 @@ suite("kangax/compat-table", function () {
       code = transform(code, {
         filename: key,
         blacklist: ["strict"],
-        optional: ["es6.symbols", "es6.blockScopingTDZ"]
+        optional: ["es6.spec.symbols", "es6.spec.blockScoping"]
       }).code;
 
       code = '"use strict";\n' + code;
diff --git a/test/core/traceur.js b/test/core/traceur.js
index d542a7c49e..e25a77c6d9 100644
--- a/test/core/traceur.js
+++ b/test/core/traceur.js
@@ -93,7 +93,7 @@ require("./_transformation-helper")({
     "Syntax/StrictKeywords"
   ]
 }, {
-  optional: ["es6.symbols"],
+  optional: ["es6.spec.symbols"],
   stage: 0
 }, function (opts, task) {
   if (!_.contains(task.exec.loc, "module.js")) {