diff --git a/mk/pp.mk b/mk/pp.mk
index 3dbd8f04d7a..21ed07d34b7 100644
--- a/mk/pp.mk
+++ b/mk/pp.mk
@@ -9,7 +9,7 @@ else
               $(wildcard $(S)src/fuzzer/*.rs)
 
   PP_INPUTS_FILTERED = $(shell echo $(PP_INPUTS) | xargs grep -L \
-                       "no-reformat\|xfail-pretty\|xfail-test")
+                       "no-reformat\|xfail-pretty\|xfail-stage2")
 endif
 
 reformat: $(SREQ1)
diff --git a/src/test/compile-fail/bad-type-env-capture.rs b/src/test/compile-fail/bad-type-env-capture.rs
index 712d1466230..3e94bdfd9eb 100644
--- a/src/test/compile-fail/bad-type-env-capture.rs
+++ b/src/test/compile-fail/bad-type-env-capture.rs
@@ -1,4 +1,6 @@
-// xfail-test
+// xfail-stage1
+// xfail-stage2
+// xfail-stage3
 // error-pattern: attempted dynamic environment-capture
 fn foo<T>() {
     obj bar(b: T) { }
diff --git a/src/test/compile-fail/constrained-type-missing-check.rs b/src/test/compile-fail/constrained-type-missing-check.rs
index 6eb5a7c1e62..78c8f64ee9c 100644
--- a/src/test/compile-fail/constrained-type-missing-check.rs
+++ b/src/test/compile-fail/constrained-type-missing-check.rs
@@ -1,5 +1,7 @@
 // -*- rust -*-
-// xfail-test
+// xfail-stage1
+// xfail-stage2
+// xfail-stage3
 // error-pattern:Unsatisfied precondition
 
 tag list { cons(int, @list); nil; }
diff --git a/src/test/compile-fail/dead-code-be.rs b/src/test/compile-fail/dead-code-be.rs
index f2faedb7434..a40d78b17a9 100644
--- a/src/test/compile-fail/dead-code-be.rs
+++ b/src/test/compile-fail/dead-code-be.rs
@@ -1,4 +1,6 @@
-// xfail-test
+// xfail-stage1
+// xfail-stage2
+// xfail-stage3
 // -*- rust -*-
 
 // error-pattern: dead
diff --git a/src/test/compile-fail/dead-code-ret.rs b/src/test/compile-fail/dead-code-ret.rs
index 3cfed81fc09..3200a6825ac 100644
--- a/src/test/compile-fail/dead-code-ret.rs
+++ b/src/test/compile-fail/dead-code-ret.rs
@@ -1,4 +1,6 @@
-// xfail-test
+// xfail-stage1
+// xfail-stage2
+// xfail-stage3
 // -*- rust -*-
 
 // error-pattern: dead
diff --git a/src/test/compile-fail/infinite-tag-type-recursion.rs b/src/test/compile-fail/infinite-tag-type-recursion.rs
index 2d3a92af888..06592b1e963 100644
--- a/src/test/compile-fail/infinite-tag-type-recursion.rs
+++ b/src/test/compile-fail/infinite-tag-type-recursion.rs
@@ -1,4 +1,6 @@
-// xfail-test
+// xfail-stage1
+// xfail-stage2
+// xfail-stage3
 // -*- rust -*-
 
 // error-pattern: tag of infinite size
diff --git a/src/test/compiletest/header.rs b/src/test/compiletest/header.rs
index a13398cb9fd..d953a903c39 100644
--- a/src/test/compiletest/header.rs
+++ b/src/test/compiletest/header.rs
@@ -59,9 +59,12 @@ fn is_test_ignored(config: &config, testfile: &istr) -> bool {
     let found = false;
     for each ln: istr in iter_header(testfile) {
         // FIXME: Can't return or break from iterator
-        found = found || parse_name_directive(ln, ~"xfail-test");
+        found = found
+            || parse_name_directive(ln, ~"xfail-"
+                                    + config.stage_id);
         if (config.mode == common::mode_pretty) {
-            found = found || parse_name_directive(ln, ~"xfail-pretty");
+            found = found
+                || parse_name_directive(ln, ~"xfail-pretty");
         }
     }
     ret found;
diff --git a/src/test/run-fail/fail-parens.rs b/src/test/run-fail/fail-parens.rs
index 849d4b41d3b..d78e29de7b4 100644
--- a/src/test/run-fail/fail-parens.rs
+++ b/src/test/run-fail/fail-parens.rs
@@ -1,4 +1,6 @@
-// xfail-test
+// xfail-stage1
+// xfail-stage2
+// xfail-stage3
 // Fail statements without arguments need to be disambiguated in
 // certain positions
 // error-pattern:explicit-failure
diff --git a/src/test/run-fail/task-comm-14.rs b/src/test/run-fail/task-comm-14.rs
index d9a1223c355..5e551eca127 100644
--- a/src/test/run-fail/task-comm-14.rs
+++ b/src/test/run-fail/task-comm-14.rs
@@ -1,4 +1,6 @@
-// xfail-test
+// xfail-stage1
+// xfail-stage2
+// xfail-stage3
 io fn main() {
     let port<int> po = port();
 
diff --git a/src/test/run-fail/trivial-message2.rs b/src/test/run-fail/trivial-message2.rs
index 5bae5036e6e..9c77d5a9c4e 100644
--- a/src/test/run-fail/trivial-message2.rs
+++ b/src/test/run-fail/trivial-message2.rs
@@ -1,4 +1,6 @@
-// xfail-test
+// xfail-stage1
+// xfail-stage2
+// xfail-stage3
 
 /*
   This program should hang on the po |> r line.
diff --git a/src/test/run-pass/acyclic-unwind.rs b/src/test/run-pass/acyclic-unwind.rs
index 28a1e9d6708..6eb011484db 100644
--- a/src/test/run-pass/acyclic-unwind.rs
+++ b/src/test/run-pass/acyclic-unwind.rs
@@ -1,4 +1,6 @@
-// xfail-test
+// xfail-stage1
+// xfail-stage2
+// xfail-stage3
 // -*- rust -*-
 
 use std;
diff --git a/src/test/run-pass/alt-type-simple.rs b/src/test/run-pass/alt-type-simple.rs
index 8a6b7b5ce46..62e3f209c68 100644
--- a/src/test/run-pass/alt-type-simple.rs
+++ b/src/test/run-pass/alt-type-simple.rs
@@ -1,4 +1,6 @@
-// xfail-test
+// xfail-stage1
+// xfail-stage2
+// xfail-stage3
 fn altsimple(any x) {
   alt type (f) {
     case (int i) { print("int"); }
diff --git a/src/test/run-pass/anon-obj-no-inner-obj.rs b/src/test/run-pass/anon-obj-no-inner-obj.rs
index 7326144d18a..5ce20410eef 100644
--- a/src/test/run-pass/anon-obj-no-inner-obj.rs
+++ b/src/test/run-pass/anon-obj-no-inner-obj.rs
@@ -1,4 +1,6 @@
-//xfail-test
+//xfail-stage1
+//xfail-stage2
+//xfail-stage3
 use std;
 
 // This is failing not because it's an anonymous object from nothing
diff --git a/src/test/run-pass/anon-obj-refer-to-parallel-method.rs b/src/test/run-pass/anon-obj-refer-to-parallel-method.rs
index 6340b128554..e9cbdaaec1f 100644
--- a/src/test/run-pass/anon-obj-refer-to-parallel-method.rs
+++ b/src/test/run-pass/anon-obj-refer-to-parallel-method.rs
@@ -1,4 +1,6 @@
-//xfail-test
+//xfail-stage1
+//xfail-stage2
+//xfail-stage3
 
 // Test case for issue #822.
 fn main() {
diff --git a/src/test/run-pass/anon-objs-with-fields.rs b/src/test/run-pass/anon-objs-with-fields.rs
index 226c2b9fd21..c63f8ac585a 100644
--- a/src/test/run-pass/anon-objs-with-fields.rs
+++ b/src/test/run-pass/anon-objs-with-fields.rs
@@ -1,4 +1,6 @@
-//xfail-test
+//xfail-stage1
+//xfail-stage2
+//xfail-stage3
 use std;
 
 fn main() {
diff --git a/src/test/run-pass/bind-native.rs b/src/test/run-pass/bind-native.rs
index cb55d90beb4..5dd321a5ef2 100644
--- a/src/test/run-pass/bind-native.rs
+++ b/src/test/run-pass/bind-native.rs
@@ -3,7 +3,9 @@ Can we bind native things?
 */
 
 //xfail-stage0
-//xfail-test
+//xfail-stage1
+//xfail-stage2
+//xfail-stage3
 
 native "rust" mod rustrt {
     fn task_yield();
diff --git a/src/test/run-pass/clone-with-exterior.rs b/src/test/run-pass/clone-with-exterior.rs
index 074da4f0219..1feed8042e7 100644
--- a/src/test/run-pass/clone-with-exterior.rs
+++ b/src/test/run-pass/clone-with-exterior.rs
@@ -1,5 +1,7 @@
 //xfail-stage0
-//xfail-test
+//xfail-stage1
+//xfail-stage2
+//xfail-stage3
 
 use std;
 import std::task;
diff --git a/src/test/run-pass/first-class-method.rs b/src/test/run-pass/first-class-method.rs
index e327c7a6cf0..c9531a08dc5 100644
--- a/src/test/run-pass/first-class-method.rs
+++ b/src/test/run-pass/first-class-method.rs
@@ -1,4 +1,6 @@
-// xfail-test
+// xfail-stage1
+// xfail-stage2
+// xfail-stage3
 
 // Test case for issue #758.
 obj foo() { fn f() { } }
diff --git a/src/test/run-pass/infinite-loops.rs b/src/test/run-pass/infinite-loops.rs
index 3c2be61ac65..f5b7e5ad6b2 100644
--- a/src/test/run-pass/infinite-loops.rs
+++ b/src/test/run-pass/infinite-loops.rs
@@ -2,7 +2,9 @@
   A simple way to make sure threading works. This should use all the
   CPU cycles an any machines that we're likely to see for a while.
 */
-// xfail-test
+// xfail-stage1
+// xfail-stage2
+// xfail-stage3
 
 use std;
 import std::task::join;
diff --git a/src/test/run-pass/interface-narrowing.rs b/src/test/run-pass/interface-narrowing.rs
index d5f07efc086..8aca8f2b21d 100644
--- a/src/test/run-pass/interface-narrowing.rs
+++ b/src/test/run-pass/interface-narrowing.rs
@@ -1,4 +1,6 @@
-//xfail-test
+//xfail-stage1
+//xfail-stage2
+//xfail-stage3
 
 // Test case for issue #115.
 type base =
diff --git a/src/test/run-pass/mlist-cycle.rs b/src/test/run-pass/mlist-cycle.rs
index b561f84c4b8..3055792c0d4 100644
--- a/src/test/run-pass/mlist-cycle.rs
+++ b/src/test/run-pass/mlist-cycle.rs
@@ -1,4 +1,6 @@
-// xfail-test
+// xfail-stage1
+// xfail-stage2
+// xfail-stage3
 // -*- rust -*-
 use std;
 
diff --git a/src/test/run-pass/native-mod.rc b/src/test/run-pass/native-mod.rc
index 73912355ef8..9537942a4ea 100644
--- a/src/test/run-pass/native-mod.rc
+++ b/src/test/run-pass/native-mod.rc
@@ -1,4 +1,6 @@
-// xfail-test
+// xfail-stage1
+// xfail-stage2
+// xfail-stage3
 // -*- rust -*-
 
 native mod libc = target_libc {
diff --git a/src/test/run-pass/native.rc b/src/test/run-pass/native.rc
index 599ee9e7f24..7a4c20e6fbb 100644
--- a/src/test/run-pass/native.rc
+++ b/src/test/run-pass/native.rc
@@ -1,4 +1,6 @@
-// xfail-test
+// xfail-stage1
+// xfail-stage2
+// xfail-stage3
 // -*- rust -*-
 
 native "rust" mod rustrt {
diff --git a/src/test/run-pass/obj-as.rs b/src/test/run-pass/obj-as.rs
index 26c27435ce1..42c80b4a883 100644
--- a/src/test/run-pass/obj-as.rs
+++ b/src/test/run-pass/obj-as.rs
@@ -1,4 +1,6 @@
-// xfail-test
+// xfail-stage1
+// xfail-stage2
+// xfail-stage3
 obj big() {
     fn one() -> int { ret 1; }
     fn two() -> int { ret 2; }
diff --git a/src/test/run-pass/preempt.rs b/src/test/run-pass/preempt.rs
index 196f54c1449..4fc67429e2c 100644
--- a/src/test/run-pass/preempt.rs
+++ b/src/test/run-pass/preempt.rs
@@ -1,4 +1,6 @@
-// xfail-test
+// xfail-stage1
+// xfail-stage2
+// xfail-stage3
 // This checks that preemption works.
 
 fn starve_main(alive: chan<int>) {
diff --git a/src/test/run-pass/sio-client.rs b/src/test/run-pass/sio-client.rs
index f3eefbcaef9..f2039013fd0 100644
--- a/src/test/run-pass/sio-client.rs
+++ b/src/test/run-pass/sio-client.rs
@@ -1,4 +1,6 @@
-// xfail-test
+// xfail-stage1
+// xfail-stage2
+// xfail-stage3
 use std;
 import std::sio;
 import std::task;
diff --git a/src/test/run-pass/sio-ctx.rs b/src/test/run-pass/sio-ctx.rs
index ea3374e493f..dd77bb9dedd 100644
--- a/src/test/run-pass/sio-ctx.rs
+++ b/src/test/run-pass/sio-ctx.rs
@@ -1,5 +1,7 @@
 // Seems to hang for long periods, probably with RUST_THREADS > 1. Issue #810
-// xfail-test
+// xfail-stage1
+// xfail-stage2
+// xfail-stage3
 
 use std;
 import std::sio;
diff --git a/src/test/run-pass/sio-read.rs b/src/test/run-pass/sio-read.rs
index 194c55a1508..688aec7a40f 100644
--- a/src/test/run-pass/sio-read.rs
+++ b/src/test/run-pass/sio-read.rs
@@ -1,4 +1,6 @@
-// xfail-test
+// xfail-stage1
+// xfail-stage2
+// xfail-stage3
 use std;
 import std::sio;
 import std::task;
diff --git a/src/test/run-pass/sio-srv.rs b/src/test/run-pass/sio-srv.rs
index c51a2c0d9d4..a6ff53598ca 100644
--- a/src/test/run-pass/sio-srv.rs
+++ b/src/test/run-pass/sio-srv.rs
@@ -1,4 +1,6 @@
-// xfail-test
+// xfail-stage1
+// xfail-stage2
+// xfail-stage3
 use std;
 import std::sio;
 import std::net;
diff --git a/src/test/run-pass/sio-write.rs b/src/test/run-pass/sio-write.rs
index 63e1cf4f3b1..bdce70b97a1 100644
--- a/src/test/run-pass/sio-write.rs
+++ b/src/test/run-pass/sio-write.rs
@@ -1,4 +1,6 @@
-// xfail-test
+// xfail-stage1
+// xfail-stage2
+// xfail-stage3
 use std;
 import std::sio;
 import std::task;
diff --git a/src/test/run-pass/syntax-extension-shell.rs b/src/test/run-pass/syntax-extension-shell.rs
index a7189359121..27c4a302b7a 100644
--- a/src/test/run-pass/syntax-extension-shell.rs
+++ b/src/test/run-pass/syntax-extension-shell.rs
@@ -1,4 +1,6 @@
-// xfail-test
+// xfail-stage1
+// xfail-stage2
+// xfail-stage3
 fn main() {
   auto s = #shell { uname -a };
   log s;
diff --git a/src/test/run-pass/task-comm-0.rs b/src/test/run-pass/task-comm-0.rs
index 424304ebc5f..acaa2b5f9b7 100644
--- a/src/test/run-pass/task-comm-0.rs
+++ b/src/test/run-pass/task-comm-0.rs
@@ -1,5 +1,5 @@
 // Temporarily xfailing, because something is wrong.
-// xfail-test
+// xfail-stage2
 use std;
 
 import std::comm;
diff --git a/src/test/run-pass/task-comm-10.rs b/src/test/run-pass/task-comm-10.rs
index c2fd52b875f..39157600263 100644
--- a/src/test/run-pass/task-comm-10.rs
+++ b/src/test/run-pass/task-comm-10.rs
@@ -1,7 +1,9 @@
 // FIXME: this test is xfailed until sending strings is legal again.
 
 //xfail-stage0
-//xfail-test
+//xfail-stage1
+//xfail-stage2
+//xfail-stage3
 
 use std;
 import std::task;
diff --git a/src/test/run-pass/task-comm-11.rs b/src/test/run-pass/task-comm-11.rs
index aed656c9f2a..2a46121b974 100644
--- a/src/test/run-pass/task-comm-11.rs
+++ b/src/test/run-pass/task-comm-11.rs
@@ -1,3 +1,4 @@
+// xfail-stage3
 use std;
 import std::comm;
 import std::task;
diff --git a/src/test/run-pass/task-comm-2.rs b/src/test/run-pass/task-comm-2.rs
index 2028c408e2e..4dfc143991c 100644
--- a/src/test/run-pass/task-comm-2.rs
+++ b/src/test/run-pass/task-comm-2.rs
@@ -1,5 +1,7 @@
 // Broken under win
-// xfail-test
+// xfail-stage1
+// xfail-stage2
+// xfail-stage3
 
 use std;
 
diff --git a/src/test/run-pass/task-compare.rs b/src/test/run-pass/task-compare.rs
index 4ef6bcaf5c4..0e9116b65d3 100644
--- a/src/test/run-pass/task-compare.rs
+++ b/src/test/run-pass/task-compare.rs
@@ -4,7 +4,9 @@
 
 // FIXME: This won't work until we can compare resources
 // xfail-stage0
-// xfail-test
+// xfail-stage1
+// xfail-stage2
+// xfail-stage3
 
 use std;
 import std::task;
diff --git a/src/test/run-pass/task-killjoin.rs b/src/test/run-pass/task-killjoin.rs
index 43690cfb104..cfed8c136ab 100644
--- a/src/test/run-pass/task-killjoin.rs
+++ b/src/test/run-pass/task-killjoin.rs
@@ -1,4 +1,6 @@
-// xfail-test
+// xfail-stage1
+// xfail-stage2
+// xfail-stage3
 
 // Create a task that is supervised by another task,
 // join the supervised task from the supervising task,
diff --git a/src/test/run-pass/type-sizes.rs b/src/test/run-pass/type-sizes.rs
index 5b17568f5dc..25020ec3ed0 100644
--- a/src/test/run-pass/type-sizes.rs
+++ b/src/test/run-pass/type-sizes.rs
@@ -1,4 +1,6 @@
-// xfail-test
+// xfail-stage1
+// xfail-stage2
+// xfail-stage3
 import std::sys::rustrt::size_of;
 use std;
 
diff --git a/src/test/run-pass/use.rs b/src/test/run-pass/use.rs
index 5d5142965ed..2c4539e3534 100644
--- a/src/test/run-pass/use.rs
+++ b/src/test/run-pass/use.rs
@@ -1,4 +1,6 @@
-// xfail-test
+// xfail-stage1
+// xfail-stage2
+// xfail-stage3
 use std;
 use libc;
 use zed(name = "std");
diff --git a/src/test/run-pass/user.rs b/src/test/run-pass/user.rs
index a17a5021ca8..994003d1fe2 100644
--- a/src/test/run-pass/user.rs
+++ b/src/test/run-pass/user.rs
@@ -1,4 +1,6 @@
-// xfail-test
+// xfail-stage1
+// xfail-stage2
+// xfail-stage3
 // -*- rust -*-
 
 use std (name = "std",
diff --git a/src/test/run-pass/vec-slice.rs b/src/test/run-pass/vec-slice.rs
index c03b8c4611a..f734059466f 100644
--- a/src/test/run-pass/vec-slice.rs
+++ b/src/test/run-pass/vec-slice.rs
@@ -1,4 +1,6 @@
-// xfail-test
+// xfail-stage1
+// xfail-stage2
+// xfail-stage3
 fn main() {
   let vec<int> v = [1,2,3,4,5];
   auto v2 = v.(1,2);