diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 1ecda698c7..d5cf758b56 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -55,7 +55,6 @@ It is good practice to cover your changes with a test. Also, try to think about
 
 Tests can be found in different places:
 * `/tests`
-* `src/tests`
 * command examples
 * crate-specific tests
 
diff --git a/src/main.rs b/src/main.rs
index 714b932df8..db0c80d4f2 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -7,8 +7,6 @@ mod signals;
 #[cfg(unix)]
 mod terminal;
 mod test_bins;
-#[cfg(test)]
-mod tests;
 
 #[cfg(feature = "mimalloc")]
 #[global_allocator]
diff --git a/tests/main.rs b/tests/main.rs
index db44c4e019..6824f26f13 100644
--- a/tests/main.rs
+++ b/tests/main.rs
@@ -11,5 +11,6 @@ mod path;
 mod plugin_persistence;
 #[cfg(feature = "plugin")]
 mod plugins;
+mod repl;
 mod scope;
 mod shell;
diff --git a/tests/repl/mod.rs b/tests/repl/mod.rs
new file mode 100644
index 0000000000..5ed7f29ba5
--- /dev/null
+++ b/tests/repl/mod.rs
@@ -0,0 +1,27 @@
+mod test_bits;
+mod test_cell_path;
+mod test_commandline;
+mod test_conditionals;
+mod test_config;
+mod test_config_path;
+mod test_converters;
+mod test_custom_commands;
+mod test_engine;
+mod test_env;
+mod test_help;
+mod test_hiding;
+mod test_ide;
+mod test_iteration;
+mod test_known_external;
+mod test_math;
+mod test_modules;
+mod test_parser;
+mod test_ranges;
+mod test_regex;
+mod test_signatures;
+mod test_spread;
+mod test_stdlib;
+mod test_strings;
+mod test_table_operations;
+mod test_type_check;
+mod tests;
diff --git a/src/tests/test_bits.rs b/tests/repl/test_bits.rs
similarity index 97%
rename from src/tests/test_bits.rs
rename to tests/repl/test_bits.rs
index fdb672d023..410f48d83b 100644
--- a/src/tests/test_bits.rs
+++ b/tests/repl/test_bits.rs
@@ -1,4 +1,4 @@
-use crate::tests::{run_test, TestResult};
+use crate::repl::tests::{run_test, TestResult};
 
 #[test]
 fn bits_and() -> TestResult {
diff --git a/src/tests/test_cell_path.rs b/tests/repl/test_cell_path.rs
similarity index 98%
rename from src/tests/test_cell_path.rs
rename to tests/repl/test_cell_path.rs
index 56b6751638..c89c50259b 100644
--- a/src/tests/test_cell_path.rs
+++ b/tests/repl/test_cell_path.rs
@@ -1,4 +1,4 @@
-use crate::tests::{fail_test, run_test, TestResult};
+use crate::repl::tests::{fail_test, run_test, TestResult};
 
 // Tests for null / null / Value::Nothing
 #[test]
diff --git a/src/tests/test_commandline.rs b/tests/repl/test_commandline.rs
similarity index 98%
rename from src/tests/test_commandline.rs
rename to tests/repl/test_commandline.rs
index 130faf933a..0443ee4d6c 100644
--- a/src/tests/test_commandline.rs
+++ b/tests/repl/test_commandline.rs
@@ -1,4 +1,4 @@
-use crate::tests::{fail_test, run_test, TestResult};
+use crate::repl::tests::{fail_test, run_test, TestResult};
 
 #[test]
 fn commandline_test_get_empty() -> TestResult {
diff --git a/src/tests/test_conditionals.rs b/tests/repl/test_conditionals.rs
similarity index 96%
rename from src/tests/test_conditionals.rs
rename to tests/repl/test_conditionals.rs
index 20307ffe65..dd1e16c5a8 100644
--- a/src/tests/test_conditionals.rs
+++ b/tests/repl/test_conditionals.rs
@@ -1,4 +1,4 @@
-use crate::tests::{run_test, TestResult};
+use crate::repl::tests::{run_test, TestResult};
 
 #[test]
 fn if_test1() -> TestResult {
diff --git a/src/tests/test_config.rs b/tests/repl/test_config.rs
similarity index 98%
rename from src/tests/test_config.rs
rename to tests/repl/test_config.rs
index 96bd7f714d..005ae63171 100644
--- a/src/tests/test_config.rs
+++ b/tests/repl/test_config.rs
@@ -1,5 +1,4 @@
-use super::{fail_test, run_test, run_test_std};
-use crate::tests::TestResult;
+use crate::repl::tests::{fail_test, run_test, run_test_std, TestResult};
 
 #[test]
 fn mutate_nu_config() -> TestResult {
diff --git a/src/tests/test_config_path.rs b/tests/repl/test_config_path.rs
similarity index 100%
rename from src/tests/test_config_path.rs
rename to tests/repl/test_config_path.rs
diff --git a/src/tests/test_converters.rs b/tests/repl/test_converters.rs
similarity index 96%
rename from src/tests/test_converters.rs
rename to tests/repl/test_converters.rs
index c41868539e..cfa165e95d 100644
--- a/src/tests/test_converters.rs
+++ b/tests/repl/test_converters.rs
@@ -1,4 +1,4 @@
-use crate::tests::{run_test, TestResult};
+use crate::repl::tests::{run_test, TestResult};
 
 #[test]
 fn from_json_1() -> TestResult {
diff --git a/src/tests/test_custom_commands.rs b/tests/repl/test_custom_commands.rs
similarity index 98%
rename from src/tests/test_custom_commands.rs
rename to tests/repl/test_custom_commands.rs
index 4cc81878e4..43a24fa250 100644
--- a/src/tests/test_custom_commands.rs
+++ b/tests/repl/test_custom_commands.rs
@@ -1,4 +1,4 @@
-use crate::tests::{fail_test, run_test, run_test_contains, TestResult};
+use crate::repl::tests::{fail_test, run_test, run_test_contains, TestResult};
 use nu_test_support::nu;
 use pretty_assertions::assert_eq;
 
diff --git a/src/tests/test_engine.rs b/tests/repl/test_engine.rs
similarity index 99%
rename from src/tests/test_engine.rs
rename to tests/repl/test_engine.rs
index 9f5be84763..c1eb919afa 100644
--- a/src/tests/test_engine.rs
+++ b/tests/repl/test_engine.rs
@@ -1,4 +1,4 @@
-use crate::tests::{fail_test, run_test, TestResult};
+use crate::repl::tests::{fail_test, run_test, TestResult};
 use rstest::rstest;
 
 #[test]
diff --git a/src/tests/test_env.rs b/tests/repl/test_env.rs
similarity index 91%
rename from src/tests/test_env.rs
rename to tests/repl/test_env.rs
index 159b3d0a20..7963f7580b 100644
--- a/src/tests/test_env.rs
+++ b/tests/repl/test_env.rs
@@ -1,4 +1,4 @@
-use crate::tests::{fail_test, run_test, TestResult};
+use crate::repl::tests::{fail_test, run_test, TestResult};
 use nu_test_support::nu;
 
 #[test]
diff --git a/src/tests/test_help.rs b/tests/repl/test_help.rs
similarity index 94%
rename from src/tests/test_help.rs
rename to tests/repl/test_help.rs
index b529f7cd19..16d168587a 100644
--- a/src/tests/test_help.rs
+++ b/tests/repl/test_help.rs
@@ -1,4 +1,4 @@
-use crate::tests::{run_test, TestResult};
+use crate::repl::tests::{run_test, TestResult};
 use rstest::rstest;
 
 #[rstest]
diff --git a/src/tests/test_hiding.rs b/tests/repl/test_hiding.rs
similarity index 99%
rename from src/tests/test_hiding.rs
rename to tests/repl/test_hiding.rs
index 81484cc51e..ee2016c54d 100644
--- a/src/tests/test_hiding.rs
+++ b/tests/repl/test_hiding.rs
@@ -1,4 +1,4 @@
-use crate::tests::{fail_test, run_test, TestResult};
+use crate::repl::tests::{fail_test, run_test, TestResult};
 
 // TODO: Test the use/hide tests also as separate lines in REPL (i.e., with  merging the delta in between)
 #[test]
diff --git a/src/tests/test_ide.rs b/tests/repl/test_ide.rs
similarity index 76%
rename from src/tests/test_ide.rs
rename to tests/repl/test_ide.rs
index b5e40cfe8d..45cc87aa4d 100644
--- a/src/tests/test_ide.rs
+++ b/tests/repl/test_ide.rs
@@ -1,4 +1,4 @@
-use crate::tests::{test_ide_contains, TestResult};
+use crate::repl::tests::{test_ide_contains, TestResult};
 
 #[test]
 fn parser_recovers() -> TestResult {
diff --git a/src/tests/test_iteration.rs b/tests/repl/test_iteration.rs
similarity index 94%
rename from src/tests/test_iteration.rs
rename to tests/repl/test_iteration.rs
index da3eef9ce2..bcc21b9ef9 100644
--- a/src/tests/test_iteration.rs
+++ b/tests/repl/test_iteration.rs
@@ -1,4 +1,4 @@
-use crate::tests::{run_test, TestResult};
+use crate::repl::tests::{run_test, TestResult};
 
 #[test]
 fn better_block_types() -> TestResult {
diff --git a/src/tests/test_known_external.rs b/tests/repl/test_known_external.rs
similarity index 97%
rename from src/tests/test_known_external.rs
rename to tests/repl/test_known_external.rs
index 586ee40cd3..c140f4ee90 100644
--- a/src/tests/test_known_external.rs
+++ b/tests/repl/test_known_external.rs
@@ -1,7 +1,6 @@
+use crate::repl::tests::{fail_test, run_test, run_test_contains, TestResult};
 use std::process::Command;
 
-use crate::tests::{fail_test, run_test, run_test_contains, TestResult};
-
 // cargo version prints a string of the form:
 // cargo 1.60.0 (d1fd9fe2c 2022-03-01)
 
diff --git a/src/tests/test_math.rs b/tests/repl/test_math.rs
similarity index 98%
rename from src/tests/test_math.rs
rename to tests/repl/test_math.rs
index ed372b198a..af44f8a857 100644
--- a/src/tests/test_math.rs
+++ b/tests/repl/test_math.rs
@@ -1,4 +1,4 @@
-use crate::tests::{fail_test, run_test, TestResult};
+use crate::repl::tests::{fail_test, run_test, TestResult};
 
 #[test]
 fn add_simple() -> TestResult {
diff --git a/src/tests/test_modules.rs b/tests/repl/test_modules.rs
similarity index 98%
rename from src/tests/test_modules.rs
rename to tests/repl/test_modules.rs
index 26ca62bf49..dd62c74b77 100644
--- a/src/tests/test_modules.rs
+++ b/tests/repl/test_modules.rs
@@ -1,4 +1,4 @@
-use crate::tests::{fail_test, run_test, TestResult};
+use crate::repl::tests::{fail_test, run_test, TestResult};
 
 #[test]
 fn module_def_imports_1() -> TestResult {
diff --git a/src/tests/test_parser.rs b/tests/repl/test_parser.rs
similarity index 99%
rename from src/tests/test_parser.rs
rename to tests/repl/test_parser.rs
index 3d19f05a9c..c0e7279b7b 100644
--- a/src/tests/test_parser.rs
+++ b/tests/repl/test_parser.rs
@@ -1,9 +1,7 @@
-use crate::tests::{fail_test, run_test, run_test_with_env, TestResult};
+use crate::repl::tests::{fail_test, run_test, run_test_contains, run_test_with_env, TestResult};
 use nu_test_support::{nu, nu_repl_code};
 use std::collections::HashMap;
 
-use super::run_test_contains;
-
 #[test]
 fn env_shorthand() -> TestResult {
     run_test("FOO=BAR if false { 3 } else { 4 }", "4")
diff --git a/src/tests/test_ranges.rs b/tests/repl/test_ranges.rs
similarity index 92%
rename from src/tests/test_ranges.rs
rename to tests/repl/test_ranges.rs
index 3a007196e6..96f59eea84 100644
--- a/src/tests/test_ranges.rs
+++ b/tests/repl/test_ranges.rs
@@ -1,4 +1,4 @@
-use crate::tests::{fail_test, run_test, TestResult};
+use crate::repl::tests::{fail_test, run_test, TestResult};
 
 #[test]
 fn int_in_inc_range() -> TestResult {
diff --git a/src/tests/test_regex.rs b/tests/repl/test_regex.rs
similarity index 96%
rename from src/tests/test_regex.rs
rename to tests/repl/test_regex.rs
index adb59cc4a7..6f9063c81a 100644
--- a/src/tests/test_regex.rs
+++ b/tests/repl/test_regex.rs
@@ -1,4 +1,4 @@
-use crate::tests::{fail_test, run_test, TestResult};
+use crate::repl::tests::{fail_test, run_test, TestResult};
 
 #[test]
 fn contains() -> TestResult {
diff --git a/src/tests/test_signatures.rs b/tests/repl/test_signatures.rs
similarity index 99%
rename from src/tests/test_signatures.rs
rename to tests/repl/test_signatures.rs
index 1ca395c90f..5e265974d5 100644
--- a/src/tests/test_signatures.rs
+++ b/tests/repl/test_signatures.rs
@@ -1,4 +1,4 @@
-use crate::tests::{fail_test, run_test, TestResult};
+use crate::repl::tests::{fail_test, run_test, TestResult};
 
 #[test]
 fn list_annotations() -> TestResult {
diff --git a/src/tests/test_spread.rs b/tests/repl/test_spread.rs
similarity index 98%
rename from src/tests/test_spread.rs
rename to tests/repl/test_spread.rs
index 3dceea7089..419188be33 100644
--- a/src/tests/test_spread.rs
+++ b/tests/repl/test_spread.rs
@@ -1,4 +1,4 @@
-use crate::tests::{fail_test, run_test, TestResult};
+use crate::repl::tests::{fail_test, run_test, TestResult};
 use nu_test_support::nu;
 
 #[test]
diff --git a/src/tests/test_stdlib.rs b/tests/repl/test_stdlib.rs
similarity index 86%
rename from src/tests/test_stdlib.rs
rename to tests/repl/test_stdlib.rs
index 3be252ef77..401fd3c0aa 100644
--- a/src/tests/test_stdlib.rs
+++ b/tests/repl/test_stdlib.rs
@@ -1,4 +1,4 @@
-use crate::tests::{fail_test, run_test_std, TestResult};
+use crate::repl::tests::{fail_test, run_test_std, TestResult};
 
 #[test]
 fn library_loaded() -> TestResult {
diff --git a/src/tests/test_strings.rs b/tests/repl/test_strings.rs
similarity index 98%
rename from src/tests/test_strings.rs
rename to tests/repl/test_strings.rs
index 7d2ae1de84..cafd6cc681 100644
--- a/src/tests/test_strings.rs
+++ b/tests/repl/test_strings.rs
@@ -1,4 +1,4 @@
-use crate::tests::{fail_test, run_test, TestResult};
+use crate::repl::tests::{fail_test, run_test, TestResult};
 
 #[test]
 fn cjk_in_substrings() -> TestResult {
diff --git a/src/tests/test_table_operations.rs b/tests/repl/test_table_operations.rs
similarity index 99%
rename from src/tests/test_table_operations.rs
rename to tests/repl/test_table_operations.rs
index 9971261190..5d61e0d902 100644
--- a/src/tests/test_table_operations.rs
+++ b/tests/repl/test_table_operations.rs
@@ -1,4 +1,4 @@
-use crate::tests::{fail_test, run_test, TestResult};
+use crate::repl::tests::{fail_test, run_test, TestResult};
 
 #[test]
 fn illegal_column_duplication() -> TestResult {
diff --git a/src/tests/test_type_check.rs b/tests/repl/test_type_check.rs
similarity index 98%
rename from src/tests/test_type_check.rs
rename to tests/repl/test_type_check.rs
index ed912f8fff..87216e6672 100644
--- a/src/tests/test_type_check.rs
+++ b/tests/repl/test_type_check.rs
@@ -1,4 +1,4 @@
-use crate::tests::{fail_test, run_test, TestResult};
+use crate::repl::tests::{fail_test, run_test, TestResult};
 
 #[test]
 fn chained_operator_typecheck() -> TestResult {
diff --git a/src/tests.rs b/tests/repl/tests.rs
similarity index 89%
rename from src/tests.rs
rename to tests/repl/tests.rs
index 487173b9b1..e3a5e89471 100644
--- a/src/tests.rs
+++ b/tests/repl/tests.rs
@@ -1,30 +1,3 @@
-mod test_bits;
-mod test_cell_path;
-mod test_commandline;
-mod test_conditionals;
-mod test_config;
-mod test_config_path;
-mod test_converters;
-mod test_custom_commands;
-mod test_engine;
-mod test_env;
-mod test_help;
-mod test_hiding;
-mod test_ide;
-mod test_iteration;
-mod test_known_external;
-mod test_math;
-mod test_modules;
-mod test_parser;
-mod test_ranges;
-mod test_regex;
-mod test_signatures;
-mod test_spread;
-mod test_stdlib;
-mod test_strings;
-mod test_table_operations;
-mod test_type_check;
-
 use assert_cmd::prelude::*;
 use pretty_assertions::assert_eq;
 use std::collections::HashMap;