diff --git a/packages/babel-parser/test/fixtures/core/categorized/regex-after-star/input.js b/packages/babel-parser/test/fixtures/core/categorized/regex-after-star/input.js
new file mode 100644
index 000000000000..9a85649c5bfc
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/core/categorized/regex-after-star/input.js
@@ -0,0 +1 @@
+a * /b/
diff --git a/packages/babel-parser/test/fixtures/core/categorized/regex-after-star/output.json b/packages/babel-parser/test/fixtures/core/categorized/regex-after-star/output.json
new file mode 100644
index 000000000000..2e01bf74071e
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/core/categorized/regex-after-star/output.json
@@ -0,0 +1,36 @@
+{
+  "type": "File",
+  "start":0,"end":7,"loc":{"start":{"line":1,"column":0},"end":{"line":1,"column":7}},
+  "program": {
+    "type": "Program",
+    "start":0,"end":7,"loc":{"start":{"line":1,"column":0},"end":{"line":1,"column":7}},
+    "sourceType": "script",
+    "interpreter": null,
+    "body": [
+      {
+        "type": "ExpressionStatement",
+        "start":0,"end":7,"loc":{"start":{"line":1,"column":0},"end":{"line":1,"column":7}},
+        "expression": {
+          "type": "BinaryExpression",
+          "start":0,"end":7,"loc":{"start":{"line":1,"column":0},"end":{"line":1,"column":7}},
+          "left": {
+            "type": "Identifier",
+            "start":0,"end":1,"loc":{"start":{"line":1,"column":0},"end":{"line":1,"column":1},"identifierName":"a"},
+            "name": "a"
+          },
+          "operator": "*",
+          "right": {
+            "type": "RegExpLiteral",
+            "start":4,"end":7,"loc":{"start":{"line":1,"column":4},"end":{"line":1,"column":7}},
+            "extra": {
+              "raw": "/b/"
+            },
+            "pattern": "b",
+            "flags": ""
+          }
+        }
+      }
+    ],
+    "directives": []
+  }
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/es2015/generators/yield-regex/input.js b/packages/babel-parser/test/fixtures/es2015/generators/yield-regex/input.js
new file mode 100644
index 000000000000..b91a3d7dd136
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/es2015/generators/yield-regex/input.js
@@ -0,0 +1 @@
+function* x() { yield y * /z/ }
diff --git a/packages/babel-parser/test/fixtures/es2015/generators/yield-regex/output.json b/packages/babel-parser/test/fixtures/es2015/generators/yield-regex/output.json
new file mode 100644
index 000000000000..f367326bbe9e
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/es2015/generators/yield-regex/output.json
@@ -0,0 +1,60 @@
+{
+  "type": "File",
+  "start":0,"end":31,"loc":{"start":{"line":1,"column":0},"end":{"line":1,"column":31}},
+  "program": {
+    "type": "Program",
+    "start":0,"end":31,"loc":{"start":{"line":1,"column":0},"end":{"line":1,"column":31}},
+    "sourceType": "script",
+    "interpreter": null,
+    "body": [
+      {
+        "type": "FunctionDeclaration",
+        "start":0,"end":31,"loc":{"start":{"line":1,"column":0},"end":{"line":1,"column":31}},
+        "id": {
+          "type": "Identifier",
+          "start":10,"end":11,"loc":{"start":{"line":1,"column":10},"end":{"line":1,"column":11},"identifierName":"x"},
+          "name": "x"
+        },
+        "generator": true,
+        "async": false,
+        "params": [],
+        "body": {
+          "type": "BlockStatement",
+          "start":14,"end":31,"loc":{"start":{"line":1,"column":14},"end":{"line":1,"column":31}},
+          "body": [
+            {
+              "type": "ExpressionStatement",
+              "start":16,"end":29,"loc":{"start":{"line":1,"column":16},"end":{"line":1,"column":29}},
+              "expression": {
+                "type": "YieldExpression",
+                "start":16,"end":29,"loc":{"start":{"line":1,"column":16},"end":{"line":1,"column":29}},
+                "delegate": false,
+                "argument": {
+                  "type": "BinaryExpression",
+                  "start":22,"end":29,"loc":{"start":{"line":1,"column":22},"end":{"line":1,"column":29}},
+                  "left": {
+                    "type": "Identifier",
+                    "start":22,"end":23,"loc":{"start":{"line":1,"column":22},"end":{"line":1,"column":23},"identifierName":"y"},
+                    "name": "y"
+                  },
+                  "operator": "*",
+                  "right": {
+                    "type": "RegExpLiteral",
+                    "start":26,"end":29,"loc":{"start":{"line":1,"column":26},"end":{"line":1,"column":29}},
+                    "extra": {
+                      "raw": "/z/"
+                    },
+                    "pattern": "z",
+                    "flags": ""
+                  }
+                }
+              }
+            }
+          ],
+          "directives": []
+        }
+      }
+    ],
+    "directives": []
+  }
+}
\ No newline at end of file