diff --git a/fish-rust/src/tests/parser.rs b/fish-rust/src/tests/parser.rs
index b2da9f1c5..6e8e977e7 100644
--- a/fish-rust/src/tests/parser.rs
+++ b/fish-rust/src/tests/parser.rs
@@ -320,6 +320,61 @@ add_test!("test_new_parser_correctness", || {
     validate!("true || \n\n false", true);
 });
 
+add_test!("test_new_parser_correctness", || {
+    let fuzzes = [
+        L!("if"),
+        L!("else"),
+        L!("for"),
+        L!("in"),
+        L!("while"),
+        L!("begin"),
+        L!("function"),
+        L!("switch"),
+        L!("case"),
+        L!("end"),
+        L!("and"),
+        L!("or"),
+        L!("not"),
+        L!("command"),
+        L!("builtin"),
+        L!("foo"),
+        L!("|"),
+        L!("^"),
+        L!("&"),
+        L!(";"),
+    ];
+
+    // Generate a list of strings of all keyword / token combinations.
+    let mut src = WString::new();
+    src.reserve(128);
+
+    // Given that we have an array of 'fuzz_count' strings, we wish to enumerate all permutations of
+    // 'len' values. We do this by incrementing an integer, interpreting it as "base fuzz_count".
+    fn string_for_permutation(fuzzes: &[&wstr], len: usize, permutation: usize) -> Option<WString> {
+        let mut remaining_permutation = permutation;
+        let mut out_str = WString::new();
+        for _i in 0..len {
+            let idx = remaining_permutation % fuzzes.len();
+            remaining_permutation /= fuzzes.len();
+            out_str.push_utfstr(fuzzes[idx]);
+            out_str.push(' ');
+        }
+        // Return false if we wrapped.
+        (remaining_permutation == 0).then_some(out_str)
+    }
+
+    let max_len = 5;
+    for len in 0..max_len {
+        // We wish to look at all permutations of 4 elements of 'fuzzes' (with replacement).
+        // Construct an int and keep incrementing it.
+        let mut permutation = 0;
+        while let Some(src) = string_for_permutation(&fuzzes, len, permutation) {
+            permutation += 1;
+            Ast::parse(&src, ParseTreeFlags::default(), None);
+        }
+    }
+});
+
 add_test!("test_eval_recursion_detection", || {
     // Ensure that we don't crash on infinite self recursion and mutual recursion. These must use
     // the principal parser because we cannot yet execute jobs on other parsers.
diff --git a/src/fish_tests.cpp b/src/fish_tests.cpp
index a4e85728e..a6ebe4588 100644
--- a/src/fish_tests.cpp
+++ b/src/fish_tests.cpp
@@ -1077,58 +1077,6 @@ static void test_input() {
     }
 }
 
-// Given that we have an array of 'fuzz_count' strings, we wish to enumerate all permutations of
-// 'len' values. We do this by incrementing an integer, interpreting it as "base fuzz_count".
-static inline bool string_for_permutation(const wcstring *fuzzes, size_t fuzz_count, size_t len,
-                                          size_t permutation, wcstring *out_str) {
-    out_str->clear();
-
-    size_t remaining_permutation = permutation;
-    for (size_t i = 0; i < len; i++) {
-        size_t idx = remaining_permutation % fuzz_count;
-        remaining_permutation /= fuzz_count;
-
-        out_str->append(fuzzes[idx]);
-        out_str->push_back(L' ');
-    }
-    // Return false if we wrapped.
-    return remaining_permutation == 0;
-}
-
-// todo!("port this")
-static void test_new_parser_fuzzing() {
-    say(L"Fuzzing parser");
-    const wcstring fuzzes[] = {
-        L"if",      L"else", L"for", L"in",  L"while", L"begin", L"function",
-        L"switch",  L"case", L"end", L"and", L"or",    L"not",   L"command",
-        L"builtin", L"foo",  L"|",   L"^",   L"&",     L";",
-    };
-
-    // Generate a list of strings of all keyword / token combinations.
-    wcstring src;
-    src.reserve(128);
-
-    auto errors = new_parse_error_list();
-
-    double start = timef();
-    bool log_it = true;
-    unsigned long max_len = 5;
-    for (unsigned long len = 0; len < max_len; len++) {
-        if (log_it) std::fwprintf(stderr, L"%lu / %lu...", len, max_len);
-
-        // We wish to look at all permutations of 4 elements of 'fuzzes' (with replacement).
-        // Construct an int and keep incrementing it.
-        unsigned long permutation = 0;
-        while (string_for_permutation(fuzzes, sizeof fuzzes / sizeof *fuzzes, len, permutation++,
-                                      &src)) {
-            ast_parse(src);
-        }
-        if (log_it) std::fwprintf(stderr, L"done (%lu)\n", permutation);
-    }
-    double end = timef();
-    if (log_it) say(L"All fuzzed in %.2f seconds!", end - start);
-}
-
 // todo!("port this")
 // Parse a statement, returning the command, args (joined by spaces), and the decoration. Returns
 // true if successful.
@@ -1767,7 +1715,6 @@ static const test_t s_tests[]{
     {TEST_GROUP("autosuggestion"), test_autosuggestion_combining},
     {TEST_GROUP("new_parser_ll2"), test_new_parser_ll2},
     {TEST_GROUP("test_abbreviations"), test_abbreviations},
-    {TEST_GROUP("new_parser_fuzzing"), test_new_parser_fuzzing},
     {TEST_GROUP("new_parser_ad_hoc"), test_new_parser_ad_hoc},
     {TEST_GROUP("new_parser_errors"), test_new_parser_errors},
     {TEST_GROUP("error_messages"), test_error_messages},