diff --git a/test/core/fixtures/transformation/spec.function-name/all/actual.js b/test/core/fixtures/transformation/spec.function-name/all/actual.js
deleted file mode 100644
index cba195bf78..0000000000
--- a/test/core/fixtures/transformation/spec.function-name/all/actual.js
+++ /dev/null
@@ -1,48 +0,0 @@
-var obj = {
-  // localy declared variable
-  f: function () {
-    (function f() {
-      console.log(f);
-    })();
-  },
-
-  // self reference
-  h: function () {
-    console.log(h);
-  },
-
-  // no reference
-  m: function () {
-    doSmth();
-  }
-};
-
-// locally declared variable
-var f = function () {
-  var f = 2;
-};
-
-// self reference
-var f = function () {
-  console.log(f, g);
-};
-
-// no reference
-var g = function () {
-  doSmth();
-};
-
-// param with the same name as id
-var h = function (h) {
-
-};
-
-// assignment to self
-var i = function () {
-  i = 5;
-};
-
-// assignment to self
-var j = function () {
-  ({ j } = 5);
-};
diff --git a/test/core/fixtures/transformation/spec.function-name/all/expected.js b/test/core/fixtures/transformation/spec.function-name/all/expected.js
deleted file mode 100644
index c10af5c4a8..0000000000
--- a/test/core/fixtures/transformation/spec.function-name/all/expected.js
+++ /dev/null
@@ -1,79 +0,0 @@
-"use strict";
-
-var obj = {
-  // localy declared variable
-  f: function f() {
-    (function f() {
-      console.log(f);
-    })();
-  },
-
-  // self reference
-  h: (function (_h) {
-    var _hWrapper = function h() {
-      return _h.apply(this, arguments);
-    };
-
-    _hWrapper.toString = function () {
-      return _h.toString();
-    };
-
-    return _hWrapper;
-  })(function () {
-    console.log(h);
-  }),
-
-  // no reference
-  m: function m() {
-    doSmth();
-  }
-};
-
-// locally declared variable
-var f = function f() {
-  var f = 2;
-};
-
-// self reference
-var f = (function (_f) {
-  var _fWrapper = function f() {
-    return _f.apply(this, arguments);
-  };
-
-  _fWrapper.toString = function () {
-    return _f.toString();
-  };
-
-  return _fWrapper;
-})(function () {
-  console.log(f, g);
-});
-
-// no reference
-var g = function g() {
-  doSmth();
-};
-
-// param with the same name as id
-var h = function h(h) {};
-
-// assignment to self
-var i = (function (_i) {
-  var _iWrapper = function i() {
-    return _i.apply(this, arguments);
-  };
-
-  _iWrapper.toString = function () {
-    return _i.toString();
-  };
-
-  return _iWrapper;
-})(function () {
-  i = 5;
-});
-
-// assignment to self
-var j = function j() {
-  var _ = 5;
-  j = _.j;
-};
\ No newline at end of file
diff --git a/test/core/fixtures/transformation/spec.function-name/assignment/actual.js b/test/core/fixtures/transformation/spec.function-name/assignment/actual.js
new file mode 100644
index 0000000000..584125ac2e
--- /dev/null
+++ b/test/core/fixtures/transformation/spec.function-name/assignment/actual.js
@@ -0,0 +1,7 @@
+var i = function () {
+  i = 5;
+};
+
+var j = function () {
+  ({ j } = 5);
+};
diff --git a/test/core/fixtures/transformation/spec.function-name/assignment/expected.js b/test/core/fixtures/transformation/spec.function-name/assignment/expected.js
new file mode 100644
index 0000000000..9f3395038b
--- /dev/null
+++ b/test/core/fixtures/transformation/spec.function-name/assignment/expected.js
@@ -0,0 +1,20 @@
+"use strict";
+
+var i = (function (_i) {
+  var _iWrapper = function i() {
+    return _i.apply(this, arguments);
+  };
+
+  _iWrapper.toString = function () {
+    return _i.toString();
+  };
+
+  return _iWrapper;
+})(function () {
+  i = 5;
+});
+
+var j = function j() {
+  var _ = 5;
+  j = _.j;
+};
diff --git a/test/core/fixtures/transformation/spec.function-name/basic/actual.js b/test/core/fixtures/transformation/spec.function-name/basic/actual.js
new file mode 100644
index 0000000000..be005cf8aa
--- /dev/null
+++ b/test/core/fixtures/transformation/spec.function-name/basic/actual.js
@@ -0,0 +1,5 @@
+var g = function () {
+  doSmth();
+};
+
+var h = function (h) {};
diff --git a/test/core/fixtures/transformation/spec.function-name/basic/expected.js b/test/core/fixtures/transformation/spec.function-name/basic/expected.js
new file mode 100644
index 0000000000..d055852eb2
--- /dev/null
+++ b/test/core/fixtures/transformation/spec.function-name/basic/expected.js
@@ -0,0 +1,7 @@
+"use strict";
+
+var g = function g() {
+  doSmth();
+};
+
+var h = function h(h) {};
diff --git a/test/core/fixtures/transformation/spec.function-name/object/actual.js b/test/core/fixtures/transformation/spec.function-name/object/actual.js
new file mode 100644
index 0000000000..4b72d3b784
--- /dev/null
+++ b/test/core/fixtures/transformation/spec.function-name/object/actual.js
@@ -0,0 +1,15 @@
+var obj = {
+  f: function () {
+    (function f() {
+      console.log(f);
+    })();
+  },
+
+  h: function () {
+    console.log(h);
+  },
+
+  m: function () {
+    doSmth();
+  }
+};
diff --git a/test/core/fixtures/transformation/spec.function-name/object/expected.js b/test/core/fixtures/transformation/spec.function-name/object/expected.js
new file mode 100644
index 0000000000..87c73c49fb
--- /dev/null
+++ b/test/core/fixtures/transformation/spec.function-name/object/expected.js
@@ -0,0 +1,27 @@
+"use strict";
+
+var obj = {
+  f: function f() {
+    (function f() {
+      console.log(f);
+    })();
+  },
+
+  h: (function (_h) {
+    var _hWrapper = function h() {
+      return _h.apply(this, arguments);
+    };
+
+    _hWrapper.toString = function () {
+      return _h.toString();
+    };
+
+    return _hWrapper;
+  })(function () {
+    console.log(h);
+  }),
+
+  m: function m() {
+    doSmth();
+  }
+};
diff --git a/test/core/fixtures/transformation/spec.function-name/own-bindings/actual.js b/test/core/fixtures/transformation/spec.function-name/own-bindings/actual.js
new file mode 100644
index 0000000000..6798b01a7b
--- /dev/null
+++ b/test/core/fixtures/transformation/spec.function-name/own-bindings/actual.js
@@ -0,0 +1,9 @@
+var f = function () {
+  var f = 2;
+};
+
+var f = function (f) {};
+
+var obj = {
+  f: function (f) {}
+};
diff --git a/test/core/fixtures/transformation/spec.function-name/own-bindings/expected.js b/test/core/fixtures/transformation/spec.function-name/own-bindings/expected.js
new file mode 100644
index 0000000000..f97255a175
--- /dev/null
+++ b/test/core/fixtures/transformation/spec.function-name/own-bindings/expected.js
@@ -0,0 +1,31 @@
+"use strict";
+
+var f = function f() {
+  var f = 2;
+};
+
+var f = (function (_f) {
+  var _fWrapper = function f(_x) {
+    return _f.apply(this, arguments);
+  };
+
+  _fWrapper.toString = function () {
+    return _f.toString();
+  };
+
+  return _fWrapper;
+})(function (f) {});
+
+var obj = {
+  f: (function (_f) {
+    var _fWrapper = function f(_x) {
+      return _f.apply(this, arguments);
+    };
+
+    _fWrapper.toString = function () {
+      return _f.toString();
+    };
+
+    return _fWrapper;
+  })(function (f) {})
+};
diff --git a/test/core/fixtures/transformation/spec.function-name/self-reference/actual.js b/test/core/fixtures/transformation/spec.function-name/self-reference/actual.js
new file mode 100644
index 0000000000..3c3e0607d2
--- /dev/null
+++ b/test/core/fixtures/transformation/spec.function-name/self-reference/actual.js
@@ -0,0 +1,3 @@
+var f = function () {
+  console.log(f, g);
+};
diff --git a/test/core/fixtures/transformation/spec.function-name/self-reference/expected.js b/test/core/fixtures/transformation/spec.function-name/self-reference/expected.js
new file mode 100644
index 0000000000..73ea1067e5
--- /dev/null
+++ b/test/core/fixtures/transformation/spec.function-name/self-reference/expected.js
@@ -0,0 +1,15 @@
+"use strict";
+
+var f = (function (_f) {
+  var _fWrapper = function f() {
+    return _f.apply(this, arguments);
+  };
+
+  _fWrapper.toString = function () {
+    return _f.toString();
+  };
+
+  return _fWrapper;
+})(function () {
+  console.log(f, g);
+});