diff --git a/src/librustuv/addrinfo.rs b/src/librustuv/addrinfo.rs
index 601cc9f84add..2808915907b2 100644
--- a/src/librustuv/addrinfo.rs
+++ b/src/librustuv/addrinfo.rs
@@ -191,6 +191,7 @@ mod test {
     use super::super::local_loop;
 
     #[test]
+    #[ignore(cfg(target_os="android"))] // cannot give tcp/ip permission without help of apk
     fn getaddrinfo_test() {
         match GetAddrInfoRequest::run(local_loop(), Some("localhost"), None, None) {
             Ok(infos) => {
diff --git a/src/libstd/rt/io/net/addrinfo.rs b/src/libstd/rt/io/net/addrinfo.rs
index 27cf9781c9c3..684a6429775c 100644
--- a/src/libstd/rt/io/net/addrinfo.rs
+++ b/src/libstd/rt/io/net/addrinfo.rs
@@ -114,6 +114,7 @@ mod test {
     use super::*;
 
     #[test]
+    #[ignore(cfg(target_os="android"))] // cannot give tcp/ip permission without help of apk
     fn dns_smoke_test() {
         let ipaddrs = get_host_addresses("localhost").unwrap();
         let mut found_local = false;
diff --git a/src/libstd/rt/io/signal.rs b/src/libstd/rt/io/signal.rs
index 0f48f83a57e0..9fe8cb3ed90b 100644
--- a/src/libstd/rt/io/signal.rs
+++ b/src/libstd/rt/io/signal.rs
@@ -161,7 +161,7 @@ mod test {
         }
     }
 
-    #[test] #[cfg(unix)]
+    #[test] #[cfg(unix, not(target_os="android"))] // FIXME(#10378)
     fn test_io_signal_smoketest() {
         let mut signal = Listener::new();
         signal.register(Interrupt);
@@ -173,7 +173,7 @@ mod test {
         }
     }
 
-    #[test] #[cfg(unix)]
+    #[test] #[cfg(unix, not(target_os="android"))] // FIXME(#10378)
     fn test_io_signal_two_signal_one_signum() {
         let mut s1 = Listener::new();
         let mut s2 = Listener::new();
@@ -191,7 +191,7 @@ mod test {
         }
     }
 
-    #[test] #[cfg(unix)]
+    #[test] #[cfg(unix, not(target_os="android"))] // FIXME(#10378)
     fn test_io_signal_unregister() {
         let mut s1 = Listener::new();
         let mut s2 = Listener::new();
diff --git a/src/libstd/run.rs b/src/libstd/run.rs
index fe23944397d8..ec0e0f5c9321 100644
--- a/src/libstd/run.rs
+++ b/src/libstd/run.rs
@@ -339,20 +339,14 @@ mod tests {
     use rt::io::{Writer, Reader};
 
     #[test]
-    #[cfg(not(target_os="android"))]
+    #[cfg(not(target_os="android"))] // FIXME(#10380)
     fn test_process_status() {
         assert_eq!(run::process_status("false", []), 1);
         assert_eq!(run::process_status("true", []), 0);
     }
-    #[test]
-    #[cfg(target_os="android")]
-    fn test_process_status() {
-        assert_eq!(run::process_status("/system/bin/sh", [~"-c",~"false"]), 1);
-        assert_eq!(run::process_status("/system/bin/sh", [~"-c",~"true"]), 0);
-    }
 
     #[test]
-    #[cfg(not(target_os="android"))]
+    #[cfg(not(target_os="android"))] // FIXME(#10380)
     fn test_process_output_output() {
 
         let run::ProcessOutput {status, output, error}
@@ -366,24 +360,9 @@ mod tests {
             assert_eq!(error, ~[]);
         }
     }
-    #[test]
-    #[cfg(target_os="android")]
-    fn test_process_output_output() {
-
-        let run::ProcessOutput {status, output, error}
-             = run::process_output("/system/bin/sh", [~"-c",~"echo hello"]);
-        let output_str = str::from_utf8(output);
-
-        assert_eq!(status, 0);
-        assert_eq!(output_str.trim().to_owned(), ~"hello");
-        // FIXME #7224
-        if !running_on_valgrind() {
-            assert_eq!(error, ~[]);
-        }
-    }
 
     #[test]
-    #[cfg(not(target_os="android"))]
+    #[cfg(not(target_os="android"))] // FIXME(#10380)
     fn test_process_output_error() {
 
         let run::ProcessOutput {status, output, error}
@@ -393,17 +372,6 @@ mod tests {
         assert_eq!(output, ~[]);
         assert!(!error.is_empty());
     }
-    #[test]
-    #[cfg(target_os="android")]
-    fn test_process_output_error() {
-
-        let run::ProcessOutput {status, output, error}
-             = run::process_output("/system/bin/mkdir", [~"."]);
-
-        assert_eq!(status, 255);
-        assert_eq!(output, ~[]);
-        assert!(!error.is_empty());
-    }
 
     #[test]
     #[ignore] // FIXME(#10016) cat never sees stdin close
@@ -454,37 +422,22 @@ mod tests {
     }
 
     #[test]
-    #[cfg(not(target_os="android"))]
+    #[cfg(not(target_os="android"))] // FIXME(#10380)
     fn test_finish_once() {
         let mut prog = run::Process::new("false", [], run::ProcessOptions::new());
         assert_eq!(prog.finish(), 1);
     }
-    #[test]
-    #[cfg(target_os="android")]
-    fn test_finish_once() {
-        let mut prog = run::Process::new("/system/bin/sh", [~"-c",~"false"],
-                                         run::ProcessOptions::new());
-        assert_eq!(prog.finish(), 1);
-    }
 
     #[test]
-    #[cfg(not(target_os="android"))]
+    #[cfg(not(target_os="android"))] // FIXME(#10380)
     fn test_finish_twice() {
         let mut prog = run::Process::new("false", [], run::ProcessOptions::new());
         assert_eq!(prog.finish(), 1);
         assert_eq!(prog.finish(), 1);
     }
-    #[test]
-    #[cfg(target_os="android")]
-    fn test_finish_twice() {
-        let mut prog = run::Process::new("/system/bin/sh", [~"-c",~"false"],
-                                         run::ProcessOptions::new());
-        assert_eq!(prog.finish(), 1);
-        assert_eq!(prog.finish(), 1);
-    }
 
     #[test]
-    #[cfg(not(target_os="android"))]
+    #[cfg(not(target_os="android"))] // FIXME(#10380)
     fn test_finish_with_output_once() {
 
         let mut prog = run::Process::new("echo", [~"hello"], run::ProcessOptions::new());
@@ -499,26 +452,9 @@ mod tests {
             assert_eq!(error, ~[]);
         }
     }
-    #[test]
-    #[cfg(target_os="android")]
-    fn test_finish_with_output_once() {
-
-        let mut prog = run::Process::new("/system/bin/sh", [~"-c",~"echo hello"],
-                                         run::ProcessOptions::new());
-        let run::ProcessOutput {status, output, error}
-            = prog.finish_with_output();
-        let output_str = str::from_utf8(output);
-
-        assert_eq!(status, 0);
-        assert_eq!(output_str.trim().to_owned(), ~"hello");
-        // FIXME #7224
-        if !running_on_valgrind() {
-            assert_eq!(error, ~[]);
-        }
-    }
 
     #[test]
-    #[cfg(not(target_os="android"))]
+    #[cfg(not(target_os="android"))] // FIXME(#10380)
     fn test_finish_with_output_twice() {
 
         let mut prog = run::Process::new("echo", [~"hello"], run::ProcessOptions::new());
@@ -544,34 +480,6 @@ mod tests {
             assert_eq!(error, ~[]);
         }
     }
-    #[test]
-    #[cfg(target_os="android")]
-    fn test_finish_with_output_twice() {
-
-        let mut prog = run::Process::new("/system/bin/sh", [~"-c",~"echo hello"],
-                                         run::ProcessOptions::new());
-        let run::ProcessOutput {status, output, error}
-            = prog.finish_with_output();
-
-        let output_str = str::from_utf8(output);
-
-        assert_eq!(status, 0);
-        assert_eq!(output_str.trim().to_owned(), ~"hello");
-        // FIXME #7224
-        if !running_on_valgrind() {
-            assert_eq!(error, ~[]);
-        }
-
-        let run::ProcessOutput {status, output, error}
-            = prog.finish_with_output();
-
-        assert_eq!(status, 0);
-        assert_eq!(output, ~[]);
-        // FIXME #7224
-        if !running_on_valgrind() {
-            assert_eq!(error, ~[]);
-        }
-    }
 
     #[cfg(unix,not(target_os="android"))]
     fn run_pwd(dir: Option<&Path>) -> run::Process {
diff --git a/src/libstd/unstable/dynamic_lib.rs b/src/libstd/unstable/dynamic_lib.rs
index 7db59f2103fc..d3c43e692a90 100644
--- a/src/libstd/unstable/dynamic_lib.rs
+++ b/src/libstd/unstable/dynamic_lib.rs
@@ -90,6 +90,7 @@ mod test {
 
     #[test]
     #[ignore(cfg(windows))] // FIXME #8818
+    #[ignore(cfg(target_os="android"))] // FIXME(#10379)
     fn test_loading_cosine() {
         // The math library does not need to be loaded since it is already
         // statically linked in
diff --git a/src/test/bench/shootout-k-nucleotide-pipes.rs b/src/test/bench/shootout-k-nucleotide-pipes.rs
index 8ac224003b83..25f24faede22 100644
--- a/src/test/bench/shootout-k-nucleotide-pipes.rs
+++ b/src/test/bench/shootout-k-nucleotide-pipes.rs
@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// xfail-android: FIXME(#10393)
+
 // xfail-pretty the `let to_child` line gets an extra newline
 // multi tasking k-nucleotide
 
diff --git a/src/test/debug-info/basic-types-metadata.rs b/src/test/debug-info/basic-types-metadata.rs
index 86a42ca5f5b2..18683102b2ab 100644
--- a/src/test/debug-info/basic-types-metadata.rs
+++ b/src/test/debug-info/basic-types-metadata.rs
@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// xfail-android
+// xfail-android: FIXME(#10381)
 
 // compile-flags:-Z extra-debug-info
 // debugger:rbreak zzz
diff --git a/src/test/debug-info/basic-types.rs b/src/test/debug-info/basic-types.rs
index 27b0a200b407..b57c359046a6 100644
--- a/src/test/debug-info/basic-types.rs
+++ b/src/test/debug-info/basic-types.rs
@@ -14,7 +14,7 @@
 // about UTF-32 character encoding and will print a rust char as only
 // its numerical value.
 
-// xfail-android
+// xfail-android: FIXME(#10381)
 
 // compile-flags:-Z extra-debug-info
 // debugger:rbreak zzz
diff --git a/src/test/debug-info/borrowed-basic.rs b/src/test/debug-info/borrowed-basic.rs
index abdc9557f04a..7f130f212e2a 100644
--- a/src/test/debug-info/borrowed-basic.rs
+++ b/src/test/debug-info/borrowed-basic.rs
@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// xfail-android
+// xfail-android: FIXME(#10381)
 
 // Gdb doesn't know about UTF-32 character encoding and will print a rust char as only
 // its numerical value.
diff --git a/src/test/debug-info/borrowed-c-style-enum.rs b/src/test/debug-info/borrowed-c-style-enum.rs
index 40d3c6f13cb6..328e0176a91b 100644
--- a/src/test/debug-info/borrowed-c-style-enum.rs
+++ b/src/test/debug-info/borrowed-c-style-enum.rs
@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// xfail-android
+// xfail-android: FIXME(#10381)
 
 // compile-flags:-Z extra-debug-info
 // debugger:rbreak zzz
diff --git a/src/test/debug-info/borrowed-enum.rs b/src/test/debug-info/borrowed-enum.rs
index 3b5d8b65988a..ae80cdd78228 100644
--- a/src/test/debug-info/borrowed-enum.rs
+++ b/src/test/debug-info/borrowed-enum.rs
@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// xfail-android
+// xfail-android: FIXME(#10381)
 
 // compile-flags:-Z extra-debug-info
 // debugger:rbreak zzz
diff --git a/src/test/debug-info/boxed-vec.rs b/src/test/debug-info/boxed-vec.rs
index 94ab91e7f1c8..d7756c00dabb 100644
--- a/src/test/debug-info/boxed-vec.rs
+++ b/src/test/debug-info/boxed-vec.rs
@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// xfail-android
+// xfail-android: FIXME(#10381)
 
 #[feature(managed_boxes)];
 
diff --git a/src/test/debug-info/by-value-non-immediate-argument.rs b/src/test/debug-info/by-value-non-immediate-argument.rs
index b712873a93e6..abb863f6b9e7 100644
--- a/src/test/debug-info/by-value-non-immediate-argument.rs
+++ b/src/test/debug-info/by-value-non-immediate-argument.rs
@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// xfail-android
+// xfail-android: FIXME(#10381)
 
 // compile-flags:-Z extra-debug-info
 // debugger:rbreak zzz
diff --git a/src/test/debug-info/by-value-self-argument-in-trait-impl.rs b/src/test/debug-info/by-value-self-argument-in-trait-impl.rs
index d5551ea6da12..d051ab9db93b 100644
--- a/src/test/debug-info/by-value-self-argument-in-trait-impl.rs
+++ b/src/test/debug-info/by-value-self-argument-in-trait-impl.rs
@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// xfail-android
+// xfail-android: FIXME(#10381)
 
 #[feature(managed_boxes)];
 
diff --git a/src/test/debug-info/c-style-enum.rs b/src/test/debug-info/c-style-enum.rs
index 3cfb374680b1..f9a1c30103c8 100644
--- a/src/test/debug-info/c-style-enum.rs
+++ b/src/test/debug-info/c-style-enum.rs
@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// xfail-android
+// xfail-android: FIXME(#10381)
 
 // compile-flags:-Z extra-debug-info
 // debugger:rbreak zzz
diff --git a/src/test/debug-info/closure-in-generic-function.rs b/src/test/debug-info/closure-in-generic-function.rs
index 3cde152ddee5..21c20325e3cd 100644
--- a/src/test/debug-info/closure-in-generic-function.rs
+++ b/src/test/debug-info/closure-in-generic-function.rs
@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// xfail-android
+// xfail-android: FIXME(#10381)
 
 // compile-flags:-Z extra-debug-info
 // debugger:rbreak zzz
diff --git a/src/test/debug-info/destructured-fn-argument.rs b/src/test/debug-info/destructured-fn-argument.rs
index 6a1732cb6d46..73734860648a 100644
--- a/src/test/debug-info/destructured-fn-argument.rs
+++ b/src/test/debug-info/destructured-fn-argument.rs
@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// xfail-android
+// xfail-android: FIXME(#10381)
 
 #[feature(managed_boxes)];
 
diff --git a/src/test/debug-info/evec-in-struct.rs b/src/test/debug-info/evec-in-struct.rs
index e06b60b2148d..a6f0a42bd306 100644
--- a/src/test/debug-info/evec-in-struct.rs
+++ b/src/test/debug-info/evec-in-struct.rs
@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// xfail-android
+// xfail-android: FIXME(#10381)
 
 // compile-flags:-Z extra-debug-info
 // debugger:set print pretty off
diff --git a/src/test/debug-info/generic-function.rs b/src/test/debug-info/generic-function.rs
index 219cba5f613a..d76551a212e4 100644
--- a/src/test/debug-info/generic-function.rs
+++ b/src/test/debug-info/generic-function.rs
@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// xfail-android
+// xfail-android: FIXME(#10381)
 
 // compile-flags:-Z extra-debug-info
 // debugger:rbreak zzz
diff --git a/src/test/debug-info/generic-functions-nested.rs b/src/test/debug-info/generic-functions-nested.rs
index d3b4c49f2f1b..a54238e981a5 100644
--- a/src/test/debug-info/generic-functions-nested.rs
+++ b/src/test/debug-info/generic-functions-nested.rs
@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// xfail-android
+// xfail-android: FIXME(#10381)
 
 // compile-flags:-Z extra-debug-info
 // debugger:rbreak zzz
diff --git a/src/test/debug-info/generic-method-on-generic-struct.rs b/src/test/debug-info/generic-method-on-generic-struct.rs
index 79cccdc4f0ba..8eafef5ab106 100644
--- a/src/test/debug-info/generic-method-on-generic-struct.rs
+++ b/src/test/debug-info/generic-method-on-generic-struct.rs
@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// xfail-android
+// xfail-android: FIXME(#10381)
 
 // compile-flags:-Z extra-debug-info
 // debugger:rbreak zzz
diff --git a/src/test/debug-info/generic-static-method-on-struct-and-enum.rs b/src/test/debug-info/generic-static-method-on-struct-and-enum.rs
index 5e5a7a7c9ad6..a0551e570c7d 100644
--- a/src/test/debug-info/generic-static-method-on-struct-and-enum.rs
+++ b/src/test/debug-info/generic-static-method-on-struct-and-enum.rs
@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// xfail-android
+// xfail-android: FIXME(#10381)
 
 // compile-flags:-Z extra-debug-info
 // debugger:rbreak zzz
diff --git a/src/test/debug-info/generic-struct-style-enum.rs b/src/test/debug-info/generic-struct-style-enum.rs
index 93822969fbf5..cd7bd57795cd 100644
--- a/src/test/debug-info/generic-struct-style-enum.rs
+++ b/src/test/debug-info/generic-struct-style-enum.rs
@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// xfail-android
+// xfail-android: FIXME(#10381)
 
 // compile-flags:-Z extra-debug-info
 // debugger:set print union on
diff --git a/src/test/debug-info/generic-struct.rs b/src/test/debug-info/generic-struct.rs
index a1f810ebfb1c..143e2ded1938 100644
--- a/src/test/debug-info/generic-struct.rs
+++ b/src/test/debug-info/generic-struct.rs
@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// xfail-android
+// xfail-android: FIXME(#10381)
 
 // compile-flags:-Z extra-debug-info
 // debugger:rbreak zzz
diff --git a/src/test/debug-info/generic-tuple-style-enum.rs b/src/test/debug-info/generic-tuple-style-enum.rs
index 73ef9430c332..03f1a6956674 100644
--- a/src/test/debug-info/generic-tuple-style-enum.rs
+++ b/src/test/debug-info/generic-tuple-style-enum.rs
@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// xfail-android
+// xfail-android: FIXME(#10381)
 
 // compile-flags:-Z extra-debug-info
 // debugger:set print union on
diff --git a/src/test/debug-info/lexical-scope-in-for-loop.rs b/src/test/debug-info/lexical-scope-in-for-loop.rs
index 4d1e0c54cf78..04ccc59250d0 100644
--- a/src/test/debug-info/lexical-scope-in-for-loop.rs
+++ b/src/test/debug-info/lexical-scope-in-for-loop.rs
@@ -9,7 +9,7 @@
 // except according to those terms.
 
 // xfail-win32
-// xfail-android
+// xfail-android: FIXME(#10381)
 
 // compile-flags:-Z extra-debug-info
 // debugger:rbreak zzz
diff --git a/src/test/debug-info/lexical-scope-in-if.rs b/src/test/debug-info/lexical-scope-in-if.rs
index 56d6547811ef..4cc58229ad0e 100644
--- a/src/test/debug-info/lexical-scope-in-if.rs
+++ b/src/test/debug-info/lexical-scope-in-if.rs
@@ -9,7 +9,7 @@
 // except according to those terms.
 
 // xfail-win32
-// xfail-android
+// xfail-android: FIXME(#10381)
 
 // compile-flags:-Z extra-debug-info
 // debugger:rbreak zzz
diff --git a/src/test/debug-info/lexical-scope-in-match.rs b/src/test/debug-info/lexical-scope-in-match.rs
index 2eeddc21471d..e5b2f9d9fe50 100644
--- a/src/test/debug-info/lexical-scope-in-match.rs
+++ b/src/test/debug-info/lexical-scope-in-match.rs
@@ -9,7 +9,7 @@
 // except according to those terms.
 
 // xfail-win32
-// xfail-android
+// xfail-android: FIXME(#10381)
 
 // compile-flags:-Z extra-debug-info
 // debugger:rbreak zzz
diff --git a/src/test/debug-info/lexical-scope-in-parameterless-closure.rs b/src/test/debug-info/lexical-scope-in-parameterless-closure.rs
index 3e3e7fc9661c..fbbb66f29048 100644
--- a/src/test/debug-info/lexical-scope-in-parameterless-closure.rs
+++ b/src/test/debug-info/lexical-scope-in-parameterless-closure.rs
@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// xfail-android
+// xfail-android: FIXME(#10381)
 
 // compile-flags:-Z debug-info
 // debugger:run
diff --git a/src/test/debug-info/lexical-scope-in-stack-closure.rs b/src/test/debug-info/lexical-scope-in-stack-closure.rs
index 14955a69d7f8..238ad3c519d1 100644
--- a/src/test/debug-info/lexical-scope-in-stack-closure.rs
+++ b/src/test/debug-info/lexical-scope-in-stack-closure.rs
@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// xfail-android
+// xfail-android: FIXME(#10381)
 
 // compile-flags:-Z extra-debug-info
 // debugger:rbreak zzz
diff --git a/src/test/debug-info/lexical-scope-in-unconditional-loop.rs b/src/test/debug-info/lexical-scope-in-unconditional-loop.rs
index beb9211cc329..fa750d247b16 100644
--- a/src/test/debug-info/lexical-scope-in-unconditional-loop.rs
+++ b/src/test/debug-info/lexical-scope-in-unconditional-loop.rs
@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// xfail-android: FIXME(#10381)
+
 // compile-flags:-Z extra-debug-info
 // debugger:rbreak zzz
 // debugger:run
diff --git a/src/test/debug-info/lexical-scope-in-unique-closure.rs b/src/test/debug-info/lexical-scope-in-unique-closure.rs
index 284db7a69ee6..63a223a330bf 100644
--- a/src/test/debug-info/lexical-scope-in-unique-closure.rs
+++ b/src/test/debug-info/lexical-scope-in-unique-closure.rs
@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// xfail-android
+// xfail-android: FIXME(#10381)
 
 // compile-flags:-Z extra-debug-info
 // debugger:rbreak zzz
diff --git a/src/test/debug-info/lexical-scope-in-while.rs b/src/test/debug-info/lexical-scope-in-while.rs
index 8b681e868231..f89f677291a0 100644
--- a/src/test/debug-info/lexical-scope-in-while.rs
+++ b/src/test/debug-info/lexical-scope-in-while.rs
@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// xfail-android
+// xfail-android: FIXME(#10381)
 
 // compile-flags:-Z extra-debug-info
 // debugger:rbreak zzz
diff --git a/src/test/debug-info/lexical-scope-with-macro.rs b/src/test/debug-info/lexical-scope-with-macro.rs
index 96dbeacfd44b..d97fdf660892 100644
--- a/src/test/debug-info/lexical-scope-with-macro.rs
+++ b/src/test/debug-info/lexical-scope-with-macro.rs
@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// xfail-android
+// xfail-android: FIXME(#10381)
 
 // compile-flags:-Z extra-debug-info
 // debugger:rbreak zzz
diff --git a/src/test/debug-info/lexical-scopes-in-block-expression.rs b/src/test/debug-info/lexical-scopes-in-block-expression.rs
index 4206429d428a..1eb03e95f8f8 100644
--- a/src/test/debug-info/lexical-scopes-in-block-expression.rs
+++ b/src/test/debug-info/lexical-scopes-in-block-expression.rs
@@ -9,7 +9,7 @@
 // except according to those terms.
 
 // xfail-win32
-// xfail-android
+// xfail-android: FIXME(#10381)
 
 // compile-flags:-Z extra-debug-info
 // debugger:rbreak zzz
diff --git a/src/test/debug-info/method-on-enum.rs b/src/test/debug-info/method-on-enum.rs
index c613f8fce959..c7e60289b22e 100644
--- a/src/test/debug-info/method-on-enum.rs
+++ b/src/test/debug-info/method-on-enum.rs
@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// xfail-android
+// xfail-android: FIXME(#10381)
 
 // compile-flags:-Z extra-debug-info
 // debugger:rbreak zzz
diff --git a/src/test/debug-info/method-on-generic-struct.rs b/src/test/debug-info/method-on-generic-struct.rs
index 48ef346260f5..e4524aaffd2c 100644
--- a/src/test/debug-info/method-on-generic-struct.rs
+++ b/src/test/debug-info/method-on-generic-struct.rs
@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// xfail-android
+// xfail-android: FIXME(#10381)
 
 // compile-flags:-Z extra-debug-info
 // debugger:rbreak zzz
diff --git a/src/test/debug-info/method-on-struct.rs b/src/test/debug-info/method-on-struct.rs
index 4f8cb9515f49..654f1db559b8 100644
--- a/src/test/debug-info/method-on-struct.rs
+++ b/src/test/debug-info/method-on-struct.rs
@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// xfail-android
+// xfail-android: FIXME(#10381)
 
 // compile-flags:-Z extra-debug-info
 // debugger:rbreak zzz
diff --git a/src/test/debug-info/method-on-trait.rs b/src/test/debug-info/method-on-trait.rs
index 1ab03315b186..e6e024323c3d 100644
--- a/src/test/debug-info/method-on-trait.rs
+++ b/src/test/debug-info/method-on-trait.rs
@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// xfail-android
+// xfail-android: FIXME(#10381)
 
 // compile-flags:-Z extra-debug-info
 // debugger:rbreak zzz
diff --git a/src/test/debug-info/method-on-tuple-struct.rs b/src/test/debug-info/method-on-tuple-struct.rs
index 70124b7071e8..0d19cf21514b 100644
--- a/src/test/debug-info/method-on-tuple-struct.rs
+++ b/src/test/debug-info/method-on-tuple-struct.rs
@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// xfail-android
+// xfail-android: FIXME(#10381)
 
 // compile-flags:-Z extra-debug-info
 // debugger:rbreak zzz
diff --git a/src/test/debug-info/multiple-functions-equal-var-names.rs b/src/test/debug-info/multiple-functions-equal-var-names.rs
index dbbbfb8b82e6..b0d9b0aa8849 100644
--- a/src/test/debug-info/multiple-functions-equal-var-names.rs
+++ b/src/test/debug-info/multiple-functions-equal-var-names.rs
@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// xfail-android
+// xfail-android: FIXME(#10381)
 
 // compile-flags:-Z extra-debug-info
 // debugger:rbreak zzz
diff --git a/src/test/debug-info/multiple-functions.rs b/src/test/debug-info/multiple-functions.rs
index f8f71e1f3baa..29d67c17684f 100644
--- a/src/test/debug-info/multiple-functions.rs
+++ b/src/test/debug-info/multiple-functions.rs
@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// xfail-android
+// xfail-android: FIXME(#10381)
 
 // compile-flags:-Z extra-debug-info
 // debugger:rbreak zzz
diff --git a/src/test/debug-info/name-shadowing-and-scope-nesting.rs b/src/test/debug-info/name-shadowing-and-scope-nesting.rs
index 62f9a6afa380..e8c7812eb095 100644
--- a/src/test/debug-info/name-shadowing-and-scope-nesting.rs
+++ b/src/test/debug-info/name-shadowing-and-scope-nesting.rs
@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// xfail-android
+// xfail-android: FIXME(#10381)
 
 // compile-flags:-Z extra-debug-info
 // debugger:rbreak zzz
diff --git a/src/test/debug-info/nil-enum.rs b/src/test/debug-info/nil-enum.rs
index 961112ab0710..fc114a79ad65 100644
--- a/src/test/debug-info/nil-enum.rs
+++ b/src/test/debug-info/nil-enum.rs
@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// xfail-android
+// xfail-android: FIXME(#10381)
 
 // compile-flags:-Z extra-debug-info
 // debugger:rbreak zzz
diff --git a/src/test/debug-info/option-like-enum.rs b/src/test/debug-info/option-like-enum.rs
index 9b8359d58fbd..be1ab45345c2 100644
--- a/src/test/debug-info/option-like-enum.rs
+++ b/src/test/debug-info/option-like-enum.rs
@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// xfail-android
+// xfail-android: FIXME(#10381)
 
 // compile-flags:-Z extra-debug-info
 // debugger:rbreak zzz
diff --git a/src/test/debug-info/packed-struct.rs b/src/test/debug-info/packed-struct.rs
index 69a1dddb74c3..6ee2574ca74d 100644
--- a/src/test/debug-info/packed-struct.rs
+++ b/src/test/debug-info/packed-struct.rs
@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// xfail-android
+// xfail-android: FIXME(#10381)
 
 // compile-flags:-Z extra-debug-info
 // debugger:set print pretty off
diff --git a/src/test/debug-info/recursive-struct.rs b/src/test/debug-info/recursive-struct.rs
index d06ed8b87a11..20c8cc27f271 100644
--- a/src/test/debug-info/recursive-struct.rs
+++ b/src/test/debug-info/recursive-struct.rs
@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// xfail-android
+// xfail-android: FIXME(#10381)
 
 #[feature(managed_boxes)];
 
diff --git a/src/test/debug-info/self-in-default-method.rs b/src/test/debug-info/self-in-default-method.rs
index a539fc47d051..d1b275c9ec0d 100644
--- a/src/test/debug-info/self-in-default-method.rs
+++ b/src/test/debug-info/self-in-default-method.rs
@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// xfail-android
+// xfail-android: FIXME(#10381)
 
 // compile-flags:-Z extra-debug-info
 // debugger:rbreak zzz
diff --git a/src/test/debug-info/self-in-generic-default-method.rs b/src/test/debug-info/self-in-generic-default-method.rs
index 5f0993a972e8..f09953487bc6 100644
--- a/src/test/debug-info/self-in-generic-default-method.rs
+++ b/src/test/debug-info/self-in-generic-default-method.rs
@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// xfail-android
+// xfail-android: FIXME(#10381)
 
 // compile-flags:-Z extra-debug-info
 // debugger:rbreak zzz
diff --git a/src/test/debug-info/shadowed-argument.rs b/src/test/debug-info/shadowed-argument.rs
index 3f89f85aca56..7bd77d22a2f7 100644
--- a/src/test/debug-info/shadowed-argument.rs
+++ b/src/test/debug-info/shadowed-argument.rs
@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// xfail-android
+// xfail-android: FIXME(#10381)
 
 // compile-flags:-Z extra-debug-info
 // debugger:rbreak zzz
diff --git a/src/test/debug-info/shadowed-variable.rs b/src/test/debug-info/shadowed-variable.rs
index 4415666c4d2a..9055487aaa71 100644
--- a/src/test/debug-info/shadowed-variable.rs
+++ b/src/test/debug-info/shadowed-variable.rs
@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// xfail-android
+// xfail-android: FIXME(#10381)
 
 // compile-flags:-Z extra-debug-info
 // debugger:rbreak zzz
diff --git a/src/test/debug-info/simple-lexical-scope.rs b/src/test/debug-info/simple-lexical-scope.rs
index 72dc2d7827b3..6d79d4d813ff 100644
--- a/src/test/debug-info/simple-lexical-scope.rs
+++ b/src/test/debug-info/simple-lexical-scope.rs
@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// xfail-android
+// xfail-android: FIXME(#10381)
 
 // compile-flags:-Z extra-debug-info
 // debugger:rbreak zzz
diff --git a/src/test/debug-info/simple-struct.rs b/src/test/debug-info/simple-struct.rs
index f708713fe8c2..8d50149a2844 100644
--- a/src/test/debug-info/simple-struct.rs
+++ b/src/test/debug-info/simple-struct.rs
@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// xfail-android
+// xfail-android: FIXME(#10381)
 
 // compile-flags:-Z extra-debug-info
 // debugger:set print pretty off
diff --git a/src/test/debug-info/simple-tuple.rs b/src/test/debug-info/simple-tuple.rs
index 5c870bf1dc80..71685c806820 100644
--- a/src/test/debug-info/simple-tuple.rs
+++ b/src/test/debug-info/simple-tuple.rs
@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// xfail-android
+// xfail-android: FIXME(#10381)
 
 // compile-flags:-Z extra-debug-info
 // debugger:set print pretty off
diff --git a/src/test/debug-info/static-method-on-struct-and-enum.rs b/src/test/debug-info/static-method-on-struct-and-enum.rs
index e83d50978a88..b56f6267a8d5 100644
--- a/src/test/debug-info/static-method-on-struct-and-enum.rs
+++ b/src/test/debug-info/static-method-on-struct-and-enum.rs
@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// xfail-android
+// xfail-android: FIXME(#10381)
 
 // compile-flags:-Z extra-debug-info
 // debugger:rbreak zzz
diff --git a/src/test/debug-info/struct-in-enum.rs b/src/test/debug-info/struct-in-enum.rs
index 208a2f4bd23e..98ded437273a 100644
--- a/src/test/debug-info/struct-in-enum.rs
+++ b/src/test/debug-info/struct-in-enum.rs
@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// xfail-android
+// xfail-android: FIXME(#10381)
 
 // compile-flags:-Z extra-debug-info
 // debugger:set print union on
diff --git a/src/test/debug-info/struct-in-struct.rs b/src/test/debug-info/struct-in-struct.rs
index df90842c2586..d46d0b1cd887 100644
--- a/src/test/debug-info/struct-in-struct.rs
+++ b/src/test/debug-info/struct-in-struct.rs
@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// xfail-android
+// xfail-android: FIXME(#10381)
 
 // compile-flags:-Z extra-debug-info
 // debugger:set print pretty off
diff --git a/src/test/debug-info/struct-style-enum.rs b/src/test/debug-info/struct-style-enum.rs
index c4ec56aff782..fbdf99dd2415 100644
--- a/src/test/debug-info/struct-style-enum.rs
+++ b/src/test/debug-info/struct-style-enum.rs
@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// xfail-android
+// xfail-android: FIXME(#10381)
 
 // compile-flags:-Z extra-debug-info
 // debugger:set print union on
diff --git a/src/test/debug-info/trait-pointers.rs b/src/test/debug-info/trait-pointers.rs
index 5d726296fad0..4bdfc6bfaf61 100644
--- a/src/test/debug-info/trait-pointers.rs
+++ b/src/test/debug-info/trait-pointers.rs
@@ -10,7 +10,7 @@
 
 #[feature(managed_boxes)];
 
-// xfail-android
+// xfail-android: FIXME(#10381)
 
 // compile-flags:-Z extra-debug-info
 // debugger:run
diff --git a/src/test/debug-info/tuple-in-struct.rs b/src/test/debug-info/tuple-in-struct.rs
index ea9d1c632c91..b60f21fe6ce8 100644
--- a/src/test/debug-info/tuple-in-struct.rs
+++ b/src/test/debug-info/tuple-in-struct.rs
@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// xfail-android
+// xfail-android: FIXME(#10381)
 
 // compile-flags:-Z extra-debug-info
 // debugger:set print pretty off
diff --git a/src/test/debug-info/tuple-in-tuple.rs b/src/test/debug-info/tuple-in-tuple.rs
index bd56014dfcf7..76475109382c 100644
--- a/src/test/debug-info/tuple-in-tuple.rs
+++ b/src/test/debug-info/tuple-in-tuple.rs
@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// xfail-android
+// xfail-android: FIXME(#10381)
 
 // compile-flags:-Z extra-debug-info
 // debugger:set print pretty off
diff --git a/src/test/debug-info/tuple-struct.rs b/src/test/debug-info/tuple-struct.rs
index 59d487f0353d..2d571ef41607 100644
--- a/src/test/debug-info/tuple-struct.rs
+++ b/src/test/debug-info/tuple-struct.rs
@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// xfail-android
+// xfail-android: FIXME(#10381)
 
 // compile-flags:-Z extra-debug-info
 // debugger:set print pretty off
diff --git a/src/test/debug-info/tuple-style-enum.rs b/src/test/debug-info/tuple-style-enum.rs
index 3401992728fa..e6a89adbd9c9 100644
--- a/src/test/debug-info/tuple-style-enum.rs
+++ b/src/test/debug-info/tuple-style-enum.rs
@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// xfail-android
+// xfail-android: FIXME(#10381)
 
 // compile-flags:-Z extra-debug-info
 // debugger:set print union on
diff --git a/src/test/debug-info/var-captured-in-nested-closure.rs b/src/test/debug-info/var-captured-in-nested-closure.rs
index e4748f4deb19..21dc6f2b24aa 100644
--- a/src/test/debug-info/var-captured-in-nested-closure.rs
+++ b/src/test/debug-info/var-captured-in-nested-closure.rs
@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// xfail-android
+// xfail-android: FIXME(#10381)
 
 // compile-flags:-Z extra-debug-info
 // debugger:rbreak zzz
diff --git a/src/test/debug-info/var-captured-in-stack-closure.rs b/src/test/debug-info/var-captured-in-stack-closure.rs
index 4a148c88472b..cbbb8cbbb122 100644
--- a/src/test/debug-info/var-captured-in-stack-closure.rs
+++ b/src/test/debug-info/var-captured-in-stack-closure.rs
@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// xfail-android
+// xfail-android: FIXME(#10381)
 
 // compile-flags:-Z extra-debug-info
 // debugger:rbreak zzz
diff --git a/src/test/debug-info/vec-slices.rs b/src/test/debug-info/vec-slices.rs
index 2157b21e0388..635608604b13 100644
--- a/src/test/debug-info/vec-slices.rs
+++ b/src/test/debug-info/vec-slices.rs
@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// xfail-android
+// xfail-android: FIXME(#10381)
 
 // compile-flags:-Z extra-debug-info
 // debugger:set print pretty off
diff --git a/src/test/debug-info/vec.rs b/src/test/debug-info/vec.rs
index 2da9d5186cca..b1224d14dc47 100644
--- a/src/test/debug-info/vec.rs
+++ b/src/test/debug-info/vec.rs
@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// xfail-android
+// xfail-android: FIXME(#10381)
 
 // compile-flags:-Z extra-debug-info
 // debugger:set print pretty off
diff --git a/src/test/run-pass/linkage-visibility.rs b/src/test/run-pass/linkage-visibility.rs
index dff45a2ffad9..f2c6140598df 100644
--- a/src/test/run-pass/linkage-visibility.rs
+++ b/src/test/run-pass/linkage-visibility.rs
@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// xfail-android: FIXME(#10379)
+
 // aux-build:linkage-visibility.rs
 // xfail-fast windows doesn't like aux-build
 
diff --git a/src/test/run-pass/rtio-processes.rs b/src/test/run-pass/rtio-processes.rs
index f45889eeb03b..65cf8722eedc 100644
--- a/src/test/run-pass/rtio-processes.rs
+++ b/src/test/run-pass/rtio-processes.rs
@@ -28,6 +28,7 @@ use std::rt::io::process::{Process, ProcessConfig, CreatePipe, Ignored};
 use std::str;
 
 #[test]
+// FIXME(#10380)
 #[cfg(unix, not(target_os="android"))]
 fn smoke() {
     let io = ~[];
@@ -45,6 +46,7 @@ fn smoke() {
 }
 
 #[test]
+// FIXME(#10380)
 #[cfg(unix, not(target_os="android"))]
 fn smoke_failure() {
     let io = ~[];
@@ -62,6 +64,7 @@ fn smoke_failure() {
 }
 
 #[test]
+// FIXME(#10380)
 #[cfg(unix, not(target_os="android"))]
 fn exit_reported_right() {
     let io = ~[];
@@ -102,6 +105,7 @@ fn run_output(args: ProcessConfig) -> ~str {
 }
 
 #[test]
+// FIXME(#10380)
 #[cfg(unix, not(target_os="android"))]
 fn stdout_works() {
     let io = ~[Ignored, CreatePipe(false, true)];
@@ -116,6 +120,7 @@ fn stdout_works() {
 }
 
 #[test]
+// FIXME(#10380)
 #[cfg(unix, not(target_os="android"))]
 fn set_cwd_works() {
     let io = ~[Ignored, CreatePipe(false, true)];
@@ -131,6 +136,7 @@ fn set_cwd_works() {
 }
 
 #[test]
+// FIXME(#10380)
 #[cfg(unix, not(target_os="android"))]
 fn stdin_works() {
     let io = ~[CreatePipe(true, false),