diff --git a/tests/command_ls_tests.rs b/tests/command_ls_tests.rs
index 6223709805..20f299764a 100644
--- a/tests/command_ls_tests.rs
+++ b/tests/command_ls_tests.rs
@@ -18,7 +18,7 @@ fn ls_lists_regular_files() {
     nu!(
         output,
         cwd(&full_path),
-        r#"ls | get name | lines | split-column "." | get Column2 | str Column2 --to-int | sum | echo $it"#
+        r#"ls | get name | lines | split-column "." | get Column2 | str --to-int | sum | echo $it"#
     );
 
     assert_eq!(output, "30");
@@ -40,7 +40,7 @@ fn ls_lists_regular_files_using_asterisk_wildcard() {
     nu!(
         output,
         cwd(&full_path),
-        "ls *.txt | get name | lines| split-column \".\" | get Column2 | str Column2 --to-int | sum | echo $it"
+        r#"ls *.txt | get name | lines| split-column "." | get Column2 | str --to-int | sum | echo $it"#
     );
 
     assert_eq!(output, "3");
@@ -62,7 +62,7 @@ fn ls_lists_regular_files_using_question_mark_wildcard() {
     nu!(
         output,
         cwd(&full_path),
-        "ls *.??.txt | get name | lines| split-column \".\" | get Column2 | str Column2 --to-int | sum | echo $it"
+        r#"ls *.??.txt | get name | lines| split-column "." | get Column2 | str --to-int | sum | echo $it"#
     );
 
     assert_eq!(output, "30");
diff --git a/tests/command_open_tests.rs b/tests/command_open_tests.rs
index 3f6da5adf5..d962d3e88d 100644
--- a/tests/command_open_tests.rs
+++ b/tests/command_open_tests.rs
@@ -17,7 +17,7 @@ fn recognizes_csv() {
     nu!(
         output,
         cwd("tests/fixtures/nuplayground/open_recognizes_csv_test"),
-        "open nu.zion.csv | where author == \"Andres N. Robalino\" | get source | echo $it"
+        r#"open nu.zion.csv | where author == "Andres N. Robalino" | get source | echo $it"#
     );
 
     assert_eq!(output, "Ecuador");
diff --git a/tests/command_rm_tests.rs b/tests/command_rm_tests.rs
index 76e7128208..126465a2da 100644
--- a/tests/command_rm_tests.rs
+++ b/tests/command_rm_tests.rs
@@ -51,7 +51,7 @@ fn rm_removes_files_with_wildcard() {
     nu!(
         _output,
         cwd("tests/fixtures/nuplayground/rm_wildcard_test_1"),
-        "rm \"src/*/*/*.rs\""
+        r#"rm "src/*/*/*.rs""#
     );
 
     assert!(!h::files_exist_at(
diff --git a/tests/commands_test.rs b/tests/commands_test.rs
index 6cdc4d7940..1c8ddd25d8 100644
--- a/tests/commands_test.rs
+++ b/tests/commands_test.rs
@@ -7,7 +7,7 @@ use helpers as h;
 fn lines() {
     nu!(output,
         cwd("tests/fixtures/formats"),
-        "open cargo_sample.toml --raw | lines | skip-while $it != \"[dependencies]\" | skip 1 | first 1 | split-column \"=\" | get Column1 | trim | echo $it"
+        r#"open cargo_sample.toml --raw | lines | skip-while $it != "[dependencies]" | skip 1 | first 1 | split-column "=" | get Column1 | trim | echo $it"#
     );
 
     assert_eq!(output, "rustyline");
diff --git a/tests/external_tests.rs b/tests/external_tests.rs
index 5db04dc27d..ba62c5e127 100644
--- a/tests/external_tests.rs
+++ b/tests/external_tests.rs
@@ -4,8 +4,6 @@ use helpers::in_directory as cwd;
 
 #[test]
 fn external_command() {
-    // Echo should exist on all currently supported platforms. A better approach might
-    // be to generate a dummy executable as part of the tests with known semantics.
     nu!(output, cwd("tests/fixtures"), "echo 1");
 
     assert!(output.contains("1"));
diff --git a/tests/filter_str_tests.rs b/tests/filter_str_tests.rs
index dd51080c6e..630c144c87 100644
--- a/tests/filter_str_tests.rs
+++ b/tests/filter_str_tests.rs
@@ -119,7 +119,7 @@ fn find_and_replaces() {
     nu!(
         output,
         cwd("tests/fixtures/nuplayground/plugin_str_find_and_replaces_test"),
-        "open sample.toml | str fortune.teller.phone --find-replace KATZ \"5289\" | get fortune.teller.phone | echo $it"
+        r#"open sample.toml | str fortune.teller.phone --find-replace KATZ "5289" | get fortune.teller.phone | echo $it"#
     );
 
     assert_eq!(output, "1-800-5289");
@@ -140,7 +140,7 @@ fn find_and_replaces_without_passing_field() {
     nu!(
         output,
         cwd("tests/fixtures/nuplayground/plugin_str_find_and_replaces_without_passing_field_test"),
-        "open sample.toml | get fortune.teller.phone | str --find-replace KATZ \"5289\" | echo $it"
+        r#"open sample.toml | get fortune.teller.phone | str --find-replace KATZ "5289" | echo $it"#
     );
 
     assert_eq!(output, "1-800-5289");
diff --git a/tests/filters_test.rs b/tests/filters_test.rs
index e8ce3db4ad..d8976c1cc1 100644
--- a/tests/filters_test.rs
+++ b/tests/filters_test.rs
@@ -27,7 +27,7 @@ fn converts_structured_table_to_csv_text() {
     nu!(
         output,
         cwd("tests/fixtures/nuplayground/filter_to_csv_test_1"),
-        r#"open sample.txt | lines | split-column ",s" a b c d origin  | last 1 | to-csv | lines | nth 1 | echo "$it""#
+        r#"open sample.txt | lines | split-column "," a b c d origin  | last 1 | to-csv | lines | nth 1 | echo "$it""#
     );
 
     assert!(output.contains("Tigre Ecuador,OMYA Andina,3824909999,Calcium carbonate,Colombia"));
diff --git a/tests/tests.rs b/tests/tests.rs
index cc20c972ff..2090e8e044 100644
--- a/tests/tests.rs
+++ b/tests/tests.rs
@@ -27,7 +27,7 @@ fn external_has_correct_quotes() {
 fn add_plugin() {
     nu!(output,
         cwd("tests/fixtures/formats"),
-        "open cargo_sample.toml | add dev-dependencies.newdep \"1\" | get dev-dependencies.newdep | echo $it"
+        r#"open cargo_sample.toml | add dev-dependencies.newdep "1" | get dev-dependencies.newdep | echo $it"#
     );
 
     assert_eq!(output, "1");
@@ -37,7 +37,7 @@ fn add_plugin() {
 fn edit_plugin() {
     nu!(output,
         cwd("tests/fixtures/formats"),
-        "open cargo_sample.toml | edit dev-dependencies.pretty_assertions \"7\" | get dev-dependencies.pretty_assertions | echo $it"
+        r#"open cargo_sample.toml | edit dev-dependencies.pretty_assertions "7" | get dev-dependencies.pretty_assertions | echo $it"#
     );
 
     assert_eq!(output, "7");