diff --git a/src/test/run-pass/binops.rs b/src/test/run-pass/binops.rs
index 7bae808504ba..09743affa79b 100644
--- a/src/test/run-pass/binops.rs
+++ b/src/test/run-pass/binops.rs
@@ -116,13 +116,13 @@ fn test_fn() {
 #[abi = "cdecl"]
 #[nolink]
 extern mod test {
-    fn unsupervise();
+    fn rust_get_sched_id();
     fn get_task_id();
 }
 
 fn test_foreign_fn() {
-    assert test::unsupervise != test::get_task_id;
-    assert test::unsupervise == test::unsupervise;
+    assert test::rust_get_sched_id != test::get_task_id;
+    assert test::rust_get_sched_id == test::rust_get_sched_id;
 }
 
 class p {
diff --git a/src/test/run-pass/c-stack-as-value.rs b/src/test/run-pass/c-stack-as-value.rs
index 1b10798166db..0947be381f25 100644
--- a/src/test/run-pass/c-stack-as-value.rs
+++ b/src/test/run-pass/c-stack-as-value.rs
@@ -1,8 +1,8 @@
 #[abi = "cdecl"]
 extern mod rustrt {
-    fn unsupervise();
+    fn get_task_id();
 }
 
 fn main() {
-    let _foo = rustrt::unsupervise;
+    let _foo = rustrt::get_task_id;
 }
diff --git a/src/test/run-pass/foreign-no-abi.rs b/src/test/run-pass/foreign-no-abi.rs
index 6b853b7d0d20..4b9fe43b2d72 100644
--- a/src/test/run-pass/foreign-no-abi.rs
+++ b/src/test/run-pass/foreign-no-abi.rs
@@ -1,9 +1,9 @@
 // ABI is cdecl by default
 
 extern mod rustrt {
-    fn unsupervise();
+    fn get_task_id() -> int;
 }
 
 fn main() {
-    rustrt::unsupervise();
-}
\ No newline at end of file
+    rustrt::get_task_id();
+}
diff --git a/src/test/run-pass/foreign2.rs b/src/test/run-pass/foreign2.rs
index 7af41e8dc415..9d1ad60cc923 100644
--- a/src/test/run-pass/foreign2.rs
+++ b/src/test/run-pass/foreign2.rs
@@ -1,10 +1,3 @@
-
-
-#[abi = "cdecl"]
-extern mod rustrt {
-    fn unsupervise();
-}
-
 #[abi = "cdecl"]
 #[nolink]
 extern mod bar { }
diff --git a/src/test/run-pass/issue-1251.rs b/src/test/run-pass/issue-1251.rs
index 0a73daa234d5..76f54100e6ee 100644
--- a/src/test/run-pass/issue-1251.rs
+++ b/src/test/run-pass/issue-1251.rs
@@ -1,7 +1,7 @@
-#[link(name = "unsupervise")];
+#[link(name = "get_task_id")];
 
 extern mod rustrt {
-      fn unsupervise();
+      fn get_task_id() -> int;
 }
 
 fn main() { }
diff --git a/src/test/run-pass/issue-506.rs b/src/test/run-pass/issue-506.rs
index 98654f497e3b..565e270baa24 100644
--- a/src/test/run-pass/issue-506.rs
+++ b/src/test/run-pass/issue-506.rs
@@ -9,7 +9,7 @@ import task;
 
 #[abi = "cdecl"]
 extern mod rustrt {
-    fn unsupervise();
+    fn get_task_id();
 }
 
-fn main() { task::spawn(rustrt::unsupervise); }
+fn main() { task::spawn(rustrt::get_task_id); }
diff --git a/src/test/run-pass/item-attributes.rs b/src/test/run-pass/item-attributes.rs
index 1e6aff673ede..5558cc22dd2f 100644
--- a/src/test/run-pass/item-attributes.rs
+++ b/src/test/run-pass/item-attributes.rs
@@ -163,7 +163,7 @@ mod test_foreign_items {
         #[attr];
 
         #[attr]
-        fn unsupervise();
+        fn get_task_id() -> int;
     }
 }
 
diff --git a/src/test/run-pass/morestack6.rs b/src/test/run-pass/morestack6.rs
index 62b73cd6a76b..746c4dabe30d 100644
--- a/src/test/run-pass/morestack6.rs
+++ b/src/test/run-pass/morestack6.rs
@@ -8,7 +8,7 @@ import std::rand;
 extern mod rustrt {
     fn debug_get_stk_seg() -> *u8;
 
-    fn unsupervise();
+    fn rust_get_sched_id() -> int;
     fn last_os_error() -> ~str;
     fn rust_getcwd() -> ~str;
     fn get_task_id();
@@ -16,7 +16,7 @@ extern mod rustrt {
     fn rust_get_task();
 }
 
-fn calllink01() { rustrt::unsupervise(); }
+fn calllink01() { rustrt::rust_get_sched_id(); }
 fn calllink02() { rustrt::last_os_error(); }
 fn calllink03() { rustrt::rust_getcwd(); }
 fn calllink08() { rustrt::get_task_id(); }