diff --git a/Makefile b/Makefile
index 4874f0e1e..151215d7e 100644
--- a/Makefile
+++ b/Makefile
@@ -173,6 +173,7 @@ TEST_PROGS  := \
   paste \
   pwd \
   readlink \
+  rm \
   seq \
   sort \
   split \
diff --git a/test/rm.rs b/test/rm.rs
new file mode 100644
index 000000000..fb6fbc727
--- /dev/null
+++ b/test/rm.rs
@@ -0,0 +1,194 @@
+#![feature(path_ext)]
+
+extern crate libc;
+
+use std::fs::{self, File, PathExt};
+use std::io::Write;
+use std::path::Path;
+use std::process::{Command, Stdio};
+use std::str::from_utf8;
+
+static PROGNAME: &'static str = "./rm";
+
+macro_rules! assert_empty_stderr(
+    ($cond:expr) => (
+        if $cond.stderr.len() > 0 {
+            panic!(format!("stderr: {}", $cond.stderr))
+        }
+    );
+);
+
+struct CmdResult {
+    success: bool,
+    stderr: String,
+    stdout: String,
+}
+
+fn run(cmd: &mut Command) -> CmdResult {
+    let prog = cmd.output().unwrap();
+    CmdResult {
+        success: prog.status.success(),
+        stderr: from_utf8(&prog.stderr).unwrap().to_string(),
+        stdout: from_utf8(&prog.stdout).unwrap().to_string(),
+    }
+}
+
+fn run_interactive(cmd: &mut Command, input: &[u8])-> CmdResult {
+    let mut command = cmd
+        .stdin(Stdio::piped())
+        .stdout(Stdio::piped())
+        .stderr(Stdio::piped())
+        .spawn()
+        .unwrap();
+
+    command.stdin
+        .take()
+        .unwrap_or_else(|| panic!("Could not take child process stdin"))
+        .write_all(input)
+        .unwrap_or_else(|e| panic!("{}", e));
+
+    let prog = command.wait_with_output().unwrap();
+    CmdResult {
+        success: prog.status.success(),
+        stderr: from_utf8(&prog.stderr).unwrap().to_string(),
+        stdout: from_utf8(&prog.stdout).unwrap().to_string(),
+    }
+}
+
+fn mkdir(dir: &str) {
+    fs::create_dir(dir).unwrap();
+}
+
+fn touch(file: &str) {
+    File::create(file).unwrap();
+}
+
+#[test]
+fn test_rm_one_file() {
+    let file = "test_rm_one_file";
+
+    touch(file);
+
+    let result = run(Command::new(PROGNAME).arg(file));
+    assert_empty_stderr!(result);
+    assert!(result.success);
+
+    assert!(!Path::new(file).exists());
+}
+
+#[test]
+fn test_rm_multiple_files() {
+    let file_a = "test_rm_multiple_file_a";
+    let file_b = "test_rm_multiple_file_b";
+
+    touch(file_a);
+    touch(file_b);
+
+    let result = run(Command::new(PROGNAME).arg(file_a).arg(file_b));
+    assert_empty_stderr!(result);
+    assert!(result.success);
+
+    assert!(!Path::new(file_a).exists());
+    assert!(!Path::new(file_b).exists());
+}
+
+#[test]
+fn test_rm_interactive() {
+    let file_a = "test_rm_interactive_file_a";
+    let file_b = "test_rm_interactive_file_b";
+
+    touch(file_a);
+    touch(file_b);
+
+    let result1 = run_interactive(Command::new(PROGNAME).arg("-i").arg(file_a).arg(file_b), b"n");
+
+    assert!(result1.success);
+
+    assert!(Path::new(file_a).exists());
+    assert!(Path::new(file_b).exists());
+
+    let result2 = run_interactive(Command::new(PROGNAME).arg("-i").arg(file_a).arg(file_b), b"Yesh");
+
+    assert!(result2.success);
+
+    assert!(!Path::new(file_a).exists());
+    assert!(Path::new(file_b).exists());
+}
+
+#[test]
+fn test_rm_force() {
+    let file_a = "test_rm_force_a";
+    let file_b = "test_rm_force_b";
+
+    let result = run(Command::new(PROGNAME).arg("-f").arg(file_a).arg(file_b));
+    assert_empty_stderr!(result);
+    assert!(result.success);
+
+    assert!(!Path::new(file_a).exists());
+    assert!(!Path::new(file_b).exists());
+}
+
+#[test]
+fn test_rm_empty_directory() {
+    let dir = "test_rm_empty_directory";
+
+    mkdir(dir);
+
+    let result = run(Command::new(PROGNAME).arg("-d").arg(dir));
+    assert_empty_stderr!(result);
+    assert!(result.success);
+
+    assert!(!Path::new(dir).exists());
+}
+
+#[test]
+fn test_rm_recursive() {
+    let dir = "test_rm_recursive_directory";
+    let file_a = "test_rm_recursive_directory/test_rm_recursive_file_a";
+    let file_b = "test_rm_recursive_directory/test_rm_recursive_file_b";
+
+    mkdir(dir);
+    touch(file_a);
+    touch(file_b);
+
+    let result = run(Command::new(PROGNAME).arg("-r").arg(dir));
+    assert_empty_stderr!(result);
+    assert!(result.success);
+
+    assert!(!Path::new(dir).exists());
+    assert!(!Path::new(file_a).exists());
+    assert!(!Path::new(file_b).exists());
+}
+
+#[test]
+fn test_rm_errors() {
+    let dir = "test_rm_errors_directory";
+    let file_a = "test_rm_errors_directory/test_rm_errors_file_a";
+    let file_b = "test_rm_errors_directory/test_rm_errors_file_b";
+
+    mkdir(dir);
+    touch(file_a);
+    touch(file_b);
+
+    // $ rm test_rm_errors_directory
+    // rm: error: could not remove directory 'test_rm_errors_directory' (did you mean to pass '-r'?)
+    let result = run(Command::new(PROGNAME).arg(dir));
+    assert_eq!(result.stderr,
+        "rm: error: could not remove directory 'test_rm_errors_directory' (did you mean to pass '-r'?)\n");
+    assert!(!result.success);
+}
+
+#[test]
+fn test_rm_verbose() {
+    let file_a = "test_rm_verbose_file_a";
+    let file_b = "test_rm_verbose_file_b";
+
+    touch(file_a);
+    touch(file_b);
+
+    let result = run(Command::new(PROGNAME).arg("-v").arg(file_a).arg(file_b));
+    assert_empty_stderr!(result);
+    assert_eq!(result.stdout,
+        format!("removed '{}'\nremoved '{}'\n", file_a, file_b));
+    assert!(result.success);
+}