diff --git a/src/libstd/process.rs b/src/libstd/process.rs
index 676ae286eaa..1b1f2291826 100644
--- a/src/libstd/process.rs
+++ b/src/libstd/process.rs
@@ -399,7 +399,7 @@ impl Command {
     ///         .spawn()
     ///         .expect("printenv failed to start");
     /// ```
-    #[stable(feature = "process", since = "1.16.0")]
+    #[stable(feature = "command_envs", since = "1.16.0")]
     pub fn envs<K, V>(&mut self, vars: &[(K, V)]) -> &mut Command
         where K: AsRef<OsStr>, V: AsRef<OsStr>
     {
diff --git a/src/test/run-pass/process-envs.rs b/src/test/run-pass/process-envs.rs
index 229f8488f19..80ff16aadb2 100644
--- a/src/test/run-pass/process-envs.rs
+++ b/src/test/run-pass/process-envs.rs
@@ -41,9 +41,9 @@ fn main() {
     let filtered_env : Vec<(String, String)> =
         env::vars().filter(|&(ref k, _)| k == "PATH").collect();
 
-    let mut cmd = env_cmd()
-        .env_clear()
-        .envs(&filtered_env);
+    let mut cmd = env_cmd();
+    cmd.env_clear();
+    cmd.envs(&filtered_env);
 
     // restore original environment
     match old_env {
@@ -51,8 +51,7 @@ fn main() {
         Some(val) => env::set_var("RUN_TEST_NEW_ENV", &val)
     }
 
-    let prog = cmd.spawn().unwrap();
-    let result = prog.wait_with_output().unwrap();
+    let result = cmd.output().unwrap();
     let output = String::from_utf8_lossy(&result.stdout);
 
     assert!(!output.contains("RUN_TEST_NEW_ENV"),
diff --git a/src/test/run-pass/process-remove-from-env.rs b/src/test/run-pass/process-remove-from-env.rs
index cce5ef4fe17..b7f296a65c2 100644
--- a/src/test/run-pass/process-remove-from-env.rs
+++ b/src/test/run-pass/process-remove-from-env.rs
@@ -46,8 +46,7 @@ fn main() {
         Some(val) => env::set_var("RUN_TEST_NEW_ENV", &val)
     }
 
-    let prog = cmd.spawn().unwrap();
-    let result = prog.wait_with_output().unwrap();
+    let result = cmd.output().unwrap();
     let output = String::from_utf8_lossy(&result.stdout);
 
     assert!(!output.contains("RUN_TEST_NEW_ENV"),