diff --git a/crates/nu-command/tests/commands/source_env.rs b/crates/nu-command/tests/commands/source_env.rs
index 0b5e3ee4e..733a610cd 100644
--- a/crates/nu-command/tests/commands/source_env.rs
+++ b/crates/nu-command/tests/commands/source_env.rs
@@ -194,7 +194,7 @@ fn source_env_eval_export_env_hide() {
 
         let actual = nu!(cwd: dirs.test(), pipeline(&inp.join("; ")));
 
-        assert!(actual.err.contains("cannot find column"));
+        assert!(actual.err.contains("not_found"));
     })
 }
 
diff --git a/crates/nu-command/tests/commands/use_.rs b/crates/nu-command/tests/commands/use_.rs
index a2ff62cbf..9e2273b4c 100644
--- a/crates/nu-command/tests/commands/use_.rs
+++ b/crates/nu-command/tests/commands/use_.rs
@@ -97,7 +97,7 @@ fn use_eval_export_env_hide() {
 
         let actual = nu!(cwd: dirs.test(), pipeline(&inp.join("; ")));
 
-        assert!(actual.err.contains("cannot find column"));
+        assert!(actual.err.contains("not_found"));
     })
 }
 
diff --git a/src/tests/test_hiding.rs b/src/tests/test_hiding.rs
index 67f31202d..0485de9c2 100644
--- a/src/tests/test_hiding.rs
+++ b/src/tests/test_hiding.rs
@@ -116,7 +116,7 @@ fn hides_alias_in_scope_4() -> TestResult {
 fn hides_env_in_scope_1() -> TestResult {
     fail_test(
         r#"let-env foo = "foo"; do { hide-env foo; $env.foo }"#,
-        "cannot find column",
+        "not_found",
     )
 }
 
diff --git a/tests/overlays/mod.rs b/tests/overlays/mod.rs
index 75d75fb81..277672b6c 100644
--- a/tests/overlays/mod.rs
+++ b/tests/overlays/mod.rs
@@ -337,8 +337,8 @@ fn remove_overlay_env() {
     let actual = nu!(cwd: "tests/overlays", pipeline(&inp.join("; ")));
     let actual_repl = nu!(cwd: "tests/overlays", nu_repl_code(inp));
 
-    assert!(actual.err.contains("cannot find column"));
-    assert!(actual_repl.err.contains("cannot find column"));
+    assert!(actual.err.contains("not_found"));
+    assert!(actual_repl.err.contains("not_found"));
 }
 
 #[test]
@@ -448,8 +448,8 @@ fn remove_overlay_discard_env() {
     let actual = nu!(cwd: "tests/overlays", pipeline(&inp.join("; ")));
     let actual_repl = nu!(cwd: "tests/overlays", nu_repl_code(inp));
 
-    assert!(actual.err.contains("cannot find column"));
-    assert!(actual_repl.err.contains("cannot find column"));
+    assert!(actual.err.contains("not_found"));
+    assert!(actual_repl.err.contains("not_found"));
 }
 
 #[test]
@@ -496,8 +496,8 @@ fn remove_overlay_dont_keep_env() {
     let actual = nu!(cwd: "tests/overlays", pipeline(&inp.join("; ")));
     let actual_repl = nu!(cwd: "tests/overlays", nu_repl_code(inp));
 
-    assert!(actual.err.contains("cannot find column"));
-    assert!(actual_repl.err.contains("cannot find column"));
+    assert!(actual.err.contains("not_found"));
+    assert!(actual_repl.err.contains("not_found"));
 }
 
 #[test]
@@ -550,8 +550,8 @@ fn remove_overlay_dont_keep_overwritten_env() {
     let actual = nu!(cwd: "tests/overlays", pipeline(&inp.join("; ")));
     let actual_repl = nu!(cwd: "tests/overlays", nu_repl_code(inp));
 
-    assert!(actual.err.contains("cannot find column"));
-    assert!(actual_repl.err.contains("cannot find column"));
+    assert!(actual.err.contains("not_found"));
+    assert!(actual_repl.err.contains("not_found"));
 }
 
 #[test]
@@ -604,8 +604,8 @@ fn remove_overlay_dont_keep_env_in_latest_overlay() {
     let actual = nu!(cwd: "tests/overlays", pipeline(&inp.join("; ")));
     let actual_repl = nu!(cwd: "tests/overlays", nu_repl_code(inp));
 
-    assert!(actual.err.contains("cannot find column"));
-    assert!(actual_repl.err.contains("cannot find column"));
+    assert!(actual.err.contains("not_found"));
+    assert!(actual_repl.err.contains("not_found"));
 }
 
 #[test]
@@ -799,8 +799,8 @@ fn overlay_use_export_env_hide() {
     let actual = nu!(cwd: "tests/overlays", pipeline(&inp.join("; ")));
     let actual_repl = nu!(cwd: "tests/overlays", nu_repl_code(inp));
 
-    assert!(actual.err.contains("cannot find column"));
-    assert!(actual_repl.err.contains("cannot find column"));
+    assert!(actual.err.contains("not_found"));
+    assert!(actual_repl.err.contains("not_found"));
 }
 
 #[test]
diff --git a/tests/shell/pipeline/commands/internal.rs b/tests/shell/pipeline/commands/internal.rs
index 5c072e47a..eda3029a5 100644
--- a/tests/shell/pipeline/commands/internal.rs
+++ b/tests/shell/pipeline/commands/internal.rs
@@ -392,7 +392,7 @@ fn let_env_hides_variable() {
     );
 
     assert_eq!(actual.out, "hello world");
-    assert!(actual.err.contains("cannot find column"));
+    assert!(actual.err.contains("not_found"));
 }
 
 #[test]
@@ -411,7 +411,7 @@ fn let_env_hides_variable_in_parent_scope() {
     );
 
     assert_eq!(actual.out, "hello world");
-    assert!(actual.err.contains("cannot find column"));
+    assert!(actual.err.contains("not_found"));
 }
 
 #[test]
@@ -424,7 +424,7 @@ fn unlet_env_variable() {
             echo $env.TEST_VAR
         "#
     );
-    assert!(actual.err.contains("cannot find column"));
+    assert!(actual.err.contains("not_found"));
 }
 
 #[test]
@@ -469,7 +469,7 @@ fn let_env_doesnt_leak() {
         "#
     );
 
-    assert!(actual.err.contains("cannot find column"));
+    assert!(actual.err.contains("not_found"));
 }
 
 #[test]
@@ -518,7 +518,7 @@ fn load_env_doesnt_leak() {
         "#
     );
 
-    assert!(actual.err.contains("cannot find column"));
+    assert!(actual.err.contains("not_found"));
 }
 
 #[test]