diff --git a/tests/test_cp.rs b/tests/test_cp.rs
index d1952ae0f..3832e3f56 100644
--- a/tests/test_cp.rs
+++ b/tests/test_cp.rs
@@ -1,9 +1,11 @@
 use common::util::*;
-
 static UTIL_NAME: &'static str = "cp";
 
 static TEST_HELLO_WORLD_SOURCE: &'static str = "hello_world.txt";
 static TEST_HELLO_WORLD_DEST: &'static str = "copy_of_hello_world.txt";
+static TEST_COPY_TO_FOLDER: &'static str = "hello_dir/";
+static TEST_COPY_TO_FOLDER_FILE: &'static str = "hello_dir/hello_world.txt";
+static TEST_COPY_FROM_FOLDER_FILE: &'static str = "hello_dir_with_file/hello_world.txt";
 
 #[test]
 fn test_cp_cp() {
@@ -15,8 +17,44 @@ fn test_cp_cp() {
 
     // Check that the exit code represents a successful copy.
     let exit_success = result.success;
-    assert_eq!(exit_success, true);
+    assert!(exit_success);
 
     // Check the content of the destination file that was copied.
     assert_eq!(at.read(TEST_HELLO_WORLD_DEST), "Hello, World!\n");
 }
+
+#[test]
+fn test_cp_with_dirs_t() {
+    let ts = TestSet::new(UTIL_NAME);
+    let at = &ts.fixtures;
+
+    //using -t option
+    let result_to_dir_t = ts.util_cmd()
+        .arg("-t")
+        .arg(TEST_COPY_TO_FOLDER)
+        .arg(TEST_HELLO_WORLD_SOURCE)
+        .run();
+    assert!(result_to_dir_t.success);
+    assert_eq!(at.read(TEST_COPY_TO_FOLDER_FILE), "Hello, World!\n");
+}
+
+#[test]
+fn test_cp_with_dirs() {
+    let ts = TestSet::new(UTIL_NAME);
+    let at = &ts.fixtures;
+
+    //using -t option
+    let result_to_dir_t = ts.util_cmd()
+        .arg(TEST_HELLO_WORLD_SOURCE)
+        .arg(TEST_COPY_TO_FOLDER)
+        .run();
+    assert!(result_to_dir_t.success);
+    assert_eq!(at.read(TEST_COPY_TO_FOLDER_FILE), "Hello, World!\n");
+
+    let result_from_dir_t = ts.util_cmd()
+        .arg(TEST_COPY_FROM_FOLDER_FILE)
+        .arg(TEST_HELLO_WORLD_DEST)
+        .run();
+    assert!(result_from_dir_t.success);
+    assert_eq!(at.read(TEST_HELLO_WORLD_DEST), "Hello, World!\n");
+}
\ No newline at end of file