diff --git a/tests/test_cp.rs b/tests/test_cp.rs
index 02f7c3b5a..82651be57 100644
--- a/tests/test_cp.rs
+++ b/tests/test_cp.rs
@@ -1,15 +1,17 @@
 use common::util::*;
 use std::fs::set_permissions;
 
-static TEST_EXISTING_FILE:         &str = "existing_file.txt";
-static TEST_HELLO_WORLD_SOURCE:    &str = "hello_world.txt";
-static TEST_HELLO_WORLD_DEST:      &str = "copy_of_hello_world.txt";
-static TEST_HOW_ARE_YOU_SOURCE:    &str = "how_are_you.txt";
-static TEST_HOW_ARE_YOU_DEST:      &str = "hello_dir/how_are_you.txt";
-static TEST_COPY_TO_FOLDER:        &str = "hello_dir/";
-static TEST_COPY_TO_FOLDER_FILE:   &str = "hello_dir/hello_world.txt";
-static TEST_COPY_FROM_FOLDER:      &str = "hello_dir_with_file/";
-static TEST_COPY_FROM_FOLDER_FILE: &str = "hello_dir_with_file/hello_world.txt";
+static TEST_EXISTING_FILE:           &str = "existing_file.txt";
+static TEST_HELLO_WORLD_SOURCE:      &str = "hello_world.txt";
+static TEST_HELLO_WORLD_DEST:        &str = "copy_of_hello_world.txt";
+static TEST_HOW_ARE_YOU_SOURCE:      &str = "how_are_you.txt";
+static TEST_HOW_ARE_YOU_DEST:        &str = "hello_dir/how_are_you.txt";
+static TEST_COPY_TO_FOLDER:          &str = "hello_dir/";
+static TEST_COPY_TO_FOLDER_FILE:     &str = "hello_dir/hello_world.txt";
+static TEST_COPY_FROM_FOLDER:        &str = "hello_dir_with_file/";
+static TEST_COPY_FROM_FOLDER_FILE:   &str = "hello_dir_with_file/hello_world.txt";
+static TEST_COPY_TO_FOLDER_NEW:      &str = "hello_dir_new/";
+static TEST_COPY_TO_FOLDER_NEW_FILE: &str = "hello_dir_new/hello_world.txt";
 
 #[test]
 fn test_cp_cp() {
@@ -81,27 +83,17 @@ fn test_cp_multiple_files() {
 
 #[test]
 fn test_cp_recurse() {
-    //let (at, mut ucmd) = at_and_ucmd!();
-    let scene = TestScenario::new(util_name!());
-    let at = &scene.fixtures;
+    let (at, mut ucmd) = at_and_ucmd!();
 
-    // Invoke our binary to make the copy.
-    let result_to_dir = scene.ucmd()
-        .arg(TEST_HELLO_WORLD_SOURCE)
-        .arg(TEST_COPY_TO_FOLDER)
+    let result = ucmd
+        .arg("-r")
+        .arg(TEST_COPY_FROM_FOLDER)
+        .arg(TEST_COPY_TO_FOLDER_NEW)
         .run();
-    assert!(result_to_dir.success);
-    assert_eq!(at.read(TEST_COPY_TO_FOLDER_FILE), "Hello, World!\n");
-
-    let result = scene.ucmd()
-                     .arg("-r")
-                     .arg(TEST_COPY_FROM_FOLDER)
-                     .arg(TEST_COPY_TO_FOLDER)
-                     .run();
 
     assert!(result.success);
     // Check the content of the destination file that was copied.
-    assert_eq!(at.read(TEST_COPY_TO_FOLDER_FILE), "Hello, World!\n");
+    assert_eq!(at.read(TEST_COPY_TO_FOLDER_NEW_FILE), "Hello, World!\n");
 }
 
 #[test]