diff --git a/Cargo.toml b/Cargo.toml
index fbc2c7d339..255bb708d8 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -40,3 +40,8 @@ name = "test-signalfd"
 path = "test/test_signalfd.rs"
 harness = false
 test = true
+
+[[test]]
+name = "test-mount"
+path = "test/test_mount.rs"
+harness = false
diff --git a/src/mount.rs b/src/mount.rs
index 683cabb885..cd0afa0a42 100644
--- a/src/mount.rs
+++ b/src/mount.rs
@@ -49,18 +49,15 @@ bitflags!(
 );
 
 mod ffi {
-    use libc::{c_char, c_int};
+    use libc::{c_char, c_int, c_ulong, c_void};
 
     extern {
-        /*
-         * TODO: Bring back
         pub fn mount(
                 source: *const c_char,
                 target: *const c_char,
                 fstype: *const c_char,
                 flags: c_ulong,
                 data: *const c_void) -> c_int;
-                */
 
         pub fn umount(target: *const c_char) -> c_int;
 
@@ -68,12 +65,9 @@ mod ffi {
     }
 }
 
-/*
- * TODO: Bring this back with a test
- *
 pub fn mount<P1: ?Sized + NixPath, P2: ?Sized + NixPath, P3: ?Sized + NixPath, P4: ?Sized + NixPath>(
         source: Option<&P1>,
-        target: P2,
+        target: &P2,
         fstype: Option<&P3>,
         flags: MsFlags,
         data: Option<&P4>) -> Result<()> {
@@ -85,20 +79,19 @@ pub fn mount<P1: ?Sized + NixPath, P2: ?Sized + NixPath, P3: ?Sized + NixPath, P
                 fstype.with_nix_path(|fstype| {
                     data.with_nix_path(|data| {
                         unsafe {
-                            ffi::mount(source.as_ext_str(),
-                                       target.as_ext_str(),
-                                       fstype,
+                            ffi::mount(source.as_ptr(),
+                                       target.as_ptr(),
+                                       fstype.as_ptr(),
                                        flags.bits,
-                                       data as *const libc::c_void)
+                                       data.as_ptr() as *const libc::c_void)
                         }
                     })
                 })
             })
         })))));
 
-    return from_ffi(res);
+    from_ffi(res)
 }
-*/
 
 pub fn umount<P: ?Sized + NixPath>(target: &P) -> Result<()> {
     let res = try!(target.with_nix_path(|cstr| {
diff --git a/test/test_mount.rs b/test/test_mount.rs
new file mode 100644
index 0000000000..30ec7210ae
--- /dev/null
+++ b/test/test_mount.rs
@@ -0,0 +1,208 @@
+// Impelmentation note: to allow unprivileged users to run it, this test makes
+// use of user and mount namespaces. On systems that allow unprivileged user
+// namespaces (Linux >= 3.8 compiled with CONFIG_USER_NS), the test should run
+// without root.
+
+
+extern crate libc;
+extern crate nix;
+extern crate tempdir;
+
+use std::fs::{self, File};
+use std::io::{Read, Write};
+use std::os::unix::fs::OpenOptionsExt;
+use std::os::unix::fs::PermissionsExt;
+use std::process::Command;
+
+use libc::{EACCES, EROFS};
+
+use nix::mount::{mount, umount, MsFlags, MS_BIND, MS_RDONLY, MS_NOEXEC};
+use nix::sched::{unshare, CLONE_NEWNS, CLONE_NEWUSER};
+use nix::sys::stat::{self, S_IRWXU, S_IRWXG, S_IRWXO, S_IXUSR, S_IXGRP, S_IXOTH};
+
+use tempdir::TempDir;
+
+static SCRIPT_CONTENTS: &'static [u8] = b"#!/bin/sh
+exit 23";
+
+const EXPECTED_STATUS: i32 = 23;
+
+const NONE: Option<&'static [u8]> = None;
+
+fn test_mount_tmpfs_without_flags_allows_rwx() {
+    let tempdir = TempDir::new("nix-test_mount")
+                      .unwrap_or_else(|e| panic!("tempdir failed: {}", e));
+
+    mount(NONE,
+          tempdir.path(),
+          Some(b"tmpfs".as_ref()),
+          MsFlags::empty(),
+          NONE)
+        .unwrap_or_else(|e| panic!("mount failed: {}", e));
+
+    let test_path = tempdir.path().join("test");
+
+    // Verify write.
+    fs::OpenOptions::new()
+        .create(true)
+        .write(true)
+        .mode((S_IRWXU | S_IRWXG | S_IRWXO).bits())
+        .open(&test_path)
+        .and_then(|mut f| f.write(SCRIPT_CONTENTS))
+        .unwrap_or_else(|e| panic!("write failed: {}", e));
+
+    // Verify read.
+    let mut buf = Vec::new();
+    File::open(&test_path)
+        .and_then(|mut f| f.read_to_end(&mut buf))
+        .unwrap_or_else(|e| panic!("read failed: {}", e));
+    assert_eq!(buf, SCRIPT_CONTENTS);
+
+    // Verify execute.
+    assert_eq!(EXPECTED_STATUS,
+               Command::new(&test_path)
+                   .status()
+                   .unwrap_or_else(|e| panic!("exec failed: {}", e))
+                   .code()
+                   .unwrap_or_else(|| panic!("child killed by signal")));
+
+    umount(tempdir.path()).unwrap_or_else(|e| panic!("umount failed: {}", e));
+}
+
+fn test_mount_rdonly_disallows_write() {
+    let tempdir = TempDir::new("nix-test_mount")
+                      .unwrap_or_else(|e| panic!("tempdir failed: {}", e));
+
+    mount(NONE,
+          tempdir.path(),
+          Some(b"tmpfs".as_ref()),
+          MS_RDONLY,
+          NONE)
+        .unwrap_or_else(|e| panic!("mount failed: {}", e));
+
+    // EROFS: Read-only file system
+    assert_eq!(EROFS as i32,
+               File::create(tempdir.path().join("test")).unwrap_err().raw_os_error().unwrap());
+
+    umount(tempdir.path()).unwrap_or_else(|e| panic!("umount failed: {}", e));
+}
+
+fn test_mount_noexec_disallows_exec() {
+    let tempdir = TempDir::new("nix-test_mount")
+                      .unwrap_or_else(|e| panic!("tempdir failed: {}", e));
+
+    mount(NONE,
+          tempdir.path(),
+          Some(b"tmpfs".as_ref()),
+          MS_NOEXEC,
+          NONE)
+        .unwrap_or_else(|e| panic!("mount failed: {}", e));
+
+    let test_path = tempdir.path().join("test");
+
+    fs::OpenOptions::new()
+        .create(true)
+        .write(true)
+        .mode((S_IRWXU | S_IRWXG | S_IRWXO).bits())
+        .open(&test_path)
+        .and_then(|mut f| f.write(SCRIPT_CONTENTS))
+        .unwrap_or_else(|e| panic!("write failed: {}", e));
+
+    // Verify that we cannot execute despite a+x permissions being set.
+    let mode = stat::Mode::from_bits_truncate(fs::metadata(&test_path)
+                                                  .map(|md| md.permissions().mode())
+                                                  .unwrap_or_else(|e| {
+                                                      panic!("metadata failed: {}", e)
+                                                  }));
+
+    assert!(mode.contains(S_IXUSR | S_IXGRP | S_IXOTH),
+            "{:?} did not have execute permissions",
+            &test_path);
+
+    // EACCES: Permission denied
+    assert_eq!(EACCES as i32,
+               Command::new(&test_path).status().unwrap_err().raw_os_error().unwrap());
+
+    umount(tempdir.path()).unwrap_or_else(|e| panic!("umount failed: {}", e));
+}
+
+fn test_mount_bind() {
+    let tempdir = TempDir::new("nix-test_mount")
+                      .unwrap_or_else(|e| panic!("tempdir failed: {}", e));
+    let file_name = "test";
+
+    {
+        let mount_point = TempDir::new("nix-test_mount")
+                              .unwrap_or_else(|e| panic!("tempdir failed: {}", e));
+
+        mount(Some(tempdir.path()),
+              mount_point.path(),
+              NONE,
+              MS_BIND,
+              NONE)
+            .unwrap_or_else(|e| panic!("mount failed: {}", e));
+
+        fs::OpenOptions::new()
+            .create(true)
+            .write(true)
+            .mode((S_IRWXU | S_IRWXG | S_IRWXO).bits())
+            .open(mount_point.path().join(file_name))
+            .and_then(|mut f| f.write(SCRIPT_CONTENTS))
+            .unwrap_or_else(|e| panic!("write failed: {}", e));
+
+        umount(mount_point.path()).unwrap_or_else(|e| panic!("umount failed: {}", e));
+    }
+
+    // Verify the file written in the mount shows up in source directory, even
+    // after unmounting.
+
+    let mut buf = Vec::new();
+    File::open(tempdir.path().join(file_name))
+        .and_then(|mut f| f.read_to_end(&mut buf))
+        .unwrap_or_else(|e| panic!("read failed: {}", e));
+    assert_eq!(buf, SCRIPT_CONTENTS);
+}
+
+
+// Test runner
+
+/// Mimic normal test output (hackishly).
+macro_rules! run_tests {
+    ( $($test_fn:ident),* ) => {{
+        print!("\n");
+
+        $(
+            print!("test test_mount::{} ... ", stringify!($test_fn));
+            $test_fn();
+            print!("ok\n");
+        )*
+
+        print!("\n");
+    }}
+}
+
+fn main() {
+    setup_namespaces();
+
+    run_tests!(test_mount_tmpfs_without_flags_allows_rwx,
+               test_mount_rdonly_disallows_write,
+               test_mount_noexec_disallows_exec,
+               test_mount_bind);
+}
+
+fn setup_namespaces() {
+    // Hold on to the uid in the parent namespace.
+    let uid = unsafe { libc::getuid() };
+
+    unshare(CLONE_NEWNS | CLONE_NEWUSER).unwrap_or_else(|e| {
+        panic!("unshare failed: {}. Are unprivileged user namespaces available?",
+               e)
+    });
+
+    // Map user as uid 1000.
+    fs::OpenOptions::new()
+        .write(true)
+        .open("/proc/self/uid_map")
+        .and_then(|mut f| f.write(format!("1000 {} 1\n", uid).as_bytes()))
+        .unwrap_or_else(|e| panic!("could not write uid map: {}", e));
+}