diff --git a/packages/babel-parser/src/tokenizer/index.js b/packages/babel-parser/src/tokenizer/index.js
index ba544a9fb7a3..050120ca786a 100644
--- a/packages/babel-parser/src/tokenizer/index.js
+++ b/packages/babel-parser/src/tokenizer/index.js
@@ -1007,11 +1007,9 @@ export default class Tokenizer extends LocationParser {
       this.raise(this.state.start + 2, "Expected number in radix " + radix);
     }
 
-    if (this.hasPlugin("bigInt")) {
-      if (this.input.charCodeAt(this.state.pos) === charCodes.lowercaseN) {
-        ++this.state.pos;
-        isBigInt = true;
-      }
+    if (this.input.charCodeAt(this.state.pos) === charCodes.lowercaseN) {
+      ++this.state.pos;
+      isBigInt = true;
     }
 
     if (isIdentifierStart(this.input.codePointAt(this.state.pos))) {
@@ -1088,16 +1086,14 @@ export default class Tokenizer extends LocationParser {
       }
     }
 
-    if (this.hasPlugin("bigInt")) {
-      if (next === charCodes.lowercaseN) {
-        // disallow floats, legacy octal syntax and non octal decimals
-        // new style octal ("0o") is handled in this.readRadixNumber
-        if (isFloat || octal || isNonOctalDecimalInt) {
-          this.raise(start, "Invalid BigIntLiteral");
-        }
-        ++this.state.pos;
-        isBigInt = true;
+    if (next === charCodes.lowercaseN) {
+      // disallow floats, legacy octal syntax and non octal decimals
+      // new style octal ("0o") is handled in this.readRadixNumber
+      if (isFloat || octal || isNonOctalDecimalInt) {
+        this.raise(start, "Invalid BigIntLiteral");
       }
+      ++this.state.pos;
+      isBigInt = true;
     }
 
     if (isIdentifierStart(this.input.codePointAt(this.state.pos))) {
diff --git a/packages/babel-parser/test/fixtures/experimental/bigint/decimal-as-property-name/input.js b/packages/babel-parser/test/fixtures/es2020/bigint/decimal-as-property-name/input.js
similarity index 100%
rename from packages/babel-parser/test/fixtures/experimental/bigint/decimal-as-property-name/input.js
rename to packages/babel-parser/test/fixtures/es2020/bigint/decimal-as-property-name/input.js
diff --git a/packages/babel-parser/test/fixtures/experimental/bigint/decimal-as-property-name/output.json b/packages/babel-parser/test/fixtures/es2020/bigint/decimal-as-property-name/output.json
similarity index 100%
rename from packages/babel-parser/test/fixtures/experimental/bigint/decimal-as-property-name/output.json
rename to packages/babel-parser/test/fixtures/es2020/bigint/decimal-as-property-name/output.json
diff --git a/packages/babel-parser/test/fixtures/experimental/bigint/hex-as-property-name/input.js b/packages/babel-parser/test/fixtures/es2020/bigint/hex-as-property-name/input.js
similarity index 100%
rename from packages/babel-parser/test/fixtures/experimental/bigint/hex-as-property-name/input.js
rename to packages/babel-parser/test/fixtures/es2020/bigint/hex-as-property-name/input.js
diff --git a/packages/babel-parser/test/fixtures/experimental/bigint/hex-as-property-name/output.json b/packages/babel-parser/test/fixtures/es2020/bigint/hex-as-property-name/output.json
similarity index 100%
rename from packages/babel-parser/test/fixtures/experimental/bigint/hex-as-property-name/output.json
rename to packages/babel-parser/test/fixtures/es2020/bigint/hex-as-property-name/output.json
diff --git a/packages/babel-parser/test/fixtures/experimental/bigint/invalid-decimal/input.js b/packages/babel-parser/test/fixtures/es2020/bigint/invalid-decimal/input.js
similarity index 100%
rename from packages/babel-parser/test/fixtures/experimental/bigint/invalid-decimal/input.js
rename to packages/babel-parser/test/fixtures/es2020/bigint/invalid-decimal/input.js
diff --git a/packages/babel-parser/test/fixtures/experimental/bigint/invalid-decimal/output.json b/packages/babel-parser/test/fixtures/es2020/bigint/invalid-decimal/output.json
similarity index 100%
rename from packages/babel-parser/test/fixtures/experimental/bigint/invalid-decimal/output.json
rename to packages/babel-parser/test/fixtures/es2020/bigint/invalid-decimal/output.json
diff --git a/packages/babel-parser/test/fixtures/experimental/bigint/invalid-e/input.js b/packages/babel-parser/test/fixtures/es2020/bigint/invalid-e/input.js
similarity index 100%
rename from packages/babel-parser/test/fixtures/experimental/bigint/invalid-e/input.js
rename to packages/babel-parser/test/fixtures/es2020/bigint/invalid-e/input.js
diff --git a/packages/babel-parser/test/fixtures/experimental/bigint/invalid-e/output.json b/packages/babel-parser/test/fixtures/es2020/bigint/invalid-e/output.json
similarity index 100%
rename from packages/babel-parser/test/fixtures/experimental/bigint/invalid-e/output.json
rename to packages/babel-parser/test/fixtures/es2020/bigint/invalid-e/output.json
diff --git a/packages/babel-parser/test/fixtures/experimental/bigint/invalid-non-octal-decimal-int/input.js b/packages/babel-parser/test/fixtures/es2020/bigint/invalid-non-octal-decimal-int/input.js
similarity index 100%
rename from packages/babel-parser/test/fixtures/experimental/bigint/invalid-non-octal-decimal-int/input.js
rename to packages/babel-parser/test/fixtures/es2020/bigint/invalid-non-octal-decimal-int/input.js
diff --git a/packages/babel-parser/test/fixtures/experimental/bigint/invalid-non-octal-decimal-int/output.json b/packages/babel-parser/test/fixtures/es2020/bigint/invalid-non-octal-decimal-int/output.json
similarity index 100%
rename from packages/babel-parser/test/fixtures/experimental/bigint/invalid-non-octal-decimal-int/output.json
rename to packages/babel-parser/test/fixtures/es2020/bigint/invalid-non-octal-decimal-int/output.json
diff --git a/packages/babel-parser/test/fixtures/experimental/bigint/invalid-octal-legacy/input.js b/packages/babel-parser/test/fixtures/es2020/bigint/invalid-octal-legacy/input.js
similarity index 100%
rename from packages/babel-parser/test/fixtures/experimental/bigint/invalid-octal-legacy/input.js
rename to packages/babel-parser/test/fixtures/es2020/bigint/invalid-octal-legacy/input.js
diff --git a/packages/babel-parser/test/fixtures/experimental/bigint/invalid-octal-legacy/output.json b/packages/babel-parser/test/fixtures/es2020/bigint/invalid-octal-legacy/output.json
similarity index 100%
rename from packages/babel-parser/test/fixtures/experimental/bigint/invalid-octal-legacy/output.json
rename to packages/babel-parser/test/fixtures/es2020/bigint/invalid-octal-legacy/output.json
diff --git a/packages/babel-parser/test/fixtures/experimental/bigint/valid-binary/input.js b/packages/babel-parser/test/fixtures/es2020/bigint/valid-binary/input.js
similarity index 100%
rename from packages/babel-parser/test/fixtures/experimental/bigint/valid-binary/input.js
rename to packages/babel-parser/test/fixtures/es2020/bigint/valid-binary/input.js
diff --git a/packages/babel-parser/test/fixtures/experimental/bigint/valid-binary/output.json b/packages/babel-parser/test/fixtures/es2020/bigint/valid-binary/output.json
similarity index 100%
rename from packages/babel-parser/test/fixtures/experimental/bigint/valid-binary/output.json
rename to packages/babel-parser/test/fixtures/es2020/bigint/valid-binary/output.json
diff --git a/packages/babel-parser/test/fixtures/experimental/bigint/valid-hex/input.js b/packages/babel-parser/test/fixtures/es2020/bigint/valid-hex/input.js
similarity index 100%
rename from packages/babel-parser/test/fixtures/experimental/bigint/valid-hex/input.js
rename to packages/babel-parser/test/fixtures/es2020/bigint/valid-hex/input.js
diff --git a/packages/babel-parser/test/fixtures/experimental/bigint/valid-hex/output.json b/packages/babel-parser/test/fixtures/es2020/bigint/valid-hex/output.json
similarity index 100%
rename from packages/babel-parser/test/fixtures/experimental/bigint/valid-hex/output.json
rename to packages/babel-parser/test/fixtures/es2020/bigint/valid-hex/output.json
diff --git a/packages/babel-parser/test/fixtures/experimental/bigint/valid-large/input.js b/packages/babel-parser/test/fixtures/es2020/bigint/valid-large/input.js
similarity index 100%
rename from packages/babel-parser/test/fixtures/experimental/bigint/valid-large/input.js
rename to packages/babel-parser/test/fixtures/es2020/bigint/valid-large/input.js
diff --git a/packages/babel-parser/test/fixtures/experimental/bigint/valid-large/output.json b/packages/babel-parser/test/fixtures/es2020/bigint/valid-large/output.json
similarity index 100%
rename from packages/babel-parser/test/fixtures/experimental/bigint/valid-large/output.json
rename to packages/babel-parser/test/fixtures/es2020/bigint/valid-large/output.json
diff --git a/packages/babel-parser/test/fixtures/experimental/bigint/valid-octal-new/input.js b/packages/babel-parser/test/fixtures/es2020/bigint/valid-octal-new/input.js
similarity index 100%
rename from packages/babel-parser/test/fixtures/experimental/bigint/valid-octal-new/input.js
rename to packages/babel-parser/test/fixtures/es2020/bigint/valid-octal-new/input.js
diff --git a/packages/babel-parser/test/fixtures/experimental/bigint/valid-octal-new/output.json b/packages/babel-parser/test/fixtures/es2020/bigint/valid-octal-new/output.json
similarity index 100%
rename from packages/babel-parser/test/fixtures/experimental/bigint/valid-octal-new/output.json
rename to packages/babel-parser/test/fixtures/es2020/bigint/valid-octal-new/output.json
diff --git a/packages/babel-parser/test/fixtures/experimental/bigint/valid-small/input.js b/packages/babel-parser/test/fixtures/es2020/bigint/valid-small/input.js
similarity index 100%
rename from packages/babel-parser/test/fixtures/experimental/bigint/valid-small/input.js
rename to packages/babel-parser/test/fixtures/es2020/bigint/valid-small/input.js
diff --git a/packages/babel-parser/test/fixtures/experimental/bigint/valid-small/output.json b/packages/babel-parser/test/fixtures/es2020/bigint/valid-small/output.json
similarity index 100%
rename from packages/babel-parser/test/fixtures/experimental/bigint/valid-small/output.json
rename to packages/babel-parser/test/fixtures/es2020/bigint/valid-small/output.json
diff --git a/packages/babel-parser/test/fixtures/estree/bigInt/options.json b/packages/babel-parser/test/fixtures/estree/bigInt/options.json
index 0df9db5c35e7..070d941a7562 100644
--- a/packages/babel-parser/test/fixtures/estree/bigInt/options.json
+++ b/packages/babel-parser/test/fixtures/estree/bigInt/options.json
@@ -1,3 +1,3 @@
 {
-  "plugins": ["estree", "bigInt"]
+  "plugins": ["estree"]
 }
diff --git a/packages/babel-parser/test/fixtures/experimental/bigint/invalid-non-octal-decimal-int/options.json b/packages/babel-parser/test/fixtures/experimental/bigint/invalid-non-octal-decimal-int/options.json
deleted file mode 100644
index f6a5fb21f1c3..000000000000
--- a/packages/babel-parser/test/fixtures/experimental/bigint/invalid-non-octal-decimal-int/options.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-  "plugins": ["bigInt"]
-}
diff --git a/packages/babel-parser/test/fixtures/experimental/bigint/options.json b/packages/babel-parser/test/fixtures/experimental/bigint/options.json
deleted file mode 100644
index f6a5fb21f1c3..000000000000
--- a/packages/babel-parser/test/fixtures/experimental/bigint/options.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-  "plugins": ["bigInt"]
-}
diff --git a/packages/babel-parser/test/fixtures/experimental/numeric-separator/invalid-hex/options.json b/packages/babel-parser/test/fixtures/experimental/numeric-separator/invalid-hex/options.json
index d6659f4863e6..7832463eea97 100644
--- a/packages/babel-parser/test/fixtures/experimental/numeric-separator/invalid-hex/options.json
+++ b/packages/babel-parser/test/fixtures/experimental/numeric-separator/invalid-hex/options.json
@@ -1,3 +1,3 @@
 {
-  "plugins": ["bigInt", "numericSeparator"]
+  "plugins": ["numericSeparator"]
 }
diff --git a/packages/babel-parser/test/fixtures/experimental/numeric-separator/invalid-leading-zero/options.json b/packages/babel-parser/test/fixtures/experimental/numeric-separator/invalid-leading-zero/options.json
index d6659f4863e6..7832463eea97 100644
--- a/packages/babel-parser/test/fixtures/experimental/numeric-separator/invalid-leading-zero/options.json
+++ b/packages/babel-parser/test/fixtures/experimental/numeric-separator/invalid-leading-zero/options.json
@@ -1,3 +1,3 @@
 {
-  "plugins": ["bigInt", "numericSeparator"]
+  "plugins": ["numericSeparator"]
 }
diff --git a/packages/babel-parser/test/fixtures/experimental/numeric-separator/invalid-legacy-octal-literal/options.json b/packages/babel-parser/test/fixtures/experimental/numeric-separator/invalid-legacy-octal-literal/options.json
index d6659f4863e6..7832463eea97 100644
--- a/packages/babel-parser/test/fixtures/experimental/numeric-separator/invalid-legacy-octal-literal/options.json
+++ b/packages/babel-parser/test/fixtures/experimental/numeric-separator/invalid-legacy-octal-literal/options.json
@@ -1,3 +1,3 @@
 {
-  "plugins": ["bigInt", "numericSeparator"]
+  "plugins": ["numericSeparator"]
 }
diff --git a/packages/babel-parser/test/fixtures/experimental/numeric-separator/invalid-non-octal-decimal-int/options.json b/packages/babel-parser/test/fixtures/experimental/numeric-separator/invalid-non-octal-decimal-int/options.json
index d6659f4863e6..7832463eea97 100644
--- a/packages/babel-parser/test/fixtures/experimental/numeric-separator/invalid-non-octal-decimal-int/options.json
+++ b/packages/babel-parser/test/fixtures/experimental/numeric-separator/invalid-non-octal-decimal-int/options.json
@@ -1,3 +1,3 @@
 {
-  "plugins": ["bigInt", "numericSeparator"]
+  "plugins": ["numericSeparator"]
 }
diff --git a/packages/babel-parser/test/fixtures/experimental/numeric-separator/invalid-unicode-2/options.json b/packages/babel-parser/test/fixtures/experimental/numeric-separator/invalid-unicode-2/options.json
index d6659f4863e6..7832463eea97 100644
--- a/packages/babel-parser/test/fixtures/experimental/numeric-separator/invalid-unicode-2/options.json
+++ b/packages/babel-parser/test/fixtures/experimental/numeric-separator/invalid-unicode-2/options.json
@@ -1,3 +1,3 @@
 {
-  "plugins": ["bigInt", "numericSeparator"]
+  "plugins": ["numericSeparator"]
 }
diff --git a/packages/babel-parser/test/fixtures/experimental/numeric-separator/invalid-unicode/options.json b/packages/babel-parser/test/fixtures/experimental/numeric-separator/invalid-unicode/options.json
index d6659f4863e6..7832463eea97 100644
--- a/packages/babel-parser/test/fixtures/experimental/numeric-separator/invalid-unicode/options.json
+++ b/packages/babel-parser/test/fixtures/experimental/numeric-separator/invalid-unicode/options.json
@@ -1,3 +1,3 @@
 {
-  "plugins": ["bigInt", "numericSeparator"]
+  "plugins": ["numericSeparator"]
 }
diff --git a/packages/babel-parser/test/fixtures/experimental/numeric-separator/options.json b/packages/babel-parser/test/fixtures/experimental/numeric-separator/options.json
index d6659f4863e6..7832463eea97 100644
--- a/packages/babel-parser/test/fixtures/experimental/numeric-separator/options.json
+++ b/packages/babel-parser/test/fixtures/experimental/numeric-separator/options.json
@@ -1,3 +1,3 @@
 {
-  "plugins": ["bigInt", "numericSeparator"]
+  "plugins": ["numericSeparator"]
 }