diff --git a/test/mkdir.rs b/test/mkdir.rs
index 7691af97e..402608292 100644
--- a/test/mkdir.rs
+++ b/test/mkdir.rs
@@ -1,12 +1,12 @@
 use std::io::process::Command;
 use std::io::fs::{rmdir, PathExtensions};
 
-static exe: &'static str = "./mkdir";
-static test_dir1: &'static str = "mkdir_test1";
-static test_dir2: &'static str = "mkdir_test2";
-static test_dir3: &'static str = "mkdir_test3";
-static test_dir4: &'static str = "mkdir_test4/mkdir_test4_1";
-static test_dir5: &'static str = "mkdir_test5/mkdir_test5_1";
+static EXE: &'static str = "./mkdir";
+static TEST_DIR1: &'static str = "mkdir_test1";
+static TEST_DIR2: &'static str = "mkdir_test2";
+static TEST_DIR3: &'static str = "mkdir_test3";
+static TEST_DIR4: &'static str = "mkdir_test4/mkdir_test4_1";
+static TEST_DIR5: &'static str = "mkdir_test5/mkdir_test5_1";
 
 fn cleanup(dir: &'static str) {
     let d = dir.into_string();
@@ -18,51 +18,51 @@ fn cleanup(dir: &'static str) {
 
 #[test]
 fn test_mkdir_mkdir() {
-    cleanup(test_dir1);
-    let prog = Command::new(exe).arg(test_dir1).status();
+    cleanup(TEST_DIR1);
+    let prog = Command::new(EXE).arg(TEST_DIR1).status();
     let exit_success = prog.unwrap().success();
-    cleanup(test_dir1);
+    cleanup(TEST_DIR1);
     assert_eq!(exit_success, true);
 }
 
 #[test]
 fn test_mkdir_dup_dir() {
-    cleanup(test_dir2);
-    let prog = Command::new(exe).arg(test_dir2).status();
+    cleanup(TEST_DIR2);
+    let prog = Command::new(EXE).arg(TEST_DIR2).status();
     let exit_success = prog.unwrap().success();
     if !exit_success {
-        cleanup(test_dir2);
+        cleanup(TEST_DIR2);
         fail!();
     }
-    let prog2 = Command::new(exe).arg(test_dir2).status();
+    let prog2 = Command::new(EXE).arg(TEST_DIR2).status();
     let exit_success2 = prog2.unwrap().success();
-    cleanup(test_dir2);
+    cleanup(TEST_DIR2);
     assert_eq!(exit_success2, false);
 }
 
 #[test]
 fn test_mkdir_mode() {
-    cleanup(test_dir3);
-    let prog = Command::new(exe).arg("-m").arg("755").arg(test_dir3).status();
+    cleanup(TEST_DIR3);
+    let prog = Command::new(EXE).arg("-m").arg("755").arg(TEST_DIR3).status();
     let exit_success = prog.unwrap().success();
-    cleanup(test_dir3);
+    cleanup(TEST_DIR3);
     assert_eq!(exit_success, true);
 }
 
 #[test]
 fn test_mkdir_parent() {
-    cleanup(test_dir4);
-    let prog = Command::new(exe).arg("-p").arg(test_dir4).status();
+    cleanup(TEST_DIR4);
+    let prog = Command::new(EXE).arg("-p").arg(TEST_DIR4).status();
     let exit_success = prog.unwrap().success();
-    cleanup(test_dir4);
+    cleanup(TEST_DIR4);
     assert_eq!(exit_success, true);
 }
 
 #[test]
 fn test_mkdir_no_parent() {
-    cleanup(test_dir5);
-    let prog = Command::new(exe).arg(test_dir5).status();
+    cleanup(TEST_DIR5);
+    let prog = Command::new(EXE).arg(TEST_DIR5).status();
     let exit_success = prog.unwrap().success();
-    cleanup(test_dir5);
+    cleanup(TEST_DIR5);
     assert_eq!(exit_success, false);
 }