diff --git a/src/test/run-pass-fulldeps/ast_stmt_expr_attr.rs b/src/test/run-pass-fulldeps/ast_stmt_expr_attr.rs
index 49e137549c04..c90fe0014326 100644
--- a/src/test/run-pass-fulldeps/ast_stmt_expr_attr.rs
+++ b/src/test/run-pass-fulldeps/ast_stmt_expr_attr.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 #![allow(unused_imports)]
 // ignore-cross-compile
 
diff --git a/src/test/run-pass-fulldeps/compiler-calls.rs b/src/test/run-pass-fulldeps/compiler-calls.rs
index b4731bbaeb5c..ea24f5809d52 100644
--- a/src/test/run-pass-fulldeps/compiler-calls.rs
+++ b/src/test/run-pass-fulldeps/compiler-calls.rs
@@ -1,3 +1,4 @@
+// run-pass
 // Test that the Callbacks interface to the compiler works.
 
 // ignore-cross-compile
diff --git a/src/test/run-pass-fulldeps/create-dir-all-bare.rs b/src/test/run-pass-fulldeps/create-dir-all-bare.rs
index da4cde447eb8..4554680ec247 100644
--- a/src/test/run-pass-fulldeps/create-dir-all-bare.rs
+++ b/src/test/run-pass-fulldeps/create-dir-all-bare.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 use std::env;
 use std::fs;
 use std::path::PathBuf;
diff --git a/src/test/run-pass-fulldeps/derive-no-std-not-supported.rs b/src/test/run-pass-fulldeps/derive-no-std-not-supported.rs
index 0111043994ef..d09b1922a7ba 100644
--- a/src/test/run-pass-fulldeps/derive-no-std-not-supported.rs
+++ b/src/test/run-pass-fulldeps/derive-no-std-not-supported.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 #![allow(dead_code)]
 #![feature(rustc_private)]
 #![no_std]
diff --git a/src/test/run-pass-fulldeps/deriving-encodable-decodable-box.rs b/src/test/run-pass-fulldeps/deriving-encodable-decodable-box.rs
index 4c00c97edf39..877fb57a2513 100644
--- a/src/test/run-pass-fulldeps/deriving-encodable-decodable-box.rs
+++ b/src/test/run-pass-fulldeps/deriving-encodable-decodable-box.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 #![allow(unused_imports)]
 
 #![feature(box_syntax)]
diff --git a/src/test/run-pass-fulldeps/deriving-encodable-decodable-cell-refcell.rs b/src/test/run-pass-fulldeps/deriving-encodable-decodable-cell-refcell.rs
index 63e9d7381791..a35b681641a4 100644
--- a/src/test/run-pass-fulldeps/deriving-encodable-decodable-cell-refcell.rs
+++ b/src/test/run-pass-fulldeps/deriving-encodable-decodable-cell-refcell.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 #![allow(unused_imports)]
 // This briefly tests the capability of `Cell` and `RefCell` to implement the
 // `Encodable` and `Decodable` traits via `#[derive(Encodable, Decodable)]`
diff --git a/src/test/run-pass-fulldeps/deriving-global.rs b/src/test/run-pass-fulldeps/deriving-global.rs
index 5283cab7bde3..b59d55ff213c 100644
--- a/src/test/run-pass-fulldeps/deriving-global.rs
+++ b/src/test/run-pass-fulldeps/deriving-global.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 #![feature(rustc_private)]
 
 extern crate serialize;
diff --git a/src/test/run-pass-fulldeps/deriving-hygiene.rs b/src/test/run-pass-fulldeps/deriving-hygiene.rs
index 6fd99931bf67..0d7439ef8724 100644
--- a/src/test/run-pass-fulldeps/deriving-hygiene.rs
+++ b/src/test/run-pass-fulldeps/deriving-hygiene.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 #![allow(non_upper_case_globals)]
 #![feature(rustc_private)]
 extern crate serialize;
diff --git a/src/test/run-pass-fulldeps/dropck_tarena_sound_drop.rs b/src/test/run-pass-fulldeps/dropck_tarena_sound_drop.rs
index 27eb70160ba5..cf188d9efa3b 100644
--- a/src/test/run-pass-fulldeps/dropck_tarena_sound_drop.rs
+++ b/src/test/run-pass-fulldeps/dropck_tarena_sound_drop.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 #![allow(unknown_lints)]
 // Check that an arena (TypedArena) can carry elements whose drop
 // methods might access borrowed data, as long as the borrowed data
diff --git a/src/test/run-pass-fulldeps/empty-struct-braces-derive.rs b/src/test/run-pass-fulldeps/empty-struct-braces-derive.rs
index d80bbca95df5..68b407423aa6 100644
--- a/src/test/run-pass-fulldeps/empty-struct-braces-derive.rs
+++ b/src/test/run-pass-fulldeps/empty-struct-braces-derive.rs
@@ -1,3 +1,4 @@
+// run-pass
 // `#[derive(Trait)]` works for empty structs/variants with braces or parens.
 
 #![feature(rustc_private)]
diff --git a/src/test/run-pass-fulldeps/extern-mod-syntax.rs b/src/test/run-pass-fulldeps/extern-mod-syntax.rs
index 12373acc365a..258ab0dbe956 100644
--- a/src/test/run-pass-fulldeps/extern-mod-syntax.rs
+++ b/src/test/run-pass-fulldeps/extern-mod-syntax.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 #![allow(unused_imports)]
 #![feature(rustc_private)]
 
diff --git a/src/test/run-pass-fulldeps/issue-11881.rs b/src/test/run-pass-fulldeps/issue-11881.rs
index b44be1e90c5d..c8893e629418 100644
--- a/src/test/run-pass-fulldeps/issue-11881.rs
+++ b/src/test/run-pass-fulldeps/issue-11881.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 #![allow(unused_must_use)]
 #![allow(dead_code)]
 #![allow(unused_imports)]
diff --git a/src/test/run-pass-fulldeps/issue-13560.rs b/src/test/run-pass-fulldeps/issue-13560.rs
index de2ecbdc988b..5f7d647e2301 100644
--- a/src/test/run-pass-fulldeps/issue-13560.rs
+++ b/src/test/run-pass-fulldeps/issue-13560.rs
@@ -1,3 +1,4 @@
+// run-pass
 // aux-build:issue-13560-1.rs
 // aux-build:issue-13560-2.rs
 // aux-build:issue-13560-3.rs
diff --git a/src/test/run-pass-fulldeps/issue-14021.rs b/src/test/run-pass-fulldeps/issue-14021.rs
index b7ba842e001e..49fa4492fa1e 100644
--- a/src/test/run-pass-fulldeps/issue-14021.rs
+++ b/src/test/run-pass-fulldeps/issue-14021.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 #![allow(unused_mut)]
 #![allow(unused_imports)]
 #![feature(rustc_private)]
diff --git a/src/test/run-pass-fulldeps/issue-15149.rs b/src/test/run-pass-fulldeps/issue-15149.rs
index 2a62fabf53d3..c80628aabc83 100644
--- a/src/test/run-pass-fulldeps/issue-15149.rs
+++ b/src/test/run-pass-fulldeps/issue-15149.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 #![allow(unused_variables)]
 // no-prefer-dynamic
 // ignore-cross-compile
diff --git a/src/test/run-pass-fulldeps/issue-15778-pass.rs b/src/test/run-pass-fulldeps/issue-15778-pass.rs
index 35152e7f4bab..91cf5dde0fb3 100644
--- a/src/test/run-pass-fulldeps/issue-15778-pass.rs
+++ b/src/test/run-pass-fulldeps/issue-15778-pass.rs
@@ -1,3 +1,4 @@
+// run-pass
 // aux-build:lint-for-crate.rs
 // ignore-stage1
 // compile-flags: -D crate-not-okay
diff --git a/src/test/run-pass-fulldeps/issue-15924.rs b/src/test/run-pass-fulldeps/issue-15924.rs
index 9d807533f429..ec33de12ebbe 100644
--- a/src/test/run-pass-fulldeps/issue-15924.rs
+++ b/src/test/run-pass-fulldeps/issue-15924.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 #![allow(unused_imports)]
 #![allow(unused_must_use)]
 // pretty-expanded FIXME #23616
diff --git a/src/test/run-pass-fulldeps/issue-16822.rs b/src/test/run-pass-fulldeps/issue-16822.rs
index bcc10d164122..c611c33affd7 100644
--- a/src/test/run-pass-fulldeps/issue-16822.rs
+++ b/src/test/run-pass-fulldeps/issue-16822.rs
@@ -1,3 +1,4 @@
+// run-pass
 // aux-build:issue-16822.rs
 
 extern crate issue_16822 as lib;
diff --git a/src/test/run-pass-fulldeps/issue-18502.rs b/src/test/run-pass-fulldeps/issue-18502.rs
index a6e1fc84932c..2082ae7a9915 100644
--- a/src/test/run-pass-fulldeps/issue-18502.rs
+++ b/src/test/run-pass-fulldeps/issue-18502.rs
@@ -1,3 +1,4 @@
+// run-pass
 // aux-build:issue-18502.rs
 
 extern crate issue_18502 as fmt;
diff --git a/src/test/run-pass-fulldeps/issue-24106.rs b/src/test/run-pass-fulldeps/issue-24106.rs
index e8e85ff33772..45f0bd5b6796 100644
--- a/src/test/run-pass-fulldeps/issue-24106.rs
+++ b/src/test/run-pass-fulldeps/issue-24106.rs
@@ -1,3 +1,4 @@
+// run-pass
 // aux-build:issue-24106.rs
 
 extern crate issue_24106;
diff --git a/src/test/run-pass-fulldeps/issue-24972.rs b/src/test/run-pass-fulldeps/issue-24972.rs
index ef4efb6218db..0d354aac1378 100644
--- a/src/test/run-pass-fulldeps/issue-24972.rs
+++ b/src/test/run-pass-fulldeps/issue-24972.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 #![allow(dead_code)]
 #![feature(rustc_private)]
 
diff --git a/src/test/run-pass-fulldeps/issue-2804.rs b/src/test/run-pass-fulldeps/issue-2804.rs
index d10f72791a26..a5345bbcd146 100644
--- a/src/test/run-pass-fulldeps/issue-2804.rs
+++ b/src/test/run-pass-fulldeps/issue-2804.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 #![allow(non_camel_case_types)]
 #![allow(dead_code)]
 #![feature(rustc_private)]
diff --git a/src/test/run-pass-fulldeps/issue-40001.rs b/src/test/run-pass-fulldeps/issue-40001.rs
index 1e546e14423f..65e188ed1b64 100644
--- a/src/test/run-pass-fulldeps/issue-40001.rs
+++ b/src/test/run-pass-fulldeps/issue-40001.rs
@@ -1,3 +1,4 @@
+// run-pass
 // aux-build:issue-40001-plugin.rs
 // ignore-stage1
 
diff --git a/src/test/run-pass-fulldeps/issue-4016.rs b/src/test/run-pass-fulldeps/issue-4016.rs
index 3de7a7cd9366..fb84acbe6452 100644
--- a/src/test/run-pass-fulldeps/issue-4016.rs
+++ b/src/test/run-pass-fulldeps/issue-4016.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 #![allow(dead_code)]
 
 #![feature(rustc_private)]
diff --git a/src/test/run-pass-fulldeps/issue-4036.rs b/src/test/run-pass-fulldeps/issue-4036.rs
index 0cbd8adf977d..9c9d39142681 100644
--- a/src/test/run-pass-fulldeps/issue-4036.rs
+++ b/src/test/run-pass-fulldeps/issue-4036.rs
@@ -1,3 +1,4 @@
+// run-pass
 // Issue #4036: Test for an issue that arose around fixing up type inference
 // byproducts in vtable records.
 
diff --git a/src/test/run-pass-fulldeps/linkage-visibility.rs b/src/test/run-pass-fulldeps/linkage-visibility.rs
index 5315a219d6d1..ae46fbc4e8a0 100644
--- a/src/test/run-pass-fulldeps/linkage-visibility.rs
+++ b/src/test/run-pass-fulldeps/linkage-visibility.rs
@@ -1,3 +1,4 @@
+// run-pass
 // aux-build:linkage-visibility.rs
 // ignore-android: FIXME(#10356)
 // ignore-windows: std::dynamic_lib does not work on Windows well
diff --git a/src/test/run-pass-fulldeps/llvm-pass-plugin.rs b/src/test/run-pass-fulldeps/llvm-pass-plugin.rs
index 411631104a4b..a9b53fa8c742 100644
--- a/src/test/run-pass-fulldeps/llvm-pass-plugin.rs
+++ b/src/test/run-pass-fulldeps/llvm-pass-plugin.rs
@@ -1,3 +1,4 @@
+// run-pass
 // aux-build:llvm-pass-plugin.rs
 // ignore-stage1
 
diff --git a/src/test/run-pass-fulldeps/lto-syntax-extension.rs b/src/test/run-pass-fulldeps/lto-syntax-extension.rs
index 05ce9e0a8df5..135861dd7728 100644
--- a/src/test/run-pass-fulldeps/lto-syntax-extension.rs
+++ b/src/test/run-pass-fulldeps/lto-syntax-extension.rs
@@ -1,3 +1,4 @@
+// run-pass
 // aux-build:lto-syntax-extension-lib.rs
 // aux-build:lto-syntax-extension-plugin.rs
 // compile-flags:-C lto
diff --git a/src/test/run-pass-fulldeps/macro-crate-multi-decorator.rs b/src/test/run-pass-fulldeps/macro-crate-multi-decorator.rs
index 573bfca31683..e396cf016155 100644
--- a/src/test/run-pass-fulldeps/macro-crate-multi-decorator.rs
+++ b/src/test/run-pass-fulldeps/macro-crate-multi-decorator.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 #![allow(plugin_as_library)]
 #![allow(dead_code)]
 #![allow(unused_variables)]
diff --git a/src/test/run-pass-fulldeps/mod_dir_path_canonicalized.rs b/src/test/run-pass-fulldeps/mod_dir_path_canonicalized.rs
index a0dca9b1da4d..8631bcca6d27 100644
--- a/src/test/run-pass-fulldeps/mod_dir_path_canonicalized.rs
+++ b/src/test/run-pass-fulldeps/mod_dir_path_canonicalized.rs
@@ -1,3 +1,4 @@
+// run-pass
 // Testing that a libsyntax can parse modules with canonicalized base path
 // ignore-cross-compile
 
diff --git a/src/test/run-pass-fulldeps/mod_dir_simple/test.rs b/src/test/run-pass-fulldeps/mod_dir_simple/test.rs
index a5e27a3a43c3..35e26093a2d6 100644
--- a/src/test/run-pass-fulldeps/mod_dir_simple/test.rs
+++ b/src/test/run-pass-fulldeps/mod_dir_simple/test.rs
@@ -1 +1,3 @@
+// run-pass
+
 pub fn foo() -> isize { 10 }
diff --git a/src/test/run-pass-fulldeps/myriad-closures.rs b/src/test/run-pass-fulldeps/myriad-closures.rs
index a6d3530f1390..310351f50cbc 100644
--- a/src/test/run-pass-fulldeps/myriad-closures.rs
+++ b/src/test/run-pass-fulldeps/myriad-closures.rs
@@ -1,3 +1,4 @@
+// run-pass
 // This test case tests whether we can handle code bases that contain a high
 // number of closures, something that needs special handling in the MingGW
 // toolchain.
diff --git a/src/test/run-pass-fulldeps/newtype_index.rs b/src/test/run-pass-fulldeps/newtype_index.rs
index 1192a44a6eec..336b584768fa 100644
--- a/src/test/run-pass-fulldeps/newtype_index.rs
+++ b/src/test/run-pass-fulldeps/newtype_index.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 #![feature(rustc_private)]
 
 extern crate rustc_data_structures;
diff --git a/src/test/run-pass-fulldeps/outlive-expansion-phase.rs b/src/test/run-pass-fulldeps/outlive-expansion-phase.rs
index 86aed2511ceb..752f1da7377c 100644
--- a/src/test/run-pass-fulldeps/outlive-expansion-phase.rs
+++ b/src/test/run-pass-fulldeps/outlive-expansion-phase.rs
@@ -1,3 +1,4 @@
+// run-pass
 // aux-build:outlive-expansion-phase.rs
 // ignore-stage1
 
diff --git a/src/test/run-pass-fulldeps/plugin-args-1.rs b/src/test/run-pass-fulldeps/plugin-args-1.rs
index 1bdf004e3052..d6437146775f 100644
--- a/src/test/run-pass-fulldeps/plugin-args-1.rs
+++ b/src/test/run-pass-fulldeps/plugin-args-1.rs
@@ -1,3 +1,4 @@
+// run-pass
 // aux-build:plugin-args.rs
 // ignore-stage1
 
diff --git a/src/test/run-pass-fulldeps/plugin-args-2.rs b/src/test/run-pass-fulldeps/plugin-args-2.rs
index 83091df05828..949f8440379b 100644
--- a/src/test/run-pass-fulldeps/plugin-args-2.rs
+++ b/src/test/run-pass-fulldeps/plugin-args-2.rs
@@ -1,3 +1,4 @@
+// run-pass
 // aux-build:plugin-args.rs
 // ignore-stage1
 
diff --git a/src/test/run-pass-fulldeps/plugin-args-3.rs b/src/test/run-pass-fulldeps/plugin-args-3.rs
index 9cd9bee5a0fe..efdbcd0bf0d0 100644
--- a/src/test/run-pass-fulldeps/plugin-args-3.rs
+++ b/src/test/run-pass-fulldeps/plugin-args-3.rs
@@ -1,3 +1,4 @@
+// run-pass
 // aux-build:plugin-args.rs
 // ignore-stage1
 
diff --git a/src/test/run-pass-fulldeps/pprust-expr-roundtrip.rs b/src/test/run-pass-fulldeps/pprust-expr-roundtrip.rs
index 5716e6d45a0b..09f58521e5d5 100644
--- a/src/test/run-pass-fulldeps/pprust-expr-roundtrip.rs
+++ b/src/test/run-pass-fulldeps/pprust-expr-roundtrip.rs
@@ -1,3 +1,4 @@
+// run-pass
 // ignore-cross-compile
 
 // The general idea of this test is to enumerate all "interesting" expressions and check that
diff --git a/src/test/run-pass-fulldeps/regions-mock-tcx.rs b/src/test/run-pass-fulldeps/regions-mock-tcx.rs
index 8e4e6d1c0586..524c94a8555e 100644
--- a/src/test/run-pass-fulldeps/regions-mock-tcx.rs
+++ b/src/test/run-pass-fulldeps/regions-mock-tcx.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 #![allow(dead_code)]
 #![allow(unused_imports)]
 
diff --git a/src/test/run-pass-fulldeps/rename-directory.rs b/src/test/run-pass-fulldeps/rename-directory.rs
index 1f2545ddcf2c..8fc340cb9187 100644
--- a/src/test/run-pass-fulldeps/rename-directory.rs
+++ b/src/test/run-pass-fulldeps/rename-directory.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 #![allow(unused_must_use)]
 #![allow(unused_imports)]
 // This test can't be a unit test in std,
diff --git a/src/test/run-pass-fulldeps/roman-numerals-macro.rs b/src/test/run-pass-fulldeps/roman-numerals-macro.rs
index 49c12e426fee..5c4ba3158dbd 100644
--- a/src/test/run-pass-fulldeps/roman-numerals-macro.rs
+++ b/src/test/run-pass-fulldeps/roman-numerals-macro.rs
@@ -1,3 +1,4 @@
+// run-pass
 // aux-build:roman-numerals.rs
 // ignore-stage1
 
diff --git a/src/test/run-pass-fulldeps/rustc_encodable_hygiene.rs b/src/test/run-pass-fulldeps/rustc_encodable_hygiene.rs
index ae232c602cb7..42a6153465c2 100644
--- a/src/test/run-pass-fulldeps/rustc_encodable_hygiene.rs
+++ b/src/test/run-pass-fulldeps/rustc_encodable_hygiene.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 #![feature(rustc_private)]
 
 #[allow(dead_code)]
diff --git a/src/test/run-pass-fulldeps/stdio-from.rs b/src/test/run-pass-fulldeps/stdio-from.rs
index 70e53936b70d..fef9f27fcdff 100644
--- a/src/test/run-pass-fulldeps/stdio-from.rs
+++ b/src/test/run-pass-fulldeps/stdio-from.rs
@@ -1,3 +1,4 @@
+// run-pass
 // ignore-cross-compile
 
 use std::env;
diff --git a/src/test/run-pass-fulldeps/switch-stdout.rs b/src/test/run-pass-fulldeps/switch-stdout.rs
index 6b16f955902e..e105637c3da4 100644
--- a/src/test/run-pass-fulldeps/switch-stdout.rs
+++ b/src/test/run-pass-fulldeps/switch-stdout.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 use std::env;
 use std::fs::File;
 use std::io::{Read, Write};
diff --git a/src/test/run-pass-fulldeps/undef_mask.rs b/src/test/run-pass-fulldeps/undef_mask.rs
index cf6e6f723163..0caccad62295 100644
--- a/src/test/run-pass-fulldeps/undef_mask.rs
+++ b/src/test/run-pass-fulldeps/undef_mask.rs
@@ -1,3 +1,4 @@
+// run-pass
 // ignore-cross-compile
 // ignore-stage1
 
diff --git a/src/test/run-pass/abi-sysv64-arg-passing.rs b/src/test/run-pass/abi-sysv64-arg-passing.rs
index fdf0573b5e3e..d40006eb9b68 100644
--- a/src/test/run-pass/abi-sysv64-arg-passing.rs
+++ b/src/test/run-pass/abi-sysv64-arg-passing.rs
@@ -1,3 +1,4 @@
+// run-pass
 // Checks if the "sysv64" calling convention behaves the same as the
 // "C" calling convention on platforms where both should be the same
 
diff --git a/src/test/run-pass/abi-sysv64-register-usage.rs b/src/test/run-pass/abi-sysv64-register-usage.rs
index a0d6e968252a..0c7e2d906b7c 100644
--- a/src/test/run-pass/abi-sysv64-register-usage.rs
+++ b/src/test/run-pass/abi-sysv64-register-usage.rs
@@ -1,3 +1,4 @@
+// run-pass
 // Checks if the correct registers are being used to pass arguments
 // when the sysv64 ABI is specified.
 
diff --git a/src/test/run-pass/abort-on-c-abi.rs b/src/test/run-pass/abort-on-c-abi.rs
index 110f3eee1ef8..cd7dd1b6a452 100644
--- a/src/test/run-pass/abort-on-c-abi.rs
+++ b/src/test/run-pass/abort-on-c-abi.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 #![allow(unused_must_use)]
 // Since we mark some ABIs as "nounwind" to LLVM, we must make sure that
 // we never unwind through them.
diff --git a/src/test/run-pass/alias-uninit-value.rs b/src/test/run-pass/alias-uninit-value.rs
index c0fd09cbd40f..932c93245e6f 100644
--- a/src/test/run-pass/alias-uninit-value.rs
+++ b/src/test/run-pass/alias-uninit-value.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 #![allow(non_camel_case_types)]
 #![allow(dead_code)]
 
diff --git a/src/test/run-pass/align-with-extern-c-fn.rs b/src/test/run-pass/align-with-extern-c-fn.rs
index dca633de3ce3..09abe4fbf7e0 100644
--- a/src/test/run-pass/align-with-extern-c-fn.rs
+++ b/src/test/run-pass/align-with-extern-c-fn.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 #![allow(stable_features)]
 #![allow(unused_variables)]
 
diff --git a/src/test/run-pass/alignment-gep-tup-like-1.rs b/src/test/run-pass/alignment-gep-tup-like-1.rs
index 7e6ee60e5194..c51c56b08992 100644
--- a/src/test/run-pass/alignment-gep-tup-like-1.rs
+++ b/src/test/run-pass/alignment-gep-tup-like-1.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 #![allow(non_camel_case_types)]
 #![allow(dead_code)]
 
diff --git a/src/test/run-pass/alloca-from-derived-tydesc.rs b/src/test/run-pass/alloca-from-derived-tydesc.rs
index 55f65806ab09..c7f7fbad435e 100644
--- a/src/test/run-pass/alloca-from-derived-tydesc.rs
+++ b/src/test/run-pass/alloca-from-derived-tydesc.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 #![allow(non_camel_case_types)]
 #![allow(dead_code)]
 
diff --git a/src/test/run-pass/allocator-alloc-one.rs b/src/test/run-pass/allocator-alloc-one.rs
index 901142617237..312d5f13b1a4 100644
--- a/src/test/run-pass/allocator-alloc-one.rs
+++ b/src/test/run-pass/allocator-alloc-one.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 #![allow(stable_features)]
 
 #![feature(allocator_api, nonnull)]
diff --git a/src/test/run-pass/anon-extern-mod.rs b/src/test/run-pass/anon-extern-mod.rs
index 6d7e3f3cd5c1..37a67876c917 100644
--- a/src/test/run-pass/anon-extern-mod.rs
+++ b/src/test/run-pass/anon-extern-mod.rs
@@ -1,3 +1,4 @@
+// run-pass
 // pretty-expanded FIXME #23616
 // ignore-wasm32-bare no libc to test ffi with
 
diff --git a/src/test/run-pass/argument-passing.rs b/src/test/run-pass/argument-passing.rs
index ea18ffe01556..74759a4a6bdf 100644
--- a/src/test/run-pass/argument-passing.rs
+++ b/src/test/run-pass/argument-passing.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 struct X {
     x: isize
 }
diff --git a/src/test/run-pass/artificial-block.rs b/src/test/run-pass/artificial-block.rs
index dd4d3e575362..2e383e1a7c68 100644
--- a/src/test/run-pass/artificial-block.rs
+++ b/src/test/run-pass/artificial-block.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 fn f() -> isize { { return 3; } }
 
 pub fn main() { assert_eq!(f(), 3); }
diff --git a/src/test/run-pass/as-precedence.rs b/src/test/run-pass/as-precedence.rs
index 34ff96ea6daf..a9f6fceb08ff 100644
--- a/src/test/run-pass/as-precedence.rs
+++ b/src/test/run-pass/as-precedence.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 fn main() {
     assert_eq!(3 as usize * 3, 9);
     assert_eq!(3 as (usize) * 3, 9);
diff --git a/src/test/run-pass/asm-concat-src.rs b/src/test/run-pass/asm-concat-src.rs
index c629519e8fe6..c4160bfeca10 100644
--- a/src/test/run-pass/asm-concat-src.rs
+++ b/src/test/run-pass/asm-concat-src.rs
@@ -1,3 +1,4 @@
+// run-pass
 // pretty-expanded FIXME #23616
 // ignore-emscripten no asm
 
diff --git a/src/test/run-pass/asm-in-moved.rs b/src/test/run-pass/asm-in-moved.rs
index 8726db355551..6525d2f53b09 100644
--- a/src/test/run-pass/asm-in-moved.rs
+++ b/src/test/run-pass/asm-in-moved.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 #![feature(asm)]
 #![allow(dead_code)]
 
diff --git a/src/test/run-pass/asm-in-out-operand.rs b/src/test/run-pass/asm-in-out-operand.rs
index 148c5b34855b..13d0363a6a07 100644
--- a/src/test/run-pass/asm-in-out-operand.rs
+++ b/src/test/run-pass/asm-in-out-operand.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 #![feature(asm)]
 
 #[cfg(any(target_arch = "x86", target_arch = "x86_64"))]
diff --git a/src/test/run-pass/asm-indirect-memory.rs b/src/test/run-pass/asm-indirect-memory.rs
index 83b773d86042..2e8011af5029 100644
--- a/src/test/run-pass/asm-indirect-memory.rs
+++ b/src/test/run-pass/asm-indirect-memory.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 #![feature(asm)]
 
 #[cfg(any(target_arch = "x86", target_arch = "x86_64"))]
diff --git a/src/test/run-pass/asm-out-assign.rs b/src/test/run-pass/asm-out-assign.rs
index 5c46cb92c6b1..ed63d1b4d492 100644
--- a/src/test/run-pass/asm-out-assign.rs
+++ b/src/test/run-pass/asm-out-assign.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 #![feature(asm)]
 
 #[cfg(any(target_arch = "x86", target_arch = "x86_64"))]
diff --git a/src/test/run-pass/assert-eq-trailing-comma.rs b/src/test/run-pass/assert-eq-trailing-comma.rs
index 77f3ec90da42..7071f80d7f7b 100644
--- a/src/test/run-pass/assert-eq-trailing-comma.rs
+++ b/src/test/run-pass/assert-eq-trailing-comma.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 fn main() {
     assert_eq!(1, 1,);
 }
diff --git a/src/test/run-pass/assert-escape.rs b/src/test/run-pass/assert-escape.rs
index 01342113bde7..00e51d42cab9 100644
--- a/src/test/run-pass/assert-escape.rs
+++ b/src/test/run-pass/assert-escape.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 fn main() {
     assert!(r#"☃\backslash"#.contains("\\"));
 }
diff --git a/src/test/run-pass/assert-ne-trailing-comma.rs b/src/test/run-pass/assert-ne-trailing-comma.rs
index f931a04a2908..03308db9a1fe 100644
--- a/src/test/run-pass/assert-ne-trailing-comma.rs
+++ b/src/test/run-pass/assert-ne-trailing-comma.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 fn main() {
     assert_ne!(1, 2,);
 }
diff --git a/src/test/run-pass/assign-assign.rs b/src/test/run-pass/assign-assign.rs
index ea0337676fc5..bcf506b398b9 100644
--- a/src/test/run-pass/assign-assign.rs
+++ b/src/test/run-pass/assign-assign.rs
@@ -1,3 +1,4 @@
+// run-pass
 // Issue 483 - Assignment expressions result in nil
 
 fn test_assign() {
diff --git a/src/test/run-pass/assoc-oddities-3.rs b/src/test/run-pass/assoc-oddities-3.rs
index bd3812596755..cd025dc8beec 100644
--- a/src/test/run-pass/assoc-oddities-3.rs
+++ b/src/test/run-pass/assoc-oddities-3.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 fn that_odd_parse(c: bool, n: usize) -> u32 {
     let x = 2;
     let a = [1, 2, 3, 4];
diff --git a/src/test/run-pass/associated-item-long-paths.rs b/src/test/run-pass/associated-item-long-paths.rs
index f2d151fc54ac..aad8c487c5a0 100644
--- a/src/test/run-pass/associated-item-long-paths.rs
+++ b/src/test/run-pass/associated-item-long-paths.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 use std::mem::size_of;
 
 // The main point of this test is to ensure that we can parse and resolve
diff --git a/src/test/run-pass/associated-types/associated-types-from-supertrait.rs b/src/test/run-pass/associated-types/associated-types-from-supertrait.rs
index c040790188d1..8f40b94c0999 100644
--- a/src/test/run-pass/associated-types/associated-types-from-supertrait.rs
+++ b/src/test/run-pass/associated-types/associated-types-from-supertrait.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 trait Foo: Iterator<Item = i32> {}
 trait Bar: Foo {}
 
diff --git a/src/test/run-pass/atomic-access-bool.rs b/src/test/run-pass/atomic-access-bool.rs
index 8522493232f9..e9d48bb3b43d 100644
--- a/src/test/run-pass/atomic-access-bool.rs
+++ b/src/test/run-pass/atomic-access-bool.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 #![allow(stable_features)]
 #![feature(atomic_access)]
 use std::sync::atomic::AtomicBool;
diff --git a/src/test/run-pass/atomic-alignment.rs b/src/test/run-pass/atomic-alignment.rs
index ec1dbf42e4a7..5bda90d2eab0 100644
--- a/src/test/run-pass/atomic-alignment.rs
+++ b/src/test/run-pass/atomic-alignment.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 #![feature(cfg_target_has_atomic)]
 #![feature(integer_atomics)]
 
diff --git a/src/test/run-pass/atomic-compare_exchange.rs b/src/test/run-pass/atomic-compare_exchange.rs
index 77da820e07c5..9b327eef3c89 100644
--- a/src/test/run-pass/atomic-compare_exchange.rs
+++ b/src/test/run-pass/atomic-compare_exchange.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 #![allow(stable_features)]
 
 #![feature(extended_compare_and_swap)]
diff --git a/src/test/run-pass/atomic-print.rs b/src/test/run-pass/atomic-print.rs
index ee76ef9b25fb..ef3453da6891 100644
--- a/src/test/run-pass/atomic-print.rs
+++ b/src/test/run-pass/atomic-print.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 #![allow(unused_must_use)]
 #![allow(deprecated)]
 // ignore-cloudabi no process support
diff --git a/src/test/run-pass/attr-main-2.rs b/src/test/run-pass/attr-main-2.rs
index e0bf6ecc8f19..3a51f83ba3b1 100644
--- a/src/test/run-pass/attr-main-2.rs
+++ b/src/test/run-pass/attr-main-2.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 #![feature(main)]
 
 pub fn main() {
diff --git a/src/test/run-pass/attr-main.rs b/src/test/run-pass/attr-main.rs
index 645baf32e045..9c4caaa4a42e 100644
--- a/src/test/run-pass/attr-main.rs
+++ b/src/test/run-pass/attr-main.rs
@@ -1,3 +1,4 @@
+// run-pass
 // pretty-expanded FIXME #23616
 
 #![feature(main)]
diff --git a/src/test/run-pass/attr-shebang.rs b/src/test/run-pass/attr-shebang.rs
index 73f104108282..cce31c9bb7b6 100644
--- a/src/test/run-pass/attr-shebang.rs
+++ b/src/test/run-pass/attr-shebang.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 #![allow(stable_features)]
 #![feature(rust1)]
 pub fn main() { }
diff --git a/src/test/run-pass/attr-start.rs b/src/test/run-pass/attr-start.rs
index 29f86c9b59e9..6777631484b7 100644
--- a/src/test/run-pass/attr-start.rs
+++ b/src/test/run-pass/attr-start.rs
@@ -1,3 +1,4 @@
+// run-pass
 // pretty-expanded FIXME #23616
 
 #![feature(start)]
diff --git a/src/test/run-pass/attr.rs b/src/test/run-pass/attr.rs
index 645baf32e045..9c4caaa4a42e 100644
--- a/src/test/run-pass/attr.rs
+++ b/src/test/run-pass/attr.rs
@@ -1,3 +1,4 @@
+// run-pass
 // pretty-expanded FIXME #23616
 
 #![feature(main)]
diff --git a/src/test/run-pass/augmented-assignments-feature-gate-cross.rs b/src/test/run-pass/augmented-assignments-feature-gate-cross.rs
index 566d4522808e..84988feb6f57 100644
--- a/src/test/run-pass/augmented-assignments-feature-gate-cross.rs
+++ b/src/test/run-pass/augmented-assignments-feature-gate-cross.rs
@@ -1,3 +1,4 @@
+// run-pass
 // aux-build:augmented_assignments.rs
 
 extern crate augmented_assignments;
diff --git a/src/test/run-pass/augmented-assignments-feature-gate.rs b/src/test/run-pass/augmented-assignments-feature-gate.rs
index 7809ac8ea967..8e686796fee9 100644
--- a/src/test/run-pass/augmented-assignments-feature-gate.rs
+++ b/src/test/run-pass/augmented-assignments-feature-gate.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 use std::ops::AddAssign;
 
 struct Int(i32);
diff --git a/src/test/run-pass/augmented-assignments.rs b/src/test/run-pass/augmented-assignments.rs
index c26d0ffce446..fb383cc57a69 100644
--- a/src/test/run-pass/augmented-assignments.rs
+++ b/src/test/run-pass/augmented-assignments.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 #![allow(unused_imports)]
 #![deny(unused_assignments)]
 
diff --git a/src/test/run-pass/auto-instantiate.rs b/src/test/run-pass/auto-instantiate.rs
index ac21409e92c0..a58b178287fb 100644
--- a/src/test/run-pass/auto-instantiate.rs
+++ b/src/test/run-pass/auto-instantiate.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 #![allow(dead_code)]
 #[derive(Debug)]
 struct Pair<T, U> { a: T, b: U }
diff --git a/src/test/run-pass/auto-is-contextual.rs b/src/test/run-pass/auto-is-contextual.rs
index 3405cc712d79..a2ddd5374c08 100644
--- a/src/test/run-pass/auto-is-contextual.rs
+++ b/src/test/run-pass/auto-is-contextual.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 #![allow(path_statements)]
 #![allow(dead_code)]
 macro_rules! auto {
diff --git a/src/test/run-pass/autobind.rs b/src/test/run-pass/autobind.rs
index bb38b7afdf6e..70606a2a200d 100644
--- a/src/test/run-pass/autobind.rs
+++ b/src/test/run-pass/autobind.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 fn f<T>(x: Vec<T>) -> T { return x.into_iter().next().unwrap(); }
 
 fn g<F>(act: F) -> isize where F: FnOnce(Vec<isize>) -> isize { return act(vec![1, 2, 3]); }
diff --git a/src/test/run-pass/backtrace-debuginfo-aux.rs b/src/test/run-pass/backtrace-debuginfo-aux.rs
index 781d6eba5ed2..1411bcf89e87 100644
--- a/src/test/run-pass/backtrace-debuginfo-aux.rs
+++ b/src/test/run-pass/backtrace-debuginfo-aux.rs
@@ -1,3 +1,4 @@
+// run-pass
 // ignore-test: not a test, used by backtrace-debuginfo.rs to test file!()
 
 #[inline(never)]
diff --git a/src/test/run-pass/backtrace-debuginfo.rs b/src/test/run-pass/backtrace-debuginfo.rs
index a2a934513d2f..8668ec82bfda 100644
--- a/src/test/run-pass/backtrace-debuginfo.rs
+++ b/src/test/run-pass/backtrace-debuginfo.rs
@@ -1,3 +1,4 @@
+// run-pass
 // We disable tail merging here because it can't preserve debuginfo and thus
 // potentially breaks the backtraces. Also, subtle changes can decide whether
 // tail merging succeeds, so the test might work today but fail tomorrow due to a
diff --git a/src/test/run-pass/backtrace.rs b/src/test/run-pass/backtrace.rs
index 93e8c9f17299..82519332d648 100644
--- a/src/test/run-pass/backtrace.rs
+++ b/src/test/run-pass/backtrace.rs
@@ -1,3 +1,4 @@
+// run-pass
 // ignore-android FIXME #17520
 // ignore-cloudabi spawning processes is not supported
 // ignore-emscripten spawning processes is not supported
diff --git a/src/test/run-pass/bare-fn-implements-fn-mut.rs b/src/test/run-pass/bare-fn-implements-fn-mut.rs
index c06fc702ca7d..dfead48893e5 100644
--- a/src/test/run-pass/bare-fn-implements-fn-mut.rs
+++ b/src/test/run-pass/bare-fn-implements-fn-mut.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 use std::ops::FnMut;
 
 fn call_f<F:FnMut()>(mut f: F) {
diff --git a/src/test/run-pass/bare-static-string.rs b/src/test/run-pass/bare-static-string.rs
index 8d4782226d50..d336dc7c6a08 100644
--- a/src/test/run-pass/bare-static-string.rs
+++ b/src/test/run-pass/bare-static-string.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 pub fn main() {
     let x: &'static str = "foo";
     println!("{}", x);
diff --git a/src/test/run-pass/big-literals.rs b/src/test/run-pass/big-literals.rs
index 9b1fa2123f91..131de5439b7d 100644
--- a/src/test/run-pass/big-literals.rs
+++ b/src/test/run-pass/big-literals.rs
@@ -1,3 +1,4 @@
+// run-pass
 // Catch mistakes in the overflowing literals lint.
 #![deny(overflowing_literals)]
 
diff --git a/src/test/run-pass/binary-minus-without-space.rs b/src/test/run-pass/binary-minus-without-space.rs
index 60d00e7cf54d..2fbd5300dd1a 100644
--- a/src/test/run-pass/binary-minus-without-space.rs
+++ b/src/test/run-pass/binary-minus-without-space.rs
@@ -1,3 +1,4 @@
+// run-pass
 // Check that issue #954 stays fixed
 
 
diff --git a/src/test/run-pass/bind-by-move.rs b/src/test/run-pass/bind-by-move.rs
index 82db89468d13..f0a9ebdd08c4 100644
--- a/src/test/run-pass/bind-by-move.rs
+++ b/src/test/run-pass/bind-by-move.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 use std::sync::Arc;
 fn dispose(_x: Arc<bool>) { }
 
diff --git a/src/test/run-pass/binding/fn-arg-incomplete-pattern-drop-order.rs b/src/test/run-pass/binding/fn-arg-incomplete-pattern-drop-order.rs
index 4d5a6fbba285..ea4a9e5afa50 100644
--- a/src/test/run-pass/binding/fn-arg-incomplete-pattern-drop-order.rs
+++ b/src/test/run-pass/binding/fn-arg-incomplete-pattern-drop-order.rs
@@ -1,3 +1,4 @@
+// run-pass
 // Check that partially moved from function parameters are dropped after the
 // named bindings that move from them.
 
diff --git a/src/test/run-pass/binops-issue-22743.rs b/src/test/run-pass/binops-issue-22743.rs
index 4e95597b6719..393ba0a56cbc 100644
--- a/src/test/run-pass/binops-issue-22743.rs
+++ b/src/test/run-pass/binops-issue-22743.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 use std::ops::Mul;
 
 #[derive(Copy, Clone)]
diff --git a/src/test/run-pass/binops.rs b/src/test/run-pass/binops.rs
index b24f8b723fdb..a7abf6087b30 100644
--- a/src/test/run-pass/binops.rs
+++ b/src/test/run-pass/binops.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 #![allow(non_camel_case_types)]
 // Binop corner cases
 
diff --git a/src/test/run-pass/bitwise.rs b/src/test/run-pass/bitwise.rs
index 309ccae14878..f79ff3c6efb6 100644
--- a/src/test/run-pass/bitwise.rs
+++ b/src/test/run-pass/bitwise.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 #[cfg(any(target_pointer_width = "32"))]
 fn target() {
     assert_eq!(-1000isize as usize >> 3_usize, 536870787_usize);
diff --git a/src/test/run-pass/blind-item-local-shadow.rs b/src/test/run-pass/blind-item-local-shadow.rs
index d88374a351a9..942aeb6fdf40 100644
--- a/src/test/run-pass/blind-item-local-shadow.rs
+++ b/src/test/run-pass/blind-item-local-shadow.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 #![allow(dead_code)]
 #![allow(unused_imports)]
 mod bar {
diff --git a/src/test/run-pass/blind-item-mixed-crate-use-item.rs b/src/test/run-pass/blind-item-mixed-crate-use-item.rs
index 00d171f6e4d4..36d8ab151e4f 100644
--- a/src/test/run-pass/blind-item-mixed-crate-use-item.rs
+++ b/src/test/run-pass/blind-item-mixed-crate-use-item.rs
@@ -1,3 +1,4 @@
+// run-pass
 // aux-build:blind-item-mixed-crate-use-item-foo.rs
 // aux-build:blind-item-mixed-crate-use-item-foo2.rs
 
diff --git a/src/test/run-pass/blind-item-mixed-use-item.rs b/src/test/run-pass/blind-item-mixed-use-item.rs
index e6008206ba8f..4a39054967b4 100644
--- a/src/test/run-pass/blind-item-mixed-use-item.rs
+++ b/src/test/run-pass/blind-item-mixed-use-item.rs
@@ -1,3 +1,4 @@
+// run-pass
 // pretty-expanded FIXME #23616
 
 mod m {
diff --git a/src/test/run-pass/block-arg-call-as.rs b/src/test/run-pass/block-arg-call-as.rs
index 7157cfecf329..87cf3a487bf4 100644
--- a/src/test/run-pass/block-arg-call-as.rs
+++ b/src/test/run-pass/block-arg-call-as.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 #![allow(non_snake_case)]
 
 fn asBlock<F>(f: F) -> usize where F: FnOnce() -> usize {
diff --git a/src/test/run-pass/block-arg.rs b/src/test/run-pass/block-arg.rs
index 8d5840ae9e79..bd1385e5c334 100644
--- a/src/test/run-pass/block-arg.rs
+++ b/src/test/run-pass/block-arg.rs
@@ -1,3 +1,4 @@
+// run-pass
 // Check usage and precedence of block arguments in expressions:
 pub fn main() {
     let v = vec![-1.0f64, 0.0, 1.0, 2.0, 3.0];
diff --git a/src/test/run-pass/block-explicit-types.rs b/src/test/run-pass/block-explicit-types.rs
index 449a4967580a..860fcc8df210 100644
--- a/src/test/run-pass/block-explicit-types.rs
+++ b/src/test/run-pass/block-explicit-types.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 pub fn main() {
     fn as_buf<T, F>(s: String, f: F) -> T where F: FnOnce(String) -> T { f(s) }
     as_buf("foo".to_string(), |foo: String| -> () { println!("{}", foo) });
diff --git a/src/test/run-pass/block-expr-precedence.rs b/src/test/run-pass/block-expr-precedence.rs
index 2be0ac4c44f2..d31eecda9bb3 100644
--- a/src/test/run-pass/block-expr-precedence.rs
+++ b/src/test/run-pass/block-expr-precedence.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 #![allow(unused_must_use)]
 #![allow(unused_parens)]
 // This test has some extra semis in it that the pretty-printer won't
diff --git a/src/test/run-pass/block-fn-coerce.rs b/src/test/run-pass/block-fn-coerce.rs
index 0fbc1f5178d3..fc5f51d46b25 100644
--- a/src/test/run-pass/block-fn-coerce.rs
+++ b/src/test/run-pass/block-fn-coerce.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 fn force<F>(f: F) -> isize where F: FnOnce() -> isize { return f(); }
 
 pub fn main() {
diff --git a/src/test/run-pass/block-iter-1.rs b/src/test/run-pass/block-iter-1.rs
index 8b3fc95f5a15..caf0266cff15 100644
--- a/src/test/run-pass/block-iter-1.rs
+++ b/src/test/run-pass/block-iter-1.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 fn iter_vec<T, F>(v: Vec<T> , mut f: F) where F: FnMut(&T) { for x in &v { f(x); } }
 
 pub fn main() {
diff --git a/src/test/run-pass/block-iter-2.rs b/src/test/run-pass/block-iter-2.rs
index 0176f6d26d9f..e90c1ee815aa 100644
--- a/src/test/run-pass/block-iter-2.rs
+++ b/src/test/run-pass/block-iter-2.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 fn iter_vec<T, F>(v: Vec<T>, mut f: F) where F: FnMut(&T) { for x in &v { f(x); } }
 
 pub fn main() {
diff --git a/src/test/run-pass/bool-not.rs b/src/test/run-pass/bool-not.rs
index 34865a367620..84713d6818a3 100644
--- a/src/test/run-pass/bool-not.rs
+++ b/src/test/run-pass/bool-not.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 pub fn main() {
     if !false { assert!((true)); } else { assert!((false)); }
     if !true { assert!((false)); } else { assert!((true)); }
diff --git a/src/test/run-pass/bool.rs b/src/test/run-pass/bool.rs
index e6322746f20c..92f36c8fd25a 100644
--- a/src/test/run-pass/bool.rs
+++ b/src/test/run-pass/bool.rs
@@ -1,3 +1,4 @@
+// run-pass
 // Basic boolean tests
 
 
diff --git a/src/test/run-pass/borrow-by-val-method-receiver.rs b/src/test/run-pass/borrow-by-val-method-receiver.rs
index 5907f8238af9..465bef1614d4 100644
--- a/src/test/run-pass/borrow-by-val-method-receiver.rs
+++ b/src/test/run-pass/borrow-by-val-method-receiver.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 trait Foo {
     fn foo(self);
 }
diff --git a/src/test/run-pass/box-new.rs b/src/test/run-pass/box-new.rs
index 2d177bcf9276..be1a40cf779d 100644
--- a/src/test/run-pass/box-new.rs
+++ b/src/test/run-pass/box-new.rs
@@ -1,3 +1,4 @@
+// run-pass
 // pretty-expanded FIXME #23616
 
 fn main() {
diff --git a/src/test/run-pass/bug-7183-generics.rs b/src/test/run-pass/bug-7183-generics.rs
index 72cfe1973a87..f53a17361274 100644
--- a/src/test/run-pass/bug-7183-generics.rs
+++ b/src/test/run-pass/bug-7183-generics.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 trait Speak : Sized {
     fn say(&self, s:&str) -> String;
     fn hi(&self) -> String { hello(self) }
diff --git a/src/test/run-pass/bug-7295.rs b/src/test/run-pass/bug-7295.rs
index b6dea6c82dc1..156ff2ee82f4 100644
--- a/src/test/run-pass/bug-7295.rs
+++ b/src/test/run-pass/bug-7295.rs
@@ -1,3 +1,4 @@
+// run-pass
 // pretty-expanded FIXME #23616
 
 pub trait Foo<T> {
diff --git a/src/test/run-pass/builtin-clone-unwind.rs b/src/test/run-pass/builtin-clone-unwind.rs
index fa278082912c..339bcfa1060a 100644
--- a/src/test/run-pass/builtin-clone-unwind.rs
+++ b/src/test/run-pass/builtin-clone-unwind.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 #![allow(unused_variables)]
 #![allow(unused_imports)]
 // ignore-wasm32-bare compiled with panic=abort by default
diff --git a/src/test/run-pass/builtin-clone.rs b/src/test/run-pass/builtin-clone.rs
index 2a9b98a6e338..0874d5bc3903 100644
--- a/src/test/run-pass/builtin-clone.rs
+++ b/src/test/run-pass/builtin-clone.rs
@@ -1,3 +1,4 @@
+// run-pass
 // Test that `Clone` is correctly implemented for builtin types.
 // Also test that cloning an array or a tuple is done right, i.e.
 // each component is cloned.
diff --git a/src/test/run-pass/builtin-superkinds-capabilities-transitive.rs b/src/test/run-pass/builtin-superkinds-capabilities-transitive.rs
index 8ff70036ed2a..1f997d37122c 100644
--- a/src/test/run-pass/builtin-superkinds-capabilities-transitive.rs
+++ b/src/test/run-pass/builtin-superkinds-capabilities-transitive.rs
@@ -1,3 +1,4 @@
+// run-pass
 // Tests "transitivity" of super-builtin-kinds on traits. Here, if
 // we have a Foo, we know we have a Bar, and if we have a Bar, we
 // know we have a Send. So if we have a Foo we should know we have
diff --git a/src/test/run-pass/builtin-superkinds-capabilities-xc.rs b/src/test/run-pass/builtin-superkinds-capabilities-xc.rs
index 7af41cbf50ba..8416bb3a3773 100644
--- a/src/test/run-pass/builtin-superkinds-capabilities-xc.rs
+++ b/src/test/run-pass/builtin-superkinds-capabilities-xc.rs
@@ -1,3 +1,4 @@
+// run-pass
 // aux-build:trait_superkinds_in_metadata.rs
 
 // Tests "capabilities" granted by traits with super-builtin-kinds,
diff --git a/src/test/run-pass/builtin-superkinds-capabilities.rs b/src/test/run-pass/builtin-superkinds-capabilities.rs
index 2a2917b69b08..e936f921a820 100644
--- a/src/test/run-pass/builtin-superkinds-capabilities.rs
+++ b/src/test/run-pass/builtin-superkinds-capabilities.rs
@@ -1,3 +1,4 @@
+// run-pass
 // Tests "capabilities" granted by traits that inherit from super-
 // builtin-kinds, e.g., if a trait requires Send to implement, then
 // at usage site of that trait, we know we have the Send capability.
diff --git a/src/test/run-pass/builtin-superkinds-in-metadata.rs b/src/test/run-pass/builtin-superkinds-in-metadata.rs
index f585d9cc4f8e..117014b44ee1 100644
--- a/src/test/run-pass/builtin-superkinds-in-metadata.rs
+++ b/src/test/run-pass/builtin-superkinds-in-metadata.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 #![allow(unused_imports)]
 
 // aux-build:trait_superkinds_in_metadata.rs
diff --git a/src/test/run-pass/builtin-superkinds-phantom-typaram.rs b/src/test/run-pass/builtin-superkinds-phantom-typaram.rs
index 3899ecf6f3f7..9b80664b04e1 100644
--- a/src/test/run-pass/builtin-superkinds-phantom-typaram.rs
+++ b/src/test/run-pass/builtin-superkinds-phantom-typaram.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 #![allow(dead_code)]
 // Tests that even when a type parameter doesn't implement a required
 // super-builtin-kind of a trait, if the type parameter is never used,
diff --git a/src/test/run-pass/builtin-superkinds-simple.rs b/src/test/run-pass/builtin-superkinds-simple.rs
index 670b8ed0e9bc..8d2477157844 100644
--- a/src/test/run-pass/builtin-superkinds-simple.rs
+++ b/src/test/run-pass/builtin-superkinds-simple.rs
@@ -1,3 +1,4 @@
+// run-pass
 // Simple test case of implementing a trait with super-builtin-kinds.
 
 // pretty-expanded FIXME #23616
diff --git a/src/test/run-pass/builtin-superkinds-typaram.rs b/src/test/run-pass/builtin-superkinds-typaram.rs
index c3a456318bce..f999dfff786e 100644
--- a/src/test/run-pass/builtin-superkinds-typaram.rs
+++ b/src/test/run-pass/builtin-superkinds-typaram.rs
@@ -1,3 +1,4 @@
+// run-pass
 // Tests correct implementation of traits with super-builtin-kinds
 // using a bounded type parameter.
 
diff --git a/src/test/run-pass/byte-literals.rs b/src/test/run-pass/byte-literals.rs
index 259ac08fd979..2649c2eac33d 100644
--- a/src/test/run-pass/byte-literals.rs
+++ b/src/test/run-pass/byte-literals.rs
@@ -1,3 +1,4 @@
+// run-pass
 //
 
 
diff --git a/src/test/run-pass/c-stack-as-value.rs b/src/test/run-pass/c-stack-as-value.rs
index 3b997295c122..7595b76fb3fe 100644
--- a/src/test/run-pass/c-stack-as-value.rs
+++ b/src/test/run-pass/c-stack-as-value.rs
@@ -1,3 +1,4 @@
+// run-pass
 // pretty-expanded FIXME #23616
 // ignore-wasm32-bare no libc to test ffi with
 
diff --git a/src/test/run-pass/c-stack-returning-int64.rs b/src/test/run-pass/c-stack-returning-int64.rs
index ec162b40bf8b..388d280b831b 100644
--- a/src/test/run-pass/c-stack-returning-int64.rs
+++ b/src/test/run-pass/c-stack-returning-int64.rs
@@ -1,3 +1,4 @@
+// run-pass
 // ignore-wasm32-bare no libc to test with
 // ignore-sgx no libc
 
diff --git a/src/test/run-pass/cabi-int-widening.rs b/src/test/run-pass/cabi-int-widening.rs
index f6524c6a3d90..240eaebf3d68 100644
--- a/src/test/run-pass/cabi-int-widening.rs
+++ b/src/test/run-pass/cabi-int-widening.rs
@@ -1,3 +1,4 @@
+// run-pass
 // ignore-wasm32-bare no libc to test ffi with
 
 #[link(name = "rust_test_helpers", kind = "static")]
diff --git a/src/test/run-pass/can-copy-pod.rs b/src/test/run-pass/can-copy-pod.rs
index bc10d236b363..e6c57ca3f711 100644
--- a/src/test/run-pass/can-copy-pod.rs
+++ b/src/test/run-pass/can-copy-pod.rs
@@ -1,3 +1,4 @@
+// run-pass
 // pretty-expanded FIXME #23616
 
 /* Any copyright is dedicated to the Public Domain.
diff --git a/src/test/run-pass/cancel-clean-via-immediate-rvalue-ref.rs b/src/test/run-pass/cancel-clean-via-immediate-rvalue-ref.rs
index f27803677cc0..781d5c14abe9 100644
--- a/src/test/run-pass/cancel-clean-via-immediate-rvalue-ref.rs
+++ b/src/test/run-pass/cancel-clean-via-immediate-rvalue-ref.rs
@@ -1,3 +1,4 @@
+// run-pass
 // pretty-expanded FIXME #23616
 
 #![feature(box_syntax)]
diff --git a/src/test/run-pass/cast-does-fallback.rs b/src/test/run-pass/cast-does-fallback.rs
index 6adf90fc0e61..770f7a31c764 100644
--- a/src/test/run-pass/cast-does-fallback.rs
+++ b/src/test/run-pass/cast-does-fallback.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 pub fn main() {
     // Test that these type check correctly.
     (&42u8 >> 4) as usize;
diff --git a/src/test/run-pass/cast-region-to-uint.rs b/src/test/run-pass/cast-region-to-uint.rs
index ef2f6f1c4928..33ec2d27610e 100644
--- a/src/test/run-pass/cast-region-to-uint.rs
+++ b/src/test/run-pass/cast-region-to-uint.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 pub fn main() {
     let x: isize = 3;
     println!("&x={:x}", (&x as *const isize as usize));
diff --git a/src/test/run-pass/cast-rfc0401-vtable-kinds.rs b/src/test/run-pass/cast-rfc0401-vtable-kinds.rs
index a27dd9eef52e..249481467e64 100644
--- a/src/test/run-pass/cast-rfc0401-vtable-kinds.rs
+++ b/src/test/run-pass/cast-rfc0401-vtable-kinds.rs
@@ -1,3 +1,4 @@
+// run-pass
 // Check that you can cast between different pointers to trait objects
 // whose vtable have the same kind (both lengths, or both trait pointers).
 
diff --git a/src/test/run-pass/cast-rfc0401.rs b/src/test/run-pass/cast-rfc0401.rs
index 017b63c73749..996fa013fedd 100644
--- a/src/test/run-pass/cast-rfc0401.rs
+++ b/src/test/run-pass/cast-rfc0401.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 #![allow(dead_code)]
 
 use std::vec;
diff --git a/src/test/run-pass/cast-to-infer-ty.rs b/src/test/run-pass/cast-to-infer-ty.rs
index e29860cbfbf5..053ebb621a7f 100644
--- a/src/test/run-pass/cast-to-infer-ty.rs
+++ b/src/test/run-pass/cast-to-infer-ty.rs
@@ -1,3 +1,4 @@
+// run-pass
 // Check that we allow a cast to `_` so long as the target type can be
 // inferred elsewhere.
 
diff --git a/src/test/run-pass/cast.rs b/src/test/run-pass/cast.rs
index c7977f461dfc..218275c4d99a 100644
--- a/src/test/run-pass/cast.rs
+++ b/src/test/run-pass/cast.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 #![allow(unused_assignments)]
 #![allow(unused_variables)]
 
diff --git a/src/test/run-pass/catch-unwind-bang.rs b/src/test/run-pass/catch-unwind-bang.rs
index 6c6f5a4fcfd9..f181991713b2 100644
--- a/src/test/run-pass/catch-unwind-bang.rs
+++ b/src/test/run-pass/catch-unwind-bang.rs
@@ -1,3 +1,4 @@
+// run-pass
 // ignore-wasm32-bare compiled with panic=abort by default
 
 fn worker() -> ! {
diff --git a/src/test/run-pass/cell-does-not-clone.rs b/src/test/run-pass/cell-does-not-clone.rs
index 7ba6419d8a3a..587447b54b7f 100644
--- a/src/test/run-pass/cell-does-not-clone.rs
+++ b/src/test/run-pass/cell-does-not-clone.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 #![allow(dead_code)]
 
 use std::cell::Cell;
diff --git a/src/test/run-pass/chalkify/builtin-copy-clone.rs b/src/test/run-pass/chalkify/builtin-copy-clone.rs
index 4f69714bc747..d403514b553b 100644
--- a/src/test/run-pass/chalkify/builtin-copy-clone.rs
+++ b/src/test/run-pass/chalkify/builtin-copy-clone.rs
@@ -1,3 +1,4 @@
+// run-pass
 // compile-flags: -Z chalk
 
 // Test that `Clone` is correctly implemented for builtin types.
diff --git a/src/test/run-pass/chalkify/inherent_impl.rs b/src/test/run-pass/chalkify/inherent_impl.rs
index fbe30f115444..44e120c1eebb 100644
--- a/src/test/run-pass/chalkify/inherent_impl.rs
+++ b/src/test/run-pass/chalkify/inherent_impl.rs
@@ -1,3 +1,4 @@
+// run-pass
 // compile-flags: -Z chalk
 
 trait Foo { }
diff --git a/src/test/run-pass/chalkify/projection.rs b/src/test/run-pass/chalkify/projection.rs
index a598f68d3f98..d6a8dd7a4a20 100644
--- a/src/test/run-pass/chalkify/projection.rs
+++ b/src/test/run-pass/chalkify/projection.rs
@@ -1,3 +1,4 @@
+// run-pass
 // compile-flags: -Z chalk
 
 trait Foo { }
diff --git a/src/test/run-pass/chalkify/super_trait.rs b/src/test/run-pass/chalkify/super_trait.rs
index 441d61ef2489..eeff9fd9b80a 100644
--- a/src/test/run-pass/chalkify/super_trait.rs
+++ b/src/test/run-pass/chalkify/super_trait.rs
@@ -1,3 +1,4 @@
+// run-pass
 // compile-flags: -Z chalk
 
 trait Foo { }
diff --git a/src/test/run-pass/chalkify/trait_implied_bound.rs b/src/test/run-pass/chalkify/trait_implied_bound.rs
index f82453792ff4..8a2e1cf59900 100644
--- a/src/test/run-pass/chalkify/trait_implied_bound.rs
+++ b/src/test/run-pass/chalkify/trait_implied_bound.rs
@@ -1,3 +1,4 @@
+// run-pass
 // compile-flags: -Z chalk
 
 trait Foo { }
diff --git a/src/test/run-pass/chalkify/type_implied_bound.rs b/src/test/run-pass/chalkify/type_implied_bound.rs
index 94d976d32427..8673f5319bdf 100644
--- a/src/test/run-pass/chalkify/type_implied_bound.rs
+++ b/src/test/run-pass/chalkify/type_implied_bound.rs
@@ -1,3 +1,4 @@
+// run-pass
 // compile-flags: -Z chalk
 
 trait Eq { }
diff --git a/src/test/run-pass/char.rs b/src/test/run-pass/char.rs
index 1616d666c1b9..cfb7a37af011 100644
--- a/src/test/run-pass/char.rs
+++ b/src/test/run-pass/char.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 pub fn main() {
     let c: char = 'x';
     let d: char = 'x';
diff --git a/src/test/run-pass/char_unicode.rs b/src/test/run-pass/char_unicode.rs
index 90ec26e80bb4..93e5300e36fe 100644
--- a/src/test/run-pass/char_unicode.rs
+++ b/src/test/run-pass/char_unicode.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 #![feature(unicode_version)]
 
 /// Tests access to the internal Unicode Version type and value.
diff --git a/src/test/run-pass/check-static-recursion-foreign.rs b/src/test/run-pass/check-static-recursion-foreign.rs
index 361f8a1d3406..8ca0af8e47a7 100644
--- a/src/test/run-pass/check-static-recursion-foreign.rs
+++ b/src/test/run-pass/check-static-recursion-foreign.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 #![allow(dead_code)]
 // Static recursion check shouldn't fail when given a foreign item (#18279)
 
diff --git a/src/test/run-pass/check_const-feature-gated.rs b/src/test/run-pass/check_const-feature-gated.rs
index 1c816d5d7c32..f4faab1abc28 100644
--- a/src/test/run-pass/check_const-feature-gated.rs
+++ b/src/test/run-pass/check_const-feature-gated.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 const ARR: [usize; 1] = [2];
 
 fn main() {
diff --git a/src/test/run-pass/child-outlives-parent.rs b/src/test/run-pass/child-outlives-parent.rs
index 80e3c81af528..e3a39a44bb82 100644
--- a/src/test/run-pass/child-outlives-parent.rs
+++ b/src/test/run-pass/child-outlives-parent.rs
@@ -1,3 +1,4 @@
+// run-pass
 // Reported as issue #126, child leaks the string.
 
 // pretty-expanded FIXME #23616
diff --git a/src/test/run-pass/cleanup-arm-conditional.rs b/src/test/run-pass/cleanup-arm-conditional.rs
index b8b109905209..915842f3e85f 100644
--- a/src/test/run-pass/cleanup-arm-conditional.rs
+++ b/src/test/run-pass/cleanup-arm-conditional.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 #![allow(stable_features)]
 #![allow(unused_imports)]
 // Test that cleanup scope for temporaries created in a match
diff --git a/src/test/run-pass/cleanup-rvalue-during-if-and-while.rs b/src/test/run-pass/cleanup-rvalue-during-if-and-while.rs
index 370c95c6668d..6fecb4e76da3 100644
--- a/src/test/run-pass/cleanup-rvalue-during-if-and-while.rs
+++ b/src/test/run-pass/cleanup-rvalue-during-if-and-while.rs
@@ -1,3 +1,4 @@
+// run-pass
 // This test verifies that temporaries created for `while`'s and `if`
 // conditions are dropped after the condition is evaluated.
 
diff --git a/src/test/run-pass/cleanup-rvalue-for-scope.rs b/src/test/run-pass/cleanup-rvalue-for-scope.rs
index 488c6e580d1d..b6582c01fbad 100644
--- a/src/test/run-pass/cleanup-rvalue-for-scope.rs
+++ b/src/test/run-pass/cleanup-rvalue-for-scope.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 #![allow(non_snake_case)]
 #![allow(dead_code)]
 #![allow(unused_variables)]
diff --git a/src/test/run-pass/cleanup-rvalue-scopes.rs b/src/test/run-pass/cleanup-rvalue-scopes.rs
index 331c93f442e1..f51f13abf792 100644
--- a/src/test/run-pass/cleanup-rvalue-scopes.rs
+++ b/src/test/run-pass/cleanup-rvalue-scopes.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 #![allow(non_snake_case)]
 #![allow(unused_variables)]
 // Test that destructors for rvalue temporaries run either at end of
diff --git a/src/test/run-pass/cleanup-rvalue-temp-during-incomplete-alloc.rs b/src/test/run-pass/cleanup-rvalue-temp-during-incomplete-alloc.rs
index 7b4d66e7571b..62f8b81385aa 100644
--- a/src/test/run-pass/cleanup-rvalue-temp-during-incomplete-alloc.rs
+++ b/src/test/run-pass/cleanup-rvalue-temp-during-incomplete-alloc.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 #![allow(unused_must_use)]
 #![allow(dead_code)]
 #![allow(unused_variables)]
diff --git a/src/test/run-pass/cleanup-shortcircuit.rs b/src/test/run-pass/cleanup-shortcircuit.rs
index 6e67a276d4f1..19d774079ab7 100644
--- a/src/test/run-pass/cleanup-shortcircuit.rs
+++ b/src/test/run-pass/cleanup-shortcircuit.rs
@@ -1,3 +1,4 @@
+// run-pass
 // Test that cleanups for the RHS of shortcircuiting operators work.
 
 // pretty-expanded FIXME #23616
diff --git a/src/test/run-pass/clone-with-exterior.rs b/src/test/run-pass/clone-with-exterior.rs
index 1d3b54aa5eb1..1ef297192679 100644
--- a/src/test/run-pass/clone-with-exterior.rs
+++ b/src/test/run-pass/clone-with-exterior.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 #![allow(unused_must_use)]
 // ignore-emscripten no threads support
 
diff --git a/src/test/run-pass/close-over-big-then-small-data.rs b/src/test/run-pass/close-over-big-then-small-data.rs
index 0eead0194efa..40e5f500df4a 100644
--- a/src/test/run-pass/close-over-big-then-small-data.rs
+++ b/src/test/run-pass/close-over-big-then-small-data.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 #![allow(dead_code)]
 // If we use GEPi rather than GEP_tup_like when
 // storing closure data (as we used to do), the u64 would
diff --git a/src/test/run-pass/cmp-default.rs b/src/test/run-pass/cmp-default.rs
index 3be0eb4c5d52..bb5c39f5cdea 100644
--- a/src/test/run-pass/cmp-default.rs
+++ b/src/test/run-pass/cmp-default.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 use std::cmp::Ordering;
 
 // Test default methods in PartialOrd and PartialEq
diff --git a/src/test/run-pass/codegen-object-shim.rs b/src/test/run-pass/codegen-object-shim.rs
index 26f53a9c1821..9a85a50ebd9b 100644
--- a/src/test/run-pass/codegen-object-shim.rs
+++ b/src/test/run-pass/codegen-object-shim.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 fn main() {
     assert_eq!((ToString::to_string as fn(&(dyn ToString+'static)) -> String)(&"foo"),
         String::from("foo"));
diff --git a/src/test/run-pass/collections-const-new.rs b/src/test/run-pass/collections-const-new.rs
index 37ee1a41c0b8..e01b0dfa14d6 100644
--- a/src/test/run-pass/collections-const-new.rs
+++ b/src/test/run-pass/collections-const-new.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 #![allow(dead_code)]
 // Test several functions can be used for constants
 // 1. Vec::new()
diff --git a/src/test/run-pass/command-exec.rs b/src/test/run-pass/command-exec.rs
index aa5a3a377058..568be67abe37 100644
--- a/src/test/run-pass/command-exec.rs
+++ b/src/test/run-pass/command-exec.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 #![allow(stable_features)]
 // ignore-windows - this is a unix-specific test
 // ignore-pretty issue #37199
diff --git a/src/test/run-pass/command-pre-exec.rs b/src/test/run-pass/command-pre-exec.rs
index 5c3cc31de581..c0fc554183a4 100644
--- a/src/test/run-pass/command-pre-exec.rs
+++ b/src/test/run-pass/command-pre-exec.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 #![allow(stable_features)]
 // ignore-windows - this is a unix-specific test
 // ignore-cloudabi no processes
diff --git a/src/test/run-pass/command-uid-gid.rs b/src/test/run-pass/command-uid-gid.rs
index 5f4b3941d90e..f867106c35d0 100644
--- a/src/test/run-pass/command-uid-gid.rs
+++ b/src/test/run-pass/command-uid-gid.rs
@@ -1,3 +1,4 @@
+// run-pass
 // ignore-android
 // ignore-cloudabi
 // ignore-emscripten
diff --git a/src/test/run-pass/complex.rs b/src/test/run-pass/complex.rs
index 4c2bb6859ddd..9b11ca67e477 100644
--- a/src/test/run-pass/complex.rs
+++ b/src/test/run-pass/complex.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 #![allow(unconditional_recursion)]
 #![allow(non_camel_case_types)]
 #![allow(dead_code)]
diff --git a/src/test/run-pass/concat.rs b/src/test/run-pass/concat.rs
index e89763745beb..0c30a39d6a25 100644
--- a/src/test/run-pass/concat.rs
+++ b/src/test/run-pass/concat.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 pub fn main() {
     assert_eq!(format!(concat!("foo", "bar", "{}"), "baz"), "foobarbaz".to_string());
     assert_eq!(format!(concat!()), "".to_string());
diff --git a/src/test/run-pass/consts/const-int-conversion.rs b/src/test/run-pass/consts/const-int-conversion.rs
index 1d3123d216eb..d52dbbae1e7b 100644
--- a/src/test/run-pass/consts/const-int-conversion.rs
+++ b/src/test/run-pass/consts/const-int-conversion.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 #![feature(const_int_conversion)]
 
 const REVERSE: u32 = 0x12345678_u32.reverse_bits();
diff --git a/src/test/run-pass/consts/const-int-overflowing.rs b/src/test/run-pass/consts/const-int-overflowing.rs
index 9597393df72d..b619c7908aa2 100644
--- a/src/test/run-pass/consts/const-int-overflowing.rs
+++ b/src/test/run-pass/consts/const-int-overflowing.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 const ADD_A: (u32, bool) = 5u32.overflowing_add(2);
 const ADD_B: (u32, bool) = u32::max_value().overflowing_add(1);
 
diff --git a/src/test/run-pass/consts/const-int-rotate.rs b/src/test/run-pass/consts/const-int-rotate.rs
index 16946eadd632..14f34f76cea5 100644
--- a/src/test/run-pass/consts/const-int-rotate.rs
+++ b/src/test/run-pass/consts/const-int-rotate.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 const LEFT: u32 = 0x10000b3u32.rotate_left(8);
 const RIGHT: u32 = 0xb301u32.rotate_right(8);
 
diff --git a/src/test/run-pass/consts/const-int-saturating-arith.rs b/src/test/run-pass/consts/const-int-saturating-arith.rs
index dae4c7216b2c..394d6c17f5ad 100644
--- a/src/test/run-pass/consts/const-int-saturating-arith.rs
+++ b/src/test/run-pass/consts/const-int-saturating-arith.rs
@@ -1,3 +1,4 @@
+// run-pass
 // ignore-emscripten no i128 support
 #![feature(const_saturating_int_methods)]
 
diff --git a/src/test/run-pass/consts/const-int-sign.rs b/src/test/run-pass/consts/const-int-sign.rs
index fcd3ef4ea025..05726cb22864 100644
--- a/src/test/run-pass/consts/const-int-sign.rs
+++ b/src/test/run-pass/consts/const-int-sign.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 #![feature(const_int_sign)]
 
 const NEGATIVE_A: bool = (-10i32).is_negative();
diff --git a/src/test/run-pass/consts/const-int-wrapping.rs b/src/test/run-pass/consts/const-int-wrapping.rs
index db86c25194f0..73147d7912d1 100644
--- a/src/test/run-pass/consts/const-int-wrapping.rs
+++ b/src/test/run-pass/consts/const-int-wrapping.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 const ADD_A: u32 = 200u32.wrapping_add(55);
 const ADD_B: u32 = 200u32.wrapping_add(u32::max_value());
 
diff --git a/src/test/run-pass/consts/const-needs_drop.rs b/src/test/run-pass/consts/const-needs_drop.rs
index 871300defaf8..58e801164428 100644
--- a/src/test/run-pass/consts/const-needs_drop.rs
+++ b/src/test/run-pass/consts/const-needs_drop.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 use std::mem;
 
 struct Trivial(u8, f32);
diff --git a/src/test/run-pass/core-run-destroy.rs b/src/test/run-pass/core-run-destroy.rs
index 625e51793814..225b2ca8f4d2 100644
--- a/src/test/run-pass/core-run-destroy.rs
+++ b/src/test/run-pass/core-run-destroy.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 #![allow(unused_must_use)]
 #![allow(stable_features)]
 #![allow(deprecated)]
diff --git a/src/test/run-pass/crate-leading-sep.rs b/src/test/run-pass/crate-leading-sep.rs
index 26d4df433aae..ca5905fab41f 100644
--- a/src/test/run-pass/crate-leading-sep.rs
+++ b/src/test/run-pass/crate-leading-sep.rs
@@ -1,3 +1,4 @@
+// run-pass
 // pretty-expanded FIXME #23616
 
 fn main() {
diff --git a/src/test/run-pass/crate-method-reexport-grrrrrrr.rs b/src/test/run-pass/crate-method-reexport-grrrrrrr.rs
index 0d243e14b94c..eefcf7738ada 100644
--- a/src/test/run-pass/crate-method-reexport-grrrrrrr.rs
+++ b/src/test/run-pass/crate-method-reexport-grrrrrrr.rs
@@ -1,3 +1,4 @@
+// run-pass
 // pretty-expanded FIXME #23616
 
 #![feature(box_syntax)]
diff --git a/src/test/run-pass/crate-name-attr-used.rs b/src/test/run-pass/crate-name-attr-used.rs
index 666f80e56626..ad53a53143ee 100644
--- a/src/test/run-pass/crate-name-attr-used.rs
+++ b/src/test/run-pass/crate-name-attr-used.rs
@@ -1,3 +1,4 @@
+// run-pass
 // compile-flags:--crate-name crate_name_attr_used -F unused-attributes
 
 // pretty-expanded FIXME #23616
diff --git a/src/test/run-pass/crt-static-off-works.rs b/src/test/run-pass/crt-static-off-works.rs
index 64d96709afc0..911467ee54ea 100644
--- a/src/test/run-pass/crt-static-off-works.rs
+++ b/src/test/run-pass/crt-static-off-works.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 #![allow(stable_features)]
 // compile-flags:-C target-feature=-crt-static -Z unstable-options
 // ignore-musl - requires changing the linker which is hard
diff --git a/src/test/run-pass/crt-static-on-works.rs b/src/test/run-pass/crt-static-on-works.rs
index 272fcfe3b5b5..21407b1b9118 100644
--- a/src/test/run-pass/crt-static-on-works.rs
+++ b/src/test/run-pass/crt-static-on-works.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 #![allow(stable_features)]
 // compile-flags:-C target-feature=+crt-static -Z unstable-options
 
diff --git a/src/test/run-pass/cycle-generic-bound.rs b/src/test/run-pass/cycle-generic-bound.rs
index 56bfa98451f7..9241f3789d72 100644
--- a/src/test/run-pass/cycle-generic-bound.rs
+++ b/src/test/run-pass/cycle-generic-bound.rs
@@ -1,3 +1,4 @@
+// run-pass
 // Regression test for #15477. This test just needs to compile.
 
 // pretty-expanded FIXME #23616
diff --git a/src/test/run-pass/dead-code-alias-in-pat.rs b/src/test/run-pass/dead-code-alias-in-pat.rs
index 5b6ca26f1ce5..69d455f3b60e 100644
--- a/src/test/run-pass/dead-code-alias-in-pat.rs
+++ b/src/test/run-pass/dead-code-alias-in-pat.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 #![deny(dead_code)]
 
 fn main() {
diff --git a/src/test/run-pass/dead-code-leading-underscore.rs b/src/test/run-pass/dead-code-leading-underscore.rs
index eff40111ac9d..1b6e03ab8874 100644
--- a/src/test/run-pass/dead-code-leading-underscore.rs
+++ b/src/test/run-pass/dead-code-leading-underscore.rs
@@ -1,3 +1,4 @@
+// run-pass
 // pretty-expanded FIXME #23616
 
 #![deny(dead_code)]
diff --git a/src/test/run-pass/debuginfo-lto.rs b/src/test/run-pass/debuginfo-lto.rs
index 680616fee7c3..e4beee9e737b 100644
--- a/src/test/run-pass/debuginfo-lto.rs
+++ b/src/test/run-pass/debuginfo-lto.rs
@@ -1,3 +1,4 @@
+// run-pass
 // This test case makes sure that we don't run into LLVM's dreaded
 // "possible ODR violation" assertion when compiling with LTO + Debuginfo.
 // It covers cases that have traditionally been prone to cause this error.
diff --git a/src/test/run-pass/deep.rs b/src/test/run-pass/deep.rs
index 5c3ecd8c22c4..2bb109c0e3f0 100644
--- a/src/test/run-pass/deep.rs
+++ b/src/test/run-pass/deep.rs
@@ -1,3 +1,4 @@
+// run-pass
 // ignore-emscripten apparently blows the stack
 
 fn f(x: isize) -> isize {
diff --git a/src/test/run-pass/default-alloc-error-hook.rs b/src/test/run-pass/default-alloc-error-hook.rs
index 7d1624320e67..40f61c2b7d5b 100644
--- a/src/test/run-pass/default-alloc-error-hook.rs
+++ b/src/test/run-pass/default-alloc-error-hook.rs
@@ -1,3 +1,4 @@
+// run-pass
 // ignore-cloudabi no processes
 // ignore-emscripten no processes
 // ignore-sgx no processes
diff --git a/src/test/run-pass/default-associated-types.rs b/src/test/run-pass/default-associated-types.rs
index d7ed943b84e0..aae70bffa383 100644
--- a/src/test/run-pass/default-associated-types.rs
+++ b/src/test/run-pass/default-associated-types.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 #![feature(associated_type_defaults)]
 
 trait Foo<T: Default + ToString> {
diff --git a/src/test/run-pass/default-method-parsing.rs b/src/test/run-pass/default-method-parsing.rs
index 7f66605d7c36..9ffb8d94a59b 100644
--- a/src/test/run-pass/default-method-parsing.rs
+++ b/src/test/run-pass/default-method-parsing.rs
@@ -1,3 +1,4 @@
+// run-pass
 // pretty-expanded FIXME #23616
 
 trait Foo {
diff --git a/src/test/run-pass/default-method-simple.rs b/src/test/run-pass/default-method-simple.rs
index d046fce9b62b..6f7ae6a3e0b5 100644
--- a/src/test/run-pass/default-method-simple.rs
+++ b/src/test/run-pass/default-method-simple.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 #![allow(dead_code)]
 
 trait Foo {
diff --git a/src/test/run-pass/defaults-well-formedness.rs b/src/test/run-pass/defaults-well-formedness.rs
index cbcdb38fbeba..3275890616b7 100644
--- a/src/test/run-pass/defaults-well-formedness.rs
+++ b/src/test/run-pass/defaults-well-formedness.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 #![allow(dead_code)]
 trait Trait<T> {}
 struct Foo<U, V=i32>(U, V) where U: Trait<V>;
diff --git a/src/test/run-pass/deprecation-in-force-unstable.rs b/src/test/run-pass/deprecation-in-force-unstable.rs
index b3509734ffcb..4df9b802d45a 100644
--- a/src/test/run-pass/deprecation-in-force-unstable.rs
+++ b/src/test/run-pass/deprecation-in-force-unstable.rs
@@ -1,3 +1,4 @@
+// run-pass
 // compile-flags:-Zforce-unstable-if-unmarked
 
 #[deprecated] // should work even with -Zforce-unstable-if-unmarked
diff --git a/src/test/run-pass/deref-lval.rs b/src/test/run-pass/deref-lval.rs
index d02adcb0cdc7..f57872f80e02 100644
--- a/src/test/run-pass/deref-lval.rs
+++ b/src/test/run-pass/deref-lval.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 #![feature(box_syntax)]
 
 use std::cell::Cell;
diff --git a/src/test/run-pass/deref-mut-on-ref.rs b/src/test/run-pass/deref-mut-on-ref.rs
index 119d943026ad..a6df5495a277 100644
--- a/src/test/run-pass/deref-mut-on-ref.rs
+++ b/src/test/run-pass/deref-mut-on-ref.rs
@@ -1,3 +1,4 @@
+// run-pass
 // Test that `&mut T` implements `DerefMut<T>`
 
 
diff --git a/src/test/run-pass/deref-on-ref.rs b/src/test/run-pass/deref-on-ref.rs
index 651ccd5be855..973e61c9d59f 100644
--- a/src/test/run-pass/deref-on-ref.rs
+++ b/src/test/run-pass/deref-on-ref.rs
@@ -1,3 +1,4 @@
+// run-pass
 // Test that `&T` and `&mut T` implement `Deref<T>`
 
 
diff --git a/src/test/run-pass/deref-rc.rs b/src/test/run-pass/deref-rc.rs
index ae17608fc56e..9b4c63b19256 100644
--- a/src/test/run-pass/deref-rc.rs
+++ b/src/test/run-pass/deref-rc.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 use std::rc::Rc;
 
 fn main() {
diff --git a/src/test/run-pass/deref.rs b/src/test/run-pass/deref.rs
index 08b047f54d94..cad4ede06a56 100644
--- a/src/test/run-pass/deref.rs
+++ b/src/test/run-pass/deref.rs
@@ -1,3 +1,4 @@
+// run-pass
 // pretty-expanded FIXME #23616
 
 #![feature(box_syntax)]
diff --git a/src/test/run-pass/dispatch_from_dyn_zst.rs b/src/test/run-pass/dispatch_from_dyn_zst.rs
index a2181336e00f..764f58ce9e80 100644
--- a/src/test/run-pass/dispatch_from_dyn_zst.rs
+++ b/src/test/run-pass/dispatch_from_dyn_zst.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 #![feature(unsize, dispatch_from_dyn, never_type)]
 
 #![allow(dead_code)]
diff --git a/src/test/run-pass/diverging-fallback-control-flow.rs b/src/test/run-pass/diverging-fallback-control-flow.rs
index c88ab42d5a89..0f0f787b407d 100644
--- a/src/test/run-pass/diverging-fallback-control-flow.rs
+++ b/src/test/run-pass/diverging-fallback-control-flow.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 #![allow(dead_code)]
 #![allow(unused_assignments)]
 #![allow(unused_variables)]
diff --git a/src/test/run-pass/diverging-fallback-method-chain.rs b/src/test/run-pass/diverging-fallback-method-chain.rs
index df1a64e3ae63..ba9f05c64e44 100644
--- a/src/test/run-pass/diverging-fallback-method-chain.rs
+++ b/src/test/run-pass/diverging-fallback-method-chain.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 #![allow(unused_imports)]
 // Test a regression found when building compiler. The `produce()`
 // error type `T` winds up getting unified with result of `x.parse()`;
diff --git a/src/test/run-pass/diverging-fallback-option.rs b/src/test/run-pass/diverging-fallback-option.rs
index af5171781503..46bdfc96dbe2 100644
--- a/src/test/run-pass/diverging-fallback-option.rs
+++ b/src/test/run-pass/diverging-fallback-option.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 #![allow(warnings)]
 
 // Here the type of `c` is `Option<?T>`, where `?T` is unconstrained.
diff --git a/src/test/run-pass/double-ref.rs b/src/test/run-pass/double-ref.rs
index 16c98da94565..e68b86833764 100644
--- a/src/test/run-pass/double-ref.rs
+++ b/src/test/run-pass/double-ref.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 #![allow(dead_code)]
 // pretty-expanded FIXME #23616
 
diff --git a/src/test/run-pass/duplicated-external-mods.rs b/src/test/run-pass/duplicated-external-mods.rs
index f2c1e1f65401..05a279a3014b 100644
--- a/src/test/run-pass/duplicated-external-mods.rs
+++ b/src/test/run-pass/duplicated-external-mods.rs
@@ -1,3 +1,4 @@
+// run-pass
 // aux-build:anon-extern-mod-cross-crate-1.rs
 // aux-build:anon-extern-mod-cross-crate-1.rs
 // pretty-expanded FIXME #23616
diff --git a/src/test/run-pass/early-ret-binop-add.rs b/src/test/run-pass/early-ret-binop-add.rs
index 158468c572c6..2b5df52a51c3 100644
--- a/src/test/run-pass/early-ret-binop-add.rs
+++ b/src/test/run-pass/early-ret-binop-add.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 #![allow(dead_code)]
 #![allow(unreachable_code)]
 // pretty-expanded FIXME #23616
diff --git a/src/test/run-pass/early-vtbl-resolution.rs b/src/test/run-pass/early-vtbl-resolution.rs
index 812771c29b3a..f4b69c140956 100644
--- a/src/test/run-pass/early-vtbl-resolution.rs
+++ b/src/test/run-pass/early-vtbl-resolution.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 #![allow(non_camel_case_types)]
 #![allow(dead_code)]
 // pretty-expanded FIXME #23616
diff --git a/src/test/run-pass/edition-keywords-2015-2015.rs b/src/test/run-pass/edition-keywords-2015-2015.rs
index 7d25b71422d2..943d203b806f 100644
--- a/src/test/run-pass/edition-keywords-2015-2015.rs
+++ b/src/test/run-pass/edition-keywords-2015-2015.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 #![allow(unused_mut)]
 #![allow(unused_assignments)]
 #![allow(unused_variables)]
diff --git a/src/test/run-pass/edition-keywords-2015-2018.rs b/src/test/run-pass/edition-keywords-2015-2018.rs
index 92d474629c11..8c3397c951db 100644
--- a/src/test/run-pass/edition-keywords-2015-2018.rs
+++ b/src/test/run-pass/edition-keywords-2015-2018.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 #![allow(unused_mut)]
 #![allow(unused_assignments)]
 #![allow(unused_variables)]
diff --git a/src/test/run-pass/edition-keywords-2018-2015.rs b/src/test/run-pass/edition-keywords-2018-2015.rs
index e4ed5ffff981..2cb2dfb18a02 100644
--- a/src/test/run-pass/edition-keywords-2018-2015.rs
+++ b/src/test/run-pass/edition-keywords-2018-2015.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 #![allow(unused_assignments)]
 // edition:2018
 // aux-build:edition-kw-macro-2015.rs
diff --git a/src/test/run-pass/edition-keywords-2018-2018.rs b/src/test/run-pass/edition-keywords-2018-2018.rs
index e3624ac96ed6..5043440aa167 100644
--- a/src/test/run-pass/edition-keywords-2018-2018.rs
+++ b/src/test/run-pass/edition-keywords-2018-2018.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 #![allow(unused_assignments)]
 // edition:2018
 // aux-build:edition-kw-macro-2018.rs
diff --git a/src/test/run-pass/else-if.rs b/src/test/run-pass/else-if.rs
index 83a6658895ae..77d8d1abfaf3 100644
--- a/src/test/run-pass/else-if.rs
+++ b/src/test/run-pass/else-if.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 pub fn main() {
     if 1 == 2 {
         assert!((false));
diff --git a/src/test/run-pass/empty-allocation-non-null.rs b/src/test/run-pass/empty-allocation-non-null.rs
index 31117936c76a..925bddd5edd9 100644
--- a/src/test/run-pass/empty-allocation-non-null.rs
+++ b/src/test/run-pass/empty-allocation-non-null.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 pub fn main() {
     assert!(Some(Box::new(())).is_some());
 
diff --git a/src/test/run-pass/empty-allocation-rvalue-non-null.rs b/src/test/run-pass/empty-allocation-rvalue-non-null.rs
index ac597bcb2087..2f5a5c4bbc6d 100644
--- a/src/test/run-pass/empty-allocation-rvalue-non-null.rs
+++ b/src/test/run-pass/empty-allocation-rvalue-non-null.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 #![allow(unused_variables)]
 // pretty-expanded FIXME #23616
 
diff --git a/src/test/run-pass/empty-type-parameter-list.rs b/src/test/run-pass/empty-type-parameter-list.rs
index 43275090f2de..e168cd03b274 100644
--- a/src/test/run-pass/empty-type-parameter-list.rs
+++ b/src/test/run-pass/empty-type-parameter-list.rs
@@ -1,3 +1,4 @@
+// run-pass
 // Test that empty type parameter list (<>) is synonymous with
 // no type parameters at all
 
diff --git a/src/test/run-pass/empty_global_asm.rs b/src/test/run-pass/empty_global_asm.rs
index 5789985a0383..efbe2b2eb670 100644
--- a/src/test/run-pass/empty_global_asm.rs
+++ b/src/test/run-pass/empty_global_asm.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 #![feature(global_asm)]
 
 #[cfg(target_arch = "x86")]
diff --git a/src/test/run-pass/env-args-reverse-iterator.rs b/src/test/run-pass/env-args-reverse-iterator.rs
index d677aa850010..0ffd74f87ab6 100644
--- a/src/test/run-pass/env-args-reverse-iterator.rs
+++ b/src/test/run-pass/env-args-reverse-iterator.rs
@@ -1,3 +1,4 @@
+// run-pass
 // ignore-cloudabi no processes
 // ignore-emscripten no processes
 // ignore-sgx no processes
diff --git a/src/test/run-pass/env-funky-keys.rs b/src/test/run-pass/env-funky-keys.rs
index 3b236e2b3afb..4faceb53266c 100644
--- a/src/test/run-pass/env-funky-keys.rs
+++ b/src/test/run-pass/env-funky-keys.rs
@@ -1,3 +1,4 @@
+// run-pass
 // Ignore this test on Android, because it segfaults there.
 
 // ignore-android
diff --git a/src/test/run-pass/env-home-dir.rs b/src/test/run-pass/env-home-dir.rs
index 62f45d0a2eb2..a75be48fd553 100644
--- a/src/test/run-pass/env-home-dir.rs
+++ b/src/test/run-pass/env-home-dir.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 #![allow(unused_variables)]
 #![allow(deprecated)]
 // ignore-cloudabi no environment variables present
diff --git a/src/test/run-pass/env-null-vars.rs b/src/test/run-pass/env-null-vars.rs
index bdd1d4778cf0..10582a8a5146 100644
--- a/src/test/run-pass/env-null-vars.rs
+++ b/src/test/run-pass/env-null-vars.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 #![allow(unused_imports)]
 
 // ignore-windows
diff --git a/src/test/run-pass/env-vars.rs b/src/test/run-pass/env-vars.rs
index 6159638745a4..2ea906788e80 100644
--- a/src/test/run-pass/env-vars.rs
+++ b/src/test/run-pass/env-vars.rs
@@ -1,3 +1,4 @@
+// run-pass
 // ignore-cloudabi no env vars
 // ignore-wasm32-bare no env vars
 
diff --git a/src/test/run-pass/epoch-gate-feature.rs b/src/test/run-pass/epoch-gate-feature.rs
index 6f0b31518c22..5f7feb5347be 100644
--- a/src/test/run-pass/epoch-gate-feature.rs
+++ b/src/test/run-pass/epoch-gate-feature.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 #![allow(dead_code)]
 #![allow(unused_variables)]
 // Checks if the correct registers are being used to pass arguments
diff --git a/src/test/run-pass/eq-multidispatch.rs b/src/test/run-pass/eq-multidispatch.rs
index 1212f5d17dbb..69d83f496b39 100644
--- a/src/test/run-pass/eq-multidispatch.rs
+++ b/src/test/run-pass/eq-multidispatch.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 #[derive(PartialEq, Debug)]
 struct Bar;
 #[derive(Debug)]
diff --git a/src/test/run-pass/estr-uniq.rs b/src/test/run-pass/estr-uniq.rs
index 6b2607a997b4..1d0a42739531 100644
--- a/src/test/run-pass/estr-uniq.rs
+++ b/src/test/run-pass/estr-uniq.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 #![allow(unused_assignments)]
 #![allow(unknown_lints)]
 
diff --git a/src/test/run-pass/exec-env.rs b/src/test/run-pass/exec-env.rs
index c1b8e0825143..230fac10d335 100644
--- a/src/test/run-pass/exec-env.rs
+++ b/src/test/run-pass/exec-env.rs
@@ -1,3 +1,4 @@
+// run-pass
 // exec-env:TEST_EXEC_ENV=22
 // ignore-cloudabi no env vars
 // ignore-emscripten FIXME: issue #31622
diff --git a/src/test/run-pass/existential_type.rs b/src/test/run-pass/existential_type.rs
index b36435cf113f..c2cf0eeed3d9 100644
--- a/src/test/run-pass/existential_type.rs
+++ b/src/test/run-pass/existential_type.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 #![allow(dead_code)]
 #![allow(unused_assignments)]
 #![allow(unused_variables)]
diff --git a/src/test/run-pass/explicit-i-suffix.rs b/src/test/run-pass/explicit-i-suffix.rs
index 119cce3087e8..40c7e4751048 100644
--- a/src/test/run-pass/explicit-i-suffix.rs
+++ b/src/test/run-pass/explicit-i-suffix.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 #![allow(unused_must_use)]
 // pretty-expanded FIXME #23616
 
diff --git a/src/test/run-pass/export-glob-imports-target.rs b/src/test/run-pass/export-glob-imports-target.rs
index 0ac80e657982..4df807ea4c93 100644
--- a/src/test/run-pass/export-glob-imports-target.rs
+++ b/src/test/run-pass/export-glob-imports-target.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 #![allow(non_upper_case_globals)]
 #![allow(dead_code)]
 // Test that a glob-export functions as an import
diff --git a/src/test/run-pass/export-multi.rs b/src/test/run-pass/export-multi.rs
index bfa2765d2545..02bdbe8afff0 100644
--- a/src/test/run-pass/export-multi.rs
+++ b/src/test/run-pass/export-multi.rs
@@ -1,3 +1,4 @@
+// run-pass
 // pretty-expanded FIXME #23616
 
 use m::f;
diff --git a/src/test/run-pass/export-non-interference2.rs b/src/test/run-pass/export-non-interference2.rs
index 30d5a0d9c05d..6d18b03891a3 100644
--- a/src/test/run-pass/export-non-interference2.rs
+++ b/src/test/run-pass/export-non-interference2.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 mod foo {
     pub mod bar {
         pub fn y() { super::super::foo::x(); }
diff --git a/src/test/run-pass/export-non-interference3.rs b/src/test/run-pass/export-non-interference3.rs
index a11ea3a04551..0d6b6369f947 100644
--- a/src/test/run-pass/export-non-interference3.rs
+++ b/src/test/run-pass/export-non-interference3.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 pub mod foo {
     pub fn x() { ::bar::x(); }
 }
diff --git a/src/test/run-pass/expr-block-fn.rs b/src/test/run-pass/expr-block-fn.rs
index 229e2b02bf02..1cac2cac0ac5 100644
--- a/src/test/run-pass/expr-block-fn.rs
+++ b/src/test/run-pass/expr-block-fn.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 fn test_fn() {
     fn ten() -> isize { return 10; }
     let rs = ten;
diff --git a/src/test/run-pass/expr-block-generic-unique1.rs b/src/test/run-pass/expr-block-generic-unique1.rs
index b89f2f9660c2..c14191f2ffcb 100644
--- a/src/test/run-pass/expr-block-generic-unique1.rs
+++ b/src/test/run-pass/expr-block-generic-unique1.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 #![feature(box_syntax)]
 
 fn test_generic<T, F>(expected: Box<T>, eq: F) where T: Clone, F: FnOnce(Box<T>, Box<T>) -> bool {
diff --git a/src/test/run-pass/expr-block-generic-unique2.rs b/src/test/run-pass/expr-block-generic-unique2.rs
index 4c712abcc3fe..90ebc02931ad 100644
--- a/src/test/run-pass/expr-block-generic-unique2.rs
+++ b/src/test/run-pass/expr-block-generic-unique2.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 #![feature(box_syntax)]
 
 fn test_generic<T, F>(expected: T, eq: F) where T: Clone, F: FnOnce(T, T) -> bool {
diff --git a/src/test/run-pass/expr-block-generic.rs b/src/test/run-pass/expr-block-generic.rs
index 5665790a84db..ec93f59722d0 100644
--- a/src/test/run-pass/expr-block-generic.rs
+++ b/src/test/run-pass/expr-block-generic.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 fn test_generic<T: Clone, F>(expected: T, eq: F) where F: FnOnce(T, T) -> bool {
     let actual: T = { expected.clone() };
     assert!(eq(expected, actual));
diff --git a/src/test/run-pass/expr-block-slot.rs b/src/test/run-pass/expr-block-slot.rs
index 65d58e00bc97..54bcbb328b03 100644
--- a/src/test/run-pass/expr-block-slot.rs
+++ b/src/test/run-pass/expr-block-slot.rs
@@ -1,3 +1,4 @@
+// run-pass
 // Regression test for issue #377
 
 
diff --git a/src/test/run-pass/expr-block-unique.rs b/src/test/run-pass/expr-block-unique.rs
index a5b7bacec23b..fe1a7d9f1fb3 100644
--- a/src/test/run-pass/expr-block-unique.rs
+++ b/src/test/run-pass/expr-block-unique.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 #![feature(box_syntax)]
 
 pub fn main() { let x: Box<_> = { box 100 }; assert_eq!(*x, 100); }
diff --git a/src/test/run-pass/expr-block.rs b/src/test/run-pass/expr-block.rs
index 222e5cfbcf6d..549ccf9774f4 100644
--- a/src/test/run-pass/expr-block.rs
+++ b/src/test/run-pass/expr-block.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 #![allow(dead_code)]
 
 
diff --git a/src/test/run-pass/expr-copy.rs b/src/test/run-pass/expr-copy.rs
index fdea32f476ac..1c6ae03810f0 100644
--- a/src/test/run-pass/expr-copy.rs
+++ b/src/test/run-pass/expr-copy.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 fn f(arg: &mut A) {
     arg.a = 100;
 }
diff --git a/src/test/run-pass/expr-empty-ret.rs b/src/test/run-pass/expr-empty-ret.rs
index 6bdf4350a990..ce8ffaf94d06 100644
--- a/src/test/run-pass/expr-empty-ret.rs
+++ b/src/test/run-pass/expr-empty-ret.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 #![allow(dead_code)]
 // Issue #521
 
diff --git a/src/test/run-pass/expr-fn.rs b/src/test/run-pass/expr-fn.rs
index 9e0679b959b9..af809f563fc0 100644
--- a/src/test/run-pass/expr-fn.rs
+++ b/src/test/run-pass/expr-fn.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 fn test_int() {
     fn f() -> isize { 10 }
     assert_eq!(f(), 10);
diff --git a/src/test/run-pass/expr-if-generic.rs b/src/test/run-pass/expr-if-generic.rs
index 3e3600c45280..32ed6d9bee0c 100644
--- a/src/test/run-pass/expr-if-generic.rs
+++ b/src/test/run-pass/expr-if-generic.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 fn test_generic<T, F>(expected: T, not_expected: T, eq: F) where
     T: Clone,
     F: FnOnce(T, T) -> bool,
diff --git a/src/test/run-pass/expr-if-panic-all.rs b/src/test/run-pass/expr-if-panic-all.rs
index ea7f36f8a3cc..f915a7d9da06 100644
--- a/src/test/run-pass/expr-if-panic-all.rs
+++ b/src/test/run-pass/expr-if-panic-all.rs
@@ -1,3 +1,4 @@
+// run-pass
 // When all branches of an if expression result in panic, the entire if
 // expression results in panic.
 
diff --git a/src/test/run-pass/expr-if-panic.rs b/src/test/run-pass/expr-if-panic.rs
index ae92e3b125ba..6069cd835e14 100644
--- a/src/test/run-pass/expr-if-panic.rs
+++ b/src/test/run-pass/expr-if-panic.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 fn test_if_panic() {
     let x = if false { panic!() } else { 10 };
     assert_eq!(x, 10);
diff --git a/src/test/run-pass/expr-if-unique.rs b/src/test/run-pass/expr-if-unique.rs
index ef76fb27e9d3..509d069d40fe 100644
--- a/src/test/run-pass/expr-if-unique.rs
+++ b/src/test/run-pass/expr-if-unique.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 #![feature(box_syntax)]
 
 // Tests for if as expressions returning boxed types
diff --git a/src/test/run-pass/expr-if.rs b/src/test/run-pass/expr-if.rs
index 4b8d363b0203..2b8474ff4539 100644
--- a/src/test/run-pass/expr-if.rs
+++ b/src/test/run-pass/expr-if.rs
@@ -1,3 +1,4 @@
+// run-pass
 // Tests for if as expressions
 
 fn test_if() { let rs: bool = if true { true } else { false }; assert!((rs)); }
diff --git a/src/test/run-pass/expr-scope.rs b/src/test/run-pass/expr-scope.rs
index 15bb4a2eb0b4..9976b6814c00 100644
--- a/src/test/run-pass/expr-scope.rs
+++ b/src/test/run-pass/expr-scope.rs
@@ -1,3 +1,4 @@
+// run-pass
 // Regression test for issue #762
 
 // pretty-expanded FIXME #23616
diff --git a/src/test/run-pass/ext-expand-inner-exprs.rs b/src/test/run-pass/ext-expand-inner-exprs.rs
index a32b3d7f002b..5bbdf5ec9560 100644
--- a/src/test/run-pass/ext-expand-inner-exprs.rs
+++ b/src/test/run-pass/ext-expand-inner-exprs.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 static FOO : &'static str = concat!(concat!("hel", "lo"), "world");
 
 pub fn main() {
diff --git a/src/test/run-pass/extend-for-unit.rs b/src/test/run-pass/extend-for-unit.rs
index 1c1e61239b79..01d743f70bc0 100644
--- a/src/test/run-pass/extend-for-unit.rs
+++ b/src/test/run-pass/extend-for-unit.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 pub fn main() {
     let mut x = 0;
     {
diff --git a/src/test/run-pass/exterior.rs b/src/test/run-pass/exterior.rs
index 01ed7dbac1f3..6f2c37926bea 100644
--- a/src/test/run-pass/exterior.rs
+++ b/src/test/run-pass/exterior.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 #![allow(dead_code)]
 
 
diff --git a/src/test/run-pass/extoption_env-not-defined.rs b/src/test/run-pass/extoption_env-not-defined.rs
index 7a2a2afad5c2..4014902ffed5 100644
--- a/src/test/run-pass/extoption_env-not-defined.rs
+++ b/src/test/run-pass/extoption_env-not-defined.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 pub fn main() {
     assert!(option_env!("__HOPEFULLY_DOESNT_EXIST__").is_none());
 }
diff --git a/src/test/run-pass/fact.rs b/src/test/run-pass/fact.rs
index 0dd68c991ad3..c6c2f57e75c5 100644
--- a/src/test/run-pass/fact.rs
+++ b/src/test/run-pass/fact.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 fn f(x: isize) -> isize {
     // println!("in f:");
 
diff --git a/src/test/run-pass/fat-lto.rs b/src/test/run-pass/fat-lto.rs
index fb741200d3cb..c8d8095a265d 100644
--- a/src/test/run-pass/fat-lto.rs
+++ b/src/test/run-pass/fat-lto.rs
@@ -1,3 +1,4 @@
+// run-pass
 // compile-flags: -Clto=fat
 // no-prefer-dynamic
 
diff --git a/src/test/run-pass/fat-ptr-cast.rs b/src/test/run-pass/fat-ptr-cast.rs
index 1943abe9e14d..5f5e621d762d 100644
--- a/src/test/run-pass/fat-ptr-cast.rs
+++ b/src/test/run-pass/fat-ptr-cast.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 #![feature(raw)]
 
 use std::mem;
diff --git a/src/test/run-pass/fds-are-cloexec.rs b/src/test/run-pass/fds-are-cloexec.rs
index c4091f84af98..2010b5b66807 100644
--- a/src/test/run-pass/fds-are-cloexec.rs
+++ b/src/test/run-pass/fds-are-cloexec.rs
@@ -1,3 +1,4 @@
+// run-pass
 // ignore-windows
 // ignore-android
 // ignore-cloudabi no processes
diff --git a/src/test/run-pass/filter-block-view-items.rs b/src/test/run-pass/filter-block-view-items.rs
index d2b9866504a9..e63aa91577bc 100644
--- a/src/test/run-pass/filter-block-view-items.rs
+++ b/src/test/run-pass/filter-block-view-items.rs
@@ -1,3 +1,4 @@
+// run-pass
 // pretty-expanded FIXME #23616
 
 pub fn main() {
diff --git a/src/test/run-pass/fixup-deref-mut.rs b/src/test/run-pass/fixup-deref-mut.rs
index a35412fea3fe..6b2fd72b8955 100644
--- a/src/test/run-pass/fixup-deref-mut.rs
+++ b/src/test/run-pass/fixup-deref-mut.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 #![allow(dead_code)]
 // pretty-expanded FIXME #23616
 
diff --git a/src/test/run-pass/format-hygiene.rs b/src/test/run-pass/format-hygiene.rs
index 4a797d19bad2..6bf5ae8beadd 100644
--- a/src/test/run-pass/format-hygiene.rs
+++ b/src/test/run-pass/format-hygiene.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 #![allow(non_upper_case_globals)]
 pub const arg0: u8 = 1;
 
diff --git a/src/test/run-pass/format-nan.rs b/src/test/run-pass/format-nan.rs
index dbe2c61c494f..e4a134fa2fbe 100644
--- a/src/test/run-pass/format-nan.rs
+++ b/src/test/run-pass/format-nan.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 pub fn main() {
     use std::f64;
     let x = "NaN".to_string();
diff --git a/src/test/run-pass/format-no-std.rs b/src/test/run-pass/format-no-std.rs
index 32f7a4a07c49..c9b7651bfda0 100644
--- a/src/test/run-pass/format-no-std.rs
+++ b/src/test/run-pass/format-no-std.rs
@@ -1,3 +1,4 @@
+// run-pass
 // ignore-emscripten no no_std executables
 
 #![feature(lang_items, start)]
diff --git a/src/test/run-pass/format-ref-cell.rs b/src/test/run-pass/format-ref-cell.rs
index 0e7925af78f2..afb2f8488b82 100644
--- a/src/test/run-pass/format-ref-cell.rs
+++ b/src/test/run-pass/format-ref-cell.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 use std::cell::RefCell;
 
 pub fn main() {
diff --git a/src/test/run-pass/fsu-moves-and-copies.rs b/src/test/run-pass/fsu-moves-and-copies.rs
index f9544ec39a0c..c41bcc73fa50 100644
--- a/src/test/run-pass/fsu-moves-and-copies.rs
+++ b/src/test/run-pass/fsu-moves-and-copies.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 #![allow(non_camel_case_types)]
 #![allow(stable_features)]
 // Issue 4691: Ensure that functional-struct-updates operates
diff --git a/src/test/run-pass/fun-call-variants.rs b/src/test/run-pass/fun-call-variants.rs
index e08878accc32..5b83e2620d84 100644
--- a/src/test/run-pass/fun-call-variants.rs
+++ b/src/test/run-pass/fun-call-variants.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 fn ho<F>(f: F) -> isize where F: FnOnce(isize) -> isize { let n: isize = f(3); return n; }
 
 fn direct(x: isize) -> isize { return x + 1; }
diff --git a/src/test/run-pass/fun-indirect-call.rs b/src/test/run-pass/fun-indirect-call.rs
index 81af4402c11e..49da3d83f4a2 100644
--- a/src/test/run-pass/fun-indirect-call.rs
+++ b/src/test/run-pass/fun-indirect-call.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 fn f() -> isize { return 42; }
 
 pub fn main() {
diff --git a/src/test/run-pass/generator/addassign-yield.rs b/src/test/run-pass/generator/addassign-yield.rs
index 6a417936384b..66f22bf31fc4 100644
--- a/src/test/run-pass/generator/addassign-yield.rs
+++ b/src/test/run-pass/generator/addassign-yield.rs
@@ -1,3 +1,4 @@
+// run-pass
 // Regression test for broken MIR error (#61442)
 // Due to the two possible evaluation orders for
 // a '+=' expression (depending on whether or not the 'AddAssign' trait
diff --git a/src/test/run-pass/generator/drop-and-replace.rs b/src/test/run-pass/generator/drop-and-replace.rs
index 042e1276db5c..bb33502815bf 100644
--- a/src/test/run-pass/generator/drop-and-replace.rs
+++ b/src/test/run-pass/generator/drop-and-replace.rs
@@ -1,3 +1,4 @@
+// run-pass
 // Regression test for incorrect DropAndReplace behavior introduced in #60840
 // and fixed in #61373. When combined with the optimization implemented in
 // #60187, this produced incorrect code for generators when a saved local was
diff --git a/src/test/run-pass/generator/overlap-locals.rs b/src/test/run-pass/generator/overlap-locals.rs
index 704484a480e2..101c8714fa87 100644
--- a/src/test/run-pass/generator/overlap-locals.rs
+++ b/src/test/run-pass/generator/overlap-locals.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 #![feature(generators)]
 
 fn main() {
diff --git a/src/test/run-pass/generator/size-moved-locals.rs b/src/test/run-pass/generator/size-moved-locals.rs
index dbcdfc61ef95..01db971434bb 100644
--- a/src/test/run-pass/generator/size-moved-locals.rs
+++ b/src/test/run-pass/generator/size-moved-locals.rs
@@ -1,3 +1,4 @@
+// run-pass
 // Test that we don't duplicate storage for a variable that is moved to another
 // binding. This used to happen in the presence of unwind and drop edges (see
 // `complex` below.)
diff --git a/src/test/run-pass/global-scope.rs b/src/test/run-pass/global-scope.rs
index 22fb0f93dbce..944eee5afc30 100644
--- a/src/test/run-pass/global-scope.rs
+++ b/src/test/run-pass/global-scope.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 pub fn f() -> isize { return 1; }
 
 pub mod foo {
diff --git a/src/test/run-pass/guards-not-exhaustive.rs b/src/test/run-pass/guards-not-exhaustive.rs
index 752e4f6be412..b74f162c0c62 100644
--- a/src/test/run-pass/guards-not-exhaustive.rs
+++ b/src/test/run-pass/guards-not-exhaustive.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 #![allow(non_snake_case)]
 
 #[derive(Copy, Clone)]
diff --git a/src/test/run-pass/guards.rs b/src/test/run-pass/guards.rs
index 94095eac1613..10a4bb673878 100644
--- a/src/test/run-pass/guards.rs
+++ b/src/test/run-pass/guards.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 #![allow(non_shorthand_field_patterns)]
 
 #[derive(Copy, Clone)]
diff --git a/src/test/run-pass/hashmap-memory.rs b/src/test/run-pass/hashmap-memory.rs
index 987a3e414f5c..3129eb0da82f 100644
--- a/src/test/run-pass/hashmap-memory.rs
+++ b/src/test/run-pass/hashmap-memory.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 #![allow(non_camel_case_types)]
 #![allow(dead_code)]
 #![allow(unused_mut)]
diff --git a/src/test/run-pass/hello.rs b/src/test/run-pass/hello.rs
index bc8bb23877e8..c207c25545ec 100644
--- a/src/test/run-pass/hello.rs
+++ b/src/test/run-pass/hello.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 pub fn main() {
     println!("hello, world");
 }
diff --git a/src/test/run-pass/html-literals.rs b/src/test/run-pass/html-literals.rs
index 237c6e1a107e..ae45e97c8b07 100644
--- a/src/test/run-pass/html-literals.rs
+++ b/src/test/run-pass/html-literals.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 #![allow(non_camel_case_types)]
 // A test of the macro system. Can we do HTML literals?
 
diff --git a/src/test/run-pass/if-bot.rs b/src/test/run-pass/if-bot.rs
index 6d87288dd082..0f09db530d45 100644
--- a/src/test/run-pass/if-bot.rs
+++ b/src/test/run-pass/if-bot.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 pub fn main() {
     let i: isize = if false { panic!() } else { 5 };
     println!("{}", i);
diff --git a/src/test/run-pass/if-check.rs b/src/test/run-pass/if-check.rs
index 43904f6823f5..6593225e7dd9 100644
--- a/src/test/run-pass/if-check.rs
+++ b/src/test/run-pass/if-check.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 fn even(x: usize) -> bool {
     if x < 2 {
         return false;
diff --git a/src/test/run-pass/if-ret.rs b/src/test/run-pass/if-ret.rs
index 3c2377466a15..e1e795d83bea 100644
--- a/src/test/run-pass/if-ret.rs
+++ b/src/test/run-pass/if-ret.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 #![allow(unused_parens)]
 // pretty-expanded FIXME #23616
 
diff --git a/src/test/run-pass/if-ret.stderr b/src/test/run-pass/if-ret.stderr
index 7c02f835685e..73402e55a4fd 100644
--- a/src/test/run-pass/if-ret.stderr
+++ b/src/test/run-pass/if-ret.stderr
@@ -1,5 +1,5 @@
 warning: unreachable block in `if` expression
-  --> $DIR/if-ret.rs:4:24
+  --> $DIR/if-ret.rs:6:24
    |
 LL | fn foo() { if (return) { } }
    |                        ^^^
diff --git a/src/test/run-pass/ifmt.rs b/src/test/run-pass/ifmt.rs
index 6660f393f7da..841be20ef864 100644
--- a/src/test/run-pass/ifmt.rs
+++ b/src/test/run-pass/ifmt.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 #![deny(warnings)]
 #![allow(unused_must_use)]
 #![allow(unused_features)]
diff --git a/src/test/run-pass/ignore-all-the-things.rs b/src/test/run-pass/ignore-all-the-things.rs
index 6916a199a100..8c046a289fad 100644
--- a/src/test/run-pass/ignore-all-the-things.rs
+++ b/src/test/run-pass/ignore-all-the-things.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 #![allow(non_shorthand_field_patterns)]
 #![allow(dead_code)]
 #![allow(unused_variables)]
diff --git a/src/test/run-pass/impl-for-never.rs b/src/test/run-pass/impl-for-never.rs
index a5287123008f..c5f12981ecc2 100644
--- a/src/test/run-pass/impl-for-never.rs
+++ b/src/test/run-pass/impl-for-never.rs
@@ -1,3 +1,4 @@
+// run-pass
 // Test that we can call static methods on ! both directly and when it appears in a generic
 
 #![feature(never_type)]
diff --git a/src/test/run-pass/impl-inherent-non-conflict.rs b/src/test/run-pass/impl-inherent-non-conflict.rs
index ed87ffb01984..be524f87c9fb 100644
--- a/src/test/run-pass/impl-inherent-non-conflict.rs
+++ b/src/test/run-pass/impl-inherent-non-conflict.rs
@@ -1,3 +1,4 @@
+// run-pass
 // Ensure that a user-defined type admits multiple inherent methods
 // with the same name, which can be called on values that have a
 // precise enough type to allow distinguishing between the methods.
diff --git a/src/test/run-pass/impl-not-adjacent-to-type.rs b/src/test/run-pass/impl-not-adjacent-to-type.rs
index c0cdff30cbf2..97caf9083877 100644
--- a/src/test/run-pass/impl-not-adjacent-to-type.rs
+++ b/src/test/run-pass/impl-not-adjacent-to-type.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 mod foo {
     pub struct Point {
         pub x: i32,
diff --git a/src/test/run-pass/impl-privacy-xc-1.rs b/src/test/run-pass/impl-privacy-xc-1.rs
index 42e149eacb54..c9f7f09c7bd0 100644
--- a/src/test/run-pass/impl-privacy-xc-1.rs
+++ b/src/test/run-pass/impl-privacy-xc-1.rs
@@ -1,3 +1,4 @@
+// run-pass
 // aux-build:impl_privacy_xc_1.rs
 
 // pretty-expanded FIXME #23616
diff --git a/src/test/run-pass/impl-privacy-xc-2.rs b/src/test/run-pass/impl-privacy-xc-2.rs
index 7cdd7146c331..390764588fc8 100644
--- a/src/test/run-pass/impl-privacy-xc-2.rs
+++ b/src/test/run-pass/impl-privacy-xc-2.rs
@@ -1,3 +1,4 @@
+// run-pass
 // aux-build:impl_privacy_xc_2.rs
 
 extern crate impl_privacy_xc_2;
diff --git a/src/test/run-pass/impl-trait-in-bindings.rs b/src/test/run-pass/impl-trait-in-bindings.rs
index 1e3a641b7cf9..2e9b6cd5c78d 100644
--- a/src/test/run-pass/impl-trait-in-bindings.rs
+++ b/src/test/run-pass/impl-trait-in-bindings.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 #![feature(impl_trait_in_bindings)]
 //~^ WARN the feature `impl_trait_in_bindings` is incomplete and may cause the compiler to crash
 
diff --git a/src/test/run-pass/impl-trait-in-bindings.stderr b/src/test/run-pass/impl-trait-in-bindings.stderr
index 4896deb9d5c9..54b42a102fa1 100644
--- a/src/test/run-pass/impl-trait-in-bindings.stderr
+++ b/src/test/run-pass/impl-trait-in-bindings.stderr
@@ -1,5 +1,5 @@
 warning: the feature `impl_trait_in_bindings` is incomplete and may cause the compiler to crash
-  --> $DIR/impl-trait-in-bindings.rs:1:12
+  --> $DIR/impl-trait-in-bindings.rs:3:12
    |
 LL | #![feature(impl_trait_in_bindings)]
    |            ^^^^^^^^^^^^^^^^^^^^^^
diff --git a/src/test/run-pass/in-band-lifetimes.rs b/src/test/run-pass/in-band-lifetimes.rs
index c89226053636..c9f7d28699e0 100644
--- a/src/test/run-pass/in-band-lifetimes.rs
+++ b/src/test/run-pass/in-band-lifetimes.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 #![allow(warnings)]
 #![feature(in_band_lifetimes)]
 
diff --git a/src/test/run-pass/inc-range-pat.rs b/src/test/run-pass/inc-range-pat.rs
index a648ff17492e..1eb7dd0aa3e7 100644
--- a/src/test/run-pass/inc-range-pat.rs
+++ b/src/test/run-pass/inc-range-pat.rs
@@ -1,3 +1,4 @@
+// run-pass
 // Test old and new syntax for inclusive range patterns.
 
 #![allow(ellipsis_inclusive_range_patterns)]
diff --git a/src/test/run-pass/infer-fn-tail-expr.rs b/src/test/run-pass/infer-fn-tail-expr.rs
index ab0210baa96e..413b1877a29f 100644
--- a/src/test/run-pass/infer-fn-tail-expr.rs
+++ b/src/test/run-pass/infer-fn-tail-expr.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 #![allow(dead_code)]
 // issue #680
 
diff --git a/src/test/run-pass/inherit-env.rs b/src/test/run-pass/inherit-env.rs
index 229953f1b18d..e29fa04bbd50 100644
--- a/src/test/run-pass/inherit-env.rs
+++ b/src/test/run-pass/inherit-env.rs
@@ -1,3 +1,4 @@
+// run-pass
 // ignore-emscripten
 // ignore-wasm32
 // ignore-sgx no processes
diff --git a/src/test/run-pass/init-large-type.rs b/src/test/run-pass/init-large-type.rs
index cb64cd0b0f3a..a304fc9356b5 100644
--- a/src/test/run-pass/init-large-type.rs
+++ b/src/test/run-pass/init-large-type.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 #![allow(unused_must_use)]
 // Makes sure that zero-initializing large types is reasonably fast,
 // Doing it incorrectly causes massive slowdown in LLVM during
diff --git a/src/test/run-pass/init-res-into-things.rs b/src/test/run-pass/init-res-into-things.rs
index 832637962bb5..ed0c600c1d2e 100644
--- a/src/test/run-pass/init-res-into-things.rs
+++ b/src/test/run-pass/init-res-into-things.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 #![allow(non_camel_case_types)]
 #![allow(dead_code)]
 #![feature(box_syntax)]
diff --git a/src/test/run-pass/inlined-main.rs b/src/test/run-pass/inlined-main.rs
index 3a55a894267a..75ff4c87dc61 100644
--- a/src/test/run-pass/inlined-main.rs
+++ b/src/test/run-pass/inlined-main.rs
@@ -1,2 +1,4 @@
+// run-pass
+
 #[inline(always)]
 fn main() {}
diff --git a/src/test/run-pass/inner-attrs-on-impl.rs b/src/test/run-pass/inner-attrs-on-impl.rs
index 4cc659562eaa..636e8c4885e6 100644
--- a/src/test/run-pass/inner-attrs-on-impl.rs
+++ b/src/test/run-pass/inner-attrs-on-impl.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 struct Foo;
 
 impl Foo {
diff --git a/src/test/run-pass/inner-module.rs b/src/test/run-pass/inner-module.rs
index d8658691875b..363f753e2487 100644
--- a/src/test/run-pass/inner-module.rs
+++ b/src/test/run-pass/inner-module.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 mod inner {
     pub mod inner2 {
         pub fn hello() { println!("hello, modular world"); }
diff --git a/src/test/run-pass/inner-static.rs b/src/test/run-pass/inner-static.rs
index 6f7d7c228875..adba299ebe22 100644
--- a/src/test/run-pass/inner-static.rs
+++ b/src/test/run-pass/inner-static.rs
@@ -1,3 +1,4 @@
+// run-pass
 // aux-build:inner_static.rs
 
 
diff --git a/src/test/run-pass/instantiable.rs b/src/test/run-pass/instantiable.rs
index fe8d9f971491..ad0cf3f4ac91 100644
--- a/src/test/run-pass/instantiable.rs
+++ b/src/test/run-pass/instantiable.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 #![allow(non_camel_case_types)]
 #![allow(dead_code)]
 // pretty-expanded FIXME #23616
diff --git a/src/test/run-pass/invalid_const_promotion.rs b/src/test/run-pass/invalid_const_promotion.rs
index ddf4dc42424d..6d59bb385dc7 100644
--- a/src/test/run-pass/invalid_const_promotion.rs
+++ b/src/test/run-pass/invalid_const_promotion.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 #![allow(unused_mut)]
 // ignore-wasm32
 // ignore-emscripten
diff --git a/src/test/run-pass/invoke-external-foreign.rs b/src/test/run-pass/invoke-external-foreign.rs
index d34933cde424..dbd2b4ad8655 100644
--- a/src/test/run-pass/invoke-external-foreign.rs
+++ b/src/test/run-pass/invoke-external-foreign.rs
@@ -1,3 +1,4 @@
+// run-pass
 // aux-build:foreign_lib.rs
 // ignore-wasm32-bare no libc to test ffi with
 
diff --git a/src/test/run-pass/irrefutable-unit.rs b/src/test/run-pass/irrefutable-unit.rs
index f588ae3a5574..dd8f03b6dbd5 100644
--- a/src/test/run-pass/irrefutable-unit.rs
+++ b/src/test/run-pass/irrefutable-unit.rs
@@ -1,3 +1,4 @@
+// run-pass
 // pretty-expanded FIXME #23616
 
 pub fn main() {
diff --git a/src/test/run-pass/issues/issue-24010.rs b/src/test/run-pass/issues/issue-24010.rs
index 264e1ee22cdd..f1818533487f 100644
--- a/src/test/run-pass/issues/issue-24010.rs
+++ b/src/test/run-pass/issues/issue-24010.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 trait Foo: Fn(i32) -> i32 + Send {}
 
 impl<T: ?Sized + Fn(i32) -> i32 + Send> Foo for T {}
diff --git a/src/test/run-pass/issues/issue-48006.rs b/src/test/run-pass/issues/issue-48006.rs
index 8e7105cf10ce..3a862ace55ec 100644
--- a/src/test/run-pass/issues/issue-48006.rs
+++ b/src/test/run-pass/issues/issue-48006.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 #![feature(step_trait)]
 
 use std::iter::Step;
diff --git a/src/test/run-pass/issues/issue-53728.rs b/src/test/run-pass/issues/issue-53728.rs
index 00666972e259..77b5010f7767 100644
--- a/src/test/run-pass/issues/issue-53728.rs
+++ b/src/test/run-pass/issues/issue-53728.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 #![allow(dead_code)]
 #[repr(u16)]
 enum DeviceKind {
diff --git a/src/test/run-pass/issues/issue-53843.rs b/src/test/run-pass/issues/issue-53843.rs
index 53728ec4d9fa..f305b370ce62 100644
--- a/src/test/run-pass/issues/issue-53843.rs
+++ b/src/test/run-pass/issues/issue-53843.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 use std::ops::Deref;
 
 pub struct Pin<P>(P);
diff --git a/src/test/run-pass/issues/issue-54462-mutable-noalias-correctness.rs b/src/test/run-pass/issues/issue-54462-mutable-noalias-correctness.rs
index e7966b2978f1..412028bdcdcb 100644
--- a/src/test/run-pass/issues/issue-54462-mutable-noalias-correctness.rs
+++ b/src/test/run-pass/issues/issue-54462-mutable-noalias-correctness.rs
@@ -1,3 +1,4 @@
+// run-pass
 //
 // compile-flags: -Ccodegen-units=1 -O
 
diff --git a/src/test/run-pass/issues/issue-54467.rs b/src/test/run-pass/issues/issue-54467.rs
index 52a9828b5484..734bf2768c2a 100644
--- a/src/test/run-pass/issues/issue-54467.rs
+++ b/src/test/run-pass/issues/issue-54467.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 pub trait Stream {
     type Item;
     type Error;
diff --git a/src/test/run-pass/issues/issue-54477-reduced-2.rs b/src/test/run-pass/issues/issue-54477-reduced-2.rs
index 28731d4b0df0..199d69b45404 100644
--- a/src/test/run-pass/issues/issue-54477-reduced-2.rs
+++ b/src/test/run-pass/issues/issue-54477-reduced-2.rs
@@ -1,3 +1,4 @@
+// run-pass
 // rust-lang/rust#54477: runtime bug in the VecDeque library that was
 // exposed by this test case, derived from test suite of crates.io
 // `collection` crate.
diff --git a/src/test/run-pass/issues/issue-55376.rs b/src/test/run-pass/issues/issue-55376.rs
index fa92a85a4452..4adff2b4544c 100644
--- a/src/test/run-pass/issues/issue-55376.rs
+++ b/src/test/run-pass/issues/issue-55376.rs
@@ -1,3 +1,4 @@
+// run-pass
 // Tests that paths in `pub(...)` don't fail HIR verification.
 
 #![allow(unused_imports)]
diff --git a/src/test/run-pass/issues/issue-56237.rs b/src/test/run-pass/issues/issue-56237.rs
index 87e10e83612d..534b85acec82 100644
--- a/src/test/run-pass/issues/issue-56237.rs
+++ b/src/test/run-pass/issues/issue-56237.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 use std::ops::Deref;
 
 fn foo<P>(_value: <P as Deref>::Target)
diff --git a/src/test/run-pass/issues/issue-58212.rs b/src/test/run-pass/issues/issue-58212.rs
index d4ce6496cae7..21dcdd56bf60 100644
--- a/src/test/run-pass/issues/issue-58212.rs
+++ b/src/test/run-pass/issues/issue-58212.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 trait FromUnchecked {
     unsafe fn from_unchecked();
 }
diff --git a/src/test/run-pass/issues/issue-58435-ice-with-assoc-const.rs b/src/test/run-pass/issues/issue-58435-ice-with-assoc-const.rs
index 94e2b2563df5..fac727d2d7dc 100644
--- a/src/test/run-pass/issues/issue-58435-ice-with-assoc-const.rs
+++ b/src/test/run-pass/issues/issue-58435-ice-with-assoc-const.rs
@@ -1,3 +1,4 @@
+// run-pass
 // The const-evaluator was at one point ICE'ing while trying to
 // evaluate the body of `fn id` during the `s.id()` call in main.
 
diff --git a/src/test/run-pass/issues/issue-61696.rs b/src/test/run-pass/issues/issue-61696.rs
index 381e5a632e71..dca52927fd7c 100644
--- a/src/test/run-pass/issues/issue-61696.rs
+++ b/src/test/run-pass/issues/issue-61696.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 pub enum Infallible {}
 
 // The check that the `bool` field of `V1` is encoding a "niche variant"
diff --git a/src/test/run-pass/issues/issue-61894.rs b/src/test/run-pass/issues/issue-61894.rs
index 4d407125299a..c018ac73fb53 100644
--- a/src/test/run-pass/issues/issue-61894.rs
+++ b/src/test/run-pass/issues/issue-61894.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 #![feature(core_intrinsics)]
 
 use std::any::type_name;
diff --git a/src/test/run-pass/istr.rs b/src/test/run-pass/istr.rs
index af11e49e56e3..dca6d40d59ad 100644
--- a/src/test/run-pass/istr.rs
+++ b/src/test/run-pass/istr.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 use std::string::String;
 
 fn test_stack_assign() {
diff --git a/src/test/run-pass/item-name-overload.rs b/src/test/run-pass/item-name-overload.rs
index 58ef977919cd..c8a302a2c5b9 100644
--- a/src/test/run-pass/item-name-overload.rs
+++ b/src/test/run-pass/item-name-overload.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 #![allow(dead_code)]
 
 
diff --git a/src/test/run-pass/keyword-changes-2012-07-31.rs b/src/test/run-pass/keyword-changes-2012-07-31.rs
index 73b0d07090b2..1b38527ec290 100644
--- a/src/test/run-pass/keyword-changes-2012-07-31.rs
+++ b/src/test/run-pass/keyword-changes-2012-07-31.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 #![allow(dead_code)]
 // return -> return
 // mod -> module
diff --git a/src/test/run-pass/kindck-implicit-close-over-mut-var.rs b/src/test/run-pass/kindck-implicit-close-over-mut-var.rs
index 3b2991ede996..5b5d86eec2c0 100644
--- a/src/test/run-pass/kindck-implicit-close-over-mut-var.rs
+++ b/src/test/run-pass/kindck-implicit-close-over-mut-var.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 #![allow(unused_must_use)]
 #![allow(dead_code)]
 use std::thread;
diff --git a/src/test/run-pass/kinds-in-metadata.rs b/src/test/run-pass/kinds-in-metadata.rs
index 7cfc28b12b98..136037a7acf7 100644
--- a/src/test/run-pass/kinds-in-metadata.rs
+++ b/src/test/run-pass/kinds-in-metadata.rs
@@ -1,3 +1,4 @@
+// run-pass
 // aux-build:kinds_in_metadata.rs
 
 // pretty-expanded FIXME #23616
diff --git a/src/test/run-pass/lambda-infer-unresolved.rs b/src/test/run-pass/lambda-infer-unresolved.rs
index 751801e7c217..9cc466b28ec5 100644
--- a/src/test/run-pass/lambda-infer-unresolved.rs
+++ b/src/test/run-pass/lambda-infer-unresolved.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 #![allow(unused_mut)]
 // This should typecheck even though the type of e is not fully
 // resolved when we finish typechecking the ||.
diff --git a/src/test/run-pass/lambda-var-hygiene.rs b/src/test/run-pass/lambda-var-hygiene.rs
index 9cc4cc29bf59..bf06765e5dd4 100644
--- a/src/test/run-pass/lambda-var-hygiene.rs
+++ b/src/test/run-pass/lambda-var-hygiene.rs
@@ -1,3 +1,4 @@
+// run-pass
 // shouldn't affect evaluation of $ex:
 macro_rules! bad_macro {
     ($ex:expr) => ({(|_x| { $ex }) (9) })
diff --git a/src/test/run-pass/large-records.rs b/src/test/run-pass/large-records.rs
index 9786ea797809..7f850a94e893 100644
--- a/src/test/run-pass/large-records.rs
+++ b/src/test/run-pass/large-records.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 #![allow(dead_code)]
 
 
diff --git a/src/test/run-pass/last-use-in-block.rs b/src/test/run-pass/last-use-in-block.rs
index 2bfd982995d1..1ab847dcd8af 100644
--- a/src/test/run-pass/last-use-in-block.rs
+++ b/src/test/run-pass/last-use-in-block.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 #![allow(dead_code)]
 #![allow(unused_parens)]
 // Issue #1818
diff --git a/src/test/run-pass/last-use-in-cap-clause.rs b/src/test/run-pass/last-use-in-cap-clause.rs
index 42dc6a4b06e1..98d43463287a 100644
--- a/src/test/run-pass/last-use-in-cap-clause.rs
+++ b/src/test/run-pass/last-use-in-cap-clause.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 #![allow(dead_code)]
 // Make sure #1399 stays fixed
 
diff --git a/src/test/run-pass/last-use-is-capture.rs b/src/test/run-pass/last-use-is-capture.rs
index 2fa85e2d5b24..af2308777939 100644
--- a/src/test/run-pass/last-use-is-capture.rs
+++ b/src/test/run-pass/last-use-is-capture.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 #![allow(dead_code)]
 // Make sure #1399 stays fixed
 
diff --git a/src/test/run-pass/lazy-and-or.rs b/src/test/run-pass/lazy-and-or.rs
index d1f564fbe4c6..0b44a70a569f 100644
--- a/src/test/run-pass/lazy-and-or.rs
+++ b/src/test/run-pass/lazy-and-or.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 fn incr(x: &mut isize) -> bool { *x += 1; assert!((false)); return false; }
 
 pub fn main() {
diff --git a/src/test/run-pass/lazy-init.rs b/src/test/run-pass/lazy-init.rs
index 1d7001b49ee8..a4b5d18bb33f 100644
--- a/src/test/run-pass/lazy-init.rs
+++ b/src/test/run-pass/lazy-init.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 #![allow(unused_mut)]
 
 
diff --git a/src/test/run-pass/leak-unique-as-tydesc.rs b/src/test/run-pass/leak-unique-as-tydesc.rs
index 2293e3c823f8..752081b78f27 100644
--- a/src/test/run-pass/leak-unique-as-tydesc.rs
+++ b/src/test/run-pass/leak-unique-as-tydesc.rs
@@ -1,3 +1,4 @@
+// run-pass
 // pretty-expanded FIXME #23616
 
 #![feature(box_syntax)]
diff --git a/src/test/run-pass/lex-bare-cr-nondoc-comment.rs b/src/test/run-pass/lex-bare-cr-nondoc-comment.rs
index da18ab268ffa..5b528d6e1e14 100644
--- a/src/test/run-pass/lex-bare-cr-nondoc-comment.rs
+++ b/src/test/run-pass/lex-bare-cr-nondoc-comment.rs
@@ -1,3 +1,4 @@
+// run-pass
 // ignore-tidy-cr
 
 // nondoc comment with bare CR: '
'
diff --git a/src/test/run-pass/lexer-crlf-line-endings-string-literal-doc-comment.rs b/src/test/run-pass/lexer-crlf-line-endings-string-literal-doc-comment.rs
index f9d1b17b8dd8..2ca88c2b9950 100644
--- a/src/test/run-pass/lexer-crlf-line-endings-string-literal-doc-comment.rs
+++ b/src/test/run-pass/lexer-crlf-line-endings-string-literal-doc-comment.rs
@@ -1,3 +1,4 @@
+// run-pass
 // ignore-tidy-cr ignore-license
 // ignore-tidy-cr (repeated again because of tidy bug)
 // license is ignored because tidy can't handle the CRLF here properly.
diff --git a/src/test/run-pass/lexical-scoping.rs b/src/test/run-pass/lexical-scoping.rs
index 15797eee9b85..04904958a6ca 100644
--- a/src/test/run-pass/lexical-scoping.rs
+++ b/src/test/run-pass/lexical-scoping.rs
@@ -1,3 +1,4 @@
+// run-pass
 // Tests that items in subscopes can shadow type parameters and local variables (see issue #23880).
 
 #![allow(unused)]
diff --git a/src/test/run-pass/lib-defaults.rs b/src/test/run-pass/lib-defaults.rs
index dcf537866c50..cd0b0bb23211 100644
--- a/src/test/run-pass/lib-defaults.rs
+++ b/src/test/run-pass/lib-defaults.rs
@@ -1,3 +1,4 @@
+// run-pass
 // dont-check-compiler-stderr (rust-lang/rust#54222)
 
 // ignore-wasm32-bare no libc to test ffi with
diff --git a/src/test/run-pass/link-cfg-works.rs b/src/test/run-pass/link-cfg-works.rs
index d7a248fd4d57..fe1b569dff61 100644
--- a/src/test/run-pass/link-cfg-works.rs
+++ b/src/test/run-pass/link-cfg-works.rs
@@ -1,3 +1,4 @@
+// run-pass
 // aux-build:link-cfg-works-transitive-rlib.rs
 // aux-build:link-cfg-works-transitive-dylib.rs
 
diff --git a/src/test/run-pass/link-section.rs b/src/test/run-pass/link-section.rs
index 1c2d3eaaa3b9..6958eeda6974 100644
--- a/src/test/run-pass/link-section.rs
+++ b/src/test/run-pass/link-section.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 #![allow(non_upper_case_globals)]
 #[cfg(not(target_os = "macos"))]
 #[link_section=".moretext"]
diff --git a/src/test/run-pass/linkage1.rs b/src/test/run-pass/linkage1.rs
index da07385ead74..bda4da53dbc2 100644
--- a/src/test/run-pass/linkage1.rs
+++ b/src/test/run-pass/linkage1.rs
@@ -1,3 +1,4 @@
+// run-pass
 // ignore-windows
 // ignore-macos
 // ignore-emscripten doesn't support this linkage
diff --git a/src/test/run-pass/lint-cap.rs b/src/test/run-pass/lint-cap.rs
index f03bb6918927..461b923ccd47 100644
--- a/src/test/run-pass/lint-cap.rs
+++ b/src/test/run-pass/lint-cap.rs
@@ -1,3 +1,4 @@
+// run-pass
 // compile-flags: --cap-lints allow
 
 #![deny(warnings)]
diff --git a/src/test/run-pass/lint-dead-code-associated-type.rs b/src/test/run-pass/lint-dead-code-associated-type.rs
index 576ba6d170cf..1cf66e75a95a 100644
--- a/src/test/run-pass/lint-dead-code-associated-type.rs
+++ b/src/test/run-pass/lint-dead-code-associated-type.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 #![deny(dead_code)]
 
 trait Foo {
diff --git a/src/test/run-pass/lint-dead-code-variant.rs b/src/test/run-pass/lint-dead-code-variant.rs
index 3838b83e45f7..91c97232eedb 100644
--- a/src/test/run-pass/lint-dead-code-variant.rs
+++ b/src/test/run-pass/lint-dead-code-variant.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 #![deny(dead_code)]
 
 enum Foo {
diff --git a/src/test/run-pass/lint-expr-stmt-attrs-for-early-lints.rs b/src/test/run-pass/lint-expr-stmt-attrs-for-early-lints.rs
index 9ca3ecc72d2c..07a32904a5e6 100644
--- a/src/test/run-pass/lint-expr-stmt-attrs-for-early-lints.rs
+++ b/src/test/run-pass/lint-expr-stmt-attrs-for-early-lints.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 #![feature(stmt_expr_attributes)]
 #![deny(unused_parens)]
 
diff --git a/src/test/run-pass/lint-unknown-lints-at-crate-level.rs b/src/test/run-pass/lint-unknown-lints-at-crate-level.rs
index fe2fbeabac67..61d27f1eff19 100644
--- a/src/test/run-pass/lint-unknown-lints-at-crate-level.rs
+++ b/src/test/run-pass/lint-unknown-lints-at-crate-level.rs
@@ -1,3 +1,4 @@
+// run-pass
 // compile-flags: -D warnings -D unknown-lints
 
 #![allow(unknown_lints)]
diff --git a/src/test/run-pass/list.rs b/src/test/run-pass/list.rs
index 62c04bcac757..2ac5733b4199 100644
--- a/src/test/run-pass/list.rs
+++ b/src/test/run-pass/list.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 #![allow(non_camel_case_types)]
 // pretty-expanded FIXME #23616
 
diff --git a/src/test/run-pass/liveness-assign-imm-local-after-ret.rs b/src/test/run-pass/liveness-assign-imm-local-after-ret.rs
index 3dc27dde52b3..b463f4368d11 100644
--- a/src/test/run-pass/liveness-assign-imm-local-after-ret.rs
+++ b/src/test/run-pass/liveness-assign-imm-local-after-ret.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 #![allow(unreachable_code)]
 // pretty-expanded FIXME #23616
 
diff --git a/src/test/run-pass/llvm-pr32379.rs b/src/test/run-pass/llvm-pr32379.rs
index a18a5386d811..8a1f03241b11 100644
--- a/src/test/run-pass/llvm-pr32379.rs
+++ b/src/test/run-pass/llvm-pr32379.rs
@@ -1,3 +1,4 @@
+// run-pass
 // aux-build:llvm_pr32379.rs
 
 // LLVM PR #32379 (https://bugs.llvm.org/show_bug.cgi?id=32379), which
diff --git a/src/test/run-pass/log-err-phi.rs b/src/test/run-pass/log-err-phi.rs
index fd12ffe36f86..c0e04d2c9734 100644
--- a/src/test/run-pass/log-err-phi.rs
+++ b/src/test/run-pass/log-err-phi.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 pub fn main() {
     if false {
         println!("{}", "foobar");
diff --git a/src/test/run-pass/log-knows-the-names-of-variants-in-std.rs b/src/test/run-pass/log-knows-the-names-of-variants-in-std.rs
index 3f4d1c701bf1..c5a40edbeef7 100644
--- a/src/test/run-pass/log-knows-the-names-of-variants-in-std.rs
+++ b/src/test/run-pass/log-knows-the-names-of-variants-in-std.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 #![allow(non_camel_case_types)]
 #![allow(dead_code)]
 #[derive(Clone, Debug)]
diff --git a/src/test/run-pass/log-knows-the-names-of-variants.rs b/src/test/run-pass/log-knows-the-names-of-variants.rs
index a16ff8023766..cf2876b6eee8 100644
--- a/src/test/run-pass/log-knows-the-names-of-variants.rs
+++ b/src/test/run-pass/log-knows-the-names-of-variants.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 #![allow(non_camel_case_types)]
 #![allow(dead_code)]
 #[derive(Debug)]
diff --git a/src/test/run-pass/log-poly.rs b/src/test/run-pass/log-poly.rs
index 32dbb95a7237..14e1b40e1684 100644
--- a/src/test/run-pass/log-poly.rs
+++ b/src/test/run-pass/log-poly.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 #[derive(Debug)]
 enum Numbers {
     Three
diff --git a/src/test/run-pass/logging-only-prints-once.rs b/src/test/run-pass/logging-only-prints-once.rs
index 1a4c4d89e7dc..6b49c441d1ea 100644
--- a/src/test/run-pass/logging-only-prints-once.rs
+++ b/src/test/run-pass/logging-only-prints-once.rs
@@ -1,3 +1,4 @@
+// run-pass
 // ignore-windows
 // ignore-emscripten no threads support
 // exec-env:RUSTC_LOG=debug
diff --git a/src/test/run-pass/logging_before_rt_started.rs b/src/test/run-pass/logging_before_rt_started.rs
index 69cfc54c465b..540d2b4f58a9 100644
--- a/src/test/run-pass/logging_before_rt_started.rs
+++ b/src/test/run-pass/logging_before_rt_started.rs
@@ -1,3 +1,4 @@
+// run-pass
 // exec-env:RUSTC_LOG=std::ptr
 
 // In issue #9487, it was realized that std::ptr was invoking the logging
diff --git a/src/test/run-pass/long-while.rs b/src/test/run-pass/long-while.rs
index 4a3ee6f97138..529cca7b7316 100644
--- a/src/test/run-pass/long-while.rs
+++ b/src/test/run-pass/long-while.rs
@@ -1,3 +1,4 @@
+// run-pass
 // pretty-expanded FIXME #23616
 
 #![allow(unused_variables)]
diff --git a/src/test/run-pass/lto-many-codegen-units.rs b/src/test/run-pass/lto-many-codegen-units.rs
index 17c345beb849..f0f461ffec81 100644
--- a/src/test/run-pass/lto-many-codegen-units.rs
+++ b/src/test/run-pass/lto-many-codegen-units.rs
@@ -1,3 +1,4 @@
+// run-pass
 // compile-flags: -C lto -C codegen-units=8
 // no-prefer-dynamic
 
diff --git a/src/test/run-pass/lto-still-runs-thread-dtors.rs b/src/test/run-pass/lto-still-runs-thread-dtors.rs
index 732681af037a..635ad783b315 100644
--- a/src/test/run-pass/lto-still-runs-thread-dtors.rs
+++ b/src/test/run-pass/lto-still-runs-thread-dtors.rs
@@ -1,3 +1,4 @@
+// run-pass
 // compile-flags: -C lto
 // no-prefer-dynamic
 // ignore-emscripten no threads support
diff --git a/src/test/run-pass/lub-glb-with-unbound-infer-var.rs b/src/test/run-pass/lub-glb-with-unbound-infer-var.rs
index 7e430d26b26f..c9e117089f57 100644
--- a/src/test/run-pass/lub-glb-with-unbound-infer-var.rs
+++ b/src/test/run-pass/lub-glb-with-unbound-infer-var.rs
@@ -1,3 +1,4 @@
+// run-pass
 // Test for a specific corner case: when we compute the LUB of two fn
 // types and their parameters have unbound variables. In that case, we
 // wind up relating those two variables. This was causing an ICE in an
diff --git a/src/test/run-pass/macro-quote-cond.rs b/src/test/run-pass/macro-quote-cond.rs
index 4d6bcf501ee6..569451e42593 100644
--- a/src/test/run-pass/macro-quote-cond.rs
+++ b/src/test/run-pass/macro-quote-cond.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 #![allow(unused_parens)]
 // aux-build:cond_plugin.rs
 
diff --git a/src/test/run-pass/macro-quote-test.rs b/src/test/run-pass/macro-quote-test.rs
index d00e8edf28b4..7815b8e6df1e 100644
--- a/src/test/run-pass/macro-quote-test.rs
+++ b/src/test/run-pass/macro-quote-test.rs
@@ -1,3 +1,4 @@
+// run-pass
 // Test that a macro can emit delimiters with nothing inside - `()`, `{}`
 
 // aux-build:hello_macro.rs
diff --git a/src/test/run-pass/macros/issue-25274.rs b/src/test/run-pass/macros/issue-25274.rs
index e81b2c7a7233..65b29bba8c81 100644
--- a/src/test/run-pass/macros/issue-25274.rs
+++ b/src/test/run-pass/macros/issue-25274.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 macro_rules! test {
     (
         fn fun() -> Option<Box<$t:ty>>;
diff --git a/src/test/run-pass/max-min-classes.rs b/src/test/run-pass/max-min-classes.rs
index 9ae5bae19e56..f9a39e486da2 100644
--- a/src/test/run-pass/max-min-classes.rs
+++ b/src/test/run-pass/max-min-classes.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 #![allow(non_snake_case)]
 trait Product {
     fn product(&self) -> isize;
diff --git a/src/test/run-pass/methods/method-probe-no-guessing-dyn-trait.rs b/src/test/run-pass/methods/method-probe-no-guessing-dyn-trait.rs
index 8c8165a10044..af362efe15c3 100644
--- a/src/test/run-pass/methods/method-probe-no-guessing-dyn-trait.rs
+++ b/src/test/run-pass/methods/method-probe-no-guessing-dyn-trait.rs
@@ -1,3 +1,4 @@
+// run-pass
 // Check that method matching does not make "guesses" depending on
 // Deref impls that don't eventually end up being picked.
 
diff --git a/src/test/run-pass/mid-path-type-params.rs b/src/test/run-pass/mid-path-type-params.rs
index e8ed0424e4ac..a8128207c808 100644
--- a/src/test/run-pass/mid-path-type-params.rs
+++ b/src/test/run-pass/mid-path-type-params.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 #![allow(dead_code)]
 // pretty-expanded FIXME #23616
 
diff --git a/src/test/run-pass/minmax-stability-issue-23687.rs b/src/test/run-pass/minmax-stability-issue-23687.rs
index d043a99688ac..9100bfbde95f 100644
--- a/src/test/run-pass/minmax-stability-issue-23687.rs
+++ b/src/test/run-pass/minmax-stability-issue-23687.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 use std::fmt::Debug;
 use std::cmp::{self, PartialOrd, Ordering};
 
diff --git a/src/test/run-pass/mir/mir_static_subtype.rs b/src/test/run-pass/mir/mir_static_subtype.rs
index 5b1ccd7ddf6d..d471b8f149d8 100644
--- a/src/test/run-pass/mir/mir_static_subtype.rs
+++ b/src/test/run-pass/mir/mir_static_subtype.rs
@@ -1,3 +1,4 @@
+// run-pass
 // Test that subtyping the body of a static doesn't cause an ICE.
 
 fn foo(_ : &()) {}
diff --git a/src/test/run-pass/modules/module-polymorphism3-files/float-template/inst_f32.rs b/src/test/run-pass/modules/module-polymorphism3-files/float-template/inst_f32.rs
index ae9811ac0249..49d2b3d4b851 100644
--- a/src/test/run-pass/modules/module-polymorphism3-files/float-template/inst_f32.rs
+++ b/src/test/run-pass/modules/module-polymorphism3-files/float-template/inst_f32.rs
@@ -1 +1,3 @@
+// run-pass
+
 pub type T = f32;
diff --git a/src/test/run-pass/modules/module-polymorphism3-files/float-template/inst_f64.rs b/src/test/run-pass/modules/module-polymorphism3-files/float-template/inst_f64.rs
index df276449c4fc..e2aad480e3db 100644
--- a/src/test/run-pass/modules/module-polymorphism3-files/float-template/inst_f64.rs
+++ b/src/test/run-pass/modules/module-polymorphism3-files/float-template/inst_f64.rs
@@ -1 +1,3 @@
+// run-pass
+
 pub type T = f64;
diff --git a/src/test/run-pass/modules/module-polymorphism3-files/float-template/inst_float.rs b/src/test/run-pass/modules/module-polymorphism3-files/float-template/inst_float.rs
index 7a0d84f3a517..5828718cddce 100644
--- a/src/test/run-pass/modules/module-polymorphism3-files/float-template/inst_float.rs
+++ b/src/test/run-pass/modules/module-polymorphism3-files/float-template/inst_float.rs
@@ -1 +1,3 @@
+// run-pass
+
 pub type T = float;
diff --git a/src/test/run-pass/monad.rs b/src/test/run-pass/monad.rs
index f0781c2920dd..5d0612cf8dc8 100644
--- a/src/test/run-pass/monad.rs
+++ b/src/test/run-pass/monad.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 #![allow(non_camel_case_types)]
 
 
diff --git a/src/test/run-pass/monomorphize-abi-alignment.rs b/src/test/run-pass/monomorphize-abi-alignment.rs
index a26f324f7dc0..637b09fc04e5 100644
--- a/src/test/run-pass/monomorphize-abi-alignment.rs
+++ b/src/test/run-pass/monomorphize-abi-alignment.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 #![allow(non_upper_case_globals)]
 /*!
  * On x86_64-linux-gnu and possibly other platforms, structs get 8-byte "preferred" alignment,
diff --git a/src/test/run-pass/monomorphized-callees-with-ty-params-3314.rs b/src/test/run-pass/monomorphized-callees-with-ty-params-3314.rs
index ec7ff2d8a517..bc314a39d8ea 100644
--- a/src/test/run-pass/monomorphized-callees-with-ty-params-3314.rs
+++ b/src/test/run-pass/monomorphized-callees-with-ty-params-3314.rs
@@ -1,3 +1,4 @@
+// run-pass
 // pretty-expanded FIXME #23616
 
 trait Serializer {
diff --git a/src/test/run-pass/mpsc_stress.rs b/src/test/run-pass/mpsc_stress.rs
index cf8d92b22789..bce5fdcd119f 100644
--- a/src/test/run-pass/mpsc_stress.rs
+++ b/src/test/run-pass/mpsc_stress.rs
@@ -1,3 +1,4 @@
+// run-pass
 // compile-flags:--test
 // ignore-emscripten
 // ignore-sgx no thread sleep support
diff --git a/src/test/run-pass/msvc-data-only.rs b/src/test/run-pass/msvc-data-only.rs
index ae4103e96c30..f668b0b06824 100644
--- a/src/test/run-pass/msvc-data-only.rs
+++ b/src/test/run-pass/msvc-data-only.rs
@@ -1,3 +1,4 @@
+// run-pass
 // aux-build:msvc-data-only-lib.rs
 
 extern crate msvc_data_only_lib;
diff --git a/src/test/run-pass/multi-panic.rs b/src/test/run-pass/multi-panic.rs
index 8bc000206527..e4b41e418066 100644
--- a/src/test/run-pass/multi-panic.rs
+++ b/src/test/run-pass/multi-panic.rs
@@ -1,3 +1,4 @@
+// run-pass
 // ignore-cloudabi no processes
 // ignore-emscripten no processes
 // ignore-sgx no processes
diff --git a/src/test/run-pass/multibyte.rs b/src/test/run-pass/multibyte.rs
index 889f0cb75c7e..7e3a577f9f2c 100644
--- a/src/test/run-pass/multibyte.rs
+++ b/src/test/run-pass/multibyte.rs
@@ -1,3 +1,4 @@
+// run-pass
 //
 
 // Test that multibyte characters don't crash the compiler
diff --git a/src/test/run-pass/multidispatch-conditional-impl-not-considered.rs b/src/test/run-pass/multidispatch-conditional-impl-not-considered.rs
index 72aa9edd0f36..f845e198aa57 100644
--- a/src/test/run-pass/multidispatch-conditional-impl-not-considered.rs
+++ b/src/test/run-pass/multidispatch-conditional-impl-not-considered.rs
@@ -1,3 +1,4 @@
+// run-pass
 // Test that we correctly ignore the blanket impl
 // because (in this case) `T` does not impl `Clone`.
 //
diff --git a/src/test/run-pass/multidispatch1.rs b/src/test/run-pass/multidispatch1.rs
index ac22aeac12ee..f2469e1490eb 100644
--- a/src/test/run-pass/multidispatch1.rs
+++ b/src/test/run-pass/multidispatch1.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 use std::fmt::Debug;
 
 trait MyTrait<T> {
diff --git a/src/test/run-pass/multidispatch2.rs b/src/test/run-pass/multidispatch2.rs
index 517f81574898..20608aabb3be 100644
--- a/src/test/run-pass/multidispatch2.rs
+++ b/src/test/run-pass/multidispatch2.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 use std::fmt::Debug;
 use std::default::Default;
 
diff --git a/src/test/run-pass/multiline-comment.rs b/src/test/run-pass/multiline-comment.rs
index 76f9284eb3eb..01aaac282325 100644
--- a/src/test/run-pass/multiline-comment.rs
+++ b/src/test/run-pass/multiline-comment.rs
@@ -1,3 +1,4 @@
+// run-pass
 // pretty-expanded FIXME #23616
 
 /*
diff --git a/src/test/run-pass/multiple-reprs.rs b/src/test/run-pass/multiple-reprs.rs
index 97c5d930f735..4be503a0ef49 100644
--- a/src/test/run-pass/multiple-reprs.rs
+++ b/src/test/run-pass/multiple-reprs.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 #![allow(dead_code)]
 
 use std::mem::{size_of, align_of};
diff --git a/src/test/run-pass/mut-function-arguments.rs b/src/test/run-pass/mut-function-arguments.rs
index 924d754b3259..620d00edbbce 100644
--- a/src/test/run-pass/mut-function-arguments.rs
+++ b/src/test/run-pass/mut-function-arguments.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 #![feature(box_syntax)]
 
 fn f(mut y: Box<isize>) {
diff --git a/src/test/run-pass/mut-vstore-expr.rs b/src/test/run-pass/mut-vstore-expr.rs
index d598e3b88db9..75b309a4839b 100644
--- a/src/test/run-pass/mut-vstore-expr.rs
+++ b/src/test/run-pass/mut-vstore-expr.rs
@@ -1,3 +1,4 @@
+// run-pass
 // pretty-expanded FIXME #23616
 
 pub fn main() {
diff --git a/src/test/run-pass/mutual-recursion-group.rs b/src/test/run-pass/mutual-recursion-group.rs
index 3be87b5a4905..86b0f1d840ef 100644
--- a/src/test/run-pass/mutual-recursion-group.rs
+++ b/src/test/run-pass/mutual-recursion-group.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 #![allow(non_camel_case_types)]
 #![allow(dead_code)]
 
diff --git a/src/test/run-pass/native-print-no-runtime.rs b/src/test/run-pass/native-print-no-runtime.rs
index e4d7eb82c670..f17c9fa6ca93 100644
--- a/src/test/run-pass/native-print-no-runtime.rs
+++ b/src/test/run-pass/native-print-no-runtime.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 #![feature(start)]
 
 #[start]
diff --git a/src/test/run-pass/negative.rs b/src/test/run-pass/negative.rs
index cc75d2ee86a7..9601e9118aa5 100644
--- a/src/test/run-pass/negative.rs
+++ b/src/test/run-pass/negative.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 pub fn main() {
     match -5 {
       -5 => {}
diff --git a/src/test/run-pass/nested-block-comment.rs b/src/test/run-pass/nested-block-comment.rs
index 62d038024a27..f8dfb5fa8ca7 100644
--- a/src/test/run-pass/nested-block-comment.rs
+++ b/src/test/run-pass/nested-block-comment.rs
@@ -1,3 +1,4 @@
+// run-pass
 // pretty-expanded FIXME #23616
 
 /* This test checks that nested comments are supported
diff --git a/src/test/run-pass/nested-class.rs b/src/test/run-pass/nested-class.rs
index 1b98291c3751..303273618e18 100644
--- a/src/test/run-pass/nested-class.rs
+++ b/src/test/run-pass/nested-class.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 #![allow(non_camel_case_types)]
 
 pub fn main() {
diff --git a/src/test/run-pass/nested-function-names-issue-8587.rs b/src/test/run-pass/nested-function-names-issue-8587.rs
index 7a6164383dfa..8fafd41d9bc6 100644
--- a/src/test/run-pass/nested-function-names-issue-8587.rs
+++ b/src/test/run-pass/nested-function-names-issue-8587.rs
@@ -1,3 +1,4 @@
+// run-pass
 // Make sure nested functions are separate, even if they have
 // equal name.
 //
diff --git a/src/test/run-pass/nested_item_main.rs b/src/test/run-pass/nested_item_main.rs
index 225619ad47a2..2fe00aede007 100644
--- a/src/test/run-pass/nested_item_main.rs
+++ b/src/test/run-pass/nested_item_main.rs
@@ -1,3 +1,4 @@
+// run-pass
 // aux-build:nested_item.rs
 
 
diff --git a/src/test/run-pass/never-result.rs b/src/test/run-pass/never-result.rs
index 808377ffa118..98ce326aa663 100644
--- a/src/test/run-pass/never-result.rs
+++ b/src/test/run-pass/never-result.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 #![allow(unused_variables)]
 #![allow(unreachable_code)]
 // Test that we can extract a ! through pattern matching then use it as several different types.
diff --git a/src/test/run-pass/never-type-rvalues.rs b/src/test/run-pass/never-type-rvalues.rs
index 2de8567924e3..9ccc73dbf92d 100644
--- a/src/test/run-pass/never-type-rvalues.rs
+++ b/src/test/run-pass/never-type-rvalues.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 #![feature(never_type)]
 #![allow(dead_code)]
 #![allow(path_statements)]
diff --git a/src/test/run-pass/never_coercions.rs b/src/test/run-pass/never_coercions.rs
index f32e2973813c..105c38635331 100644
--- a/src/test/run-pass/never_coercions.rs
+++ b/src/test/run-pass/never_coercions.rs
@@ -1,3 +1,4 @@
+// run-pass
 // Test that having something of type ! doesn't screw up type-checking and that it coerces to the
 // LUB type of the other match arms.
 
diff --git a/src/test/run-pass/new-box-syntax.rs b/src/test/run-pass/new-box-syntax.rs
index a39803c2eb84..418cf554b49b 100644
--- a/src/test/run-pass/new-box-syntax.rs
+++ b/src/test/run-pass/new-box-syntax.rs
@@ -1,3 +1,4 @@
+// run-pass
 // pretty-expanded FIXME #23616
 
 /* Any copyright is dedicated to the Public Domain.
diff --git a/src/test/run-pass/new-box.rs b/src/test/run-pass/new-box.rs
index 5539518c3707..d11f0d045a7e 100644
--- a/src/test/run-pass/new-box.rs
+++ b/src/test/run-pass/new-box.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 #![feature(box_syntax)]
 
 fn f(x: Box<isize>) {
diff --git a/src/test/run-pass/new-impl-syntax.rs b/src/test/run-pass/new-impl-syntax.rs
index d02136d9309f..e1f2bea9afab 100644
--- a/src/test/run-pass/new-impl-syntax.rs
+++ b/src/test/run-pass/new-impl-syntax.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 use std::fmt;
 
 struct Thingy {
diff --git a/src/test/run-pass/new-import-syntax.rs b/src/test/run-pass/new-import-syntax.rs
index 67cf5ab2e1f6..f132ed57ce93 100644
--- a/src/test/run-pass/new-import-syntax.rs
+++ b/src/test/run-pass/new-import-syntax.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 pub fn main() {
     println!("Hello world!");
 }
diff --git a/src/test/run-pass/new-style-constants.rs b/src/test/run-pass/new-style-constants.rs
index 1ded0cd1c8ba..82ed7b55740f 100644
--- a/src/test/run-pass/new-style-constants.rs
+++ b/src/test/run-pass/new-style-constants.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 static FOO: isize = 3;
 
 pub fn main() {
diff --git a/src/test/run-pass/new-unicode-escapes.rs b/src/test/run-pass/new-unicode-escapes.rs
index 1bce71a9ed9a..850b0de44b7e 100644
--- a/src/test/run-pass/new-unicode-escapes.rs
+++ b/src/test/run-pass/new-unicode-escapes.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 pub fn main() {
     let s = "\u{2603}";
     assert_eq!(s, "☃");
diff --git a/src/test/run-pass/new-unsafe-pointers.rs b/src/test/run-pass/new-unsafe-pointers.rs
index a80ef1410876..d99eb4cbd1c8 100644
--- a/src/test/run-pass/new-unsafe-pointers.rs
+++ b/src/test/run-pass/new-unsafe-pointers.rs
@@ -1,3 +1,4 @@
+// run-pass
 // pretty-expanded FIXME #23616
 
 fn main() {
diff --git a/src/test/run-pass/newlambdas-ret-infer.rs b/src/test/run-pass/newlambdas-ret-infer.rs
index 79c9f7dc0110..9b629838ffdf 100644
--- a/src/test/run-pass/newlambdas-ret-infer.rs
+++ b/src/test/run-pass/newlambdas-ret-infer.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 #![allow(dead_code)]
 // Test that the lambda kind is inferred correctly as a return
 // expression
diff --git a/src/test/run-pass/newlambdas-ret-infer2.rs b/src/test/run-pass/newlambdas-ret-infer2.rs
index 104f5be7767d..abe31a05f226 100644
--- a/src/test/run-pass/newlambdas-ret-infer2.rs
+++ b/src/test/run-pass/newlambdas-ret-infer2.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 #![allow(dead_code)]
 // Test that the lambda kind is inferred correctly as a return
 // expression
diff --git a/src/test/run-pass/newlambdas.rs b/src/test/run-pass/newlambdas.rs
index 93199f8ccd50..90de53856c0d 100644
--- a/src/test/run-pass/newlambdas.rs
+++ b/src/test/run-pass/newlambdas.rs
@@ -1,3 +1,4 @@
+// run-pass
 // Tests for the new |args| expr lambda syntax
 
 
diff --git a/src/test/run-pass/newtype-polymorphic.rs b/src/test/run-pass/newtype-polymorphic.rs
index c79b76d646c7..a6a725211ade 100644
--- a/src/test/run-pass/newtype-polymorphic.rs
+++ b/src/test/run-pass/newtype-polymorphic.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 #![allow(non_camel_case_types)]
 
 
diff --git a/src/test/run-pass/newtype-temporary.rs b/src/test/run-pass/newtype-temporary.rs
index f8d6cde2aa8c..8ee75b2fef11 100644
--- a/src/test/run-pass/newtype-temporary.rs
+++ b/src/test/run-pass/newtype-temporary.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 #[derive(PartialEq, Debug)]
 struct Foo(usize);
 
diff --git a/src/test/run-pass/newtype.rs b/src/test/run-pass/newtype.rs
index 56d908ad0b7e..f02b66f450f3 100644
--- a/src/test/run-pass/newtype.rs
+++ b/src/test/run-pass/newtype.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 #![allow(non_camel_case_types)]
 #[derive(Copy, Clone)]
 struct mytype(Mytype);
diff --git a/src/test/run-pass/nil-decl-in-foreign.rs b/src/test/run-pass/nil-decl-in-foreign.rs
index faff6b48730c..98422665b9c5 100644
--- a/src/test/run-pass/nil-decl-in-foreign.rs
+++ b/src/test/run-pass/nil-decl-in-foreign.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 #![allow(improper_ctypes)]
 #![allow(dead_code)]
 // Issue #901
diff --git a/src/test/run-pass/no-core-1.rs b/src/test/run-pass/no-core-1.rs
index 36a3050d3df7..9374f546ac90 100644
--- a/src/test/run-pass/no-core-1.rs
+++ b/src/test/run-pass/no-core-1.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 #![allow(stable_features)]
 #![feature(no_core, core)]
 #![no_core]
diff --git a/src/test/run-pass/no-core-2.rs b/src/test/run-pass/no-core-2.rs
index e09f8f6b7a87..b08e63dc7cfe 100644
--- a/src/test/run-pass/no-core-2.rs
+++ b/src/test/run-pass/no-core-2.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 #![allow(dead_code, unused_imports)]
 #![feature(no_core)]
 #![no_core]
diff --git a/src/test/run-pass/no-landing-pads.rs b/src/test/run-pass/no-landing-pads.rs
index 464978658262..d9d532106125 100644
--- a/src/test/run-pass/no-landing-pads.rs
+++ b/src/test/run-pass/no-landing-pads.rs
@@ -1,3 +1,4 @@
+// run-pass
 // compile-flags: -Z no-landing-pads -C codegen-units=1
 // ignore-emscripten no threads support
 
diff --git a/src/test/run-pass/no-std-1.rs b/src/test/run-pass/no-std-1.rs
index fecf7397c8f8..5b59e9b4eb38 100644
--- a/src/test/run-pass/no-std-1.rs
+++ b/src/test/run-pass/no-std-1.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 #![no_std]
 
 extern crate std;
diff --git a/src/test/run-pass/no-std-2.rs b/src/test/run-pass/no-std-2.rs
index 946f993ca888..487d41649f4c 100644
--- a/src/test/run-pass/no-std-2.rs
+++ b/src/test/run-pass/no-std-2.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 #![no_std]
 
 extern crate std;
diff --git a/src/test/run-pass/no-std-3.rs b/src/test/run-pass/no-std-3.rs
index f937d2593a0c..f6c4ed5794c9 100644
--- a/src/test/run-pass/no-std-3.rs
+++ b/src/test/run-pass/no-std-3.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 #![no_std]
 
 extern crate std;
diff --git a/src/test/run-pass/no-stdio.rs b/src/test/run-pass/no-stdio.rs
index aae1d0b7f81c..e72b7b26e224 100644
--- a/src/test/run-pass/no-stdio.rs
+++ b/src/test/run-pass/no-stdio.rs
@@ -1,3 +1,4 @@
+// run-pass
 // ignore-android
 // ignore-cloudabi no processes
 // ignore-emscripten no processes
diff --git a/src/test/run-pass/non-built-in-quote.rs b/src/test/run-pass/non-built-in-quote.rs
index 75df2788d791..92efa99e3969 100644
--- a/src/test/run-pass/non-built-in-quote.rs
+++ b/src/test/run-pass/non-built-in-quote.rs
@@ -1,3 +1,4 @@
+// run-pass
 // pretty-expanded FIXME #23616
 
 macro_rules! quote_tokens { () => (()) }
diff --git a/src/test/run-pass/non-legacy-modes.rs b/src/test/run-pass/non-legacy-modes.rs
index a3abbeb81566..38c83e00a6ad 100644
--- a/src/test/run-pass/non-legacy-modes.rs
+++ b/src/test/run-pass/non-legacy-modes.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 struct X {
     repr: isize
 }
diff --git a/src/test/run-pass/non_modrs_mods/foors_mod.rs b/src/test/run-pass/non_modrs_mods/foors_mod.rs
index 1ed2e0d88df6..5bf35fbf7fb0 100644
--- a/src/test/run-pass/non_modrs_mods/foors_mod.rs
+++ b/src/test/run-pass/non_modrs_mods/foors_mod.rs
@@ -1,3 +1,4 @@
+// run-pass
 //
 // ignore-test: not a test, used by non_modrs_mods.rs
 
diff --git a/src/test/run-pass/non_modrs_mods/foors_mod/inline/somename.rs b/src/test/run-pass/non_modrs_mods/foors_mod/inline/somename.rs
index b76b4321d62a..04585f918fd1 100644
--- a/src/test/run-pass/non_modrs_mods/foors_mod/inline/somename.rs
+++ b/src/test/run-pass/non_modrs_mods/foors_mod/inline/somename.rs
@@ -1 +1,3 @@
+// run-pass
+
 pub fn foo() {}
diff --git a/src/test/run-pass/non_modrs_mods/foors_mod/inner_foors_mod.rs b/src/test/run-pass/non_modrs_mods/foors_mod/inner_foors_mod.rs
index 68429e9831f0..4d8eb350bd20 100644
--- a/src/test/run-pass/non_modrs_mods/foors_mod/inner_foors_mod.rs
+++ b/src/test/run-pass/non_modrs_mods/foors_mod/inner_foors_mod.rs
@@ -1 +1,3 @@
+// run-pass
+
 pub mod innest;
diff --git a/src/test/run-pass/non_modrs_mods/foors_mod/inner_foors_mod/innest.rs b/src/test/run-pass/non_modrs_mods/foors_mod/inner_foors_mod/innest.rs
index b76b4321d62a..04585f918fd1 100644
--- a/src/test/run-pass/non_modrs_mods/foors_mod/inner_foors_mod/innest.rs
+++ b/src/test/run-pass/non_modrs_mods/foors_mod/inner_foors_mod/innest.rs
@@ -1 +1,3 @@
+// run-pass
+
 pub fn foo() {}
diff --git a/src/test/run-pass/non_modrs_mods/foors_mod/inner_modrs_mod/innest.rs b/src/test/run-pass/non_modrs_mods/foors_mod/inner_modrs_mod/innest.rs
index b76b4321d62a..04585f918fd1 100644
--- a/src/test/run-pass/non_modrs_mods/foors_mod/inner_modrs_mod/innest.rs
+++ b/src/test/run-pass/non_modrs_mods/foors_mod/inner_modrs_mod/innest.rs
@@ -1 +1,3 @@
+// run-pass
+
 pub fn foo() {}
diff --git a/src/test/run-pass/non_modrs_mods/foors_mod/inner_modrs_mod/mod.rs b/src/test/run-pass/non_modrs_mods/foors_mod/inner_modrs_mod/mod.rs
index 68429e9831f0..4d8eb350bd20 100644
--- a/src/test/run-pass/non_modrs_mods/foors_mod/inner_modrs_mod/mod.rs
+++ b/src/test/run-pass/non_modrs_mods/foors_mod/inner_modrs_mod/mod.rs
@@ -1 +1,3 @@
+// run-pass
+
 pub mod innest;
diff --git a/src/test/run-pass/non_modrs_mods/modrs_mod/inline/somename.rs b/src/test/run-pass/non_modrs_mods/modrs_mod/inline/somename.rs
index b76b4321d62a..04585f918fd1 100644
--- a/src/test/run-pass/non_modrs_mods/modrs_mod/inline/somename.rs
+++ b/src/test/run-pass/non_modrs_mods/modrs_mod/inline/somename.rs
@@ -1 +1,3 @@
+// run-pass
+
 pub fn foo() {}
diff --git a/src/test/run-pass/non_modrs_mods/modrs_mod/inner_foors_mod.rs b/src/test/run-pass/non_modrs_mods/modrs_mod/inner_foors_mod.rs
index 68429e9831f0..4d8eb350bd20 100644
--- a/src/test/run-pass/non_modrs_mods/modrs_mod/inner_foors_mod.rs
+++ b/src/test/run-pass/non_modrs_mods/modrs_mod/inner_foors_mod.rs
@@ -1 +1,3 @@
+// run-pass
+
 pub mod innest;
diff --git a/src/test/run-pass/non_modrs_mods/modrs_mod/inner_foors_mod/innest.rs b/src/test/run-pass/non_modrs_mods/modrs_mod/inner_foors_mod/innest.rs
index b76b4321d62a..04585f918fd1 100644
--- a/src/test/run-pass/non_modrs_mods/modrs_mod/inner_foors_mod/innest.rs
+++ b/src/test/run-pass/non_modrs_mods/modrs_mod/inner_foors_mod/innest.rs
@@ -1 +1,3 @@
+// run-pass
+
 pub fn foo() {}
diff --git a/src/test/run-pass/non_modrs_mods/modrs_mod/inner_modrs_mod/innest.rs b/src/test/run-pass/non_modrs_mods/modrs_mod/inner_modrs_mod/innest.rs
index b76b4321d62a..04585f918fd1 100644
--- a/src/test/run-pass/non_modrs_mods/modrs_mod/inner_modrs_mod/innest.rs
+++ b/src/test/run-pass/non_modrs_mods/modrs_mod/inner_modrs_mod/innest.rs
@@ -1 +1,3 @@
+// run-pass
+
 pub fn foo() {}
diff --git a/src/test/run-pass/non_modrs_mods/modrs_mod/inner_modrs_mod/mod.rs b/src/test/run-pass/non_modrs_mods/modrs_mod/inner_modrs_mod/mod.rs
index 68429e9831f0..4d8eb350bd20 100644
--- a/src/test/run-pass/non_modrs_mods/modrs_mod/inner_modrs_mod/mod.rs
+++ b/src/test/run-pass/non_modrs_mods/modrs_mod/inner_modrs_mod/mod.rs
@@ -1 +1,3 @@
+// run-pass
+
 pub mod innest;
diff --git a/src/test/run-pass/non_modrs_mods/modrs_mod/mod.rs b/src/test/run-pass/non_modrs_mods/modrs_mod/mod.rs
index 46add00996b5..c8efa66d6657 100644
--- a/src/test/run-pass/non_modrs_mods/modrs_mod/mod.rs
+++ b/src/test/run-pass/non_modrs_mods/modrs_mod/mod.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 pub mod inner_modrs_mod;
 pub mod inner_foors_mod;
 pub mod inline {
diff --git a/src/test/run-pass/non_modrs_mods/some_crazy_attr_mod_dir/arbitrary_name.rs b/src/test/run-pass/non_modrs_mods/some_crazy_attr_mod_dir/arbitrary_name.rs
index 97441eb5e57a..7d5d5b9e5ca9 100644
--- a/src/test/run-pass/non_modrs_mods/some_crazy_attr_mod_dir/arbitrary_name.rs
+++ b/src/test/run-pass/non_modrs_mods/some_crazy_attr_mod_dir/arbitrary_name.rs
@@ -1 +1,3 @@
+// run-pass
+
 pub mod inner_modrs_mod;
diff --git a/src/test/run-pass/non_modrs_mods/some_crazy_attr_mod_dir/inner_modrs_mod/innest.rs b/src/test/run-pass/non_modrs_mods/some_crazy_attr_mod_dir/inner_modrs_mod/innest.rs
index b76b4321d62a..04585f918fd1 100644
--- a/src/test/run-pass/non_modrs_mods/some_crazy_attr_mod_dir/inner_modrs_mod/innest.rs
+++ b/src/test/run-pass/non_modrs_mods/some_crazy_attr_mod_dir/inner_modrs_mod/innest.rs
@@ -1 +1,3 @@
+// run-pass
+
 pub fn foo() {}
diff --git a/src/test/run-pass/non_modrs_mods/some_crazy_attr_mod_dir/inner_modrs_mod/mod.rs b/src/test/run-pass/non_modrs_mods/some_crazy_attr_mod_dir/inner_modrs_mod/mod.rs
index 68429e9831f0..4d8eb350bd20 100644
--- a/src/test/run-pass/non_modrs_mods/some_crazy_attr_mod_dir/inner_modrs_mod/mod.rs
+++ b/src/test/run-pass/non_modrs_mods/some_crazy_attr_mod_dir/inner_modrs_mod/mod.rs
@@ -1 +1,3 @@
+// run-pass
+
 pub mod innest;
diff --git a/src/test/run-pass/nul-characters.rs b/src/test/run-pass/nul-characters.rs
index d93219d83d26..11b6e9fe3764 100644
--- a/src/test/run-pass/nul-characters.rs
+++ b/src/test/run-pass/nul-characters.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 pub fn main()
 {
     let all_nuls1 = "\0\x00\u{0}\u{0}";
diff --git a/src/test/run-pass/nullable-pointer-ffi-compat.rs b/src/test/run-pass/nullable-pointer-ffi-compat.rs
index 0487052799a4..0647a18c3c45 100644
--- a/src/test/run-pass/nullable-pointer-ffi-compat.rs
+++ b/src/test/run-pass/nullable-pointer-ffi-compat.rs
@@ -1,3 +1,4 @@
+// run-pass
 // #11303, #11040:
 // This would previously crash on i686 Linux due to abi differences
 // between returning an Option<T> and T, where T is a non nullable
diff --git a/src/test/run-pass/nullable-pointer-iotareduction.rs b/src/test/run-pass/nullable-pointer-iotareduction.rs
index 42aad550c1a7..4c6964f294b5 100644
--- a/src/test/run-pass/nullable-pointer-iotareduction.rs
+++ b/src/test/run-pass/nullable-pointer-iotareduction.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 #![feature(box_syntax)]
 
 // Iota-reduction is a rule in the Calculus of (Co-)Inductive Constructions,
diff --git a/src/test/run-pass/nullable-pointer-size.rs b/src/test/run-pass/nullable-pointer-size.rs
index efd5cea6a4bf..63a106f12928 100644
--- a/src/test/run-pass/nullable-pointer-size.rs
+++ b/src/test/run-pass/nullable-pointer-size.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 #![allow(dead_code)]
 
 use std::mem;
diff --git a/src/test/run-pass/object-lifetime-default-default-to-static.rs b/src/test/run-pass/object-lifetime-default-default-to-static.rs
index cd61dea03788..467767ae59d7 100644
--- a/src/test/run-pass/object-lifetime-default-default-to-static.rs
+++ b/src/test/run-pass/object-lifetime-default-default-to-static.rs
@@ -1,3 +1,4 @@
+// run-pass
 // Test that `Box<Test>` is equivalent to `Box<Test+'static>`, both in
 // fields and fn arguments.
 
diff --git a/src/test/run-pass/object-lifetime-default-from-rptr-box.rs b/src/test/run-pass/object-lifetime-default-from-rptr-box.rs
index 9212f2802c01..8ac45b3db71b 100644
--- a/src/test/run-pass/object-lifetime-default-from-rptr-box.rs
+++ b/src/test/run-pass/object-lifetime-default-from-rptr-box.rs
@@ -1,3 +1,4 @@
+// run-pass
 // Test that the lifetime from the enclosing `&` is "inherited"
 // through the `Box` struct.
 
diff --git a/src/test/run-pass/object-lifetime-default-from-rptr-mut.rs b/src/test/run-pass/object-lifetime-default-from-rptr-mut.rs
index 061f3a116fcb..a09fc03ab9b4 100644
--- a/src/test/run-pass/object-lifetime-default-from-rptr-mut.rs
+++ b/src/test/run-pass/object-lifetime-default-from-rptr-mut.rs
@@ -1,3 +1,4 @@
+// run-pass
 // Test that the lifetime of the enclosing `&` is used for the object
 // lifetime bound.
 
diff --git a/src/test/run-pass/object-lifetime-default-from-rptr.rs b/src/test/run-pass/object-lifetime-default-from-rptr.rs
index cfa4af0d7a53..5093b1c27d0e 100644
--- a/src/test/run-pass/object-lifetime-default-from-rptr.rs
+++ b/src/test/run-pass/object-lifetime-default-from-rptr.rs
@@ -1,3 +1,4 @@
+// run-pass
 // Test that the lifetime of the enclosing `&` is used for the object
 // lifetime bound.
 
diff --git a/src/test/run-pass/object-method-numbering.rs b/src/test/run-pass/object-method-numbering.rs
index 7f24ab2cbb5f..bf80a80f4060 100644
--- a/src/test/run-pass/object-method-numbering.rs
+++ b/src/test/run-pass/object-method-numbering.rs
@@ -1,3 +1,4 @@
+// run-pass
 // Test for using an object with an associated type binding as the
 // instantiation for a generic type with a bound.
 
diff --git a/src/test/run-pass/objects-coerce-freeze-borrored.rs b/src/test/run-pass/objects-coerce-freeze-borrored.rs
index 47196f108c02..704d77480b85 100644
--- a/src/test/run-pass/objects-coerce-freeze-borrored.rs
+++ b/src/test/run-pass/objects-coerce-freeze-borrored.rs
@@ -1,3 +1,4 @@
+// run-pass
 // Test that we can coerce an `@Object` to an `&Object`
 
 
diff --git a/src/test/run-pass/objects-owned-object-borrowed-method-headerless.rs b/src/test/run-pass/objects-owned-object-borrowed-method-headerless.rs
index 58327237494e..9b88d8ea7bcd 100644
--- a/src/test/run-pass/objects-owned-object-borrowed-method-headerless.rs
+++ b/src/test/run-pass/objects-owned-object-borrowed-method-headerless.rs
@@ -1,3 +1,4 @@
+// run-pass
 // Test invoked `&self` methods on owned objects where the values
 // closed over do not contain managed values, and thus the boxes do
 // not have headers.
diff --git a/src/test/run-pass/objects-owned-object-owned-method.rs b/src/test/run-pass/objects-owned-object-owned-method.rs
index 69984fbb62f1..4b7b68f22176 100644
--- a/src/test/run-pass/objects-owned-object-owned-method.rs
+++ b/src/test/run-pass/objects-owned-object-owned-method.rs
@@ -1,3 +1,4 @@
+// run-pass
 // Test invoked `&self` methods on owned objects where the values
 // closed over contain managed values. This implies that the boxes
 // will have headers that must be skipped over.
diff --git a/src/test/run-pass/once-move-out-on-heap.rs b/src/test/run-pass/once-move-out-on-heap.rs
index 46e663417cf9..4e2e400cec02 100644
--- a/src/test/run-pass/once-move-out-on-heap.rs
+++ b/src/test/run-pass/once-move-out-on-heap.rs
@@ -1,3 +1,4 @@
+// run-pass
 // Testing guarantees provided by once functions.
 
 
diff --git a/src/test/run-pass/one-tuple.rs b/src/test/run-pass/one-tuple.rs
index fa54f9529382..00fbadce1ac8 100644
--- a/src/test/run-pass/one-tuple.rs
+++ b/src/test/run-pass/one-tuple.rs
@@ -1,3 +1,4 @@
+// run-pass
 // Why one-tuples? Because macros.
 
 
diff --git a/src/test/run-pass/op-assign-builtins-by-ref.rs b/src/test/run-pass/op-assign-builtins-by-ref.rs
index 8e0353e48492..96853854d6cc 100644
--- a/src/test/run-pass/op-assign-builtins-by-ref.rs
+++ b/src/test/run-pass/op-assign-builtins-by-ref.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 fn main() {
     // test compound assignment operators with ref as right-hand side,
     // for each operator, with various types as operands.
diff --git a/src/test/run-pass/opeq.rs b/src/test/run-pass/opeq.rs
index ea6c7647bb5c..9737be97fa37 100644
--- a/src/test/run-pass/opeq.rs
+++ b/src/test/run-pass/opeq.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 pub fn main() {
     let mut x: isize = 1;
     x *= 2;
diff --git a/src/test/run-pass/operator-associativity.rs b/src/test/run-pass/operator-associativity.rs
index 69e3f699e9c6..4f40c80bc4c7 100644
--- a/src/test/run-pass/operator-associativity.rs
+++ b/src/test/run-pass/operator-associativity.rs
@@ -1,3 +1,4 @@
+// run-pass
 // Testcase for issue #130, operator associativity.
 
 pub fn main() { assert_eq!(3 * 5 / 2, 7); }
diff --git a/src/test/run-pass/operator-multidispatch.rs b/src/test/run-pass/operator-multidispatch.rs
index cc546c903b79..0d1dcfd8bddb 100644
--- a/src/test/run-pass/operator-multidispatch.rs
+++ b/src/test/run-pass/operator-multidispatch.rs
@@ -1,3 +1,4 @@
+// run-pass
 // Test that we can overload the `+` operator for points so that two
 // points can be added, and a point can be added to an integer.
 
diff --git a/src/test/run-pass/operator-overloading.rs b/src/test/run-pass/operator-overloading.rs
index 026e2536cef4..6b3abcbc76cc 100644
--- a/src/test/run-pass/operator-overloading.rs
+++ b/src/test/run-pass/operator-overloading.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 #![allow(unused_variables)]
 use std::cmp;
 use std::ops;
diff --git a/src/test/run-pass/optimization-fuel-0.rs b/src/test/run-pass/optimization-fuel-0.rs
index 77f21b3fcc0a..f86972b73482 100644
--- a/src/test/run-pass/optimization-fuel-0.rs
+++ b/src/test/run-pass/optimization-fuel-0.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 #![crate_name="foo"]
 
 use std::mem::size_of;
diff --git a/src/test/run-pass/optimization-fuel-1.rs b/src/test/run-pass/optimization-fuel-1.rs
index 58778cac50dd..98283066361c 100644
--- a/src/test/run-pass/optimization-fuel-1.rs
+++ b/src/test/run-pass/optimization-fuel-1.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 #![crate_name="foo"]
 
 use std::mem::size_of;
diff --git a/src/test/run-pass/option-ext.rs b/src/test/run-pass/option-ext.rs
index 0b21b8e5b5a6..76d0cf43984b 100644
--- a/src/test/run-pass/option-ext.rs
+++ b/src/test/run-pass/option-ext.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 pub fn main() {
     let thing = "{{ f }}";
     let f = thing.find("{{");
diff --git a/src/test/run-pass/option-unwrap.rs b/src/test/run-pass/option-unwrap.rs
index 6ad65c99247f..173f803ee24d 100644
--- a/src/test/run-pass/option-unwrap.rs
+++ b/src/test/run-pass/option-unwrap.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 #![allow(non_camel_case_types)]
 use std::cell::Cell;
 
diff --git a/src/test/run-pass/out-of-stack.rs b/src/test/run-pass/out-of-stack.rs
index f03935e3d27c..5e9265be4b98 100644
--- a/src/test/run-pass/out-of-stack.rs
+++ b/src/test/run-pass/out-of-stack.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 #![allow(unused_must_use)]
 #![allow(unconditional_recursion)]
 // ignore-android: FIXME (#20004)
diff --git a/src/test/run-pass/out-pointer-aliasing.rs b/src/test/run-pass/out-pointer-aliasing.rs
index 48fa9020b930..b28a09101797 100644
--- a/src/test/run-pass/out-pointer-aliasing.rs
+++ b/src/test/run-pass/out-pointer-aliasing.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 #[derive(Copy, Clone)]
 pub struct Foo {
     f1: isize,
diff --git a/src/test/run-pass/output-slot-variants.rs b/src/test/run-pass/output-slot-variants.rs
index f3cc2e99e0ff..af4caf756699 100644
--- a/src/test/run-pass/output-slot-variants.rs
+++ b/src/test/run-pass/output-slot-variants.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 #![allow(dead_code)]
 #![allow(unused_assignments)]
 #![allow(unknown_lints)]
diff --git a/src/test/run-pass/over-constrained-vregs.rs b/src/test/run-pass/over-constrained-vregs.rs
index 6d1b2d55e556..cc808147600b 100644
--- a/src/test/run-pass/over-constrained-vregs.rs
+++ b/src/test/run-pass/over-constrained-vregs.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 #![allow(unused_must_use)]
 // Regression test for issue #152.
 pub fn main() {
diff --git a/src/test/run-pass/overlap-doesnt-conflict-with-specialization.rs b/src/test/run-pass/overlap-doesnt-conflict-with-specialization.rs
index ddad0f596991..3d4069f368d2 100644
--- a/src/test/run-pass/overlap-doesnt-conflict-with-specialization.rs
+++ b/src/test/run-pass/overlap-doesnt-conflict-with-specialization.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 #![feature(overlapping_marker_traits)]
 #![feature(specialization)]
 
diff --git a/src/test/run-pass/overlap-permitted-for-annotated-marker-traits.rs b/src/test/run-pass/overlap-permitted-for-annotated-marker-traits.rs
index 53c5cfc81388..383313902379 100644
--- a/src/test/run-pass/overlap-permitted-for-annotated-marker-traits.rs
+++ b/src/test/run-pass/overlap-permitted-for-annotated-marker-traits.rs
@@ -1,3 +1,4 @@
+// run-pass
 // Tests for RFC 1268: we allow overlapping impls of marker traits,
 // that is, traits with #[marker]. In this case, a type `T` is
 // `MyMarker` if it is either `Debug` or `Display`.
diff --git a/src/test/run-pass/owned-implies-static.rs b/src/test/run-pass/owned-implies-static.rs
index 7101726ab6a6..2efa8cc02f42 100644
--- a/src/test/run-pass/owned-implies-static.rs
+++ b/src/test/run-pass/owned-implies-static.rs
@@ -1,3 +1,4 @@
+// run-pass
 // pretty-expanded FIXME #23616
 
 fn f<T: 'static>(_x: T) {}
diff --git a/src/test/run-pass/packed/packed-with-inference-vars-issue-61402.rs b/src/test/run-pass/packed/packed-with-inference-vars-issue-61402.rs
index 6028b8f5ab49..659864c1d9b5 100644
--- a/src/test/run-pass/packed/packed-with-inference-vars-issue-61402.rs
+++ b/src/test/run-pass/packed/packed-with-inference-vars-issue-61402.rs
@@ -1,3 +1,4 @@
+// run-pass
 // If a struct is packed and its last field has drop glue, then that
 // field needs to be Sized (to allow it to be destroyed out-of-place).
 //
diff --git a/src/test/run-pass/panic-uninitialized-zeroed.rs b/src/test/run-pass/panic-uninitialized-zeroed.rs
index 5026ad1ccd4c..0c97babd51cd 100644
--- a/src/test/run-pass/panic-uninitialized-zeroed.rs
+++ b/src/test/run-pass/panic-uninitialized-zeroed.rs
@@ -1,3 +1,4 @@
+// run-pass
 // ignore-wasm32-bare always compiled as panic=abort right now and this requires unwinding
 // This test checks that instantiating an uninhabited type via `mem::{uninitialized,zeroed}` results
 // in a runtime panic.
diff --git a/src/test/run-pass/paren-free.rs b/src/test/run-pass/paren-free.rs
index 1f05ee0ed224..8e8bb8800ec0 100644
--- a/src/test/run-pass/paren-free.rs
+++ b/src/test/run-pass/paren-free.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 pub fn main() {
     let x = true;
     if x { let mut i = 10; while i > 0 { i -= 1; } }
diff --git a/src/test/run-pass/parse-assoc-type-lt.rs b/src/test/run-pass/parse-assoc-type-lt.rs
index e6b07c583fb0..d3fe6079a5d2 100644
--- a/src/test/run-pass/parse-assoc-type-lt.rs
+++ b/src/test/run-pass/parse-assoc-type-lt.rs
@@ -1,3 +1,4 @@
+// run-pass
 // pretty-expanded FIXME #23616
 
 trait Foo {
diff --git a/src/test/run-pass/parse-panic.rs b/src/test/run-pass/parse-panic.rs
index a08cd106ec11..aeb2ba4faa54 100644
--- a/src/test/run-pass/parse-panic.rs
+++ b/src/test/run-pass/parse-panic.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 #![allow(dead_code)]
 #![allow(unreachable_code)]
 
diff --git a/src/test/run-pass/parser-unicode-whitespace.rs b/src/test/run-pass/parser-unicode-whitespace.rs
index 26e79b061726..2d1fa7dc42e0 100644
--- a/src/test/run-pass/parser-unicode-whitespace.rs
+++ b/src/test/run-pass/parser-unicode-whitespace.rs
@@ -1,3 +1,4 @@
+// run-pass
 // Beware editing: it has numerous whitespace characters which are important.
 // It contains one ranges from the 'PATTERN_WHITE_SPACE' property outlined in
 // http://unicode.org/Public/UNIDATA/PropList.txt
diff --git a/src/test/run-pass/path.rs b/src/test/run-pass/path.rs
index 7a9b04c07046..4c137de82d07 100644
--- a/src/test/run-pass/path.rs
+++ b/src/test/run-pass/path.rs
@@ -1,3 +1,4 @@
+// run-pass
 // pretty-expanded FIXME #23616
 
 mod foo {
diff --git a/src/test/run-pass/paths-containing-nul.rs b/src/test/run-pass/paths-containing-nul.rs
index 64ee7319fdde..c9bf710b8e76 100644
--- a/src/test/run-pass/paths-containing-nul.rs
+++ b/src/test/run-pass/paths-containing-nul.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 #![allow(deprecated)]
 // ignore-cloudabi no files or I/O
 // ignore-wasm32-bare no files or I/O
diff --git a/src/test/run-pass/print-stdout-eprint-stderr.rs b/src/test/run-pass/print-stdout-eprint-stderr.rs
index 65130a1a9f2c..70c083e0800c 100644
--- a/src/test/run-pass/print-stdout-eprint-stderr.rs
+++ b/src/test/run-pass/print-stdout-eprint-stderr.rs
@@ -1,3 +1,4 @@
+// run-pass
 // ignore-cloudabi spawning processes is not supported
 // ignore-emscripten spawning processes is not supported
 // ignore-sgx no processes
diff --git a/src/test/run-pass/proc-macro/add-impl.rs b/src/test/run-pass/proc-macro/add-impl.rs
index 239074b4e429..ff2897a5e868 100644
--- a/src/test/run-pass/proc-macro/add-impl.rs
+++ b/src/test/run-pass/proc-macro/add-impl.rs
@@ -1,3 +1,4 @@
+// run-pass
 // aux-build:add-impl.rs
 
 #[macro_use]
diff --git a/src/test/run-pass/proc-macro/append-impl.rs b/src/test/run-pass/proc-macro/append-impl.rs
index a49fd8278011..a49384013484 100644
--- a/src/test/run-pass/proc-macro/append-impl.rs
+++ b/src/test/run-pass/proc-macro/append-impl.rs
@@ -1,3 +1,4 @@
+// run-pass
 // aux-build:append-impl.rs
 
 #![allow(warnings)]
diff --git a/src/test/run-pass/proc-macro/attr-args.rs b/src/test/run-pass/proc-macro/attr-args.rs
index 6ff6ccacf7c4..764f507abfc6 100644
--- a/src/test/run-pass/proc-macro/attr-args.rs
+++ b/src/test/run-pass/proc-macro/attr-args.rs
@@ -1,3 +1,4 @@
+// run-pass
 // aux-build:attr-args.rs
 
 #![allow(warnings)]
diff --git a/src/test/run-pass/proc-macro/attr-cfg.rs b/src/test/run-pass/proc-macro/attr-cfg.rs
index 7816576eb5c1..2aed9e2e814d 100644
--- a/src/test/run-pass/proc-macro/attr-cfg.rs
+++ b/src/test/run-pass/proc-macro/attr-cfg.rs
@@ -1,3 +1,4 @@
+// run-pass
 // aux-build:attr-cfg.rs
 // revisions: foo bar
 
diff --git a/src/test/run-pass/proc-macro/attr-on-trait.rs b/src/test/run-pass/proc-macro/attr-on-trait.rs
index 4a8fac411016..e0edee630a4a 100644
--- a/src/test/run-pass/proc-macro/attr-on-trait.rs
+++ b/src/test/run-pass/proc-macro/attr-on-trait.rs
@@ -1,3 +1,4 @@
+// run-pass
 // aux-build:attr-on-trait.rs
 
 extern crate attr_on_trait;
diff --git a/src/test/run-pass/proc-macro/attr-stmt-expr.rs b/src/test/run-pass/proc-macro/attr-stmt-expr.rs
index 3f10754985b1..fe22f4877214 100644
--- a/src/test/run-pass/proc-macro/attr-stmt-expr.rs
+++ b/src/test/run-pass/proc-macro/attr-stmt-expr.rs
@@ -1,3 +1,4 @@
+// run-pass
 // aux-build:attr-stmt-expr.rs
 
 #![feature(stmt_expr_attributes, proc_macro_hygiene)]
diff --git a/src/test/run-pass/proc-macro/bang-macro.rs b/src/test/run-pass/proc-macro/bang-macro.rs
index 6f04bb10b903..7073c71538cf 100644
--- a/src/test/run-pass/proc-macro/bang-macro.rs
+++ b/src/test/run-pass/proc-macro/bang-macro.rs
@@ -1,3 +1,4 @@
+// run-pass
 // aux-build:bang-macro.rs
 
 #![feature(proc_macro_hygiene)]
diff --git a/src/test/run-pass/proc-macro/call-site.rs b/src/test/run-pass/proc-macro/call-site.rs
index f31b418e3b27..096d0ec533a7 100644
--- a/src/test/run-pass/proc-macro/call-site.rs
+++ b/src/test/run-pass/proc-macro/call-site.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 #![allow(unused_variables)]
 #![allow(unused_imports)]
 // aux-build:call-site.rs
diff --git a/src/test/run-pass/proc-macro/count_compound_ops.rs b/src/test/run-pass/proc-macro/count_compound_ops.rs
index f42d82ce046d..966ab616cdf0 100644
--- a/src/test/run-pass/proc-macro/count_compound_ops.rs
+++ b/src/test/run-pass/proc-macro/count_compound_ops.rs
@@ -1,3 +1,4 @@
+// run-pass
 // aux-build:count_compound_ops.rs
 
 #![feature(proc_macro_hygiene)]
diff --git a/src/test/run-pass/proc-macro/crate-var.rs b/src/test/run-pass/proc-macro/crate-var.rs
index 4d551f65cd0b..c0518e4b08cc 100644
--- a/src/test/run-pass/proc-macro/crate-var.rs
+++ b/src/test/run-pass/proc-macro/crate-var.rs
@@ -1,3 +1,4 @@
+// run-pass
 // aux-build:double.rs
 // aux-build:external-crate-var.rs
 
diff --git a/src/test/run-pass/proc-macro/custom-attr-only-one-derive.rs b/src/test/run-pass/proc-macro/custom-attr-only-one-derive.rs
index 993d3315596e..2cd5b487301c 100644
--- a/src/test/run-pass/proc-macro/custom-attr-only-one-derive.rs
+++ b/src/test/run-pass/proc-macro/custom-attr-only-one-derive.rs
@@ -1,3 +1,4 @@
+// run-pass
 // aux-build:custom-attr-only-one-derive.rs
 
 #![feature(rust_2018_preview)]
diff --git a/src/test/run-pass/proc-macro/derive-attr-cfg.rs b/src/test/run-pass/proc-macro/derive-attr-cfg.rs
index c23ab9fb683e..3947746286da 100644
--- a/src/test/run-pass/proc-macro/derive-attr-cfg.rs
+++ b/src/test/run-pass/proc-macro/derive-attr-cfg.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 #![allow(dead_code)]
 // aux-build:derive-attr-cfg.rs
 
diff --git a/src/test/run-pass/proc-macro/derive-b.rs b/src/test/run-pass/proc-macro/derive-b.rs
index da67534364b6..41291a87b01e 100644
--- a/src/test/run-pass/proc-macro/derive-b.rs
+++ b/src/test/run-pass/proc-macro/derive-b.rs
@@ -1,3 +1,4 @@
+// run-pass
 // aux-build:derive-b.rs
 
 extern crate derive_b;
diff --git a/src/test/run-pass/proc-macro/derive-same-struct.rs b/src/test/run-pass/proc-macro/derive-same-struct.rs
index 184015250875..528b0f22a81e 100644
--- a/src/test/run-pass/proc-macro/derive-same-struct.rs
+++ b/src/test/run-pass/proc-macro/derive-same-struct.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 #![allow(path_statements)]
 #![allow(dead_code)]
 // aux-build:derive-same-struct.rs
diff --git a/src/test/run-pass/proc-macro/derive-test.rs b/src/test/run-pass/proc-macro/derive-test.rs
index edb0201ba779..b81e38432e83 100644
--- a/src/test/run-pass/proc-macro/derive-test.rs
+++ b/src/test/run-pass/proc-macro/derive-test.rs
@@ -1,3 +1,4 @@
+// run-pass
 // no-prefer-dynamic
 // compile-flags: --test
 
diff --git a/src/test/run-pass/proc-macro/derive-two-attrs.rs b/src/test/run-pass/proc-macro/derive-two-attrs.rs
index a93ba8184f7f..08225b8e3f22 100644
--- a/src/test/run-pass/proc-macro/derive-two-attrs.rs
+++ b/src/test/run-pass/proc-macro/derive-two-attrs.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 #![allow(dead_code)]
 // aux-build:derive-two-attrs.rs
 
diff --git a/src/test/run-pass/proc-macro/derive-union.rs b/src/test/run-pass/proc-macro/derive-union.rs
index 6e8b1b726e46..e83eee0936ad 100644
--- a/src/test/run-pass/proc-macro/derive-union.rs
+++ b/src/test/run-pass/proc-macro/derive-union.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 #![allow(unused_variables)]
 // aux-build:derive-union.rs
 
diff --git a/src/test/run-pass/proc-macro/empty-crate.rs b/src/test/run-pass/proc-macro/empty-crate.rs
index 84104a3f5cf0..3e54c9feebc6 100644
--- a/src/test/run-pass/proc-macro/empty-crate.rs
+++ b/src/test/run-pass/proc-macro/empty-crate.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 #![allow(unused_imports)]
 // aux-build:empty-crate.rs
 
diff --git a/src/test/run-pass/proc-macro/expand-with-a-macro.rs b/src/test/run-pass/proc-macro/expand-with-a-macro.rs
index 097520b993a7..418178d0f0ea 100644
--- a/src/test/run-pass/proc-macro/expand-with-a-macro.rs
+++ b/src/test/run-pass/proc-macro/expand-with-a-macro.rs
@@ -1,3 +1,4 @@
+// run-pass
 // aux-build:expand-with-a-macro.rs
 
 // ignore-wasm32-bare compiled with panic=abort by default
diff --git a/src/test/run-pass/proc-macro/gen-lifetime-token.rs b/src/test/run-pass/proc-macro/gen-lifetime-token.rs
index 1659b87440b9..588bd2b76c10 100644
--- a/src/test/run-pass/proc-macro/gen-lifetime-token.rs
+++ b/src/test/run-pass/proc-macro/gen-lifetime-token.rs
@@ -1,3 +1,4 @@
+// run-pass
 // aux-build:gen-lifetime-token.rs
 
 extern crate gen_lifetime_token as bar;
diff --git a/src/test/run-pass/proc-macro/hygiene_example.rs b/src/test/run-pass/proc-macro/hygiene_example.rs
index 3e5bab6bb133..56ea9daacc3b 100644
--- a/src/test/run-pass/proc-macro/hygiene_example.rs
+++ b/src/test/run-pass/proc-macro/hygiene_example.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 #![allow(unused_macros)]
 // aux-build:hygiene_example_codegen.rs
 // aux-build:hygiene_example.rs
diff --git a/src/test/run-pass/proc-macro/issue-39889.rs b/src/test/run-pass/proc-macro/issue-39889.rs
index 91c8d48b8711..ada125a215a5 100644
--- a/src/test/run-pass/proc-macro/issue-39889.rs
+++ b/src/test/run-pass/proc-macro/issue-39889.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 #![allow(dead_code)]
 // aux-build:issue-39889.rs
 
diff --git a/src/test/run-pass/proc-macro/issue-42708.rs b/src/test/run-pass/proc-macro/issue-42708.rs
index 466021c16e8d..e8f445aaaf72 100644
--- a/src/test/run-pass/proc-macro/issue-42708.rs
+++ b/src/test/run-pass/proc-macro/issue-42708.rs
@@ -1,3 +1,4 @@
+// run-pass
 // aux-build:issue-42708.rs
 
 #![feature(decl_macro)]
diff --git a/src/test/run-pass/proc-macro/issue-50061.rs b/src/test/run-pass/proc-macro/issue-50061.rs
index b0dad493ebcb..01c6b80b46ca 100644
--- a/src/test/run-pass/proc-macro/issue-50061.rs
+++ b/src/test/run-pass/proc-macro/issue-50061.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 #![allow(path_statements)]
 // aux-build:issue-50061.rs
 
diff --git a/src/test/run-pass/proc-macro/lifetimes.rs b/src/test/run-pass/proc-macro/lifetimes.rs
index e462a53ec283..016c530fe353 100644
--- a/src/test/run-pass/proc-macro/lifetimes.rs
+++ b/src/test/run-pass/proc-macro/lifetimes.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 #![allow(unused_variables)]
 // aux-build:lifetimes.rs
 
diff --git a/src/test/run-pass/proc-macro/load-two.rs b/src/test/run-pass/proc-macro/load-two.rs
index 24585e1e0674..5ce0e65452e9 100644
--- a/src/test/run-pass/proc-macro/load-two.rs
+++ b/src/test/run-pass/proc-macro/load-two.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 #![allow(path_statements)]
 #![allow(dead_code)]
 // aux-build:derive-atob.rs
diff --git a/src/test/run-pass/proc-macro/macros-in-extern.rs b/src/test/run-pass/proc-macro/macros-in-extern.rs
index 99e3f7d14fd1..93ae5441f9b5 100644
--- a/src/test/run-pass/proc-macro/macros-in-extern.rs
+++ b/src/test/run-pass/proc-macro/macros-in-extern.rs
@@ -1,3 +1,4 @@
+// run-pass
 // aux-build:test-macros.rs
 // ignore-wasm32
 
diff --git a/src/test/run-pass/proc-macro/modify-ast.rs b/src/test/run-pass/proc-macro/modify-ast.rs
index a96c61f1cb88..ea9bf837c247 100644
--- a/src/test/run-pass/proc-macro/modify-ast.rs
+++ b/src/test/run-pass/proc-macro/modify-ast.rs
@@ -1,3 +1,4 @@
+// run-pass
 // aux-build:modify-ast.rs
 
 extern crate modify_ast;
diff --git a/src/test/run-pass/proc-macro/negative-token.rs b/src/test/run-pass/proc-macro/negative-token.rs
index 751d1a43a0a9..3d018fe60a13 100644
--- a/src/test/run-pass/proc-macro/negative-token.rs
+++ b/src/test/run-pass/proc-macro/negative-token.rs
@@ -1,3 +1,4 @@
+// run-pass
 // aux-build:negative-token.rs
 
 #![feature(proc_macro_hygiene)]
diff --git a/src/test/run-pass/proc-macro/not-joint.rs b/src/test/run-pass/proc-macro/not-joint.rs
index b360e4e1bb27..30da2811ed4d 100644
--- a/src/test/run-pass/proc-macro/not-joint.rs
+++ b/src/test/run-pass/proc-macro/not-joint.rs
@@ -1,3 +1,4 @@
+// run-pass
 // aux-build:not-joint.rs
 
 extern crate not_joint as bar;
diff --git a/src/test/run-pass/proc-macro/smoke.rs b/src/test/run-pass/proc-macro/smoke.rs
index 26fbce3ebf14..04625559b919 100644
--- a/src/test/run-pass/proc-macro/smoke.rs
+++ b/src/test/run-pass/proc-macro/smoke.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 #![allow(unused_must_use)]
 #![allow(path_statements)]
 // aux-build:derive-a.rs
diff --git a/src/test/run-pass/proc-macro/span-api-tests.rs b/src/test/run-pass/proc-macro/span-api-tests.rs
index 9b977b8fa75c..3667e14c9e05 100644
--- a/src/test/run-pass/proc-macro/span-api-tests.rs
+++ b/src/test/run-pass/proc-macro/span-api-tests.rs
@@ -1,3 +1,4 @@
+// run-pass
 // aux-build:span-api-tests.rs
 // aux-build:span-test-macros.rs
 
diff --git a/src/test/run-pass/proc-macro/struct-field-macro.rs b/src/test/run-pass/proc-macro/struct-field-macro.rs
index 58663cc6c379..460f4d9f726f 100644
--- a/src/test/run-pass/proc-macro/struct-field-macro.rs
+++ b/src/test/run-pass/proc-macro/struct-field-macro.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 #![allow(dead_code)]
 // aux-build:derive-nothing.rs
 
diff --git a/src/test/run-pass/proc_macro.rs b/src/test/run-pass/proc_macro.rs
index afdf2b8baa19..7ff946490034 100644
--- a/src/test/run-pass/proc_macro.rs
+++ b/src/test/run-pass/proc_macro.rs
@@ -1,3 +1,4 @@
+// run-pass
 // aux-build:proc_macro_def.rs
 // ignore-cross-compile
 
diff --git a/src/test/run-pass/project-cache-issue-31849.rs b/src/test/run-pass/project-cache-issue-31849.rs
index 4920678af1a0..07fb6abaeace 100644
--- a/src/test/run-pass/project-cache-issue-31849.rs
+++ b/src/test/run-pass/project-cache-issue-31849.rs
@@ -1,3 +1,4 @@
+// run-pass
 // Regression test for #31849: the problem here was actually a performance
 // cliff, but I'm adding the test for reference.
 
diff --git a/src/test/run-pass/project-cache-issue-37154.rs b/src/test/run-pass/project-cache-issue-37154.rs
index 8b07b9c98ad8..b10239c22d1f 100644
--- a/src/test/run-pass/project-cache-issue-37154.rs
+++ b/src/test/run-pass/project-cache-issue-37154.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 #![allow(dead_code)]
 // Regression test for #37154: the problem here was that the cache
 // results in a false error because it was caching placeholder results
diff --git a/src/test/run-pass/project-defer-unification.rs b/src/test/run-pass/project-defer-unification.rs
index 548c4d29cbb7..547ff45c2296 100644
--- a/src/test/run-pass/project-defer-unification.rs
+++ b/src/test/run-pass/project-defer-unification.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 #![allow(dead_code)]
 #![allow(unused_variables)]
 #![allow(unreachable_code)]
diff --git a/src/test/run-pass/ptr-coercion.rs b/src/test/run-pass/ptr-coercion.rs
index 0dd2b5467d9a..1c3ce33039e1 100644
--- a/src/test/run-pass/ptr-coercion.rs
+++ b/src/test/run-pass/ptr-coercion.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 #![allow(unused_variables)]
 // Test coercions between pointers which don't do anything fancy like unsizing.
 
diff --git a/src/test/run-pass/pure-sum.rs b/src/test/run-pass/pure-sum.rs
index d000c8488a68..2ff6f935a03c 100644
--- a/src/test/run-pass/pure-sum.rs
+++ b/src/test/run-pass/pure-sum.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 #![allow(dead_code)]
 // Check that functions can modify local state.
 
diff --git a/src/test/run-pass/purity-infer.rs b/src/test/run-pass/purity-infer.rs
index 3b2b41860194..dc0eb89bfa20 100644
--- a/src/test/run-pass/purity-infer.rs
+++ b/src/test/run-pass/purity-infer.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 fn something<F>(f: F) where F: FnOnce() { f(); }
 pub fn main() {
     something(|| println!("hi!") );
diff --git a/src/test/run-pass/range-type-infer.rs b/src/test/run-pass/range-type-infer.rs
index 777286d85587..f07c041717f3 100644
--- a/src/test/run-pass/range-type-infer.rs
+++ b/src/test/run-pass/range-type-infer.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 #![allow(unused_must_use)]
 // Make sure the type inference for the new range expression work as
 // good as the old one. Check out issue #21672, #21595 and #21649 for
diff --git a/src/test/run-pass/range.rs b/src/test/run-pass/range.rs
index a3667d876130..82983e37ea18 100644
--- a/src/test/run-pass/range.rs
+++ b/src/test/run-pass/range.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 #![allow(unused_comparisons)]
 #![allow(dead_code)]
 #![allow(unused_mut)]
diff --git a/src/test/run-pass/range_inclusive.rs b/src/test/run-pass/range_inclusive.rs
index 31c3c3940344..68d9bf7d26b6 100644
--- a/src/test/run-pass/range_inclusive.rs
+++ b/src/test/run-pass/range_inclusive.rs
@@ -1,3 +1,4 @@
+// run-pass
 // Test inclusive range syntax.
 
 #![feature(range_is_empty)]
diff --git a/src/test/run-pass/range_inclusive_gate.rs b/src/test/run-pass/range_inclusive_gate.rs
index d4d830ef2231..e26e31b44a07 100644
--- a/src/test/run-pass/range_inclusive_gate.rs
+++ b/src/test/run-pass/range_inclusive_gate.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 #![allow(unused_comparisons)]
 // Test that you only need the syntax gate if you don't mention the structs.
 // (Obsoleted since both features are stabilized)
diff --git a/src/test/run-pass/ranges-precedence.rs b/src/test/run-pass/ranges-precedence.rs
index 86862993d4da..db241ed0ccd7 100644
--- a/src/test/run-pass/ranges-precedence.rs
+++ b/src/test/run-pass/ranges-precedence.rs
@@ -1,3 +1,4 @@
+// run-pass
 // Test that the precedence of ranges is correct
 
 
diff --git a/src/test/run-pass/raw-fat-ptr.rs b/src/test/run-pass/raw-fat-ptr.rs
index 511a35b25a3e..9f50659ed60d 100644
--- a/src/test/run-pass/raw-fat-ptr.rs
+++ b/src/test/run-pass/raw-fat-ptr.rs
@@ -1,3 +1,4 @@
+// run-pass
 // check raw fat pointer ops
 
 use std::mem;
diff --git a/src/test/run-pass/raw-str.rs b/src/test/run-pass/raw-str.rs
index 8861ec3f85a1..0916dddbb7be 100644
Binary files a/src/test/run-pass/raw-str.rs and b/src/test/run-pass/raw-str.rs differ
diff --git a/src/test/run-pass/rcvr-borrowed-to-region.rs b/src/test/run-pass/rcvr-borrowed-to-region.rs
index b1b253589783..37113bc0a050 100644
--- a/src/test/run-pass/rcvr-borrowed-to-region.rs
+++ b/src/test/run-pass/rcvr-borrowed-to-region.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 #![allow(non_camel_case_types)]
 #![feature(box_syntax)]
 
diff --git a/src/test/run-pass/reachable-unnameable-items.rs b/src/test/run-pass/reachable-unnameable-items.rs
index a74540474063..f1e53a0d8b42 100644
--- a/src/test/run-pass/reachable-unnameable-items.rs
+++ b/src/test/run-pass/reachable-unnameable-items.rs
@@ -1,3 +1,4 @@
+// run-pass
 // ignore-wasm32-bare compiled with panic=abort by default
 // aux-build:reachable-unnameable-items.rs
 
diff --git a/src/test/run-pass/reachable-unnameable-type-alias.rs b/src/test/run-pass/reachable-unnameable-type-alias.rs
index a632ce186e1d..461355f87cf1 100644
--- a/src/test/run-pass/reachable-unnameable-type-alias.rs
+++ b/src/test/run-pass/reachable-unnameable-type-alias.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 #![feature(staged_api)]
 #![stable(feature = "a", since = "b")]
 
diff --git a/src/test/run-pass/readalias.rs b/src/test/run-pass/readalias.rs
index 444d44712336..a6bf61803cf8 100644
--- a/src/test/run-pass/readalias.rs
+++ b/src/test/run-pass/readalias.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 #![allow(dead_code)]
 
 
diff --git a/src/test/run-pass/realloc-16687.rs b/src/test/run-pass/realloc-16687.rs
index e283d5b6de1d..69292d241c30 100644
--- a/src/test/run-pass/realloc-16687.rs
+++ b/src/test/run-pass/realloc-16687.rs
@@ -1,3 +1,4 @@
+// run-pass
 // alloc::heap::reallocate test.
 //
 // Ideally this would be revised to use no_std, but for now it serves
diff --git a/src/test/run-pass/reexport-should-still-link.rs b/src/test/run-pass/reexport-should-still-link.rs
index 733f8f9c1f37..913da56a184f 100644
--- a/src/test/run-pass/reexport-should-still-link.rs
+++ b/src/test/run-pass/reexport-should-still-link.rs
@@ -1,3 +1,4 @@
+// run-pass
 // aux-build:reexport-should-still-link.rs
 
 // pretty-expanded FIXME #23616
diff --git a/src/test/run-pass/reexport-star.rs b/src/test/run-pass/reexport-star.rs
index ae48f97a9ddb..639ab1a0f3ac 100644
--- a/src/test/run-pass/reexport-star.rs
+++ b/src/test/run-pass/reexport-star.rs
@@ -1,3 +1,4 @@
+// run-pass
 // pretty-expanded FIXME #23616
 
 mod a {
diff --git a/src/test/run-pass/reexport-test-harness-main.rs b/src/test/run-pass/reexport-test-harness-main.rs
index 5171c1c17393..2582975e219a 100644
--- a/src/test/run-pass/reexport-test-harness-main.rs
+++ b/src/test/run-pass/reexport-test-harness-main.rs
@@ -1,3 +1,4 @@
+// run-pass
 // compile-flags:--test
 
 #![reexport_test_harness_main = "test_main"]
diff --git a/src/test/run-pass/refer-to-other-statics-by-value.rs b/src/test/run-pass/refer-to-other-statics-by-value.rs
index e08700c57c0e..90f1980f8580 100644
--- a/src/test/run-pass/refer-to-other-statics-by-value.rs
+++ b/src/test/run-pass/refer-to-other-statics-by-value.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 static A: usize = 42;
 static B: usize = A;
 
diff --git a/src/test/run-pass/repeat-expr-in-static.rs b/src/test/run-pass/repeat-expr-in-static.rs
index 928509e1bd65..0b8953793307 100644
--- a/src/test/run-pass/repeat-expr-in-static.rs
+++ b/src/test/run-pass/repeat-expr-in-static.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 static FOO: [isize; 4] = [32; 4];
 static BAR: [isize; 4] = [32, 32, 32, 32];
 
diff --git a/src/test/run-pass/repr_c_int_align.rs b/src/test/run-pass/repr_c_int_align.rs
index 9bb08cb6c647..fdd14fc2dbe7 100644
--- a/src/test/run-pass/repr_c_int_align.rs
+++ b/src/test/run-pass/repr_c_int_align.rs
@@ -1,3 +1,4 @@
+// run-pass
 // compile-flags: -O
 
 #![allow(dead_code)]
diff --git a/src/test/run-pass/resolve-issue-2428.rs b/src/test/run-pass/resolve-issue-2428.rs
index 7e730f6156c8..5f3473e9feb7 100644
--- a/src/test/run-pass/resolve-issue-2428.rs
+++ b/src/test/run-pass/resolve-issue-2428.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 #![allow(non_camel_case_types)]
 #![allow(non_upper_case_globals)]
 
diff --git a/src/test/run-pass/resolve-pseudo-shadowing.rs b/src/test/run-pass/resolve-pseudo-shadowing.rs
index 1a8ce9682ec6..85c684ca0328 100644
--- a/src/test/run-pass/resolve-pseudo-shadowing.rs
+++ b/src/test/run-pass/resolve-pseudo-shadowing.rs
@@ -1,3 +1,4 @@
+// run-pass
 // check that type parameters can't "shadow" qualified paths.
 
 fn check<Clone>(_c: Clone) {
diff --git a/src/test/run-pass/resource-assign-is-not-copy.rs b/src/test/run-pass/resource-assign-is-not-copy.rs
index c26473da5e0a..c1de139a9a95 100644
--- a/src/test/run-pass/resource-assign-is-not-copy.rs
+++ b/src/test/run-pass/resource-assign-is-not-copy.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 #![allow(non_camel_case_types)]
 use std::cell::Cell;
 
diff --git a/src/test/run-pass/resource-destruct.rs b/src/test/run-pass/resource-destruct.rs
index 066ce46f0b24..c4756a21a001 100644
--- a/src/test/run-pass/resource-destruct.rs
+++ b/src/test/run-pass/resource-destruct.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 #![allow(non_camel_case_types)]
 use std::cell::Cell;
 
diff --git a/src/test/run-pass/result-opt-conversions.rs b/src/test/run-pass/result-opt-conversions.rs
index 14b562160dfe..57f258aab654 100644
--- a/src/test/run-pass/result-opt-conversions.rs
+++ b/src/test/run-pass/result-opt-conversions.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 #[derive(Copy, Clone, Debug, PartialEq)]
 struct BadNumErr;
 
diff --git a/src/test/run-pass/ret-bang.rs b/src/test/run-pass/ret-bang.rs
index eb69ee6f886e..6618992e0361 100644
--- a/src/test/run-pass/ret-bang.rs
+++ b/src/test/run-pass/ret-bang.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 fn my_err(s: String) -> ! { println!("{}", s); panic!(); }
 
 fn okay(i: usize) -> isize {
diff --git a/src/test/run-pass/ret-none.rs b/src/test/run-pass/ret-none.rs
index f23461faaf44..d595506e336f 100644
--- a/src/test/run-pass/ret-none.rs
+++ b/src/test/run-pass/ret-none.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 #![allow(non_camel_case_types)]
 #![allow(dead_code)]
 
diff --git a/src/test/run-pass/return-nil.rs b/src/test/run-pass/return-nil.rs
index f24df197234f..fd5203ff0ed6 100644
--- a/src/test/run-pass/return-nil.rs
+++ b/src/test/run-pass/return-nil.rs
@@ -1,3 +1,4 @@
+// run-pass
 // pretty-expanded FIXME #23616
 
 fn f() { let x: () = (); return x; }
diff --git a/src/test/run-pass/rmeta.rs b/src/test/run-pass/rmeta.rs
index cbbdd78dc204..4ef673b4ec78 100644
--- a/src/test/run-pass/rmeta.rs
+++ b/src/test/run-pass/rmeta.rs
@@ -1,3 +1,4 @@
+// run-pass
 // Test that using rlibs and rmeta dep crates work together. Specifically, that
 // there can be both an rmeta and an rlib file and rustc will prefer the rlib.
 
diff --git a/src/test/run-pass/running-with-no-runtime.rs b/src/test/run-pass/running-with-no-runtime.rs
index ab1bf3a5b91d..3fc631be60ed 100644
--- a/src/test/run-pass/running-with-no-runtime.rs
+++ b/src/test/run-pass/running-with-no-runtime.rs
@@ -1,3 +1,4 @@
+// run-pass
 // ignore-cloudabi spawning processes is not supported
 // ignore-emscripten spawning processes is not supported
 // ignore-sgx no processes
diff --git a/src/test/run-pass/rustc-rust-log.rs b/src/test/run-pass/rustc-rust-log.rs
index b66425724183..1c4252b23ea2 100644
--- a/src/test/run-pass/rustc-rust-log.rs
+++ b/src/test/run-pass/rustc-rust-log.rs
@@ -1,3 +1,4 @@
+// run-pass
 // This test is just checking that we won't ICE if logging is turned
 // on; don't bother trying to compare that (copious) output. (Note
 // also that this test potentially silly, since we do not build+test
diff --git a/src/test/run-pass/rvalue-static-promotion.rs b/src/test/run-pass/rvalue-static-promotion.rs
index 0066217774d9..2d7e4ab39893 100644
--- a/src/test/run-pass/rvalue-static-promotion.rs
+++ b/src/test/run-pass/rvalue-static-promotion.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 use std::cell::Cell;
 
 const NONE_CELL_STRING: Option<Cell<String>> = None;
diff --git a/src/test/run-pass/segfault-no-out-of-stack.rs b/src/test/run-pass/segfault-no-out-of-stack.rs
index e90efface687..626de4ed5b66 100644
--- a/src/test/run-pass/segfault-no-out-of-stack.rs
+++ b/src/test/run-pass/segfault-no-out-of-stack.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 #![allow(unused_imports)]
 // ignore-cloudabi can't run commands
 // ignore-emscripten can't run commands
diff --git a/src/test/run-pass/semistatement-in-lambda.rs b/src/test/run-pass/semistatement-in-lambda.rs
index f00fbc363d48..ebd55e0ba02f 100644
--- a/src/test/run-pass/semistatement-in-lambda.rs
+++ b/src/test/run-pass/semistatement-in-lambda.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 #![allow(unused_must_use)]
 
 pub fn main() {
diff --git a/src/test/run-pass/seq-compare.rs b/src/test/run-pass/seq-compare.rs
index cb90e3be0ac8..4078326b559c 100644
--- a/src/test/run-pass/seq-compare.rs
+++ b/src/test/run-pass/seq-compare.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 pub fn main() {
     assert!(("hello".to_string() < "hellr".to_string()));
     assert!(("hello ".to_string() > "hello".to_string()));
diff --git a/src/test/run-pass/shadow.rs b/src/test/run-pass/shadow.rs
index 03338d79da80..2495c8f47e7e 100644
--- a/src/test/run-pass/shadow.rs
+++ b/src/test/run-pass/shadow.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 #![allow(non_camel_case_types)]
 #![allow(dead_code)]
 fn foo(c: Vec<isize> ) {
diff --git a/src/test/run-pass/shadowed-use-visibility.rs b/src/test/run-pass/shadowed-use-visibility.rs
index 83f9c0bedc62..350fbfeaeb5b 100644
--- a/src/test/run-pass/shadowed-use-visibility.rs
+++ b/src/test/run-pass/shadowed-use-visibility.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 #![allow(unused_imports)]
 mod foo {
     pub fn f() {}
diff --git a/src/test/run-pass/shebang.rs b/src/test/run-pass/shebang.rs
index a5fbda1c1ea3..3d3ba468be95 100644
--- a/src/test/run-pass/shebang.rs
+++ b/src/test/run-pass/shebang.rs
@@ -1,5 +1,5 @@
 #!/usr/bin/env rustx
-// http://rust-lang.org/COPYRIGHT.
-//
+
+// run-pass
 
 pub fn main() { println!("Hello World"); }
diff --git a/src/test/run-pass/signal-alternate-stack-cleanup.rs b/src/test/run-pass/signal-alternate-stack-cleanup.rs
index 6f2fa2a370df..787ff51799a8 100644
--- a/src/test/run-pass/signal-alternate-stack-cleanup.rs
+++ b/src/test/run-pass/signal-alternate-stack-cleanup.rs
@@ -1,3 +1,4 @@
+// run-pass
 // Previously memory for alternate signal stack have been unmapped during
 // main thread exit while still being in use by signal handlers. This test
 // triggers this situation by sending signal from atexit handler.
diff --git a/src/test/run-pass/signal-exit-status.rs b/src/test/run-pass/signal-exit-status.rs
index c22c0352286d..bd34a2181603 100644
--- a/src/test/run-pass/signal-exit-status.rs
+++ b/src/test/run-pass/signal-exit-status.rs
@@ -1,3 +1,4 @@
+// run-pass
 // ignore-cloudabi no processes
 // ignore-emscripten no processes
 // ignore-sgx no processes
diff --git a/src/test/run-pass/sigpipe-should-be-ignored.rs b/src/test/run-pass/sigpipe-should-be-ignored.rs
index 6c5bbd45a3c3..f472029b820b 100644
--- a/src/test/run-pass/sigpipe-should-be-ignored.rs
+++ b/src/test/run-pass/sigpipe-should-be-ignored.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 #![allow(unused_must_use)]
 // Be sure that when a SIGPIPE would have been received that the entire process
 // doesn't die in a ball of fire, but rather it's gracefully handled.
diff --git a/src/test/run-pass/simple-infer.rs b/src/test/run-pass/simple-infer.rs
index 020c9c26512d..561e4fdec7c6 100644
--- a/src/test/run-pass/simple-infer.rs
+++ b/src/test/run-pass/simple-infer.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 #![allow(unused_mut)]
 
 
diff --git a/src/test/run-pass/simple_global_asm.rs b/src/test/run-pass/simple_global_asm.rs
index c6ede34b2998..d95fefebc0f9 100644
--- a/src/test/run-pass/simple_global_asm.rs
+++ b/src/test/run-pass/simple_global_asm.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 #![feature(global_asm)]
 #![feature(naked_functions)]
 #![allow(dead_code)]
diff --git a/src/test/run-pass/size-and-align.rs b/src/test/run-pass/size-and-align.rs
index fb7ba68ffe75..a32b5de72920 100644
--- a/src/test/run-pass/size-and-align.rs
+++ b/src/test/run-pass/size-and-align.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 #![allow(non_camel_case_types)]
 enum clam<T> { a(T, isize), b, }
 
diff --git a/src/test/run-pass/sized-borrowed-pointer.rs b/src/test/run-pass/sized-borrowed-pointer.rs
index e5d55761539a..319b8026954b 100644
--- a/src/test/run-pass/sized-borrowed-pointer.rs
+++ b/src/test/run-pass/sized-borrowed-pointer.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 #![allow(dead_code)]
 // Possibly-dynamic size of typaram should be cleared at pointer boundary.
 
diff --git a/src/test/run-pass/sized-owned-pointer.rs b/src/test/run-pass/sized-owned-pointer.rs
index 8dd3227ba887..2abf0a1e0c2c 100644
--- a/src/test/run-pass/sized-owned-pointer.rs
+++ b/src/test/run-pass/sized-owned-pointer.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 #![allow(dead_code)]
 // Possibly-dynamic size of typaram should be cleared at pointer boundary.
 
diff --git a/src/test/run-pass/sleep.rs b/src/test/run-pass/sleep.rs
index 7128b3cc7c3a..757578b84750 100644
--- a/src/test/run-pass/sleep.rs
+++ b/src/test/run-pass/sleep.rs
@@ -1,3 +1,4 @@
+// run-pass
 // ignore-emscripten no threads support
 // ignore-sgx no thread sleep support
 
diff --git a/src/test/run-pass/slowparse-bstring.rs b/src/test/run-pass/slowparse-bstring.rs
index ee6be75be221..f3a6a668372f 100644
--- a/src/test/run-pass/slowparse-bstring.rs
+++ b/src/test/run-pass/slowparse-bstring.rs
@@ -1,3 +1,4 @@
+// run-pass
 // ignore-tidy-linelength
 
 // Issue #16624
diff --git a/src/test/run-pass/slowparse-string.rs b/src/test/run-pass/slowparse-string.rs
index a2bf26f1e275..6ebc61dae783 100644
--- a/src/test/run-pass/slowparse-string.rs
+++ b/src/test/run-pass/slowparse-string.rs
@@ -1,3 +1,4 @@
+// run-pass
 // ignore-tidy-linelength
 
 // Issue #16624
diff --git a/src/test/run-pass/sse2.rs b/src/test/run-pass/sse2.rs
index c58bf4520c19..74f112464c75 100644
--- a/src/test/run-pass/sse2.rs
+++ b/src/test/run-pass/sse2.rs
@@ -1,3 +1,4 @@
+// run-pass
 // ignore-cloudabi no std::env
 
 #![allow(stable_features)]
diff --git a/src/test/run-pass/stable-addr-of.rs b/src/test/run-pass/stable-addr-of.rs
index 2a256bbfa393..99839166e302 100644
--- a/src/test/run-pass/stable-addr-of.rs
+++ b/src/test/run-pass/stable-addr-of.rs
@@ -1,3 +1,4 @@
+// run-pass
 // Issue #2040
 
 
diff --git a/src/test/run-pass/stack-probes-lto.rs b/src/test/run-pass/stack-probes-lto.rs
index 1274f032a3e2..9018ff4bfc2e 100644
--- a/src/test/run-pass/stack-probes-lto.rs
+++ b/src/test/run-pass/stack-probes-lto.rs
@@ -1,3 +1,4 @@
+// run-pass
 // ignore-arm
 // ignore-aarch64
 // ignore-mips
diff --git a/src/test/run-pass/stack-probes.rs b/src/test/run-pass/stack-probes.rs
index 773d0ace90ed..1ab1d6df66d4 100644
--- a/src/test/run-pass/stack-probes.rs
+++ b/src/test/run-pass/stack-probes.rs
@@ -1,3 +1,4 @@
+// run-pass
 // ignore-arm
 // ignore-aarch64
 // ignore-mips
diff --git a/src/test/run-pass/stdio-is-blocking.rs b/src/test/run-pass/stdio-is-blocking.rs
index 1824162b8bac..e96406e46b57 100644
--- a/src/test/run-pass/stdio-is-blocking.rs
+++ b/src/test/run-pass/stdio-is-blocking.rs
@@ -1,3 +1,4 @@
+// run-pass
 // ignore-cloudabi no processes
 // ignore-emscripten no processes
 // ignore-sgx no processes
diff --git a/src/test/run-pass/str-concat.rs b/src/test/run-pass/str-concat.rs
index a0392f479c8d..fa2fc97d7b8a 100644
--- a/src/test/run-pass/str-concat.rs
+++ b/src/test/run-pass/str-concat.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 pub fn main() {
     let a: String = "hello".to_string();
     let b: String = "world".to_string();
diff --git a/src/test/run-pass/str-multiline.rs b/src/test/run-pass/str-multiline.rs
index faf992fabf16..2b2e001d8bb7 100644
--- a/src/test/run-pass/str-multiline.rs
+++ b/src/test/run-pass/str-multiline.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 pub fn main() {
     let a: String = "this \
 is a test".to_string();
diff --git a/src/test/run-pass/string-box-error.rs b/src/test/run-pass/string-box-error.rs
index 944157d0b200..11a5bd07c3b5 100644
--- a/src/test/run-pass/string-box-error.rs
+++ b/src/test/run-pass/string-box-error.rs
@@ -1,3 +1,4 @@
+// run-pass
 // Ensure that both `Box<dyn Error + Send + Sync>` and `Box<dyn Error>` can be
 // obtained from `String`.
 
diff --git a/src/test/run-pass/string-escapes.rs b/src/test/run-pass/string-escapes.rs
index 6013173f3134..cee5e27786ca 100644
--- a/src/test/run-pass/string-escapes.rs
+++ b/src/test/run-pass/string-escapes.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 fn main() {
     let x = "\\\\\
     ";
diff --git a/src/test/run-pass/struct-ctor-mangling.rs b/src/test/run-pass/struct-ctor-mangling.rs
index 5f5ee7cfe441..f242cb8457f9 100644
--- a/src/test/run-pass/struct-ctor-mangling.rs
+++ b/src/test/run-pass/struct-ctor-mangling.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 fn size_of_val<T>(_: &T) -> usize {
     std::mem::size_of::<T>()
 }
diff --git a/src/test/run-pass/structured-compare.rs b/src/test/run-pass/structured-compare.rs
index 56acc6bd7d4f..63d30c4da896 100644
--- a/src/test/run-pass/structured-compare.rs
+++ b/src/test/run-pass/structured-compare.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 #![allow(non_camel_case_types)]
 
 
diff --git a/src/test/run-pass/super-fast-paren-parsing.rs b/src/test/run-pass/super-fast-paren-parsing.rs
index c86f2b8f9c3b..60c8db53a8c3 100644
--- a/src/test/run-pass/super-fast-paren-parsing.rs
+++ b/src/test/run-pass/super-fast-paren-parsing.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 #![allow(non_upper_case_globals)]
 #![allow(dead_code)]
 // exec-env:RUST_MIN_STACK=16000000
diff --git a/src/test/run-pass/super.rs b/src/test/run-pass/super.rs
index e378aac8be41..86c720288c35 100644
--- a/src/test/run-pass/super.rs
+++ b/src/test/run-pass/super.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 #![allow(dead_code)]
 // pretty-expanded FIXME #23616
 
diff --git a/src/test/run-pass/supported-cast.rs b/src/test/run-pass/supported-cast.rs
index 9d875c59d87c..ff41ce6c79ac 100644
--- a/src/test/run-pass/supported-cast.rs
+++ b/src/test/run-pass/supported-cast.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 pub fn main() {
   let f = 1_usize as *const String;
   println!("{:?}", f as isize);
diff --git a/src/test/run-pass/svh-add-nothing.rs b/src/test/run-pass/svh-add-nothing.rs
index b673fa55e381..d7d037f0b32b 100644
--- a/src/test/run-pass/svh-add-nothing.rs
+++ b/src/test/run-pass/svh-add-nothing.rs
@@ -1,3 +1,4 @@
+// run-pass
 // note that these aux-build directives must be in this order
 // aux-build:svh-a-base.rs
 // aux-build:svh-b.rs
diff --git a/src/test/run-pass/swap-1.rs b/src/test/run-pass/swap-1.rs
index 55f9c1b6fa2d..d87114748dd8 100644
--- a/src/test/run-pass/swap-1.rs
+++ b/src/test/run-pass/swap-1.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 use std::mem::swap;
 
 pub fn main() {
diff --git a/src/test/run-pass/swap-2.rs b/src/test/run-pass/swap-2.rs
index 42b17ef8b78e..c8f298ec0e5c 100644
--- a/src/test/run-pass/swap-2.rs
+++ b/src/test/run-pass/swap-2.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 use std::mem::swap;
 
 pub fn main() {
diff --git a/src/test/run-pass/swap-overlapping.rs b/src/test/run-pass/swap-overlapping.rs
index 31fd9ce7d1a4..85b357e0c024 100644
--- a/src/test/run-pass/swap-overlapping.rs
+++ b/src/test/run-pass/swap-overlapping.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 #![allow(dead_code)]
 // Issue #5041 - avoid overlapping memcpy when src and dest of a swap are the same
 
diff --git a/src/test/run-pass/tail-call-arg-leak.rs b/src/test/run-pass/tail-call-arg-leak.rs
index 53ec5ea7ff7b..a60944b632d2 100644
--- a/src/test/run-pass/tail-call-arg-leak.rs
+++ b/src/test/run-pass/tail-call-arg-leak.rs
@@ -1,3 +1,4 @@
+// run-pass
 // use of tail calls causes arg slot leaks, issue #160.
 // pretty-expanded FIXME #23616
 
diff --git a/src/test/run-pass/tail-cps.rs b/src/test/run-pass/tail-cps.rs
index c945f3de0cad..f186683ea668 100644
--- a/src/test/run-pass/tail-cps.rs
+++ b/src/test/run-pass/tail-cps.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 fn checktrue(rs: bool) -> bool { assert!((rs)); return true; }
 
 pub fn main() { let k = checktrue; evenk(42, k); oddk(45, k); }
diff --git a/src/test/run-pass/tail-direct.rs b/src/test/run-pass/tail-direct.rs
index 47847ee6db9e..c67c5b7a555c 100644
--- a/src/test/run-pass/tail-direct.rs
+++ b/src/test/run-pass/tail-direct.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 pub fn main() { assert!((even(42))); assert!((odd(45))); }
 
 fn even(n: isize) -> bool { if n == 0 { return true; } else { return odd(n - 1); } }
diff --git a/src/test/run-pass/tcp-stress.rs b/src/test/run-pass/tcp-stress.rs
index 391cbbdd42da..1f1948fa8fa2 100644
--- a/src/test/run-pass/tcp-stress.rs
+++ b/src/test/run-pass/tcp-stress.rs
@@ -1,3 +1,4 @@
+// run-pass
 // ignore-android needs extra network permissions
 // ignore-cloudabi no global network namespace access
 // ignore-emscripten no threads or sockets support
diff --git a/src/test/run-pass/terminate-in-initializer.rs b/src/test/run-pass/terminate-in-initializer.rs
index cd9d09316063..c9cb932e62af 100644
--- a/src/test/run-pass/terminate-in-initializer.rs
+++ b/src/test/run-pass/terminate-in-initializer.rs
@@ -1,3 +1,4 @@
+// run-pass
 // ignore-emscripten no threads support
 
 // Issue #787
diff --git a/src/test/run-pass/test-allow-dead-extern-static-no-warning.rs b/src/test/run-pass/test-allow-dead-extern-static-no-warning.rs
index aa95f55e88e3..2583e431ec17 100644
--- a/src/test/run-pass/test-allow-dead-extern-static-no-warning.rs
+++ b/src/test/run-pass/test-allow-dead-extern-static-no-warning.rs
@@ -1,3 +1,4 @@
+// run-pass
 // compile-flags: --test
 
 #![deny(dead_code)]
diff --git a/src/test/run-pass/test-allow-fail-attr.rs b/src/test/run-pass/test-allow-fail-attr.rs
index 0c3c2a424885..1a478460efc6 100644
--- a/src/test/run-pass/test-allow-fail-attr.rs
+++ b/src/test/run-pass/test-allow-fail-attr.rs
@@ -1,3 +1,4 @@
+// run-pass
 // ignore-wasm32-bare compiled with panic=abort by default
 // compile-flags: --test
 #![feature(allow_fail)]
diff --git a/src/test/run-pass/test-fn-signature-verification-for-explicit-return-type.rs b/src/test/run-pass/test-fn-signature-verification-for-explicit-return-type.rs
index a9d09d0398d5..ff62d84925f2 100644
--- a/src/test/run-pass/test-fn-signature-verification-for-explicit-return-type.rs
+++ b/src/test/run-pass/test-fn-signature-verification-for-explicit-return-type.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 #![feature(test)]
 
 // compile-flags: --test
diff --git a/src/test/run-pass/test-main-not-dead-attr.rs b/src/test/run-pass/test-main-not-dead-attr.rs
index fb596dade8fe..628b1896ace4 100644
--- a/src/test/run-pass/test-main-not-dead-attr.rs
+++ b/src/test/run-pass/test-main-not-dead-attr.rs
@@ -1,3 +1,4 @@
+// run-pass
 // compile-flags: --test
 
 #![feature(main)]
diff --git a/src/test/run-pass/test-main-not-dead.rs b/src/test/run-pass/test-main-not-dead.rs
index 97ab2e308311..30a9c85e3d2a 100644
--- a/src/test/run-pass/test-main-not-dead.rs
+++ b/src/test/run-pass/test-main-not-dead.rs
@@ -1,3 +1,4 @@
+// run-pass
 // compile-flags: --test
 
 #![deny(dead_code)]
diff --git a/src/test/run-pass/test-runner-hides-buried-main.rs b/src/test/run-pass/test-runner-hides-buried-main.rs
index 4295f8bbf4cd..917c09801e17 100644
--- a/src/test/run-pass/test-runner-hides-buried-main.rs
+++ b/src/test/run-pass/test-runner-hides-buried-main.rs
@@ -1,3 +1,4 @@
+// run-pass
 // compile-flags: --test
 
 #![feature(main)]
diff --git a/src/test/run-pass/test-runner-hides-main.rs b/src/test/run-pass/test-runner-hides-main.rs
index 664d9153caf0..0de1d64f0fcc 100644
--- a/src/test/run-pass/test-runner-hides-main.rs
+++ b/src/test/run-pass/test-runner-hides-main.rs
@@ -1,3 +1,4 @@
+// run-pass
 // compile-flags:--test
 // Building as a test runner means that a synthetic main will be run,
 // not ours
diff --git a/src/test/run-pass/test-runner-hides-start.rs b/src/test/run-pass/test-runner-hides-start.rs
index 2634df10f266..56212bb6f4b7 100644
--- a/src/test/run-pass/test-runner-hides-start.rs
+++ b/src/test/run-pass/test-runner-hides-start.rs
@@ -1,3 +1,4 @@
+// run-pass
 // compile-flags: --test
 
 #![feature(start)]
diff --git a/src/test/run-pass/test-should-fail-good-message.rs b/src/test/run-pass/test-should-fail-good-message.rs
index d7d9c6c1edc7..9fa759f9eb48 100644
--- a/src/test/run-pass/test-should-fail-good-message.rs
+++ b/src/test/run-pass/test-should-fail-good-message.rs
@@ -1,3 +1,4 @@
+// run-pass
 // ignore-wasm32-bare compiled with panic=abort by default
 // compile-flags: --test
 #[test]
diff --git a/src/test/run-pass/test-vs-cfg-test.rs b/src/test/run-pass/test-vs-cfg-test.rs
index 75f4d0c8db23..cd1cd33c2840 100644
--- a/src/test/run-pass/test-vs-cfg-test.rs
+++ b/src/test/run-pass/test-vs-cfg-test.rs
@@ -1,3 +1,4 @@
+// run-pass
 // compile-flags: --cfg test
 
 // Make sure `--cfg test` does not inject test harness
diff --git a/src/test/run-pass/thin-lto-global-allocator.rs b/src/test/run-pass/thin-lto-global-allocator.rs
index 18869cf66da8..e00c5caf97c6 100644
--- a/src/test/run-pass/thin-lto-global-allocator.rs
+++ b/src/test/run-pass/thin-lto-global-allocator.rs
@@ -1,3 +1,4 @@
+// run-pass
 // compile-flags: -Z thinlto -C codegen-units=2
 
 #[global_allocator]
diff --git a/src/test/run-pass/thread-local-not-in-prelude.rs b/src/test/run-pass/thread-local-not-in-prelude.rs
index 6825b0338f90..039749826256 100644
--- a/src/test/run-pass/thread-local-not-in-prelude.rs
+++ b/src/test/run-pass/thread-local-not-in-prelude.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 #![no_std]
 
 extern crate std;
diff --git a/src/test/run-pass/tool_attributes.rs b/src/test/run-pass/tool_attributes.rs
index 506c11011a6d..be4a10c0ee93 100644
--- a/src/test/run-pass/tool_attributes.rs
+++ b/src/test/run-pass/tool_attributes.rs
@@ -1,3 +1,4 @@
+// run-pass
 // Scoped attributes should not trigger an unused attributes lint.
 
 #![deny(unused_attributes)]
diff --git a/src/test/run-pass/tool_lints.rs b/src/test/run-pass/tool_lints.rs
index bf848b8ebe00..e467d34376f7 100644
--- a/src/test/run-pass/tool_lints.rs
+++ b/src/test/run-pass/tool_lints.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 #![deny(unknown_lints)]
 
 #[allow(clippy::almost_swapped)]
diff --git a/src/test/run-pass/tool_lints_2018_preview.rs b/src/test/run-pass/tool_lints_2018_preview.rs
index be6d1991374c..190f0b99dc88 100644
--- a/src/test/run-pass/tool_lints_2018_preview.rs
+++ b/src/test/run-pass/tool_lints_2018_preview.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 #![feature(rust_2018_preview)]
 #![deny(unknown_lints)]
 
diff --git a/src/test/run-pass/trailing-comma.rs b/src/test/run-pass/trailing-comma.rs
index 197af295a42c..f34e6b7606dd 100644
--- a/src/test/run-pass/trailing-comma.rs
+++ b/src/test/run-pass/trailing-comma.rs
@@ -1,3 +1,4 @@
+// run-pass
 // pretty-expanded FIXME #23616
 
 #![feature(slice_patterns)]
diff --git a/src/test/run-pass/traits/principal-less-trait-objects.rs b/src/test/run-pass/traits/principal-less-trait-objects.rs
index 0984362993cb..82624650a549 100644
--- a/src/test/run-pass/traits/principal-less-trait-objects.rs
+++ b/src/test/run-pass/traits/principal-less-trait-objects.rs
@@ -1,3 +1,4 @@
+// run-pass
 // Check that trait-objects without a principal codegen properly.
 
 use std::sync::atomic::{AtomicUsize, Ordering};
diff --git a/src/test/run-pass/traits/trait-alias-import.rs b/src/test/run-pass/traits/trait-alias-import.rs
index 7d63320b9aad..802a8f15698f 100644
--- a/src/test/run-pass/traits/trait-alias-import.rs
+++ b/src/test/run-pass/traits/trait-alias-import.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 #![feature(trait_alias)]
 
 mod inner {
diff --git a/src/test/run-pass/transmute-non-immediate-to-immediate.rs b/src/test/run-pass/transmute-non-immediate-to-immediate.rs
index 2119c8336f4c..cf77c113f4c6 100644
--- a/src/test/run-pass/transmute-non-immediate-to-immediate.rs
+++ b/src/test/run-pass/transmute-non-immediate-to-immediate.rs
@@ -1,3 +1,4 @@
+// run-pass
 // Issue #7988
 // Transmuting non-immediate type to immediate type
 
diff --git a/src/test/run-pass/transmute-specialization.rs b/src/test/run-pass/transmute-specialization.rs
index e2b110db6367..002fba9ce810 100644
--- a/src/test/run-pass/transmute-specialization.rs
+++ b/src/test/run-pass/transmute-specialization.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 #![feature(specialization)]
 
 trait Specializable { type Output; }
diff --git a/src/test/run-pass/trivial-message.rs b/src/test/run-pass/trivial-message.rs
index dae070682767..5831e867be57 100644
--- a/src/test/run-pass/trivial-message.rs
+++ b/src/test/run-pass/trivial-message.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 #![allow(unused_must_use)]
 /*
   This is about the simplest program that can successfully send a
diff --git a/src/test/run-pass/trivial_casts.rs b/src/test/run-pass/trivial_casts.rs
index f06b0708290b..8e49468bf0c4 100644
--- a/src/test/run-pass/trivial_casts.rs
+++ b/src/test/run-pass/trivial_casts.rs
@@ -1,3 +1,4 @@
+// run-pass
 // Test that all coercions can actually be done using casts (modulo the lints).
 
 #![allow(trivial_casts, trivial_numeric_casts)]
diff --git a/src/test/run-pass/try-block.rs b/src/test/run-pass/try-block.rs
index dff186cfd07c..c29ccc704277 100644
--- a/src/test/run-pass/try-block.rs
+++ b/src/test/run-pass/try-block.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 #![allow(non_camel_case_types)]
 #![allow(dead_code)]
 // compile-flags: --edition 2018
diff --git a/src/test/run-pass/try-from-int-error-partial-eq.rs b/src/test/run-pass/try-from-int-error-partial-eq.rs
index e9b53f2d1c8d..6ee4a4cf3192 100644
--- a/src/test/run-pass/try-from-int-error-partial-eq.rs
+++ b/src/test/run-pass/try-from-int-error-partial-eq.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 #![allow(unused_must_use)]
 
 use std::convert::TryFrom;
diff --git a/src/test/run-pass/try-is-identifier-edition2015.rs b/src/test/run-pass/try-is-identifier-edition2015.rs
index b9807a7072d3..dfb05599be6b 100644
--- a/src/test/run-pass/try-is-identifier-edition2015.rs
+++ b/src/test/run-pass/try-is-identifier-edition2015.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 #![allow(non_camel_case_types)]
 // compile-flags: --edition 2015
 
diff --git a/src/test/run-pass/try-operator-custom.rs b/src/test/run-pass/try-operator-custom.rs
index 008cab00ea24..9993061ea615 100644
--- a/src/test/run-pass/try-operator-custom.rs
+++ b/src/test/run-pass/try-operator-custom.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 #![feature(try_trait)]
 
 use std::ops::Try;
diff --git a/src/test/run-pass/try-operator-hygiene.rs b/src/test/run-pass/try-operator-hygiene.rs
index 5f0f9a932cd5..0b24b4305acc 100644
--- a/src/test/run-pass/try-operator-hygiene.rs
+++ b/src/test/run-pass/try-operator-hygiene.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 #![allow(non_upper_case_globals)]
 #![allow(dead_code)]
 // `expr?` expands to:
diff --git a/src/test/run-pass/try-operator.rs b/src/test/run-pass/try-operator.rs
index 8e7a7b5dfc62..9118e8e71345 100644
--- a/src/test/run-pass/try-operator.rs
+++ b/src/test/run-pass/try-operator.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 #![allow(dead_code)]
 // ignore-cloudabi no std::fs
 
diff --git a/src/test/run-pass/try-wait.rs b/src/test/run-pass/try-wait.rs
index 97caddde4121..d8a07c55cf26 100644
--- a/src/test/run-pass/try-wait.rs
+++ b/src/test/run-pass/try-wait.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 #![allow(stable_features)]
 // ignore-cloudabi no processes
 // ignore-emscripten no processes
diff --git a/src/test/run-pass/try_from.rs b/src/test/run-pass/try_from.rs
index 98344491aecf..50451576f9c9 100644
--- a/src/test/run-pass/try_from.rs
+++ b/src/test/run-pass/try_from.rs
@@ -1,3 +1,4 @@
+// run-pass
 // This test relies on `TryFrom` being blanket impl for all `T: Into`
 // and `TryInto` being blanket impl for all `U: TryFrom`
 
diff --git a/src/test/run-pass/tup.rs b/src/test/run-pass/tup.rs
index 47ea0e1c0da2..160477b0b0a6 100644
--- a/src/test/run-pass/tup.rs
+++ b/src/test/run-pass/tup.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 #![allow(non_camel_case_types)]
 
 type point = (isize, isize);
diff --git a/src/test/run-pass/tuple-index-fat-types.rs b/src/test/run-pass/tuple-index-fat-types.rs
index ee224cc84bfb..5dda1ed975cc 100644
--- a/src/test/run-pass/tuple-index-fat-types.rs
+++ b/src/test/run-pass/tuple-index-fat-types.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 struct Foo<'a>(&'a [isize]);
 
 fn main() {
diff --git a/src/test/run-pass/tuple-index.rs b/src/test/run-pass/tuple-index.rs
index e68fa1caa551..3e1d92b42aac 100644
--- a/src/test/run-pass/tuple-index.rs
+++ b/src/test/run-pass/tuple-index.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 struct Point(isize, isize);
 
 fn main() {
diff --git a/src/test/run-pass/tydesc-name.rs b/src/test/run-pass/tydesc-name.rs
index d9d947bd4c06..c432e5b54810 100644
--- a/src/test/run-pass/tydesc-name.rs
+++ b/src/test/run-pass/tydesc-name.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 #![allow(dead_code)]
 
 use std::any::type_name;
diff --git a/src/test/run-pass/type-ascription.rs b/src/test/run-pass/type-ascription.rs
index 7e5231b7e067..7adb074428ce 100644
--- a/src/test/run-pass/type-ascription.rs
+++ b/src/test/run-pass/type-ascription.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 #![allow(dead_code)]
 #![allow(unused_variables)]
 // Type ascription doesn't lead to unsoundness
diff --git a/src/test/run-pass/type-id-higher-rank-2.rs b/src/test/run-pass/type-id-higher-rank-2.rs
index 469bc8ed7e15..5391c849dad9 100644
--- a/src/test/run-pass/type-id-higher-rank-2.rs
+++ b/src/test/run-pass/type-id-higher-rank-2.rs
@@ -1,3 +1,4 @@
+// run-pass
 // Test that we can't ignore lifetimes by going through Any.
 
 use std::any::Any;
diff --git a/src/test/run-pass/type-id-higher-rank.rs b/src/test/run-pass/type-id-higher-rank.rs
index b98dff0d72b8..355d11099419 100644
--- a/src/test/run-pass/type-id-higher-rank.rs
+++ b/src/test/run-pass/type-id-higher-rank.rs
@@ -1,3 +1,4 @@
+// run-pass
 // Test that type IDs correctly account for higher-rank lifetimes
 // Also acts as a regression test for an ICE (issue #19791)
 
diff --git a/src/test/run-pass/type-in-nested-module.rs b/src/test/run-pass/type-in-nested-module.rs
index 077a28436df3..8a92f065f1bb 100644
--- a/src/test/run-pass/type-in-nested-module.rs
+++ b/src/test/run-pass/type-in-nested-module.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 #![allow(non_camel_case_types)]
 #![allow(dead_code)]
 
diff --git a/src/test/run-pass/type-infer-generalize-ty-var.rs b/src/test/run-pass/type-infer-generalize-ty-var.rs
index 6298156452e4..a3d6916cbf76 100644
--- a/src/test/run-pass/type-infer-generalize-ty-var.rs
+++ b/src/test/run-pass/type-infer-generalize-ty-var.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 #![allow(non_upper_case_globals)]
 #![allow(dead_code)]
 #![allow(unused_assignments)]
diff --git a/src/test/run-pass/type-namespace.rs b/src/test/run-pass/type-namespace.rs
index 587a302ad5f8..3cc0bc447a5b 100644
--- a/src/test/run-pass/type-namespace.rs
+++ b/src/test/run-pass/type-namespace.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 struct A { a: isize }
 
 fn a(a: A) -> isize { return a.a; }
diff --git a/src/test/run-pass/type-param-constraints.rs b/src/test/run-pass/type-param-constraints.rs
index 819456289966..4b42fddaf5c8 100644
--- a/src/test/run-pass/type-param-constraints.rs
+++ b/src/test/run-pass/type-param-constraints.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 #![allow(non_camel_case_types)]
 #![allow(dead_code)]
 // pretty-expanded FIXME #23616
diff --git a/src/test/run-pass/type-param.rs b/src/test/run-pass/type-param.rs
index bfce3f328791..f5ac19cf73aa 100644
--- a/src/test/run-pass/type-param.rs
+++ b/src/test/run-pass/type-param.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 #![allow(non_camel_case_types)]
 #![allow(dead_code)]
 
diff --git a/src/test/run-pass/type-params-in-for-each.rs b/src/test/run-pass/type-params-in-for-each.rs
index 509843c6b928..be4a0185edaf 100644
--- a/src/test/run-pass/type-params-in-for-each.rs
+++ b/src/test/run-pass/type-params-in-for-each.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 #![allow(dead_code)]
 
 // pretty-expanded FIXME #23616
diff --git a/src/test/run-pass/type-ptr.rs b/src/test/run-pass/type-ptr.rs
index 57c229a21758..7c2438d38bdd 100644
--- a/src/test/run-pass/type-ptr.rs
+++ b/src/test/run-pass/type-ptr.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 #![allow(dead_code)]
 // pretty-expanded FIXME #23616
 
diff --git a/src/test/run-pass/type-sizes.rs b/src/test/run-pass/type-sizes.rs
index db9705058da2..27433fd770b0 100644
--- a/src/test/run-pass/type-sizes.rs
+++ b/src/test/run-pass/type-sizes.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 #![allow(non_camel_case_types)]
 #![allow(dead_code)]
 #![feature(never_type)]
diff --git a/src/test/run-pass/type-use-i1-versus-i8.rs b/src/test/run-pass/type-use-i1-versus-i8.rs
index dc029e4569ef..7315cd2feeaa 100644
--- a/src/test/run-pass/type-use-i1-versus-i8.rs
+++ b/src/test/run-pass/type-use-i1-versus-i8.rs
@@ -1,3 +1,4 @@
+// run-pass
 // pretty-expanded FIXME #23616
 
 use std::ptr;
diff --git a/src/test/run-pass/typeck-closure-to-unsafe-fn-ptr.rs b/src/test/run-pass/typeck-closure-to-unsafe-fn-ptr.rs
index fe15b912d602..2530a1e966d0 100644
--- a/src/test/run-pass/typeck-closure-to-unsafe-fn-ptr.rs
+++ b/src/test/run-pass/typeck-closure-to-unsafe-fn-ptr.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 unsafe fn call_unsafe(func: unsafe fn() -> ()) -> () {
     func()
 }
diff --git a/src/test/run-pass/typeck-fn-to-unsafe-fn-ptr.rs b/src/test/run-pass/typeck-fn-to-unsafe-fn-ptr.rs
index 101f9756c850..1e954f569095 100644
--- a/src/test/run-pass/typeck-fn-to-unsafe-fn-ptr.rs
+++ b/src/test/run-pass/typeck-fn-to-unsafe-fn-ptr.rs
@@ -1,3 +1,4 @@
+// run-pass
 // This tests reification from safe function to `unsafe fn` pointer
 
 fn do_nothing() -> () {}
diff --git a/src/test/run-pass/typeck_type_placeholder_1.rs b/src/test/run-pass/typeck_type_placeholder_1.rs
index 6a3657e4aeff..ea7aa5285b09 100644
--- a/src/test/run-pass/typeck_type_placeholder_1.rs
+++ b/src/test/run-pass/typeck_type_placeholder_1.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 #![allow(dead_code)]
 // This test checks that the `_` type placeholder works
 // correctly for enabling type inference.
diff --git a/src/test/run-pass/typeclasses-eq-example-static.rs b/src/test/run-pass/typeclasses-eq-example-static.rs
index 60c886ba386b..282d51a93df8 100644
--- a/src/test/run-pass/typeclasses-eq-example-static.rs
+++ b/src/test/run-pass/typeclasses-eq-example-static.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 #![allow(non_camel_case_types)]
 #![allow(non_snake_case)]
 #![allow(dead_code)]
diff --git a/src/test/run-pass/typeclasses-eq-example.rs b/src/test/run-pass/typeclasses-eq-example.rs
index 06bec5385eb2..8d1d22eb8230 100644
--- a/src/test/run-pass/typeclasses-eq-example.rs
+++ b/src/test/run-pass/typeclasses-eq-example.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 #![allow(non_camel_case_types)]
 #![allow(non_snake_case)]
 #![allow(dead_code)]
diff --git a/src/test/run-pass/typeid-intrinsic.rs b/src/test/run-pass/typeid-intrinsic.rs
index 0c7abc086fcf..c2611158e65e 100644
--- a/src/test/run-pass/typeid-intrinsic.rs
+++ b/src/test/run-pass/typeid-intrinsic.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 #![allow(deprecated)]
 // aux-build:typeid-intrinsic-aux1.rs
 // aux-build:typeid-intrinsic-aux2.rs
diff --git a/src/test/run-pass/typestate-cfg-nesting.rs b/src/test/run-pass/typestate-cfg-nesting.rs
index 994c7d516926..5718e0efd182 100644
--- a/src/test/run-pass/typestate-cfg-nesting.rs
+++ b/src/test/run-pass/typestate-cfg-nesting.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 #![allow(dead_code)]
 #![allow(unused_assignments)]
 #![allow(unknown_lints)]
diff --git a/src/test/run-pass/typestate-multi-decl.rs b/src/test/run-pass/typestate-multi-decl.rs
index bc8d9c10de17..9f941620559c 100644
--- a/src/test/run-pass/typestate-multi-decl.rs
+++ b/src/test/run-pass/typestate-multi-decl.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 pub fn main() {
     let (x, y) = (10, 20);
     let z = x + y;
diff --git a/src/test/run-pass/ufcs-polymorphic-paths.rs b/src/test/run-pass/ufcs-polymorphic-paths.rs
index e136bb23bcd8..a14ebd6a41fc 100644
--- a/src/test/run-pass/ufcs-polymorphic-paths.rs
+++ b/src/test/run-pass/ufcs-polymorphic-paths.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 use std::borrow::{Cow, ToOwned};
 use std::default::Default;
 use std::iter::FromIterator;
diff --git a/src/test/run-pass/ufcs-type-params.rs b/src/test/run-pass/ufcs-type-params.rs
index 2bb15b91760f..eee2b55b2a01 100644
--- a/src/test/run-pass/ufcs-type-params.rs
+++ b/src/test/run-pass/ufcs-type-params.rs
@@ -1,3 +1,4 @@
+// run-pass
 // pretty-expanded FIXME #23616
 
 trait Foo<T> {
diff --git a/src/test/run-pass/unary-minus-suffix-inference.rs b/src/test/run-pass/unary-minus-suffix-inference.rs
index e5579c20a147..a4d0a849484e 100644
--- a/src/test/run-pass/unary-minus-suffix-inference.rs
+++ b/src/test/run-pass/unary-minus-suffix-inference.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 pub fn main() {
     let a = 1;
     let a_neg: i8 = -a;
diff --git a/src/test/run-pass/underscore-lifetimes.rs b/src/test/run-pass/underscore-lifetimes.rs
index 3d0660554e8a..a1593880d84d 100644
--- a/src/test/run-pass/underscore-lifetimes.rs
+++ b/src/test/run-pass/underscore-lifetimes.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 #![allow(dead_code)]
 struct Foo<'a>(&'a u8);
 
diff --git a/src/test/run-pass/underscore-method-after-integer.rs b/src/test/run-pass/underscore-method-after-integer.rs
index f9c06d1e4f14..7fb8607f97da 100644
--- a/src/test/run-pass/underscore-method-after-integer.rs
+++ b/src/test/run-pass/underscore-method-after-integer.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 trait Tr : Sized {
     fn _method_on_numbers(self) {}
 }
diff --git a/src/test/run-pass/uniform-paths/issue-53691.rs b/src/test/run-pass/uniform-paths/issue-53691.rs
index 73e5fbf42381..5c5ca5b70bb6 100644
--- a/src/test/run-pass/uniform-paths/issue-53691.rs
+++ b/src/test/run-pass/uniform-paths/issue-53691.rs
@@ -1,3 +1,4 @@
+// run-pass
 // aux-build:issue-53691.rs
 
 extern crate issue_53691;
diff --git a/src/test/run-pass/unify-return-ty.rs b/src/test/run-pass/unify-return-ty.rs
index 3f743a7da406..da1d82e896ae 100644
--- a/src/test/run-pass/unify-return-ty.rs
+++ b/src/test/run-pass/unify-return-ty.rs
@@ -1,3 +1,4 @@
+// run-pass
 // Tests that the tail expr in null() has its type
 // unified with the type *T, and so the type variable
 // in that type gets resolved.
diff --git a/src/test/run-pass/uninit-empty-types.rs b/src/test/run-pass/uninit-empty-types.rs
index 4bc247a3dcab..0d1235776a6e 100644
--- a/src/test/run-pass/uninit-empty-types.rs
+++ b/src/test/run-pass/uninit-empty-types.rs
@@ -1,3 +1,4 @@
+// run-pass
 // Test the uninit() construct returning various empty types.
 
 // pretty-expanded FIXME #23616
diff --git a/src/test/run-pass/unit.rs b/src/test/run-pass/unit.rs
index e10b2408cb79..4f2dd4194a54 100644
--- a/src/test/run-pass/unit.rs
+++ b/src/test/run-pass/unit.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 #![allow(unused_assignments)]
 #![allow(unknown_lints)]
 // pretty-expanded FIXME #23616
diff --git a/src/test/run-pass/unnamed_argument_mode.rs b/src/test/run-pass/unnamed_argument_mode.rs
index fa817be27049..5b7b4002f477 100644
--- a/src/test/run-pass/unnamed_argument_mode.rs
+++ b/src/test/run-pass/unnamed_argument_mode.rs
@@ -1,3 +1,4 @@
+// run-pass
 // pretty-expanded FIXME #23616
 
 fn good(_a: &isize) {
diff --git a/src/test/run-pass/unreachable-code-1.rs b/src/test/run-pass/unreachable-code-1.rs
index ac41377e056e..ee44f3999455 100644
--- a/src/test/run-pass/unreachable-code-1.rs
+++ b/src/test/run-pass/unreachable-code-1.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 #![allow(unused_must_use)]
 #![allow(unreachable_code)]
 
diff --git a/src/test/run-pass/unreachable-code.rs b/src/test/run-pass/unreachable-code.rs
index ea17be7adee7..28b938edc63b 100644
--- a/src/test/run-pass/unreachable-code.rs
+++ b/src/test/run-pass/unreachable-code.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 #![allow(unused_must_use)]
 #![allow(dead_code)]
 
diff --git a/src/test/run-pass/unsafe-coercion.rs b/src/test/run-pass/unsafe-coercion.rs
index 0c977c1ef320..2478deeab0d4 100644
--- a/src/test/run-pass/unsafe-coercion.rs
+++ b/src/test/run-pass/unsafe-coercion.rs
@@ -1,3 +1,4 @@
+// run-pass
 // Check that safe fns are not a subtype of unsafe fns.
 
 
diff --git a/src/test/run-pass/unsafe-fn-called-from-unsafe-blk.rs b/src/test/run-pass/unsafe-fn-called-from-unsafe-blk.rs
index e49b372981bf..38271cc3c78b 100644
--- a/src/test/run-pass/unsafe-fn-called-from-unsafe-blk.rs
+++ b/src/test/run-pass/unsafe-fn-called-from-unsafe-blk.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 #![allow(dead_code)]
 //
 // See also: compile-fail/unsafe-fn-called-from-safe.rs
diff --git a/src/test/run-pass/unsafe-fn-called-from-unsafe-fn.rs b/src/test/run-pass/unsafe-fn-called-from-unsafe-fn.rs
index f9414bee2987..26acc913e872 100644
--- a/src/test/run-pass/unsafe-fn-called-from-unsafe-fn.rs
+++ b/src/test/run-pass/unsafe-fn-called-from-unsafe-fn.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 #![allow(dead_code)]
 //
 // See also: compile-fail/unsafe-fn-called-from-safe.rs
diff --git a/src/test/run-pass/unsafe-pointer-assignability.rs b/src/test/run-pass/unsafe-pointer-assignability.rs
index 11e22d7a08ac..db822bb6a028 100644
--- a/src/test/run-pass/unsafe-pointer-assignability.rs
+++ b/src/test/run-pass/unsafe-pointer-assignability.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 fn f(x: *const isize) {
     unsafe {
         assert_eq!(*x, 3);
diff --git a/src/test/run-pass/unsized-locals/autoderef.rs b/src/test/run-pass/unsized-locals/autoderef.rs
index 885cd2b83608..7f2d2f9c7ef3 100644
--- a/src/test/run-pass/unsized-locals/autoderef.rs
+++ b/src/test/run-pass/unsized-locals/autoderef.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 #![feature(unsized_locals)]
 
 pub trait Foo {
diff --git a/src/test/run-pass/unsized-locals/box-fnonce.rs b/src/test/run-pass/unsized-locals/box-fnonce.rs
index 16bdeae4fad4..8b2f9b4c9fcd 100644
--- a/src/test/run-pass/unsized-locals/box-fnonce.rs
+++ b/src/test/run-pass/unsized-locals/box-fnonce.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 fn call_it<T>(f: Box<dyn FnOnce() -> T>) -> T {
     f()
 }
diff --git a/src/test/run-pass/unsized-locals/by-value-trait-object-safety-withdefault.rs b/src/test/run-pass/unsized-locals/by-value-trait-object-safety-withdefault.rs
index e6e363f55a1a..8b39a99da582 100644
--- a/src/test/run-pass/unsized-locals/by-value-trait-object-safety-withdefault.rs
+++ b/src/test/run-pass/unsized-locals/by-value-trait-object-safety-withdefault.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 #![feature(unsized_locals)]
 
 pub trait Foo {
diff --git a/src/test/run-pass/unsized-locals/by-value-trait-object-safety.rs b/src/test/run-pass/unsized-locals/by-value-trait-object-safety.rs
index f19ff5b8de46..b07d1a571b21 100644
--- a/src/test/run-pass/unsized-locals/by-value-trait-object-safety.rs
+++ b/src/test/run-pass/unsized-locals/by-value-trait-object-safety.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 #![feature(unsized_locals)]
 
 pub trait Foo {
diff --git a/src/test/run-pass/unsized-tuple-impls.rs b/src/test/run-pass/unsized-tuple-impls.rs
index 17ab317361ee..5e385f33bee7 100644
--- a/src/test/run-pass/unsized-tuple-impls.rs
+++ b/src/test/run-pass/unsized-tuple-impls.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 #![feature(unsized_tuple_coercion)]
 
 use std::collections::HashSet;
diff --git a/src/test/run-pass/unsized.rs b/src/test/run-pass/unsized.rs
index ad69214db879..54304834d4b2 100644
--- a/src/test/run-pass/unsized.rs
+++ b/src/test/run-pass/unsized.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 #![allow(type_alias_bounds)]
 #![allow(dead_code)]
 // Test syntax checks for `?Sized` syntax.
diff --git a/src/test/run-pass/unsized2.rs b/src/test/run-pass/unsized2.rs
index c9a8b2e7c664..be4406399fd0 100644
--- a/src/test/run-pass/unsized2.rs
+++ b/src/test/run-pass/unsized2.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 #![allow(unconditional_recursion)]
 #![allow(dead_code)]
 #![allow(unused_variables)]
diff --git a/src/test/run-pass/unsized3.rs b/src/test/run-pass/unsized3.rs
index eaa65cf37fab..65efbd6b5207 100644
--- a/src/test/run-pass/unsized3.rs
+++ b/src/test/run-pass/unsized3.rs
@@ -1,3 +1,4 @@
+// run-pass
 // Test structs with always-unsized fields.
 
 
diff --git a/src/test/run-pass/unused-move-capture.rs b/src/test/run-pass/unused-move-capture.rs
index baba19c08cd5..e9d4684736eb 100644
--- a/src/test/run-pass/unused-move-capture.rs
+++ b/src/test/run-pass/unused-move-capture.rs
@@ -1,3 +1,4 @@
+// run-pass
 // pretty-expanded FIXME #23616
 
 #![feature(box_syntax)]
diff --git a/src/test/run-pass/unused-move.rs b/src/test/run-pass/unused-move.rs
index 74632dbc797f..37aee22f85db 100644
--- a/src/test/run-pass/unused-move.rs
+++ b/src/test/run-pass/unused-move.rs
@@ -1,3 +1,4 @@
+// run-pass
 // Issue #3878
 // Issue Name: Unused move causes a crash
 // Abstract: zero-fill to block after drop
diff --git a/src/test/run-pass/unwind-resource.rs b/src/test/run-pass/unwind-resource.rs
index a55730c55fd9..a063bef0822f 100644
--- a/src/test/run-pass/unwind-resource.rs
+++ b/src/test/run-pass/unwind-resource.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 #![allow(non_camel_case_types)]
 // ignore-emscripten no threads support
 
diff --git a/src/test/run-pass/unwind-unique.rs b/src/test/run-pass/unwind-unique.rs
index 07613a6dd64d..ea3089e747fb 100644
--- a/src/test/run-pass/unwind-unique.rs
+++ b/src/test/run-pass/unwind-unique.rs
@@ -1,3 +1,4 @@
+// run-pass
 // ignore-emscripten no threads support
 
 #![feature(box_syntax)]
diff --git a/src/test/run-pass/use-crate-name-alias.rs b/src/test/run-pass/use-crate-name-alias.rs
index 520e72676b09..0920d9685853 100644
--- a/src/test/run-pass/use-crate-name-alias.rs
+++ b/src/test/run-pass/use-crate-name-alias.rs
@@ -1,3 +1,4 @@
+// run-pass
 // Issue #1706
 // pretty-expanded FIXME #23616
 
diff --git a/src/test/run-pass/use-import-export.rs b/src/test/run-pass/use-import-export.rs
index bb6a8ee55bfc..07a6866ba662 100644
--- a/src/test/run-pass/use-import-export.rs
+++ b/src/test/run-pass/use-import-export.rs
@@ -1,3 +1,4 @@
+// run-pass
 // pretty-expanded FIXME #23616
 
 mod foo {
diff --git a/src/test/run-pass/use-keyword-2.rs b/src/test/run-pass/use-keyword-2.rs
index 840c907e2341..ebddb5d1a483 100644
--- a/src/test/run-pass/use-keyword-2.rs
+++ b/src/test/run-pass/use-keyword-2.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 #![allow(unused_variables)]
 pub struct A;
 
diff --git a/src/test/run-pass/use-mod.rs b/src/test/run-pass/use-mod.rs
index 9af56b71de00..84da2e70878f 100644
--- a/src/test/run-pass/use-mod.rs
+++ b/src/test/run-pass/use-mod.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 #![allow(unused_imports)]
 // pretty-expanded FIXME #23616
 
diff --git a/src/test/run-pass/use-nested-groups.rs b/src/test/run-pass/use-nested-groups.rs
index 092b4a34e553..5c739709e9ea 100644
--- a/src/test/run-pass/use-nested-groups.rs
+++ b/src/test/run-pass/use-nested-groups.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 mod a {
     pub enum B {}
 
diff --git a/src/test/run-pass/use.rs b/src/test/run-pass/use.rs
index df37a60e3560..1beee4a51437 100644
--- a/src/test/run-pass/use.rs
+++ b/src/test/run-pass/use.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 #![allow(stable_features)]
 // pretty-expanded FIXME #23616
 
diff --git a/src/test/run-pass/use_inline_dtor.rs b/src/test/run-pass/use_inline_dtor.rs
index 0873d185575b..ac916de46469 100644
--- a/src/test/run-pass/use_inline_dtor.rs
+++ b/src/test/run-pass/use_inline_dtor.rs
@@ -1,3 +1,4 @@
+// run-pass
 // aux-build:inline_dtor.rs
 
 // pretty-expanded FIXME #23616
diff --git a/src/test/run-pass/using-target-feature-unstable.rs b/src/test/run-pass/using-target-feature-unstable.rs
index 05b1d93a697b..c5da45c0854b 100644
--- a/src/test/run-pass/using-target-feature-unstable.rs
+++ b/src/test/run-pass/using-target-feature-unstable.rs
@@ -1,3 +1,4 @@
+// run-pass
 // only-x86_64
 // aux-build:using-target-feature-unstable.rs
 
diff --git a/src/test/run-pass/utf8-bom.rs b/src/test/run-pass/utf8-bom.rs
index 90874c9b2e38..a3cb0e9a52a8 100644
--- a/src/test/run-pass/utf8-bom.rs
+++ b/src/test/run-pass/utf8-bom.rs
@@ -1,3 +1,4 @@
+// run-pass
 //
 
 // This file has utf-8 BOM, it should be compiled normally without error.
diff --git a/src/test/run-pass/utf8.rs b/src/test/run-pass/utf8.rs
index b908afbd5b64..75b6ddf7895c 100644
--- a/src/test/run-pass/utf8.rs
+++ b/src/test/run-pass/utf8.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 pub fn main() {
     let yen: char = '¥'; // 0xa5
     let c_cedilla: char = 'ç'; // 0xe7
diff --git a/src/test/run-pass/utf8_chars.rs b/src/test/run-pass/utf8_chars.rs
index c29d8557b706..d764509813de 100644
--- a/src/test/run-pass/utf8_chars.rs
+++ b/src/test/run-pass/utf8_chars.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 use std::str;
 
 pub fn main() {
diff --git a/src/test/run-pass/utf8_idents.rs b/src/test/run-pass/utf8_idents.rs
index 7323e144f8dc..582b67bc2992 100644
--- a/src/test/run-pass/utf8_idents.rs
+++ b/src/test/run-pass/utf8_idents.rs
@@ -1,3 +1,4 @@
+// run-pass
 //
 #![allow(non_snake_case)]
 
diff --git a/src/test/run-pass/variadic-ffi.rs b/src/test/run-pass/variadic-ffi.rs
index d6fbb1773b29..3232a11d726e 100644
--- a/src/test/run-pass/variadic-ffi.rs
+++ b/src/test/run-pass/variadic-ffi.rs
@@ -1,3 +1,4 @@
+// run-pass
 // ignore-wasm32-bare no libc to test ffi with
 #![feature(c_variadic)]
 
diff --git a/src/test/run-pass/variance-intersection-of-ref-and-opt-ref.rs b/src/test/run-pass/variance-intersection-of-ref-and-opt-ref.rs
index fde151400be4..74707a98d325 100644
--- a/src/test/run-pass/variance-intersection-of-ref-and-opt-ref.rs
+++ b/src/test/run-pass/variance-intersection-of-ref-and-opt-ref.rs
@@ -1,3 +1,4 @@
+// run-pass
 // Elaborated version of the opening example from RFC 738. This failed
 // to compile before variance because invariance of `Option` prevented
 // us from approximating the lifetimes of `field1` and `field2` to a
diff --git a/src/test/run-pass/variance-iterators-in-libcore.rs b/src/test/run-pass/variance-iterators-in-libcore.rs
index 32b56bd0b5ad..2ab3a8ab5c12 100644
--- a/src/test/run-pass/variance-iterators-in-libcore.rs
+++ b/src/test/run-pass/variance-iterators-in-libcore.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 #![allow(warnings)]
 
 use std::iter::Zip;
diff --git a/src/test/run-pass/volatile-fat-ptr.rs b/src/test/run-pass/volatile-fat-ptr.rs
index f01263b73a9f..f73e7e1c3912 100644
--- a/src/test/run-pass/volatile-fat-ptr.rs
+++ b/src/test/run-pass/volatile-fat-ptr.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 #![allow(stable_features)]
 #![feature(volatile)]
 use std::ptr::{read_volatile, write_volatile};
diff --git a/src/test/run-pass/wait-forked-but-failed-child.rs b/src/test/run-pass/wait-forked-but-failed-child.rs
index 1f32bd00a037..434361b40de6 100644
--- a/src/test/run-pass/wait-forked-but-failed-child.rs
+++ b/src/test/run-pass/wait-forked-but-failed-child.rs
@@ -1,3 +1,4 @@
+// run-pass
 // ignore-cloudabi no processes
 // ignore-emscripten no processes
 // ignore-sgx no processes
diff --git a/src/test/run-pass/warn-ctypes-inhibit.rs b/src/test/run-pass/warn-ctypes-inhibit.rs
index 76b36a12c200..ab9634df65c8 100644
--- a/src/test/run-pass/warn-ctypes-inhibit.rs
+++ b/src/test/run-pass/warn-ctypes-inhibit.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 #![allow(dead_code)]
 // compile-flags:-D improper-ctypes
 
diff --git a/src/test/run-pass/weak-lang-item.rs b/src/test/run-pass/weak-lang-item.rs
index 9a36606a4650..a429d8fabc72 100644
--- a/src/test/run-pass/weak-lang-item.rs
+++ b/src/test/run-pass/weak-lang-item.rs
@@ -1,3 +1,4 @@
+// run-pass
 // aux-build:weak-lang-items.rs
 
 // ignore-emscripten no threads support
diff --git a/src/test/run-pass/weak-new-uninhabited-issue-48493.rs b/src/test/run-pass/weak-new-uninhabited-issue-48493.rs
index 4f93800b864b..644fc8c24837 100644
--- a/src/test/run-pass/weak-new-uninhabited-issue-48493.rs
+++ b/src/test/run-pass/weak-new-uninhabited-issue-48493.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 fn main() {
     enum Void {}
     std::rc::Weak::<Void>::new();
diff --git a/src/test/run-pass/weird-exit-code.rs b/src/test/run-pass/weird-exit-code.rs
index 9456cbbe6f7b..a067b7b5b1f2 100644
--- a/src/test/run-pass/weird-exit-code.rs
+++ b/src/test/run-pass/weird-exit-code.rs
@@ -1,3 +1,4 @@
+// run-pass
 // On Windows the GetExitCodeProcess API is used to get the exit code of a
 // process, but it's easy to mistake a process exiting with the code 259 as
 // "still running" because this is the value of the STILL_ACTIVE constant. Make
diff --git a/src/test/run-pass/weird-exprs.rs b/src/test/run-pass/weird-exprs.rs
index 7b2b46c45d27..ca68a5af0ddc 100644
--- a/src/test/run-pass/weird-exprs.rs
+++ b/src/test/run-pass/weird-exprs.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 #![feature(generators)]
 
 #![allow(non_camel_case_types)]
diff --git a/src/test/run-pass/wf-bound-region-in-object-type.rs b/src/test/run-pass/wf-bound-region-in-object-type.rs
index 6814e2baab59..7c4dd3ec84f6 100644
--- a/src/test/run-pass/wf-bound-region-in-object-type.rs
+++ b/src/test/run-pass/wf-bound-region-in-object-type.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 #![allow(dead_code)]
 #![allow(unused_variables)]
 // Test that the `wf` checker properly handles bound regions in object
diff --git a/src/test/run-pass/wrapping-int-api.rs b/src/test/run-pass/wrapping-int-api.rs
index fc62caf3b8d7..2a5baad8b786 100644
--- a/src/test/run-pass/wrapping-int-api.rs
+++ b/src/test/run-pass/wrapping-int-api.rs
@@ -1,3 +1,4 @@
+// run-pass
 // Test inherent wrapping_* methods for {i,u}{size,8,16,32,64}.
 
 use std::{i8, i16, i32, i64, isize};
diff --git a/src/test/run-pass/write-fmt-errors.rs b/src/test/run-pass/write-fmt-errors.rs
index f95bbfd569a1..7dd98564425f 100644
--- a/src/test/run-pass/write-fmt-errors.rs
+++ b/src/test/run-pass/write-fmt-errors.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 use std::fmt;
 use std::io::{self, Error, Write, sink};
 
diff --git a/src/test/run-pass/writealias.rs b/src/test/run-pass/writealias.rs
index f80118e08c9d..8ba4b09ae298 100644
--- a/src/test/run-pass/writealias.rs
+++ b/src/test/run-pass/writealias.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 #![allow(dead_code)]
 
 use std::sync::Mutex;
diff --git a/src/test/run-pass/wrong-hashset-issue-42918.rs b/src/test/run-pass/wrong-hashset-issue-42918.rs
index 12b10640c53d..ef834d915c93 100644
--- a/src/test/run-pass/wrong-hashset-issue-42918.rs
+++ b/src/test/run-pass/wrong-hashset-issue-42918.rs
@@ -1,3 +1,4 @@
+// run-pass
 //
 #![allow(dead_code)]
 // compile-flags: -O
diff --git a/src/test/run-pass/x86stdcall.rs b/src/test/run-pass/x86stdcall.rs
index cd9450a5697c..fc67ccdc8c41 100644
--- a/src/test/run-pass/x86stdcall.rs
+++ b/src/test/run-pass/x86stdcall.rs
@@ -1,3 +1,4 @@
+// run-pass
 // ignore-wasm32-bare no libc to test ffi with
 // ignore-sgx no libc
 // GetLastError doesn't seem to work with stack switching
diff --git a/src/test/run-pass/x86stdcall2.rs b/src/test/run-pass/x86stdcall2.rs
index 3d008f26ab33..563e3aba6326 100644
--- a/src/test/run-pass/x86stdcall2.rs
+++ b/src/test/run-pass/x86stdcall2.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 #![allow(non_camel_case_types)]
 pub type HANDLE = usize;
 pub type DWORD = u32;
diff --git a/src/test/run-pass/yield.rs b/src/test/run-pass/yield.rs
index a5fd14bd8fd7..e83ba556078a 100644
--- a/src/test/run-pass/yield.rs
+++ b/src/test/run-pass/yield.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 #![allow(unused_must_use)]
 #![allow(unused_mut)]
 // ignore-emscripten no threads support
diff --git a/src/test/run-pass/yield1.rs b/src/test/run-pass/yield1.rs
index e7a6190b5677..002e590550c3 100644
--- a/src/test/run-pass/yield1.rs
+++ b/src/test/run-pass/yield1.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 #![allow(unused_must_use)]
 #![allow(unused_mut)]
 // ignore-emscripten no threads support
diff --git a/src/test/run-pass/yield2.rs b/src/test/run-pass/yield2.rs
index c4ccd2d14755..376faab0c48f 100644
--- a/src/test/run-pass/yield2.rs
+++ b/src/test/run-pass/yield2.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 use std::thread;
 
 pub fn main() {
diff --git a/src/test/run-pass/z-crate-attr.rs b/src/test/run-pass/z-crate-attr.rs
index f08439413091..1021774fc5f3 100644
--- a/src/test/run-pass/z-crate-attr.rs
+++ b/src/test/run-pass/z-crate-attr.rs
@@ -1,3 +1,4 @@
+// run-pass
 // This test checks if an unstable feature is enabled with the -Zcrate-attr=feature(foo) flag. If
 // the exact feature used here is causing problems feel free to replace it with another
 // perma-unstable feature.