diff --git a/packages/babel-parser/test/fixtures/comments/basic/shebang-import/input.js b/packages/babel-parser/test/fixtures/comments/interpreter-directive/interpreter-directive-import/input.js
similarity index 100%
rename from packages/babel-parser/test/fixtures/comments/basic/shebang-import/input.js
rename to packages/babel-parser/test/fixtures/comments/interpreter-directive/interpreter-directive-import/input.js
diff --git a/packages/babel-parser/test/fixtures/comments/basic/shebang-import/options.json b/packages/babel-parser/test/fixtures/comments/interpreter-directive/interpreter-directive-import/options.json
similarity index 100%
rename from packages/babel-parser/test/fixtures/comments/basic/shebang-import/options.json
rename to packages/babel-parser/test/fixtures/comments/interpreter-directive/interpreter-directive-import/options.json
diff --git a/packages/babel-parser/test/fixtures/comments/basic/shebang-import/output.json b/packages/babel-parser/test/fixtures/comments/interpreter-directive/interpreter-directive-import/output.json
similarity index 100%
rename from packages/babel-parser/test/fixtures/comments/basic/shebang-import/output.json
rename to packages/babel-parser/test/fixtures/comments/interpreter-directive/interpreter-directive-import/output.json
diff --git a/packages/babel-parser/test/fixtures/comments/basic/shebang-object/input.js b/packages/babel-parser/test/fixtures/comments/interpreter-directive/interpreter-directive-object/input.js
similarity index 100%
rename from packages/babel-parser/test/fixtures/comments/basic/shebang-object/input.js
rename to packages/babel-parser/test/fixtures/comments/interpreter-directive/interpreter-directive-object/input.js
diff --git a/packages/babel-parser/test/fixtures/comments/basic/shebang-object/output.json b/packages/babel-parser/test/fixtures/comments/interpreter-directive/interpreter-directive-object/output.json
similarity index 100%
rename from packages/babel-parser/test/fixtures/comments/basic/shebang-object/output.json
rename to packages/babel-parser/test/fixtures/comments/interpreter-directive/interpreter-directive-object/output.json
diff --git a/packages/babylon/test/fixtures/comments/basic/interpreter-directive-import/input.js b/packages/babylon/test/fixtures/comments/basic/interpreter-directive-import/input.js
deleted file mode 100755
index 450358ed06..0000000000
--- a/packages/babylon/test/fixtures/comments/basic/interpreter-directive-import/input.js
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/usr/bin/env babel-node
-
-import {spawn} from 'foobar';
diff --git a/packages/babylon/test/fixtures/comments/basic/interpreter-directive-import/options.json b/packages/babylon/test/fixtures/comments/basic/interpreter-directive-import/options.json
deleted file mode 100644
index 2104ca4328..0000000000
--- a/packages/babylon/test/fixtures/comments/basic/interpreter-directive-import/options.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-  "sourceType": "module"
-}
diff --git a/packages/babylon/test/fixtures/comments/basic/interpreter-directive-import/output.json b/packages/babylon/test/fixtures/comments/basic/interpreter-directive-import/output.json
deleted file mode 100644
index 2967587b80..0000000000
--- a/packages/babylon/test/fixtures/comments/basic/interpreter-directive-import/output.json
+++ /dev/null
@@ -1,136 +0,0 @@
-{
-  "type": "File",
-  "start": 0,
-  "end": 56,
-  "loc": {
-    "start": {
-      "line": 1,
-      "column": 0
-    },
-    "end": {
-      "line": 3,
-      "column": 29
-    }
-  },
-  "program": {
-    "type": "Program",
-    "start": 0,
-    "end": 56,
-    "loc": {
-      "start": {
-        "line": 1,
-        "column": 0
-      },
-      "end": {
-        "line": 3,
-        "column": 29
-      }
-    },
-    "sourceType": "module",
-    "interpreter": {
-      "type": "InterpreterDirective",
-      "start": 0,
-      "end": 25,
-      "loc": {
-        "start": {
-          "line": 1,
-          "column": 0
-        },
-        "end": {
-          "line": 1,
-          "column": 25
-        }
-      },
-      "value": "/usr/bin/env babel-node"
-    },
-    "body": [
-      {
-        "type": "ImportDeclaration",
-        "start": 27,
-        "end": 56,
-        "loc": {
-          "start": {
-            "line": 3,
-            "column": 0
-          },
-          "end": {
-            "line": 3,
-            "column": 29
-          }
-        },
-        "specifiers": [
-          {
-            "type": "ImportSpecifier",
-            "start": 35,
-            "end": 40,
-            "loc": {
-              "start": {
-                "line": 3,
-                "column": 8
-              },
-              "end": {
-                "line": 3,
-                "column": 13
-              }
-            },
-            "imported": {
-              "type": "Identifier",
-              "start": 35,
-              "end": 40,
-              "loc": {
-                "start": {
-                  "line": 3,
-                  "column": 8
-                },
-                "end": {
-                  "line": 3,
-                  "column": 13
-                },
-                "identifierName": "spawn"
-              },
-              "name": "spawn"
-            },
-            "local": {
-              "type": "Identifier",
-              "start": 35,
-              "end": 40,
-              "loc": {
-                "start": {
-                  "line": 3,
-                  "column": 8
-                },
-                "end": {
-                  "line": 3,
-                  "column": 13
-                },
-                "identifierName": "spawn"
-              },
-              "name": "spawn"
-            }
-          }
-        ],
-        "source": {
-          "type": "StringLiteral",
-          "start": 47,
-          "end": 55,
-          "loc": {
-            "start": {
-              "line": 3,
-              "column": 20
-            },
-            "end": {
-              "line": 3,
-              "column": 28
-            }
-          },
-          "extra": {
-            "rawValue": "foobar",
-            "raw": "'foobar'"
-          },
-          "value": "foobar"
-        }
-      }
-    ],
-    "directives": []
-  }
-}
\ No newline at end of file
diff --git a/packages/babylon/test/fixtures/comments/basic/interpreter-directive-object/input.js b/packages/babylon/test/fixtures/comments/basic/interpreter-directive-object/input.js
deleted file mode 100755
index a61adc7c27..0000000000
--- a/packages/babylon/test/fixtures/comments/basic/interpreter-directive-object/input.js
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/usr/bin/env babel-node
-
-var { spawn } = x;
diff --git a/packages/babylon/test/fixtures/comments/basic/interpreter-directive-object/output.json b/packages/babylon/test/fixtures/comments/basic/interpreter-directive-object/output.json
deleted file mode 100644
index 43dd91cf31..0000000000
--- a/packages/babylon/test/fixtures/comments/basic/interpreter-directive-object/output.json
+++ /dev/null
@@ -1,172 +0,0 @@
-{
-  "type": "File",
-  "start": 0,
-  "end": 45,
-  "loc": {
-    "start": {
-      "line": 1,
-      "column": 0
-    },
-    "end": {
-      "line": 3,
-      "column": 18
-    }
-  },
-  "program": {
-    "type": "Program",
-    "start": 0,
-    "end": 45,
-    "loc": {
-      "start": {
-        "line": 1,
-        "column": 0
-      },
-      "end": {
-        "line": 3,
-        "column": 18
-      }
-    },
-    "sourceType": "script",
-    "interpreter": {
-      "type": "InterpreterDirective",
-      "start": 0,
-      "end": 25,
-      "loc": {
-        "start": {
-          "line": 1,
-          "column": 0
-        },
-        "end": {
-          "line": 1,
-          "column": 25
-        }
-      },
-      "value": "/usr/bin/env babel-node"
-    },
-    "body": [
-      {
-        "type": "VariableDeclaration",
-        "start": 27,
-        "end": 45,
-        "loc": {
-          "start": {
-            "line": 3,
-            "column": 0
-          },
-          "end": {
-            "line": 3,
-            "column": 18
-          }
-        },
-        "declarations": [
-          {
-            "type": "VariableDeclarator",
-            "start": 31,
-            "end": 44,
-            "loc": {
-              "start": {
-                "line": 3,
-                "column": 4
-              },
-              "end": {
-                "line": 3,
-                "column": 17
-              }
-            },
-            "id": {
-              "type": "ObjectPattern",
-              "start": 31,
-              "end": 40,
-              "loc": {
-                "start": {
-                  "line": 3,
-                  "column": 4
-                },
-                "end": {
-                  "line": 3,
-                  "column": 13
-                }
-              },
-              "properties": [
-                {
-                  "type": "ObjectProperty",
-                  "start": 33,
-                  "end": 38,
-                  "loc": {
-                    "start": {
-                      "line": 3,
-                      "column": 6
-                    },
-                    "end": {
-                      "line": 3,
-                      "column": 11
-                    }
-                  },
-                  "method": false,
-                  "key": {
-                    "type": "Identifier",
-                    "start": 33,
-                    "end": 38,
-                    "loc": {
-                      "start": {
-                        "line": 3,
-                        "column": 6
-                      },
-                      "end": {
-                        "line": 3,
-                        "column": 11
-                      },
-                      "identifierName": "spawn"
-                    },
-                    "name": "spawn"
-                  },
-                  "computed": false,
-                  "shorthand": true,
-                  "value": {
-                    "type": "Identifier",
-                    "start": 33,
-                    "end": 38,
-                    "loc": {
-                      "start": {
-                        "line": 3,
-                        "column": 6
-                      },
-                      "end": {
-                        "line": 3,
-                        "column": 11
-                      },
-                      "identifierName": "spawn"
-                    },
-                    "name": "spawn"
-                  },
-                  "extra": {
-                    "shorthand": true
-                  }
-                }
-              ]
-            },
-            "init": {
-              "type": "Identifier",
-              "start": 43,
-              "end": 44,
-              "loc": {
-                "start": {
-                  "line": 3,
-                  "column": 16
-                },
-                "end": {
-                  "line": 3,
-                  "column": 17
-                },
-                "identifierName": "x"
-              },
-              "name": "x"
-            }
-          }
-        ],
-        "kind": "var"
-      }
-    ],
-    "directives": []
-  }
-}
\ No newline at end of file