1557 files changed, 2635 insertions, 2635 deletions

diff --git a/test/000-nop/expected.txt b/test/000-nop/expected-stdout.txt
index 80a233e745..80a233e745 100644
--- a/test/000-nop/expected.txt
+++ b/test/000-nop/expected-stdout.txt
diff --git a/test/001-HelloWorld/Android.bp b/test/001-HelloWorld/Android.bp
index 676b1d4b42..56883deaf6 100644
--- a/test/001-HelloWorld/Android.bp
+++ b/test/001-HelloWorld/Android.bp
@@ -8,13 +8,13 @@ java_test {
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-001-HelloWorld-expected"],
+    data: [":art-run-test-001-HelloWorld-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-001-HelloWorld-expected",
-    out: ["art-run-test-001-HelloWorld-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-001-HelloWorld-expected-stdout",
+    out: ["art-run-test-001-HelloWorld-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/001-HelloWorld/expected.txt b/test/001-HelloWorld/expected-stdout.txt
index af5626b4a1..af5626b4a1 100644
--- a/test/001-HelloWorld/expected.txt
+++ b/test/001-HelloWorld/expected-stdout.txt
diff --git a/test/001-Main/Android.bp b/test/001-Main/Android.bp
index b7dc8ee29b..3f33fc0d6e 100644
--- a/test/001-Main/Android.bp
+++ b/test/001-Main/Android.bp
@@ -8,13 +8,13 @@ java_test {
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-001-Main-expected"],
+    data: [":art-run-test-001-Main-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-001-Main-expected",
-    out: ["art-run-test-001-Main-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-001-Main-expected-stdout",
+    out: ["art-run-test-001-Main-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/001-Main/expected.txt b/test/001-Main/expected-stdout.txt
index e69de29bb2..e69de29bb2 100644
--- a/test/001-Main/expected.txt
+++ b/test/001-Main/expected-stdout.txt
diff --git a/test/002-sleep/Android.bp b/test/002-sleep/Android.bp
index f3fe282cf8..fb39bb604a 100644
--- a/test/002-sleep/Android.bp
+++ b/test/002-sleep/Android.bp
@@ -8,13 +8,13 @@ java_test {
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-002-sleep-expected"],
+    data: [":art-run-test-002-sleep-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-002-sleep-expected",
-    out: ["art-run-test-002-sleep-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-002-sleep-expected-stdout",
+    out: ["art-run-test-002-sleep-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/002-sleep/expected.txt b/test/002-sleep/expected-stdout.txt
index f994ce5de0..f994ce5de0 100644
--- a/test/002-sleep/expected.txt
+++ b/test/002-sleep/expected-stdout.txt
diff --git a/test/003-omnibus-opcodes/expected.txt b/test/003-omnibus-opcodes/expected-stdout.txt
index ee25ec10e6..ee25ec10e6 100644
--- a/test/003-omnibus-opcodes/expected.txt
+++ b/test/003-omnibus-opcodes/expected-stdout.txt
diff --git a/test/004-InterfaceTest/Android.bp b/test/004-InterfaceTest/Android.bp
index 85d1ee39f6..51fa5eab3c 100644
--- a/test/004-InterfaceTest/Android.bp
+++ b/test/004-InterfaceTest/Android.bp
@@ -8,13 +8,13 @@ java_test {
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-004-InterfaceTest-expected"],
+    data: [":art-run-test-004-InterfaceTest-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-004-InterfaceTest-expected",
-    out: ["art-run-test-004-InterfaceTest-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-004-InterfaceTest-expected-stdout",
+    out: ["art-run-test-004-InterfaceTest-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/004-InterfaceTest/expected.txt b/test/004-InterfaceTest/expected-stdout.txt
index 4854e24149..4854e24149 100644
--- a/test/004-InterfaceTest/expected.txt
+++ b/test/004-InterfaceTest/expected-stdout.txt
diff --git a/test/004-JniTest/expected.txt b/test/004-JniTest/expected-stdout.txt
index b09b9a22eb..b09b9a22eb 100644
--- a/test/004-JniTest/expected.txt
+++ b/test/004-JniTest/expected-stdout.txt
diff --git a/test/004-NativeAllocations/expected.txt b/test/004-NativeAllocations/expected-stdout.txt
index f75da10caf..f75da10caf 100644
--- a/test/004-NativeAllocations/expected.txt
+++ b/test/004-NativeAllocations/expected-stdout.txt
diff --git a/test/004-ReferenceMap/expected.txt b/test/004-ReferenceMap/expected-stdout.txt
index 6a5618ebc6..6a5618ebc6 100644
--- a/test/004-ReferenceMap/expected.txt
+++ b/test/004-ReferenceMap/expected-stdout.txt
diff --git a/test/004-SignalTest/Android.bp b/test/004-SignalTest/Android.bp
index cf0e4af5cc..7eca5ec824 100644
--- a/test/004-SignalTest/Android.bp
+++ b/test/004-SignalTest/Android.bp
@@ -8,13 +8,13 @@ java_test {
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-004-SignalTest-expected"],
+    data: [":art-run-test-004-SignalTest-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-004-SignalTest-expected",
-    out: ["art-run-test-004-SignalTest-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-004-SignalTest-expected-stdout",
+    out: ["art-run-test-004-SignalTest-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/004-SignalTest/expected.txt b/test/004-SignalTest/expected-stdout.txt
index 847b56f823..847b56f823 100644
--- a/test/004-SignalTest/expected.txt
+++ b/test/004-SignalTest/expected-stdout.txt
diff --git a/test/004-StackWalk/expected.txt b/test/004-StackWalk/expected-stdout.txt
index 5af68cd85d..5af68cd85d 100644
--- a/test/004-StackWalk/expected.txt
+++ b/test/004-StackWalk/expected-stdout.txt
diff --git a/test/004-ThreadStress/expected.txt b/test/004-ThreadStress/expected-stdout.txt
index 9eaab24ede..9eaab24ede 100644
--- a/test/004-ThreadStress/expected.txt
+++ b/test/004-ThreadStress/expected-stdout.txt
diff --git a/test/004-UnsafeTest/Android.bp b/test/004-UnsafeTest/Android.bp
index 6dd5af799e..41bc73d22b 100644
--- a/test/004-UnsafeTest/Android.bp
+++ b/test/004-UnsafeTest/Android.bp
@@ -8,13 +8,13 @@ java_test {
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-004-UnsafeTest-expected"],
+    data: [":art-run-test-004-UnsafeTest-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-004-UnsafeTest-expected",
-    out: ["art-run-test-004-UnsafeTest-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-004-UnsafeTest-expected-stdout",
+    out: ["art-run-test-004-UnsafeTest-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/004-UnsafeTest/expected.txt b/test/004-UnsafeTest/expected-stdout.txt
index 6a5618ebc6..6a5618ebc6 100644
--- a/test/004-UnsafeTest/expected.txt
+++ b/test/004-UnsafeTest/expected-stdout.txt
diff --git a/test/004-checker-UnsafeTest18/Android.bp b/test/004-checker-UnsafeTest18/Android.bp
index fb8c9c6923..f163f2c6a8 100644
--- a/test/004-checker-UnsafeTest18/Android.bp
+++ b/test/004-checker-UnsafeTest18/Android.bp
@@ -8,7 +8,7 @@ java_test {
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-004-checker-UnsafeTest18-expected"],
+    data: [":art-run-test-004-checker-UnsafeTest18-expected-stdout"],
     // Include the Java source files in the test's artifacts, to make Checker assertions
     // available to the TradeFed test runner.
     include_srcs: true,
@@ -16,8 +16,8 @@ java_test {
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-004-checker-UnsafeTest18-expected",
-    out: ["art-run-test-004-checker-UnsafeTest18-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-004-checker-UnsafeTest18-expected-stdout",
+    out: ["art-run-test-004-checker-UnsafeTest18-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/004-checker-UnsafeTest18/expected.txt b/test/004-checker-UnsafeTest18/expected-stdout.txt
index 651da727af..651da727af 100644
--- a/test/004-checker-UnsafeTest18/expected.txt
+++ b/test/004-checker-UnsafeTest18/expected-stdout.txt
diff --git a/test/005-annotations/expected.txt b/test/005-annotations/expected-stdout.txt
index b537c8f8bd..b537c8f8bd 100644
--- a/test/005-annotations/expected.txt
+++ b/test/005-annotations/expected-stdout.txt
diff --git a/test/006-args/Android.bp b/test/006-args/Android.bp
index 5bd2d1cf1d..3d19e35c5a 100644
--- a/test/006-args/Android.bp
+++ b/test/006-args/Android.bp
@@ -8,13 +8,13 @@ java_test {
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-006-args-expected"],
+    data: [":art-run-test-006-args-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-006-args-expected",
-    out: ["art-run-test-006-args-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-006-args-expected-stdout",
+    out: ["art-run-test-006-args-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/006-args/expected.txt b/test/006-args/expected-stdout.txt
index 094fbbbcfd..094fbbbcfd 100644
--- a/test/006-args/expected.txt
+++ b/test/006-args/expected-stdout.txt
diff --git a/test/007-count10/Android.bp b/test/007-count10/Android.bp
index 2f353b62d0..415ff2e288 100644
--- a/test/007-count10/Android.bp
+++ b/test/007-count10/Android.bp
@@ -8,13 +8,13 @@ java_test {
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-007-count10-expected"],
+    data: [":art-run-test-007-count10-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-007-count10-expected",
-    out: ["art-run-test-007-count10-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-007-count10-expected-stdout",
+    out: ["art-run-test-007-count10-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/007-count10/expected.txt b/test/007-count10/expected-stdout.txt
index 8b1acc12b6..8b1acc12b6 100644
--- a/test/007-count10/expected.txt
+++ b/test/007-count10/expected-stdout.txt
diff --git a/test/008-exceptions/expected.txt b/test/008-exceptions/expected-stdout.txt
index fcf2ef49f3..fcf2ef49f3 100644
--- a/test/008-exceptions/expected.txt
+++ b/test/008-exceptions/expected-stdout.txt
diff --git a/test/009-instanceof/Android.bp b/test/009-instanceof/Android.bp
index 2f97b0abbb..7878eb8b09 100644
--- a/test/009-instanceof/Android.bp
+++ b/test/009-instanceof/Android.bp
@@ -8,13 +8,13 @@ java_test {
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-009-instanceof-expected"],
+    data: [":art-run-test-009-instanceof-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-009-instanceof-expected",
-    out: ["art-run-test-009-instanceof-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-009-instanceof-expected-stdout",
+    out: ["art-run-test-009-instanceof-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/009-instanceof/expected.txt b/test/009-instanceof/expected-stdout.txt
index 967c0bf4d5..967c0bf4d5 100644
--- a/test/009-instanceof/expected.txt
+++ b/test/009-instanceof/expected-stdout.txt
diff --git a/test/010-instance/Android.bp b/test/010-instance/Android.bp
index aac75327c1..d0064a27c3 100644
--- a/test/010-instance/Android.bp
+++ b/test/010-instance/Android.bp
@@ -8,13 +8,13 @@ java_test {
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-010-instance-expected"],
+    data: [":art-run-test-010-instance-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-010-instance-expected",
-    out: ["art-run-test-010-instance-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-010-instance-expected-stdout",
+    out: ["art-run-test-010-instance-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/010-instance/expected.txt b/test/010-instance/expected-stdout.txt
index 219dd06f8e..219dd06f8e 100644
--- a/test/010-instance/expected.txt
+++ b/test/010-instance/expected-stdout.txt
diff --git a/test/011-array-copy/Android.bp b/test/011-array-copy/Android.bp
index 354efdd74c..378ccc4b9d 100644
--- a/test/011-array-copy/Android.bp
+++ b/test/011-array-copy/Android.bp
@@ -8,13 +8,13 @@ java_test {
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-011-array-copy-expected"],
+    data: [":art-run-test-011-array-copy-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-011-array-copy-expected",
-    out: ["art-run-test-011-array-copy-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-011-array-copy-expected-stdout",
+    out: ["art-run-test-011-array-copy-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/011-array-copy/expected.txt b/test/011-array-copy/expected-stdout.txt
index 724786ee36..724786ee36 100644
--- a/test/011-array-copy/expected.txt
+++ b/test/011-array-copy/expected-stdout.txt
diff --git a/test/012-math/Android.bp b/test/012-math/Android.bp
index 05599449a3..77a5884bb2 100644
--- a/test/012-math/Android.bp
+++ b/test/012-math/Android.bp
@@ -8,13 +8,13 @@ java_test {
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-012-math-expected"],
+    data: [":art-run-test-012-math-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-012-math-expected",
-    out: ["art-run-test-012-math-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-012-math-expected-stdout",
+    out: ["art-run-test-012-math-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/012-math/expected.txt b/test/012-math/expected-stdout.txt
index 75a559e4ff..75a559e4ff 100644
--- a/test/012-math/expected.txt
+++ b/test/012-math/expected-stdout.txt
diff --git a/test/013-math2/Android.bp b/test/013-math2/Android.bp
index 26d94fd14c..9a750aecc6 100644
--- a/test/013-math2/Android.bp
+++ b/test/013-math2/Android.bp
@@ -8,13 +8,13 @@ java_test {
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-013-math2-expected"],
+    data: [":art-run-test-013-math2-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-013-math2-expected",
-    out: ["art-run-test-013-math2-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-013-math2-expected-stdout",
+    out: ["art-run-test-013-math2-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/013-math2/expected.txt b/test/013-math2/expected-stdout.txt
index 84fb9e2750..84fb9e2750 100644
--- a/test/013-math2/expected.txt
+++ b/test/013-math2/expected-stdout.txt
diff --git a/test/014-math3/Android.bp b/test/014-math3/Android.bp
index 818cd3a9b1..53f8ab2f0a 100644
--- a/test/014-math3/Android.bp
+++ b/test/014-math3/Android.bp
@@ -8,13 +8,13 @@ java_test {
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-014-math3-expected"],
+    data: [":art-run-test-014-math3-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-014-math3-expected",
-    out: ["art-run-test-014-math3-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-014-math3-expected-stdout",
+    out: ["art-run-test-014-math3-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/014-math3/expected.txt b/test/014-math3/expected-stdout.txt
index bda3dc7d23..bda3dc7d23 100644
--- a/test/014-math3/expected.txt
+++ b/test/014-math3/expected-stdout.txt
diff --git a/test/015-switch/Android.bp b/test/015-switch/Android.bp
index b38c716226..013fbca13b 100644
--- a/test/015-switch/Android.bp
+++ b/test/015-switch/Android.bp
@@ -8,13 +8,13 @@ java_test {
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-015-switch-expected"],
+    data: [":art-run-test-015-switch-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-015-switch-expected",
-    out: ["art-run-test-015-switch-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-015-switch-expected-stdout",
+    out: ["art-run-test-015-switch-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/015-switch/expected.txt b/test/015-switch/expected-stdout.txt
index be6d2cac55..be6d2cac55 100644
--- a/test/015-switch/expected.txt
+++ b/test/015-switch/expected-stdout.txt
diff --git a/test/016-intern/Android.bp b/test/016-intern/Android.bp
index 0bf003a020..b6b7a8f541 100644
--- a/test/016-intern/Android.bp
+++ b/test/016-intern/Android.bp
@@ -8,13 +8,13 @@ java_test {
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-016-intern-expected"],
+    data: [":art-run-test-016-intern-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-016-intern-expected",
-    out: ["art-run-test-016-intern-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-016-intern-expected-stdout",
+    out: ["art-run-test-016-intern-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/016-intern/expected.txt b/test/016-intern/expected-stdout.txt
index 0b7ac3d3ce..0b7ac3d3ce 100644
--- a/test/016-intern/expected.txt
+++ b/test/016-intern/expected-stdout.txt
diff --git a/test/017-float/Android.bp b/test/017-float/Android.bp
index 4b0dee72d3..d1678c190b 100644
--- a/test/017-float/Android.bp
+++ b/test/017-float/Android.bp
@@ -8,13 +8,13 @@ java_test {
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-017-float-expected"],
+    data: [":art-run-test-017-float-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-017-float-expected",
-    out: ["art-run-test-017-float-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-017-float-expected-stdout",
+    out: ["art-run-test-017-float-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/017-float/expected.txt b/test/017-float/expected-stdout.txt
index 2062f9e7bb..2062f9e7bb 100644
--- a/test/017-float/expected.txt
+++ b/test/017-float/expected-stdout.txt
diff --git a/test/018-stack-overflow/Android.bp b/test/018-stack-overflow/Android.bp
index 1b1b42db94..c0a2bdc8e4 100644
--- a/test/018-stack-overflow/Android.bp
+++ b/test/018-stack-overflow/Android.bp
@@ -8,13 +8,13 @@ java_test {
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-018-stack-overflow-expected"],
+    data: [":art-run-test-018-stack-overflow-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-018-stack-overflow-expected",
-    out: ["art-run-test-018-stack-overflow-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-018-stack-overflow-expected-stdout",
+    out: ["art-run-test-018-stack-overflow-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/018-stack-overflow/expected.txt b/test/018-stack-overflow/expected-stdout.txt
index dbe81126ac..dbe81126ac 100644
--- a/test/018-stack-overflow/expected.txt
+++ b/test/018-stack-overflow/expected-stdout.txt
diff --git a/test/019-wrong-array-type/Android.bp b/test/019-wrong-array-type/Android.bp
index c629a665c2..e756088283 100644
--- a/test/019-wrong-array-type/Android.bp
+++ b/test/019-wrong-array-type/Android.bp
@@ -8,13 +8,13 @@ java_test {
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-019-wrong-array-type-expected"],
+    data: [":art-run-test-019-wrong-array-type-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-019-wrong-array-type-expected",
-    out: ["art-run-test-019-wrong-array-type-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-019-wrong-array-type-expected-stdout",
+    out: ["art-run-test-019-wrong-array-type-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/019-wrong-array-type/expected.txt b/test/019-wrong-array-type/expected-stdout.txt
index c0ed716523..c0ed716523 100644
--- a/test/019-wrong-array-type/expected.txt
+++ b/test/019-wrong-array-type/expected-stdout.txt
diff --git a/test/020-string/Android.bp b/test/020-string/Android.bp
index 7689db6f95..cd6617e21c 100644
--- a/test/020-string/Android.bp
+++ b/test/020-string/Android.bp
@@ -8,13 +8,13 @@ java_test {
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-020-string-expected"],
+    data: [":art-run-test-020-string-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-020-string-expected",
-    out: ["art-run-test-020-string-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-020-string-expected-stdout",
+    out: ["art-run-test-020-string-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/020-string/expected.txt b/test/020-string/expected-stdout.txt
index 83a0835718..83a0835718 100644
--- a/test/020-string/expected.txt
+++ b/test/020-string/expected-stdout.txt
diff --git a/test/021-string2/Android.bp b/test/021-string2/Android.bp
index b4c3d4736a..725fdd81e9 100644
--- a/test/021-string2/Android.bp
+++ b/test/021-string2/Android.bp
@@ -8,13 +8,13 @@ java_test {
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-021-string2-expected"],
+    data: [":art-run-test-021-string2-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-021-string2-expected",
-    out: ["art-run-test-021-string2-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-021-string2-expected-stdout",
+    out: ["art-run-test-021-string2-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/021-string2/expected.txt b/test/021-string2/expected-stdout.txt
index f269c7cf3e..f269c7cf3e 100644
--- a/test/021-string2/expected.txt
+++ b/test/021-string2/expected-stdout.txt
diff --git a/test/022-interface/Android.bp b/test/022-interface/Android.bp
index ea8648dcdb..eefa63b570 100644
--- a/test/022-interface/Android.bp
+++ b/test/022-interface/Android.bp
@@ -8,13 +8,13 @@ java_test {
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-022-interface-expected"],
+    data: [":art-run-test-022-interface-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-022-interface-expected",
-    out: ["art-run-test-022-interface-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-022-interface-expected-stdout",
+    out: ["art-run-test-022-interface-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/022-interface/expected.txt b/test/022-interface/expected-stdout.txt
index e627b69c4d..e627b69c4d 100644
--- a/test/022-interface/expected.txt
+++ b/test/022-interface/expected-stdout.txt
diff --git a/test/023-many-interfaces/expected.txt b/test/023-many-interfaces/expected-stdout.txt
index c6a0c61795..c6a0c61795 100644
--- a/test/023-many-interfaces/expected.txt
+++ b/test/023-many-interfaces/expected-stdout.txt
diff --git a/test/024-illegal-access/expected.txt b/test/024-illegal-access/expected-stdout.txt
index 0ae4a774f3..0ae4a774f3 100644
--- a/test/024-illegal-access/expected.txt
+++ b/test/024-illegal-access/expected-stdout.txt
diff --git a/test/025-access-controller/Android.bp b/test/025-access-controller/Android.bp
index aca7ccf087..a94ef64d61 100644
--- a/test/025-access-controller/Android.bp
+++ b/test/025-access-controller/Android.bp
@@ -8,13 +8,13 @@ java_test {
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-025-access-controller-expected"],
+    data: [":art-run-test-025-access-controller-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-025-access-controller-expected",
-    out: ["art-run-test-025-access-controller-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-025-access-controller-expected-stdout",
+    out: ["art-run-test-025-access-controller-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/025-access-controller/expected.txt b/test/025-access-controller/expected-stdout.txt
index 75cfc99716..75cfc99716 100644
--- a/test/025-access-controller/expected.txt
+++ b/test/025-access-controller/expected-stdout.txt
diff --git a/test/026-access/Android.bp b/test/026-access/Android.bp
index ae74b13a74..1e7c8523bf 100644
--- a/test/026-access/Android.bp
+++ b/test/026-access/Android.bp
@@ -8,13 +8,13 @@ java_test {
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-026-access-expected"],
+    data: [":art-run-test-026-access-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-026-access-expected",
-    out: ["art-run-test-026-access-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-026-access-expected-stdout",
+    out: ["art-run-test-026-access-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/026-access/expected.txt b/test/026-access/expected-stdout.txt
index 89fa21a974..89fa21a974 100644
--- a/test/026-access/expected.txt
+++ b/test/026-access/expected-stdout.txt
diff --git a/test/027-arithmetic/Android.bp b/test/027-arithmetic/Android.bp
index ddf456a32e..d0c44469a3 100644
--- a/test/027-arithmetic/Android.bp
+++ b/test/027-arithmetic/Android.bp
@@ -8,13 +8,13 @@ java_test {
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-027-arithmetic-expected"],
+    data: [":art-run-test-027-arithmetic-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-027-arithmetic-expected",
-    out: ["art-run-test-027-arithmetic-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-027-arithmetic-expected-stdout",
+    out: ["art-run-test-027-arithmetic-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/027-arithmetic/expected.txt b/test/027-arithmetic/expected-stdout.txt
index 2dadf10d96..2dadf10d96 100644
--- a/test/027-arithmetic/expected.txt
+++ b/test/027-arithmetic/expected-stdout.txt
diff --git a/test/028-array-write/Android.bp b/test/028-array-write/Android.bp
index 9417f40f6f..0f1558c096 100644
--- a/test/028-array-write/Android.bp
+++ b/test/028-array-write/Android.bp
@@ -8,13 +8,13 @@ java_test {
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-028-array-write-expected"],
+    data: [":art-run-test-028-array-write-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-028-array-write-expected",
-    out: ["art-run-test-028-array-write-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-028-array-write-expected-stdout",
+    out: ["art-run-test-028-array-write-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/028-array-write/expected.txt b/test/028-array-write/expected-stdout.txt
index 85986b5eb0..85986b5eb0 100644
--- a/test/028-array-write/expected.txt
+++ b/test/028-array-write/expected-stdout.txt
diff --git a/test/029-assert/Android.bp b/test/029-assert/Android.bp
index 05090bf062..aa222edd5a 100644
--- a/test/029-assert/Android.bp
+++ b/test/029-assert/Android.bp
@@ -8,13 +8,13 @@ java_test {
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-029-assert-expected"],
+    data: [":art-run-test-029-assert-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-029-assert-expected",
-    out: ["art-run-test-029-assert-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-029-assert-expected-stdout",
+    out: ["art-run-test-029-assert-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/029-assert/expected.txt b/test/029-assert/expected-stdout.txt
index 4230192f80..4230192f80 100644
--- a/test/029-assert/expected.txt
+++ b/test/029-assert/expected-stdout.txt
diff --git a/test/030-bad-finalizer/Android.bp b/test/030-bad-finalizer/Android.bp
index f032e51bd5..b507ccb1a4 100644
--- a/test/030-bad-finalizer/Android.bp
+++ b/test/030-bad-finalizer/Android.bp
@@ -8,13 +8,13 @@ java_test {
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-030-bad-finalizer-expected"],
+    data: [":art-run-test-030-bad-finalizer-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-030-bad-finalizer-expected",
-    out: ["art-run-test-030-bad-finalizer-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-030-bad-finalizer-expected-stdout",
+    out: ["art-run-test-030-bad-finalizer-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/030-bad-finalizer/expected.txt b/test/030-bad-finalizer/expected-stdout.txt
index 0aca6f2e93..0aca6f2e93 100644
--- a/test/030-bad-finalizer/expected.txt
+++ b/test/030-bad-finalizer/expected-stdout.txt
diff --git a/test/031-class-attributes/expected.txt b/test/031-class-attributes/expected-stdout.txt
index 72656ae916..72656ae916 100644
--- a/test/031-class-attributes/expected.txt
+++ b/test/031-class-attributes/expected-stdout.txt
diff --git a/test/032-concrete-sub/expected.txt b/test/032-concrete-sub/expected-stdout.txt
index 56f25bb096..56f25bb096 100644
--- a/test/032-concrete-sub/expected.txt
+++ b/test/032-concrete-sub/expected-stdout.txt
diff --git a/test/033-class-init-deadlock/Android.bp b/test/033-class-init-deadlock/Android.bp
index 0b6b4102cc..f367406bb5 100644
--- a/test/033-class-init-deadlock/Android.bp
+++ b/test/033-class-init-deadlock/Android.bp
@@ -8,13 +8,13 @@ java_test {
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-033-class-init-deadlock-expected"],
+    data: [":art-run-test-033-class-init-deadlock-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-033-class-init-deadlock-expected",
-    out: ["art-run-test-033-class-init-deadlock-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-033-class-init-deadlock-expected-stdout",
+    out: ["art-run-test-033-class-init-deadlock-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/033-class-init-deadlock/expected.txt b/test/033-class-init-deadlock/expected-stdout.txt
index 9e843a06f6..9e843a06f6 100644
--- a/test/033-class-init-deadlock/expected.txt
+++ b/test/033-class-init-deadlock/expected-stdout.txt
diff --git a/test/034-call-null/Android.bp b/test/034-call-null/Android.bp
index bf87771a06..de3a93edcb 100644
--- a/test/034-call-null/Android.bp
+++ b/test/034-call-null/Android.bp
@@ -8,13 +8,13 @@ java_test {
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-034-call-null-expected"],
+    data: [":art-run-test-034-call-null-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-034-call-null-expected",
-    out: ["art-run-test-034-call-null-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-034-call-null-expected-stdout",
+    out: ["art-run-test-034-call-null-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/034-call-null/expected.txt b/test/034-call-null/expected-stdout.txt
index 11aefde417..11aefde417 100644
--- a/test/034-call-null/expected.txt
+++ b/test/034-call-null/expected-stdout.txt
diff --git a/test/035-enum/Android.bp b/test/035-enum/Android.bp
index 9ed399968e..011ea2d71c 100644
--- a/test/035-enum/Android.bp
+++ b/test/035-enum/Android.bp
@@ -8,13 +8,13 @@ java_test {
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-035-enum-expected"],
+    data: [":art-run-test-035-enum-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-035-enum-expected",
-    out: ["art-run-test-035-enum-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-035-enum-expected-stdout",
+    out: ["art-run-test-035-enum-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/035-enum/expected.txt b/test/035-enum/expected-stdout.txt
index 50f2791b02..50f2791b02 100644
--- a/test/035-enum/expected.txt
+++ b/test/035-enum/expected-stdout.txt
diff --git a/test/036-finalizer/Android.bp b/test/036-finalizer/Android.bp
index 5586453201..028bc0ad2d 100644
--- a/test/036-finalizer/Android.bp
+++ b/test/036-finalizer/Android.bp
@@ -8,13 +8,13 @@ java_test {
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-036-finalizer-expected"],
+    data: [":art-run-test-036-finalizer-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-036-finalizer-expected",
-    out: ["art-run-test-036-finalizer-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-036-finalizer-expected-stdout",
+    out: ["art-run-test-036-finalizer-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/036-finalizer/expected.txt b/test/036-finalizer/expected-stdout.txt
index c5d03ba85a..c5d03ba85a 100644
--- a/test/036-finalizer/expected.txt
+++ b/test/036-finalizer/expected-stdout.txt
diff --git a/test/037-inherit/Android.bp b/test/037-inherit/Android.bp
index 9aebf4454a..270f7e81be 100644
--- a/test/037-inherit/Android.bp
+++ b/test/037-inherit/Android.bp
@@ -8,13 +8,13 @@ java_test {
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-037-inherit-expected"],
+    data: [":art-run-test-037-inherit-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-037-inherit-expected",
-    out: ["art-run-test-037-inherit-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-037-inherit-expected-stdout",
+    out: ["art-run-test-037-inherit-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/037-inherit/expected.txt b/test/037-inherit/expected-stdout.txt
index 1fb9912e39..1fb9912e39 100644
--- a/test/037-inherit/expected.txt
+++ b/test/037-inherit/expected-stdout.txt
diff --git a/test/038-inner-null/Android.bp b/test/038-inner-null/Android.bp
index 293426cffb..bfae117783 100644
--- a/test/038-inner-null/Android.bp
+++ b/test/038-inner-null/Android.bp
@@ -8,13 +8,13 @@ java_test {
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-038-inner-null-expected"],
+    data: [":art-run-test-038-inner-null-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-038-inner-null-expected",
-    out: ["art-run-test-038-inner-null-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-038-inner-null-expected-stdout",
+    out: ["art-run-test-038-inner-null-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/038-inner-null/expected.txt b/test/038-inner-null/expected-stdout.txt
index d148eff407..d148eff407 100644
--- a/test/038-inner-null/expected.txt
+++ b/test/038-inner-null/expected-stdout.txt
diff --git a/test/039-join-main/Android.bp b/test/039-join-main/Android.bp
index 8af6335ba0..c42b146d05 100644
--- a/test/039-join-main/Android.bp
+++ b/test/039-join-main/Android.bp
@@ -8,13 +8,13 @@ java_test {
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-039-join-main-expected"],
+    data: [":art-run-test-039-join-main-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-039-join-main-expected",
-    out: ["art-run-test-039-join-main-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-039-join-main-expected-stdout",
+    out: ["art-run-test-039-join-main-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/039-join-main/expected.txt b/test/039-join-main/expected-stdout.txt
index 37e6d777b4..37e6d777b4 100644
--- a/test/039-join-main/expected.txt
+++ b/test/039-join-main/expected-stdout.txt
diff --git a/test/040-miranda/Android.bp b/test/040-miranda/Android.bp
index 633568294d..92c4cba32a 100644
--- a/test/040-miranda/Android.bp
+++ b/test/040-miranda/Android.bp
@@ -8,13 +8,13 @@ java_test {
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-040-miranda-expected"],
+    data: [":art-run-test-040-miranda-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-040-miranda-expected",
-    out: ["art-run-test-040-miranda-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-040-miranda-expected-stdout",
+    out: ["art-run-test-040-miranda-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/040-miranda/expected.txt b/test/040-miranda/expected-stdout.txt
index 011be2af86..011be2af86 100644
--- a/test/040-miranda/expected.txt
+++ b/test/040-miranda/expected-stdout.txt
diff --git a/test/041-narrowing/Android.bp b/test/041-narrowing/Android.bp
index ee249a71c2..2a11c066e6 100644
--- a/test/041-narrowing/Android.bp
+++ b/test/041-narrowing/Android.bp
@@ -8,13 +8,13 @@ java_test {
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-041-narrowing-expected"],
+    data: [":art-run-test-041-narrowing-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-041-narrowing-expected",
-    out: ["art-run-test-041-narrowing-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-041-narrowing-expected-stdout",
+    out: ["art-run-test-041-narrowing-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/041-narrowing/expected.txt b/test/041-narrowing/expected-stdout.txt
index 93b85901cf..93b85901cf 100644
--- a/test/041-narrowing/expected.txt
+++ b/test/041-narrowing/expected-stdout.txt
diff --git a/test/042-new-instance/expected.txt b/test/042-new-instance/expected-stdout.txt
index c5de313baf..c5de313baf 100644
--- a/test/042-new-instance/expected.txt
+++ b/test/042-new-instance/expected-stdout.txt
diff --git a/test/043-privates/Android.bp b/test/043-privates/Android.bp
index dd5802dae1..931e0b6ad0 100644
--- a/test/043-privates/Android.bp
+++ b/test/043-privates/Android.bp
@@ -8,13 +8,13 @@ java_test {
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-043-privates-expected"],
+    data: [":art-run-test-043-privates-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-043-privates-expected",
-    out: ["art-run-test-043-privates-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-043-privates-expected-stdout",
+    out: ["art-run-test-043-privates-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/043-privates/expected.txt b/test/043-privates/expected-stdout.txt
index 2779ec7461..2779ec7461 100644
--- a/test/043-privates/expected.txt
+++ b/test/043-privates/expected-stdout.txt
diff --git a/test/044-proxy/Android.bp b/test/044-proxy/Android.bp
index b862e889a9..0d232219a5 100644
--- a/test/044-proxy/Android.bp
+++ b/test/044-proxy/Android.bp
@@ -8,13 +8,13 @@ java_test {
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-044-proxy-expected"],
+    data: [":art-run-test-044-proxy-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-044-proxy-expected",
-    out: ["art-run-test-044-proxy-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-044-proxy-expected-stdout",
+    out: ["art-run-test-044-proxy-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/044-proxy/expected.txt b/test/044-proxy/expected-stdout.txt
index 9b16113484..9b16113484 100644
--- a/test/044-proxy/expected.txt
+++ b/test/044-proxy/expected-stdout.txt
diff --git a/test/045-reflect-array/Android.bp b/test/045-reflect-array/Android.bp
index 9475745b6f..699c36eb79 100644
--- a/test/045-reflect-array/Android.bp
+++ b/test/045-reflect-array/Android.bp
@@ -8,13 +8,13 @@ java_test {
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-045-reflect-array-expected"],
+    data: [":art-run-test-045-reflect-array-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-045-reflect-array-expected",
-    out: ["art-run-test-045-reflect-array-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-045-reflect-array-expected-stdout",
+    out: ["art-run-test-045-reflect-array-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/045-reflect-array/expected.txt b/test/045-reflect-array/expected-stdout.txt
index b9a98c9849..b9a98c9849 100644
--- a/test/045-reflect-array/expected.txt
+++ b/test/045-reflect-array/expected-stdout.txt
diff --git a/test/046-reflect/Android.bp b/test/046-reflect/Android.bp
index 56a0591147..7e2fbee697 100644
--- a/test/046-reflect/Android.bp
+++ b/test/046-reflect/Android.bp
@@ -8,13 +8,13 @@ java_test {
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-046-reflect-expected"],
+    data: [":art-run-test-046-reflect-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-046-reflect-expected",
-    out: ["art-run-test-046-reflect-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-046-reflect-expected-stdout",
+    out: ["art-run-test-046-reflect-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/046-reflect/expected.txt b/test/046-reflect/expected-stdout.txt
index 06932b9671..06932b9671 100644
--- a/test/046-reflect/expected.txt
+++ b/test/046-reflect/expected-stdout.txt
diff --git a/test/047-returns/Android.bp b/test/047-returns/Android.bp
index d9070770f3..6f3bca37cc 100644
--- a/test/047-returns/Android.bp
+++ b/test/047-returns/Android.bp
@@ -8,13 +8,13 @@ java_test {
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-047-returns-expected"],
+    data: [":art-run-test-047-returns-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-047-returns-expected",
-    out: ["art-run-test-047-returns-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-047-returns-expected-stdout",
+    out: ["art-run-test-047-returns-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/047-returns/expected.txt b/test/047-returns/expected-stdout.txt
index 160f69c238..160f69c238 100644
--- a/test/047-returns/expected.txt
+++ b/test/047-returns/expected-stdout.txt
diff --git a/test/048-reflect-v8/Android.bp b/test/048-reflect-v8/Android.bp
index a5737a8908..274a11075d 100644
--- a/test/048-reflect-v8/Android.bp
+++ b/test/048-reflect-v8/Android.bp
@@ -8,13 +8,13 @@ java_test {
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-048-reflect-v8-expected"],
+    data: [":art-run-test-048-reflect-v8-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-048-reflect-v8-expected",
-    out: ["art-run-test-048-reflect-v8-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-048-reflect-v8-expected-stdout",
+    out: ["art-run-test-048-reflect-v8-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/048-reflect-v8/expected.txt b/test/048-reflect-v8/expected-stdout.txt
index 54aede9a79..54aede9a79 100644
--- a/test/048-reflect-v8/expected.txt
+++ b/test/048-reflect-v8/expected-stdout.txt
diff --git a/test/049-show-object/Android.bp b/test/049-show-object/Android.bp
index 219a5563eb..2d77a1d458 100644
--- a/test/049-show-object/Android.bp
+++ b/test/049-show-object/Android.bp
@@ -8,13 +8,13 @@ java_test {
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-049-show-object-expected"],
+    data: [":art-run-test-049-show-object-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-049-show-object-expected",
-    out: ["art-run-test-049-show-object-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-049-show-object-expected-stdout",
+    out: ["art-run-test-049-show-object-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/049-show-object/expected.txt b/test/049-show-object/expected-stdout.txt
index 4613c39e71..4613c39e71 100644
--- a/test/049-show-object/expected.txt
+++ b/test/049-show-object/expected-stdout.txt
diff --git a/test/050-sync-test/Android.bp b/test/050-sync-test/Android.bp
index e6834465b5..f1a562a955 100644
--- a/test/050-sync-test/Android.bp
+++ b/test/050-sync-test/Android.bp
@@ -8,13 +8,13 @@ java_test {
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-050-sync-test-expected"],
+    data: [":art-run-test-050-sync-test-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-050-sync-test-expected",
-    out: ["art-run-test-050-sync-test-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-050-sync-test-expected-stdout",
+    out: ["art-run-test-050-sync-test-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/050-sync-test/expected.txt b/test/050-sync-test/expected-stdout.txt
index c2a70318bd..c2a70318bd 100644
--- a/test/050-sync-test/expected.txt
+++ b/test/050-sync-test/expected-stdout.txt
diff --git a/test/051-thread/Android.bp b/test/051-thread/Android.bp
index e974c2761f..2348af4872 100644
--- a/test/051-thread/Android.bp
+++ b/test/051-thread/Android.bp
@@ -8,13 +8,13 @@ java_test {
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-051-thread-expected"],
+    data: [":art-run-test-051-thread-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-051-thread-expected",
-    out: ["art-run-test-051-thread-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-051-thread-expected-stdout",
+    out: ["art-run-test-051-thread-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/051-thread/expected.txt b/test/051-thread/expected-stdout.txt
index c8af963723..c8af963723 100644
--- a/test/051-thread/expected.txt
+++ b/test/051-thread/expected-stdout.txt
diff --git a/test/052-verifier-fun/Android.bp b/test/052-verifier-fun/Android.bp
index e8c2e1eafb..bb3ba4ab5f 100644
--- a/test/052-verifier-fun/Android.bp
+++ b/test/052-verifier-fun/Android.bp
@@ -8,13 +8,13 @@ java_test {
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-052-verifier-fun-expected"],
+    data: [":art-run-test-052-verifier-fun-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-052-verifier-fun-expected",
-    out: ["art-run-test-052-verifier-fun-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-052-verifier-fun-expected-stdout",
+    out: ["art-run-test-052-verifier-fun-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/052-verifier-fun/expected.txt b/test/052-verifier-fun/expected-stdout.txt
index 931aef30a1..931aef30a1 100644
--- a/test/052-verifier-fun/expected.txt
+++ b/test/052-verifier-fun/expected-stdout.txt
diff --git a/test/053-wait-some/Android.bp b/test/053-wait-some/Android.bp
index 8f3f3a5e85..8679171847 100644
--- a/test/053-wait-some/Android.bp
+++ b/test/053-wait-some/Android.bp
@@ -8,13 +8,13 @@ java_test {
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-053-wait-some-expected"],
+    data: [":art-run-test-053-wait-some-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-053-wait-some-expected",
-    out: ["art-run-test-053-wait-some-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-053-wait-some-expected-stdout",
+    out: ["art-run-test-053-wait-some-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/053-wait-some/expected.txt b/test/053-wait-some/expected-stdout.txt
index 182892cc6d..182892cc6d 100644
--- a/test/053-wait-some/expected.txt
+++ b/test/053-wait-some/expected-stdout.txt
diff --git a/test/054-uncaught/Android.bp b/test/054-uncaught/Android.bp
index 82bacdff61..be0eda037c 100644
--- a/test/054-uncaught/Android.bp
+++ b/test/054-uncaught/Android.bp
@@ -8,13 +8,13 @@ java_test {
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-054-uncaught-expected"],
+    data: [":art-run-test-054-uncaught-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-054-uncaught-expected",
-    out: ["art-run-test-054-uncaught-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-054-uncaught-expected-stdout",
+    out: ["art-run-test-054-uncaught-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/054-uncaught/expected.txt b/test/054-uncaught/expected-stdout.txt
index 878260a07d..878260a07d 100644
--- a/test/054-uncaught/expected.txt
+++ b/test/054-uncaught/expected-stdout.txt
diff --git a/test/055-enum-performance/Android.bp b/test/055-enum-performance/Android.bp
index b17a32107c..e53f4fddf9 100644
--- a/test/055-enum-performance/Android.bp
+++ b/test/055-enum-performance/Android.bp
@@ -8,13 +8,13 @@ java_test {
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-055-enum-performance-expected"],
+    data: [":art-run-test-055-enum-performance-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-055-enum-performance-expected",
-    out: ["art-run-test-055-enum-performance-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-055-enum-performance-expected-stdout",
+    out: ["art-run-test-055-enum-performance-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/055-enum-performance/expected.txt b/test/055-enum-performance/expected-stdout.txt
index ceb6bc4ac2..ceb6bc4ac2 100644
--- a/test/055-enum-performance/expected.txt
+++ b/test/055-enum-performance/expected-stdout.txt
diff --git a/test/056-const-string-jumbo/expected.txt b/test/056-const-string-jumbo/expected-stdout.txt
index bebbf9e7e0..bebbf9e7e0 100644
--- a/test/056-const-string-jumbo/expected.txt
+++ b/test/056-const-string-jumbo/expected-stdout.txt
diff --git a/test/058-enum-order/Android.bp b/test/058-enum-order/Android.bp
index 1d1f14fc48..d076d7d4b3 100644
--- a/test/058-enum-order/Android.bp
+++ b/test/058-enum-order/Android.bp
@@ -8,13 +8,13 @@ java_test {
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-058-enum-order-expected"],
+    data: [":art-run-test-058-enum-order-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-058-enum-order-expected",
-    out: ["art-run-test-058-enum-order-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-058-enum-order-expected-stdout",
+    out: ["art-run-test-058-enum-order-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/058-enum-order/expected.txt b/test/058-enum-order/expected-stdout.txt
index b8124046c3..b8124046c3 100644
--- a/test/058-enum-order/expected.txt
+++ b/test/058-enum-order/expected-stdout.txt
diff --git a/test/059-finalizer-throw/Android.bp b/test/059-finalizer-throw/Android.bp
index bba058c7b8..3ac4ba1c1b 100644
--- a/test/059-finalizer-throw/Android.bp
+++ b/test/059-finalizer-throw/Android.bp
@@ -8,13 +8,13 @@ java_test {
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-059-finalizer-throw-expected"],
+    data: [":art-run-test-059-finalizer-throw-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-059-finalizer-throw-expected",
-    out: ["art-run-test-059-finalizer-throw-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-059-finalizer-throw-expected-stdout",
+    out: ["art-run-test-059-finalizer-throw-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/059-finalizer-throw/expected.txt b/test/059-finalizer-throw/expected-stdout.txt
index f19011bafb..f19011bafb 100644
--- a/test/059-finalizer-throw/expected.txt
+++ b/test/059-finalizer-throw/expected-stdout.txt
diff --git a/test/061-out-of-memory/Android.bp b/test/061-out-of-memory/Android.bp
index 85979917f7..9fd42f4453 100644
--- a/test/061-out-of-memory/Android.bp
+++ b/test/061-out-of-memory/Android.bp
@@ -8,13 +8,13 @@ java_test {
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-061-out-of-memory-expected"],
+    data: [":art-run-test-061-out-of-memory-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-061-out-of-memory-expected",
-    out: ["art-run-test-061-out-of-memory-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-061-out-of-memory-expected-stdout",
+    out: ["art-run-test-061-out-of-memory-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/061-out-of-memory/expected.txt b/test/061-out-of-memory/expected-stdout.txt
index c31980cad7..c31980cad7 100644
--- a/test/061-out-of-memory/expected.txt
+++ b/test/061-out-of-memory/expected-stdout.txt
diff --git a/test/062-character-encodings/Android.bp b/test/062-character-encodings/Android.bp
index efc2df8010..4533abb394 100644
--- a/test/062-character-encodings/Android.bp
+++ b/test/062-character-encodings/Android.bp
@@ -8,13 +8,13 @@ java_test {
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-062-character-encodings-expected"],
+    data: [":art-run-test-062-character-encodings-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-062-character-encodings-expected",
-    out: ["art-run-test-062-character-encodings-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-062-character-encodings-expected-stdout",
+    out: ["art-run-test-062-character-encodings-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/062-character-encodings/expected.txt b/test/062-character-encodings/expected-stdout.txt
index b395a2a7ab..b395a2a7ab 100644
--- a/test/062-character-encodings/expected.txt
+++ b/test/062-character-encodings/expected-stdout.txt
diff --git a/test/063-process-manager/Android.bp b/test/063-process-manager/Android.bp
index 339515b22c..f08e2aff89 100644
--- a/test/063-process-manager/Android.bp
+++ b/test/063-process-manager/Android.bp
@@ -8,13 +8,13 @@ java_test {
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-063-process-manager-expected"],
+    data: [":art-run-test-063-process-manager-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-063-process-manager-expected",
-    out: ["art-run-test-063-process-manager-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-063-process-manager-expected-stdout",
+    out: ["art-run-test-063-process-manager-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/063-process-manager/expected.txt b/test/063-process-manager/expected-stdout.txt
index 8c01bf01dd..8c01bf01dd 100644
--- a/test/063-process-manager/expected.txt
+++ b/test/063-process-manager/expected-stdout.txt
diff --git a/test/064-field-access/expected.txt b/test/064-field-access/expected-stdout.txt
index 8e1af746ab..8e1af746ab 100644
--- a/test/064-field-access/expected.txt
+++ b/test/064-field-access/expected-stdout.txt
diff --git a/test/065-mismatched-implements/expected.txt b/test/065-mismatched-implements/expected-stdout.txt
index 09c05967d9..09c05967d9 100644
--- a/test/065-mismatched-implements/expected.txt
+++ b/test/065-mismatched-implements/expected-stdout.txt
diff --git a/test/066-mismatched-super/expected.txt b/test/066-mismatched-super/expected-stdout.txt
index f5b15cac8e..f5b15cac8e 100644
--- a/test/066-mismatched-super/expected.txt
+++ b/test/066-mismatched-super/expected-stdout.txt
diff --git a/test/067-preemptive-unpark/Android.bp b/test/067-preemptive-unpark/Android.bp
index 39247c6e5d..cadd4af022 100644
--- a/test/067-preemptive-unpark/Android.bp
+++ b/test/067-preemptive-unpark/Android.bp
@@ -8,13 +8,13 @@ java_test {
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-067-preemptive-unpark-expected"],
+    data: [":art-run-test-067-preemptive-unpark-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-067-preemptive-unpark-expected",
-    out: ["art-run-test-067-preemptive-unpark-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-067-preemptive-unpark-expected-stdout",
+    out: ["art-run-test-067-preemptive-unpark-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/067-preemptive-unpark/expected.txt b/test/067-preemptive-unpark/expected-stdout.txt
index 12bfee059e..12bfee059e 100644
--- a/test/067-preemptive-unpark/expected.txt
+++ b/test/067-preemptive-unpark/expected-stdout.txt
diff --git a/test/068-classloader/expected.txt b/test/068-classloader/expected-stdout.txt
index ae937e04fb..ae937e04fb 100644
--- a/test/068-classloader/expected.txt
+++ b/test/068-classloader/expected-stdout.txt
diff --git a/test/069-field-type/expected.txt b/test/069-field-type/expected-stdout.txt
index 88281780f3..88281780f3 100644
--- a/test/069-field-type/expected.txt
+++ b/test/069-field-type/expected-stdout.txt
diff --git a/test/070-nio-buffer/Android.bp b/test/070-nio-buffer/Android.bp
index ceaf3cbce7..c46a15979d 100644
--- a/test/070-nio-buffer/Android.bp
+++ b/test/070-nio-buffer/Android.bp
@@ -8,13 +8,13 @@ java_test {
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-070-nio-buffer-expected"],
+    data: [":art-run-test-070-nio-buffer-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-070-nio-buffer-expected",
-    out: ["art-run-test-070-nio-buffer-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-070-nio-buffer-expected-stdout",
+    out: ["art-run-test-070-nio-buffer-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/070-nio-buffer/expected.txt b/test/070-nio-buffer/expected-stdout.txt
index ddb45af6b5..ddb45af6b5 100644
--- a/test/070-nio-buffer/expected.txt
+++ b/test/070-nio-buffer/expected-stdout.txt
diff --git a/test/071-dexfile-get-static-size/expected.txt b/test/071-dexfile-get-static-size/expected-stdout.txt
index dfb77c3a2f..dfb77c3a2f 100644
--- a/test/071-dexfile-get-static-size/expected.txt
+++ b/test/071-dexfile-get-static-size/expected-stdout.txt
diff --git a/test/071-dexfile-map-clean/expected.txt b/test/071-dexfile-map-clean/expected-stdout.txt
index af7fb2806b..af7fb2806b 100644
--- a/test/071-dexfile-map-clean/expected.txt
+++ b/test/071-dexfile-map-clean/expected-stdout.txt
diff --git a/test/071-dexfile/expected.txt b/test/071-dexfile/expected-stdout.txt
index d14c986eaf..d14c986eaf 100644
--- a/test/071-dexfile/expected.txt
+++ b/test/071-dexfile/expected-stdout.txt
diff --git a/test/072-precise-gc/Android.bp b/test/072-precise-gc/Android.bp
index 2bd33c947b..7a521bea8d 100644
--- a/test/072-precise-gc/Android.bp
+++ b/test/072-precise-gc/Android.bp
@@ -8,13 +8,13 @@ java_test {
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-072-precise-gc-expected"],
+    data: [":art-run-test-072-precise-gc-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-072-precise-gc-expected",
-    out: ["art-run-test-072-precise-gc-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-072-precise-gc-expected-stdout",
+    out: ["art-run-test-072-precise-gc-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/072-precise-gc/expected.txt b/test/072-precise-gc/expected-stdout.txt
index 18ec087af9..18ec087af9 100644
--- a/test/072-precise-gc/expected.txt
+++ b/test/072-precise-gc/expected-stdout.txt
diff --git a/test/072-reachability-fence/Android.bp b/test/072-reachability-fence/Android.bp
index 311653b9c7..bea2efa663 100644
--- a/test/072-reachability-fence/Android.bp
+++ b/test/072-reachability-fence/Android.bp
@@ -8,13 +8,13 @@ java_test {
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-072-reachability-fence-expected"],
+    data: [":art-run-test-072-reachability-fence-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-072-reachability-fence-expected",
-    out: ["art-run-test-072-reachability-fence-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-072-reachability-fence-expected-stdout",
+    out: ["art-run-test-072-reachability-fence-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/072-reachability-fence/expected.txt b/test/072-reachability-fence/expected-stdout.txt
index fdd0d7bd59..fdd0d7bd59 100644
--- a/test/072-reachability-fence/expected.txt
+++ b/test/072-reachability-fence/expected-stdout.txt
diff --git a/test/073-mismatched-field/expected.txt b/test/073-mismatched-field/expected-stdout.txt
index 90fbab87af..90fbab87af 100644
--- a/test/073-mismatched-field/expected.txt
+++ b/test/073-mismatched-field/expected-stdout.txt
diff --git a/test/074-gc-thrash/Android.bp b/test/074-gc-thrash/Android.bp
index c7e601a1d6..3b3958ae83 100644
--- a/test/074-gc-thrash/Android.bp
+++ b/test/074-gc-thrash/Android.bp
@@ -8,13 +8,13 @@ java_test {
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-074-gc-thrash-expected"],
+    data: [":art-run-test-074-gc-thrash-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-074-gc-thrash-expected",
-    out: ["art-run-test-074-gc-thrash-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-074-gc-thrash-expected-stdout",
+    out: ["art-run-test-074-gc-thrash-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/074-gc-thrash/expected.txt b/test/074-gc-thrash/expected-stdout.txt
index 26691659be..26691659be 100644
--- a/test/074-gc-thrash/expected.txt
+++ b/test/074-gc-thrash/expected-stdout.txt
diff --git a/test/075-verification-error/expected.txt b/test/075-verification-error/expected-stdout.txt
index 7ccc32cbac..7ccc32cbac 100644
--- a/test/075-verification-error/expected.txt
+++ b/test/075-verification-error/expected-stdout.txt
diff --git a/test/076-boolean-put/Android.bp b/test/076-boolean-put/Android.bp
index b74b5f2cbd..1eee20328b 100644
--- a/test/076-boolean-put/Android.bp
+++ b/test/076-boolean-put/Android.bp
@@ -8,13 +8,13 @@ java_test {
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-076-boolean-put-expected"],
+    data: [":art-run-test-076-boolean-put-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-076-boolean-put-expected",
-    out: ["art-run-test-076-boolean-put-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-076-boolean-put-expected-stdout",
+    out: ["art-run-test-076-boolean-put-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/076-boolean-put/expected.txt b/test/076-boolean-put/expected-stdout.txt
index a965a70ed4..a965a70ed4 100644
--- a/test/076-boolean-put/expected.txt
+++ b/test/076-boolean-put/expected-stdout.txt
diff --git a/test/077-method-override/expected.txt b/test/077-method-override/expected-stdout.txt
index 2e9bda33fe..2e9bda33fe 100644
--- a/test/077-method-override/expected.txt
+++ b/test/077-method-override/expected-stdout.txt
diff --git a/test/078-polymorphic-virtual/Android.bp b/test/078-polymorphic-virtual/Android.bp
index 408b5c862a..43b0b3416b 100644
--- a/test/078-polymorphic-virtual/Android.bp
+++ b/test/078-polymorphic-virtual/Android.bp
@@ -8,13 +8,13 @@ java_test {
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-078-polymorphic-virtual-expected"],
+    data: [":art-run-test-078-polymorphic-virtual-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-078-polymorphic-virtual-expected",
-    out: ["art-run-test-078-polymorphic-virtual-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-078-polymorphic-virtual-expected-stdout",
+    out: ["art-run-test-078-polymorphic-virtual-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/078-polymorphic-virtual/expected.txt b/test/078-polymorphic-virtual/expected-stdout.txt
index 0d29728237..0d29728237 100644
--- a/test/078-polymorphic-virtual/expected.txt
+++ b/test/078-polymorphic-virtual/expected-stdout.txt
diff --git a/test/079-phantom/Android.bp b/test/079-phantom/Android.bp
index 90a8b18760..2c59410d30 100644
--- a/test/079-phantom/Android.bp
+++ b/test/079-phantom/Android.bp
@@ -8,13 +8,13 @@ java_test {
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-079-phantom-expected"],
+    data: [":art-run-test-079-phantom-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-079-phantom-expected",
-    out: ["art-run-test-079-phantom-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-079-phantom-expected-stdout",
+    out: ["art-run-test-079-phantom-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/079-phantom/expected.txt b/test/079-phantom/expected-stdout.txt
index a932b770c1..a932b770c1 100644
--- a/test/079-phantom/expected.txt
+++ b/test/079-phantom/expected-stdout.txt
diff --git a/test/080-oom-fragmentation/Android.bp b/test/080-oom-fragmentation/Android.bp
index 817bd98eca..c0023a061f 100644
--- a/test/080-oom-fragmentation/Android.bp
+++ b/test/080-oom-fragmentation/Android.bp
@@ -8,13 +8,13 @@ java_test {
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-080-oom-fragmentation-expected"],
+    data: [":art-run-test-080-oom-fragmentation-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-080-oom-fragmentation-expected",
-    out: ["art-run-test-080-oom-fragmentation-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-080-oom-fragmentation-expected-stdout",
+    out: ["art-run-test-080-oom-fragmentation-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/080-oom-fragmentation/expected.txt b/test/080-oom-fragmentation/expected-stdout.txt
index e69de29bb2..e69de29bb2 100644
--- a/test/080-oom-fragmentation/expected.txt
+++ b/test/080-oom-fragmentation/expected-stdout.txt
diff --git a/test/080-oom-throw-with-finalizer/Android.bp b/test/080-oom-throw-with-finalizer/Android.bp
index 3a2474cbdd..c0431074b6 100644
--- a/test/080-oom-throw-with-finalizer/Android.bp
+++ b/test/080-oom-throw-with-finalizer/Android.bp
@@ -8,13 +8,13 @@ java_test {
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-080-oom-throw-with-finalizer-expected"],
+    data: [":art-run-test-080-oom-throw-with-finalizer-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-080-oom-throw-with-finalizer-expected",
-    out: ["art-run-test-080-oom-throw-with-finalizer-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-080-oom-throw-with-finalizer-expected-stdout",
+    out: ["art-run-test-080-oom-throw-with-finalizer-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/080-oom-throw-with-finalizer/expected.txt b/test/080-oom-throw-with-finalizer/expected-stdout.txt
index e69de29bb2..e69de29bb2 100644
--- a/test/080-oom-throw-with-finalizer/expected.txt
+++ b/test/080-oom-throw-with-finalizer/expected-stdout.txt
diff --git a/test/080-oom-throw/Android.bp b/test/080-oom-throw/Android.bp
index ca5233d7a0..6069fc42fc 100644
--- a/test/080-oom-throw/Android.bp
+++ b/test/080-oom-throw/Android.bp
@@ -8,13 +8,13 @@ java_test {
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-080-oom-throw-expected"],
+    data: [":art-run-test-080-oom-throw-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-080-oom-throw-expected",
-    out: ["art-run-test-080-oom-throw-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-080-oom-throw-expected-stdout",
+    out: ["art-run-test-080-oom-throw-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/080-oom-throw/expected.txt b/test/080-oom-throw/expected-stdout.txt
index 0967278314..0967278314 100644
--- a/test/080-oom-throw/expected.txt
+++ b/test/080-oom-throw/expected-stdout.txt
diff --git a/test/081-hot-exceptions/Android.bp b/test/081-hot-exceptions/Android.bp
index 34c686db27..e7e4cc667e 100644
--- a/test/081-hot-exceptions/Android.bp
+++ b/test/081-hot-exceptions/Android.bp
@@ -8,13 +8,13 @@ java_test {
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-081-hot-exceptions-expected"],
+    data: [":art-run-test-081-hot-exceptions-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-081-hot-exceptions-expected",
-    out: ["art-run-test-081-hot-exceptions-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-081-hot-exceptions-expected-stdout",
+    out: ["art-run-test-081-hot-exceptions-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/081-hot-exceptions/expected.txt b/test/081-hot-exceptions/expected-stdout.txt
index 2432ff4554..2432ff4554 100644
--- a/test/081-hot-exceptions/expected.txt
+++ b/test/081-hot-exceptions/expected-stdout.txt
diff --git a/test/082-inline-execute/Android.bp b/test/082-inline-execute/Android.bp
index 3bead60699..f3bd0d5316 100644
--- a/test/082-inline-execute/Android.bp
+++ b/test/082-inline-execute/Android.bp
@@ -8,13 +8,13 @@ java_test {
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-082-inline-execute-expected"],
+    data: [":art-run-test-082-inline-execute-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-082-inline-execute-expected",
-    out: ["art-run-test-082-inline-execute-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-082-inline-execute-expected-stdout",
+    out: ["art-run-test-082-inline-execute-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/082-inline-execute/expected.txt b/test/082-inline-execute/expected-stdout.txt
index e69de29bb2..e69de29bb2 100644
--- a/test/082-inline-execute/expected.txt
+++ b/test/082-inline-execute/expected-stdout.txt
diff --git a/test/083-compiler-regressions/Android.bp b/test/083-compiler-regressions/Android.bp
index 304693c6a7..1bdd69b587 100644
--- a/test/083-compiler-regressions/Android.bp
+++ b/test/083-compiler-regressions/Android.bp
@@ -8,13 +8,13 @@ java_test {
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-083-compiler-regressions-expected"],
+    data: [":art-run-test-083-compiler-regressions-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-083-compiler-regressions-expected",
-    out: ["art-run-test-083-compiler-regressions-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-083-compiler-regressions-expected-stdout",
+    out: ["art-run-test-083-compiler-regressions-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/083-compiler-regressions/expected.txt b/test/083-compiler-regressions/expected-stdout.txt
index 78c92fc51a..78c92fc51a 100644
--- a/test/083-compiler-regressions/expected.txt
+++ b/test/083-compiler-regressions/expected-stdout.txt
diff --git a/test/084-class-init/Android.bp b/test/084-class-init/Android.bp
index 867d775464..c922380c15 100644
--- a/test/084-class-init/Android.bp
+++ b/test/084-class-init/Android.bp
@@ -8,13 +8,13 @@ java_test {
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-084-class-init-expected"],
+    data: [":art-run-test-084-class-init-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-084-class-init-expected",
-    out: ["art-run-test-084-class-init-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-084-class-init-expected-stdout",
+    out: ["art-run-test-084-class-init-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/084-class-init/expected.txt b/test/084-class-init/expected-stdout.txt
index d7a80bf741..d7a80bf741 100644
--- a/test/084-class-init/expected.txt
+++ b/test/084-class-init/expected-stdout.txt
diff --git a/test/085-old-style-inner-class/expected.txt b/test/085-old-style-inner-class/expected-stdout.txt
index 63a007606b..63a007606b 100644
--- a/test/085-old-style-inner-class/expected.txt
+++ b/test/085-old-style-inner-class/expected-stdout.txt
diff --git a/test/086-null-super/Android.bp b/test/086-null-super/Android.bp
index 7ea03b4b04..dd5615cb92 100644
--- a/test/086-null-super/Android.bp
+++ b/test/086-null-super/Android.bp
@@ -8,13 +8,13 @@ java_test {
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-086-null-super-expected"],
+    data: [":art-run-test-086-null-super-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-086-null-super-expected",
-    out: ["art-run-test-086-null-super-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-086-null-super-expected-stdout",
+    out: ["art-run-test-086-null-super-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/086-null-super/expected.txt b/test/086-null-super/expected-stdout.txt
index 20c6796db8..20c6796db8 100644
--- a/test/086-null-super/expected.txt
+++ b/test/086-null-super/expected-stdout.txt
diff --git a/test/087-gc-after-link/Android.bp b/test/087-gc-after-link/Android.bp
index 300e7960df..8210a8ff25 100644
--- a/test/087-gc-after-link/Android.bp
+++ b/test/087-gc-after-link/Android.bp
@@ -8,13 +8,13 @@ java_test {
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-087-gc-after-link-expected"],
+    data: [":art-run-test-087-gc-after-link-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-087-gc-after-link-expected",
-    out: ["art-run-test-087-gc-after-link-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-087-gc-after-link-expected-stdout",
+    out: ["art-run-test-087-gc-after-link-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/087-gc-after-link/expected.txt b/test/087-gc-after-link/expected-stdout.txt
index 3b2d33a6bf..3b2d33a6bf 100644
--- a/test/087-gc-after-link/expected.txt
+++ b/test/087-gc-after-link/expected-stdout.txt
diff --git a/test/088-monitor-verification/expected.txt b/test/088-monitor-verification/expected-stdout.txt
index 2cb8f2cdf2..2cb8f2cdf2 100644
--- a/test/088-monitor-verification/expected.txt
+++ b/test/088-monitor-verification/expected-stdout.txt
diff --git a/test/089-many-methods/expected.txt b/test/089-many-methods/expected-stdout.txt
index b75bde462c..b75bde462c 100644
--- a/test/089-many-methods/expected.txt
+++ b/test/089-many-methods/expected-stdout.txt
diff --git a/test/090-loop-formation/Android.bp b/test/090-loop-formation/Android.bp
index e97fcd808e..aa9e122403 100644
--- a/test/090-loop-formation/Android.bp
+++ b/test/090-loop-formation/Android.bp
@@ -8,13 +8,13 @@ java_test {
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-090-loop-formation-expected"],
+    data: [":art-run-test-090-loop-formation-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-090-loop-formation-expected",
-    out: ["art-run-test-090-loop-formation-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-090-loop-formation-expected-stdout",
+    out: ["art-run-test-090-loop-formation-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/090-loop-formation/expected.txt b/test/090-loop-formation/expected-stdout.txt
index b945c305b2..b945c305b2 100644
--- a/test/090-loop-formation/expected.txt
+++ b/test/090-loop-formation/expected-stdout.txt
diff --git a/test/091-override-package-private-method/expected.txt b/test/091-override-package-private-method/expected-stdout.txt
index 286cfcd274..286cfcd274 100644
--- a/test/091-override-package-private-method/expected.txt
+++ b/test/091-override-package-private-method/expected-stdout.txt
diff --git a/test/092-locale/Android.bp b/test/092-locale/Android.bp
index 7a724067bf..0186cc5f77 100644
--- a/test/092-locale/Android.bp
+++ b/test/092-locale/Android.bp
@@ -8,13 +8,13 @@ java_test {
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-092-locale-expected"],
+    data: [":art-run-test-092-locale-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-092-locale-expected",
-    out: ["art-run-test-092-locale-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-092-locale-expected-stdout",
+    out: ["art-run-test-092-locale-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/092-locale/expected.txt b/test/092-locale/expected-stdout.txt
index 0a955e729b..0a955e729b 100644
--- a/test/092-locale/expected.txt
+++ b/test/092-locale/expected-stdout.txt
diff --git a/test/093-serialization/Android.bp b/test/093-serialization/Android.bp
index de0cf09556..096884c67f 100644
--- a/test/093-serialization/Android.bp
+++ b/test/093-serialization/Android.bp
@@ -8,13 +8,13 @@ java_test {
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-093-serialization-expected"],
+    data: [":art-run-test-093-serialization-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-093-serialization-expected",
-    out: ["art-run-test-093-serialization-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-093-serialization-expected-stdout",
+    out: ["art-run-test-093-serialization-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/093-serialization/expected.txt b/test/093-serialization/expected-stdout.txt
index c9bc1c34cf..c9bc1c34cf 100644
--- a/test/093-serialization/expected.txt
+++ b/test/093-serialization/expected-stdout.txt
diff --git a/test/094-pattern/Android.bp b/test/094-pattern/Android.bp
index 7a8feeae41..57bcba7c34 100644
--- a/test/094-pattern/Android.bp
+++ b/test/094-pattern/Android.bp
@@ -8,13 +8,13 @@ java_test {
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-094-pattern-expected"],
+    data: [":art-run-test-094-pattern-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-094-pattern-expected",
-    out: ["art-run-test-094-pattern-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-094-pattern-expected-stdout",
+    out: ["art-run-test-094-pattern-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/094-pattern/expected.txt b/test/094-pattern/expected-stdout.txt
index 4af0c66ddb..4af0c66ddb 100644
--- a/test/094-pattern/expected.txt
+++ b/test/094-pattern/expected-stdout.txt
diff --git a/test/095-switch-MAX_INT/Android.bp b/test/095-switch-MAX_INT/Android.bp
index ead51fb9b0..547236b18c 100644
--- a/test/095-switch-MAX_INT/Android.bp
+++ b/test/095-switch-MAX_INT/Android.bp
@@ -8,13 +8,13 @@ java_test {
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-095-switch-MAX_INT-expected"],
+    data: [":art-run-test-095-switch-MAX_INT-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-095-switch-MAX_INT-expected",
-    out: ["art-run-test-095-switch-MAX_INT-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-095-switch-MAX_INT-expected-stdout",
+    out: ["art-run-test-095-switch-MAX_INT-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/095-switch-MAX_INT/expected.txt b/test/095-switch-MAX_INT/expected-stdout.txt
index 12799ccbe7..12799ccbe7 100644
--- a/test/095-switch-MAX_INT/expected.txt
+++ b/test/095-switch-MAX_INT/expected-stdout.txt
diff --git a/test/096-array-copy-concurrent-gc/Android.bp b/test/096-array-copy-concurrent-gc/Android.bp
index 5024ce9455..467478a2f9 100644
--- a/test/096-array-copy-concurrent-gc/Android.bp
+++ b/test/096-array-copy-concurrent-gc/Android.bp
@@ -8,13 +8,13 @@ java_test {
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-096-array-copy-concurrent-gc-expected"],
+    data: [":art-run-test-096-array-copy-concurrent-gc-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-096-array-copy-concurrent-gc-expected",
-    out: ["art-run-test-096-array-copy-concurrent-gc-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-096-array-copy-concurrent-gc-expected-stdout",
+    out: ["art-run-test-096-array-copy-concurrent-gc-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/096-array-copy-concurrent-gc/expected.txt b/test/096-array-copy-concurrent-gc/expected-stdout.txt
index 23b9dab6b5..23b9dab6b5 100644
--- a/test/096-array-copy-concurrent-gc/expected.txt
+++ b/test/096-array-copy-concurrent-gc/expected-stdout.txt
diff --git a/test/097-duplicate-method/expected.txt b/test/097-duplicate-method/expected-stdout.txt
index f985b46aff..f985b46aff 100644
--- a/test/097-duplicate-method/expected.txt
+++ b/test/097-duplicate-method/expected-stdout.txt
diff --git a/test/098-ddmc/Android.bp b/test/098-ddmc/Android.bp
index 6ed9298322..fd2c6954db 100644
--- a/test/098-ddmc/Android.bp
+++ b/test/098-ddmc/Android.bp
@@ -8,13 +8,13 @@ java_test {
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-098-ddmc-expected"],
+    data: [":art-run-test-098-ddmc-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-098-ddmc-expected",
-    out: ["art-run-test-098-ddmc-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-098-ddmc-expected-stdout",
+    out: ["art-run-test-098-ddmc-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/098-ddmc/expected.txt b/test/098-ddmc/expected-stdout.txt
index f8cda4c623..f8cda4c623 100644
--- a/test/098-ddmc/expected.txt
+++ b/test/098-ddmc/expected-stdout.txt
diff --git a/test/099-vmdebug/Android.bp b/test/099-vmdebug/Android.bp
index 7ecd5a6e1b..b245466802 100644
--- a/test/099-vmdebug/Android.bp
+++ b/test/099-vmdebug/Android.bp
@@ -8,13 +8,13 @@ java_test {
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-099-vmdebug-expected"],
+    data: [":art-run-test-099-vmdebug-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-099-vmdebug-expected",
-    out: ["art-run-test-099-vmdebug-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-099-vmdebug-expected-stdout",
+    out: ["art-run-test-099-vmdebug-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/099-vmdebug/expected.txt b/test/099-vmdebug/expected-stdout.txt
index b8d72f66f8..b8d72f66f8 100644
--- a/test/099-vmdebug/expected.txt
+++ b/test/099-vmdebug/expected-stdout.txt
diff --git a/test/100-reflect2/Android.bp b/test/100-reflect2/Android.bp
index cecc377d2b..ffd1f9e5c2 100644
--- a/test/100-reflect2/Android.bp
+++ b/test/100-reflect2/Android.bp
@@ -8,13 +8,13 @@ java_test {
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-100-reflect2-expected"],
+    data: [":art-run-test-100-reflect2-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-100-reflect2-expected",
-    out: ["art-run-test-100-reflect2-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-100-reflect2-expected-stdout",
+    out: ["art-run-test-100-reflect2-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/100-reflect2/expected.txt b/test/100-reflect2/expected-stdout.txt
index 2b57824464..2b57824464 100644
--- a/test/100-reflect2/expected.txt
+++ b/test/100-reflect2/expected-stdout.txt
diff --git a/test/1000-non-moving-space-stress/expected.txt b/test/1000-non-moving-space-stress/expected-stdout.txt
index b0aad4deb5..b0aad4deb5 100644
--- a/test/1000-non-moving-space-stress/expected.txt
+++ b/test/1000-non-moving-space-stress/expected-stdout.txt
diff --git a/test/1001-app-image-regions/expected.txt b/test/1001-app-image-regions/expected-stdout.txt
index 9fd87cad85..9fd87cad85 100644
--- a/test/1001-app-image-regions/expected.txt
+++ b/test/1001-app-image-regions/expected-stdout.txt
diff --git a/test/1002-notify-startup/expected.txt b/test/1002-notify-startup/expected-stdout.txt
index a86b9aa949..a86b9aa949 100644
--- a/test/1002-notify-startup/expected.txt
+++ b/test/1002-notify-startup/expected-stdout.txt
diff --git a/test/1003-metadata-section-strings/expected.txt b/test/1003-metadata-section-strings/expected-stdout.txt
index 8925e1f30f..8925e1f30f 100644
--- a/test/1003-metadata-section-strings/expected.txt
+++ b/test/1003-metadata-section-strings/expected-stdout.txt
diff --git a/test/1004-checker-volatile-ref-load/Android.bp b/test/1004-checker-volatile-ref-load/Android.bp
index f24a64b914..98bce5dbe2 100644
--- a/test/1004-checker-volatile-ref-load/Android.bp
+++ b/test/1004-checker-volatile-ref-load/Android.bp
@@ -8,7 +8,7 @@ java_test {
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-1004-checker-volatile-ref-load-expected"],
+    data: [":art-run-test-1004-checker-volatile-ref-load-expected-stdout"],
     // Include the Java source files in the test's artifacts, to make Checker assertions
     // available to the TradeFed test runner.
     include_srcs: true,
@@ -16,8 +16,8 @@ java_test {
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-1004-checker-volatile-ref-load-expected",
-    out: ["art-run-test-1004-checker-volatile-ref-load-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-1004-checker-volatile-ref-load-expected-stdout",
+    out: ["art-run-test-1004-checker-volatile-ref-load-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/1004-checker-volatile-ref-load/expected.txt b/test/1004-checker-volatile-ref-load/expected-stdout.txt
index b0aad4deb5..b0aad4deb5 100644
--- a/test/1004-checker-volatile-ref-load/expected.txt
+++ b/test/1004-checker-volatile-ref-load/expected-stdout.txt
diff --git a/test/101-fibonacci/Android.bp b/test/101-fibonacci/Android.bp
index e1185c1866..afa3dda6f6 100644
--- a/test/101-fibonacci/Android.bp
+++ b/test/101-fibonacci/Android.bp
@@ -8,13 +8,13 @@ java_test {
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-101-fibonacci-expected"],
+    data: [":art-run-test-101-fibonacci-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-101-fibonacci-expected",
-    out: ["art-run-test-101-fibonacci-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-101-fibonacci-expected-stdout",
+    out: ["art-run-test-101-fibonacci-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/101-fibonacci/expected.txt b/test/101-fibonacci/expected-stdout.txt
index dcc3617068..dcc3617068 100644
--- a/test/101-fibonacci/expected.txt
+++ b/test/101-fibonacci/expected-stdout.txt
diff --git a/test/102-concurrent-gc/Android.bp b/test/102-concurrent-gc/Android.bp
index 883465a404..42a1e9b4b8 100644
--- a/test/102-concurrent-gc/Android.bp
+++ b/test/102-concurrent-gc/Android.bp
@@ -8,13 +8,13 @@ java_test {
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-102-concurrent-gc-expected"],
+    data: [":art-run-test-102-concurrent-gc-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-102-concurrent-gc-expected",
-    out: ["art-run-test-102-concurrent-gc-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-102-concurrent-gc-expected-stdout",
+    out: ["art-run-test-102-concurrent-gc-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/102-concurrent-gc/expected.txt b/test/102-concurrent-gc/expected-stdout.txt
index f75da10caf..f75da10caf 100644
--- a/test/102-concurrent-gc/expected.txt
+++ b/test/102-concurrent-gc/expected-stdout.txt
diff --git a/test/103-string-append/Android.bp b/test/103-string-append/Android.bp
index a1155e4efd..6f61f26964 100644
--- a/test/103-string-append/Android.bp
+++ b/test/103-string-append/Android.bp
@@ -8,13 +8,13 @@ java_test {
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-103-string-append-expected"],
+    data: [":art-run-test-103-string-append-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-103-string-append-expected",
-    out: ["art-run-test-103-string-append-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-103-string-append-expected-stdout",
+    out: ["art-run-test-103-string-append-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/103-string-append/expected.txt b/test/103-string-append/expected-stdout.txt
index f75da10caf..f75da10caf 100644
--- a/test/103-string-append/expected.txt
+++ b/test/103-string-append/expected-stdout.txt
diff --git a/test/104-growth-limit/Android.bp b/test/104-growth-limit/Android.bp
index 04f31f1445..b9f39b37c1 100644
--- a/test/104-growth-limit/Android.bp
+++ b/test/104-growth-limit/Android.bp
@@ -8,13 +8,13 @@ java_test {
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-104-growth-limit-expected"],
+    data: [":art-run-test-104-growth-limit-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-104-growth-limit-expected",
-    out: ["art-run-test-104-growth-limit-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-104-growth-limit-expected-stdout",
+    out: ["art-run-test-104-growth-limit-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/104-growth-limit/expected.txt b/test/104-growth-limit/expected-stdout.txt
index f75da10caf..f75da10caf 100644
--- a/test/104-growth-limit/expected.txt
+++ b/test/104-growth-limit/expected-stdout.txt
diff --git a/test/105-invoke/Android.bp b/test/105-invoke/Android.bp
index 19776094e1..2dc324f4ee 100644
--- a/test/105-invoke/Android.bp
+++ b/test/105-invoke/Android.bp
@@ -8,13 +8,13 @@ java_test {
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-105-invoke-expected"],
+    data: [":art-run-test-105-invoke-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-105-invoke-expected",
-    out: ["art-run-test-105-invoke-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-105-invoke-expected-stdout",
+    out: ["art-run-test-105-invoke-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/105-invoke/expected.txt b/test/105-invoke/expected-stdout.txt
index e0ffebd720..e0ffebd720 100644
--- a/test/105-invoke/expected.txt
+++ b/test/105-invoke/expected-stdout.txt
diff --git a/test/106-exceptions2/Android.bp b/test/106-exceptions2/Android.bp
index 3b3722ab22..e1c8393590 100644
--- a/test/106-exceptions2/Android.bp
+++ b/test/106-exceptions2/Android.bp
@@ -8,13 +8,13 @@ java_test {
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-106-exceptions2-expected"],
+    data: [":art-run-test-106-exceptions2-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-106-exceptions2-expected",
-    out: ["art-run-test-106-exceptions2-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-106-exceptions2-expected-stdout",
+    out: ["art-run-test-106-exceptions2-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/106-exceptions2/expected.txt b/test/106-exceptions2/expected-stdout.txt
index 50472f7ff8..50472f7ff8 100644
--- a/test/106-exceptions2/expected.txt
+++ b/test/106-exceptions2/expected-stdout.txt
diff --git a/test/107-int-math2/Android.bp b/test/107-int-math2/Android.bp
index 6ec7727a2f..ef5015a7f5 100644
--- a/test/107-int-math2/Android.bp
+++ b/test/107-int-math2/Android.bp
@@ -8,13 +8,13 @@ java_test {
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-107-int-math2-expected"],
+    data: [":art-run-test-107-int-math2-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-107-int-math2-expected",
-    out: ["art-run-test-107-int-math2-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-107-int-math2-expected-stdout",
+    out: ["art-run-test-107-int-math2-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/107-int-math2/expected.txt b/test/107-int-math2/expected-stdout.txt
index b131cc2400..b131cc2400 100644
--- a/test/107-int-math2/expected.txt
+++ b/test/107-int-math2/expected-stdout.txt
diff --git a/test/108-check-cast/Android.bp b/test/108-check-cast/Android.bp
index 1b4d3b9e53..91a172c873 100644
--- a/test/108-check-cast/Android.bp
+++ b/test/108-check-cast/Android.bp
@@ -8,13 +8,13 @@ java_test {
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-108-check-cast-expected"],
+    data: [":art-run-test-108-check-cast-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-108-check-cast-expected",
-    out: ["art-run-test-108-check-cast-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-108-check-cast-expected-stdout",
+    out: ["art-run-test-108-check-cast-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/108-check-cast/expected.txt b/test/108-check-cast/expected-stdout.txt
index d86bac9de5..d86bac9de5 100644
--- a/test/108-check-cast/expected.txt
+++ b/test/108-check-cast/expected-stdout.txt
diff --git a/test/109-suspend-check/Android.bp b/test/109-suspend-check/Android.bp
index 5e74db78d0..6ddbe78eeb 100644
--- a/test/109-suspend-check/Android.bp
+++ b/test/109-suspend-check/Android.bp
@@ -8,13 +8,13 @@ java_test {
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-109-suspend-check-expected"],
+    data: [":art-run-test-109-suspend-check-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-109-suspend-check-expected",
-    out: ["art-run-test-109-suspend-check-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-109-suspend-check-expected-stdout",
+    out: ["art-run-test-109-suspend-check-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/109-suspend-check/expected.txt b/test/109-suspend-check/expected-stdout.txt
index 07cc8253da..07cc8253da 100644
--- a/test/109-suspend-check/expected.txt
+++ b/test/109-suspend-check/expected-stdout.txt
diff --git a/test/110-field-access/Android.bp b/test/110-field-access/Android.bp
index 5b857a5e10..9b6d242306 100644
--- a/test/110-field-access/Android.bp
+++ b/test/110-field-access/Android.bp
@@ -8,13 +8,13 @@ java_test {
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-110-field-access-expected"],
+    data: [":art-run-test-110-field-access-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-110-field-access-expected",
-    out: ["art-run-test-110-field-access-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-110-field-access-expected-stdout",
+    out: ["art-run-test-110-field-access-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/110-field-access/expected.txt b/test/110-field-access/expected-stdout.txt
index f4a4007fd7..f4a4007fd7 100644
--- a/test/110-field-access/expected.txt
+++ b/test/110-field-access/expected-stdout.txt
diff --git a/test/111-unresolvable-exception/expected.txt b/test/111-unresolvable-exception/expected-stdout.txt
index f8a1e960fe..f8a1e960fe 100644
--- a/test/111-unresolvable-exception/expected.txt
+++ b/test/111-unresolvable-exception/expected-stdout.txt
diff --git a/test/112-double-math/Android.bp b/test/112-double-math/Android.bp
index e0f6b26144..47284c43de 100644
--- a/test/112-double-math/Android.bp
+++ b/test/112-double-math/Android.bp
@@ -8,13 +8,13 @@ java_test {
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-112-double-math-expected"],
+    data: [":art-run-test-112-double-math-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-112-double-math-expected",
-    out: ["art-run-test-112-double-math-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-112-double-math-expected-stdout",
+    out: ["art-run-test-112-double-math-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/112-double-math/expected.txt b/test/112-double-math/expected-stdout.txt
index 1e10a952bb..1e10a952bb 100644
--- a/test/112-double-math/expected.txt
+++ b/test/112-double-math/expected-stdout.txt
diff --git a/test/113-multidex/expected.txt b/test/113-multidex/expected-stdout.txt
index 603e911806..603e911806 100644
--- a/test/113-multidex/expected.txt
+++ b/test/113-multidex/expected-stdout.txt
diff --git a/test/114-ParallelGC/Android.bp b/test/114-ParallelGC/Android.bp
index 21ced76eb8..f3e6f190f6 100644
--- a/test/114-ParallelGC/Android.bp
+++ b/test/114-ParallelGC/Android.bp
@@ -8,13 +8,13 @@ java_test {
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-114-ParallelGC-expected"],
+    data: [":art-run-test-114-ParallelGC-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-114-ParallelGC-expected",
-    out: ["art-run-test-114-ParallelGC-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-114-ParallelGC-expected-stdout",
+    out: ["art-run-test-114-ParallelGC-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/114-ParallelGC/expected.txt b/test/114-ParallelGC/expected-stdout.txt
index e69de29bb2..e69de29bb2 100644
--- a/test/114-ParallelGC/expected.txt
+++ b/test/114-ParallelGC/expected-stdout.txt
diff --git a/test/115-native-bridge/Android.bp b/test/115-native-bridge/Android.bp
index fdc9cf361a..cba48f7fb6 100644
--- a/test/115-native-bridge/Android.bp
+++ b/test/115-native-bridge/Android.bp
@@ -8,13 +8,13 @@ java_test {
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-115-native-bridge-expected"],
+    data: [":art-run-test-115-native-bridge-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-115-native-bridge-expected",
-    out: ["art-run-test-115-native-bridge-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-115-native-bridge-expected-stdout",
+    out: ["art-run-test-115-native-bridge-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/115-native-bridge/expected.txt b/test/115-native-bridge/expected-stdout.txt
index 06f5979f3e..06f5979f3e 100644
--- a/test/115-native-bridge/expected.txt
+++ b/test/115-native-bridge/expected-stdout.txt
diff --git a/test/116-nodex2oat/Android.bp b/test/116-nodex2oat/Android.bp
index e2a6ba7c6e..91293add7a 100644
--- a/test/116-nodex2oat/Android.bp
+++ b/test/116-nodex2oat/Android.bp
@@ -8,13 +8,13 @@ java_test {
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-116-nodex2oat-expected"],
+    data: [":art-run-test-116-nodex2oat-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-116-nodex2oat-expected",
-    out: ["art-run-test-116-nodex2oat-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-116-nodex2oat-expected-stdout",
+    out: ["art-run-test-116-nodex2oat-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/116-nodex2oat/expected.txt b/test/116-nodex2oat/expected-stdout.txt
index c6c7daa21d..c6c7daa21d 100644
--- a/test/116-nodex2oat/expected.txt
+++ b/test/116-nodex2oat/expected-stdout.txt
diff --git a/test/118-noimage-dex2oat/expected.txt b/test/118-noimage-dex2oat/expected-stdout.txt
index 8946a86ac0..8946a86ac0 100644
--- a/test/118-noimage-dex2oat/expected.txt
+++ b/test/118-noimage-dex2oat/expected-stdout.txt
diff --git a/test/120-hashcode/Android.bp b/test/120-hashcode/Android.bp
index 7e60b8e424..c15ebcc583 100644
--- a/test/120-hashcode/Android.bp
+++ b/test/120-hashcode/Android.bp
@@ -8,13 +8,13 @@ java_test {
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-120-hashcode-expected"],
+    data: [":art-run-test-120-hashcode-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-120-hashcode-expected",
-    out: ["art-run-test-120-hashcode-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-120-hashcode-expected-stdout",
+    out: ["art-run-test-120-hashcode-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/120-hashcode/expected.txt b/test/120-hashcode/expected-stdout.txt
index 619c56180b..619c56180b 100644
--- a/test/120-hashcode/expected.txt
+++ b/test/120-hashcode/expected-stdout.txt
diff --git a/test/121-modifiers/expected.txt b/test/121-modifiers/expected-stdout.txt
index e69de29bb2..e69de29bb2 100644
--- a/test/121-modifiers/expected.txt
+++ b/test/121-modifiers/expected-stdout.txt
diff --git a/test/121-simple-suspend-check/Android.bp b/test/121-simple-suspend-check/Android.bp
index bf25234171..7a555cffc2 100644
--- a/test/121-simple-suspend-check/Android.bp
+++ b/test/121-simple-suspend-check/Android.bp
@@ -8,13 +8,13 @@ java_test {
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-121-simple-suspend-check-expected"],
+    data: [":art-run-test-121-simple-suspend-check-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-121-simple-suspend-check-expected",
-    out: ["art-run-test-121-simple-suspend-check-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-121-simple-suspend-check-expected-stdout",
+    out: ["art-run-test-121-simple-suspend-check-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/121-simple-suspend-check/expected.txt b/test/121-simple-suspend-check/expected-stdout.txt
index 7ef22e9a43..7ef22e9a43 100644
--- a/test/121-simple-suspend-check/expected.txt
+++ b/test/121-simple-suspend-check/expected-stdout.txt
diff --git a/test/122-npe/Android.bp b/test/122-npe/Android.bp
index 1db729cbdf..ef739d4946 100644
--- a/test/122-npe/Android.bp
+++ b/test/122-npe/Android.bp
@@ -8,13 +8,13 @@ java_test {
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-122-npe-expected"],
+    data: [":art-run-test-122-npe-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-122-npe-expected",
-    out: ["art-run-test-122-npe-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-122-npe-expected-stdout",
+    out: ["art-run-test-122-npe-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/122-npe/expected.txt b/test/122-npe/expected-stdout.txt
index e69de29bb2..e69de29bb2 100644
--- a/test/122-npe/expected.txt
+++ b/test/122-npe/expected-stdout.txt
diff --git a/test/123-compiler-regressions-mt/Android.bp b/test/123-compiler-regressions-mt/Android.bp
index 088b30081e..41090be4fc 100644
--- a/test/123-compiler-regressions-mt/Android.bp
+++ b/test/123-compiler-regressions-mt/Android.bp
@@ -8,13 +8,13 @@ java_test {
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-123-compiler-regressions-mt-expected"],
+    data: [":art-run-test-123-compiler-regressions-mt-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-123-compiler-regressions-mt-expected",
-    out: ["art-run-test-123-compiler-regressions-mt-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-123-compiler-regressions-mt-expected-stdout",
+    out: ["art-run-test-123-compiler-regressions-mt-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/123-compiler-regressions-mt/expected.txt b/test/123-compiler-regressions-mt/expected-stdout.txt
index a11e5bf87d..a11e5bf87d 100644
--- a/test/123-compiler-regressions-mt/expected.txt
+++ b/test/123-compiler-regressions-mt/expected-stdout.txt
diff --git a/test/123-inline-execute2/Android.bp b/test/123-inline-execute2/Android.bp
index bb084f2f6d..c7aa8e093b 100644
--- a/test/123-inline-execute2/Android.bp
+++ b/test/123-inline-execute2/Android.bp
@@ -8,13 +8,13 @@ java_test {
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-123-inline-execute2-expected"],
+    data: [":art-run-test-123-inline-execute2-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-123-inline-execute2-expected",
-    out: ["art-run-test-123-inline-execute2-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-123-inline-execute2-expected-stdout",
+    out: ["art-run-test-123-inline-execute2-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/123-inline-execute2/expected.txt b/test/123-inline-execute2/expected-stdout.txt
index aa74fa3757..aa74fa3757 100644
--- a/test/123-inline-execute2/expected.txt
+++ b/test/123-inline-execute2/expected-stdout.txt
diff --git a/test/124-missing-classes/expected.txt b/test/124-missing-classes/expected-stdout.txt
index ce761c3761..ce761c3761 100644
--- a/test/124-missing-classes/expected.txt
+++ b/test/124-missing-classes/expected-stdout.txt
diff --git a/test/125-gc-and-classloading/Android.bp b/test/125-gc-and-classloading/Android.bp
index fedc5b8283..6cc76e1061 100644
--- a/test/125-gc-and-classloading/Android.bp
+++ b/test/125-gc-and-classloading/Android.bp
@@ -8,13 +8,13 @@ java_test {
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-125-gc-and-classloading-expected"],
+    data: [":art-run-test-125-gc-and-classloading-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-125-gc-and-classloading-expected",
-    out: ["art-run-test-125-gc-and-classloading-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-125-gc-and-classloading-expected-stdout",
+    out: ["art-run-test-125-gc-and-classloading-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/125-gc-and-classloading/expected.txt b/test/125-gc-and-classloading/expected-stdout.txt
index 7ef22e9a43..7ef22e9a43 100644
--- a/test/125-gc-and-classloading/expected.txt
+++ b/test/125-gc-and-classloading/expected-stdout.txt
diff --git a/test/126-miranda-multidex/expected.txt b/test/126-miranda-multidex/expected-stdout.txt
index dbe37173a5..dbe37173a5 100644
--- a/test/126-miranda-multidex/expected.txt
+++ b/test/126-miranda-multidex/expected-stdout.txt
diff --git a/test/127-checker-secondarydex/expected.txt b/test/127-checker-secondarydex/expected-stdout.txt
index 1c8defb6ec..1c8defb6ec 100644
--- a/test/127-checker-secondarydex/expected.txt
+++ b/test/127-checker-secondarydex/expected-stdout.txt
diff --git a/test/128-reg-spill-on-implicit-nullcheck/Android.bp b/test/128-reg-spill-on-implicit-nullcheck/Android.bp
index 607b627562..8195602eff 100644
--- a/test/128-reg-spill-on-implicit-nullcheck/Android.bp
+++ b/test/128-reg-spill-on-implicit-nullcheck/Android.bp
@@ -8,13 +8,13 @@ java_test {
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-128-reg-spill-on-implicit-nullcheck-expected"],
+    data: [":art-run-test-128-reg-spill-on-implicit-nullcheck-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-128-reg-spill-on-implicit-nullcheck-expected",
-    out: ["art-run-test-128-reg-spill-on-implicit-nullcheck-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-128-reg-spill-on-implicit-nullcheck-expected-stdout",
+    out: ["art-run-test-128-reg-spill-on-implicit-nullcheck-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/128-reg-spill-on-implicit-nullcheck/expected.txt b/test/128-reg-spill-on-implicit-nullcheck/expected-stdout.txt
index 9bdf658823..9bdf658823 100644
--- a/test/128-reg-spill-on-implicit-nullcheck/expected.txt
+++ b/test/128-reg-spill-on-implicit-nullcheck/expected-stdout.txt
diff --git a/test/129-ThreadGetId/Android.bp b/test/129-ThreadGetId/Android.bp
index 19e25c24cc..a31627ab83 100644
--- a/test/129-ThreadGetId/Android.bp
+++ b/test/129-ThreadGetId/Android.bp
@@ -8,13 +8,13 @@ java_test {
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-129-ThreadGetId-expected"],
+    data: [":art-run-test-129-ThreadGetId-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-129-ThreadGetId-expected",
-    out: ["art-run-test-129-ThreadGetId-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-129-ThreadGetId-expected-stdout",
+    out: ["art-run-test-129-ThreadGetId-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/129-ThreadGetId/expected.txt b/test/129-ThreadGetId/expected-stdout.txt
index aadf90d9d7..aadf90d9d7 100644
--- a/test/129-ThreadGetId/expected.txt
+++ b/test/129-ThreadGetId/expected-stdout.txt
diff --git a/test/130-hprof/expected.txt b/test/130-hprof/expected-stdout.txt
index cc3d9f25c4..cc3d9f25c4 100644
--- a/test/130-hprof/expected.txt
+++ b/test/130-hprof/expected-stdout.txt
diff --git a/test/132-daemon-locks-shutdown/Android.bp b/test/132-daemon-locks-shutdown/Android.bp
index d869591ae7..f3c148e3ee 100644
--- a/test/132-daemon-locks-shutdown/Android.bp
+++ b/test/132-daemon-locks-shutdown/Android.bp
@@ -8,13 +8,13 @@ java_test {
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-132-daemon-locks-shutdown-expected"],
+    data: [":art-run-test-132-daemon-locks-shutdown-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-132-daemon-locks-shutdown-expected",
-    out: ["art-run-test-132-daemon-locks-shutdown-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-132-daemon-locks-shutdown-expected-stdout",
+    out: ["art-run-test-132-daemon-locks-shutdown-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/132-daemon-locks-shutdown/expected.txt b/test/132-daemon-locks-shutdown/expected-stdout.txt
index e69de29bb2..e69de29bb2 100644
--- a/test/132-daemon-locks-shutdown/expected.txt
+++ b/test/132-daemon-locks-shutdown/expected-stdout.txt
diff --git a/test/133-static-invoke-super/Android.bp b/test/133-static-invoke-super/Android.bp
index 75717fff33..28ea825211 100644
--- a/test/133-static-invoke-super/Android.bp
+++ b/test/133-static-invoke-super/Android.bp
@@ -8,13 +8,13 @@ java_test {
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-133-static-invoke-super-expected"],
+    data: [":art-run-test-133-static-invoke-super-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-133-static-invoke-super-expected",
-    out: ["art-run-test-133-static-invoke-super-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-133-static-invoke-super-expected-stdout",
+    out: ["art-run-test-133-static-invoke-super-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/133-static-invoke-super/expected.txt b/test/133-static-invoke-super/expected-stdout.txt
index 089d8e85aa..089d8e85aa 100644
--- a/test/133-static-invoke-super/expected.txt
+++ b/test/133-static-invoke-super/expected-stdout.txt
diff --git a/test/1336-short-finalizer-timeout/Android.bp b/test/1336-short-finalizer-timeout/Android.bp
index 6ea9e05d0b..6752c41b43 100644
--- a/test/1336-short-finalizer-timeout/Android.bp
+++ b/test/1336-short-finalizer-timeout/Android.bp
@@ -8,13 +8,13 @@ java_test {
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-1336-short-finalizer-timeout-expected"],
+    data: [":art-run-test-1336-short-finalizer-timeout-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-1336-short-finalizer-timeout-expected",
-    out: ["art-run-test-1336-short-finalizer-timeout-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-1336-short-finalizer-timeout-expected-stdout",
+    out: ["art-run-test-1336-short-finalizer-timeout-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/1336-short-finalizer-timeout/expected.txt b/test/1336-short-finalizer-timeout/expected-stdout.txt
index 496e0e683f..496e0e683f 100644
--- a/test/1336-short-finalizer-timeout/expected.txt
+++ b/test/1336-short-finalizer-timeout/expected-stdout.txt
diff --git a/test/1337-gc-coverage/Android.bp b/test/1337-gc-coverage/Android.bp
index 06f3267a97..1ff654654d 100644
--- a/test/1337-gc-coverage/Android.bp
+++ b/test/1337-gc-coverage/Android.bp
@@ -8,13 +8,13 @@ java_test {
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-1337-gc-coverage-expected"],
+    data: [":art-run-test-1337-gc-coverage-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-1337-gc-coverage-expected",
-    out: ["art-run-test-1337-gc-coverage-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-1337-gc-coverage-expected-stdout",
+    out: ["art-run-test-1337-gc-coverage-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/1337-gc-coverage/expected.txt b/test/1337-gc-coverage/expected-stdout.txt
index e69de29bb2..e69de29bb2 100644
--- a/test/1337-gc-coverage/expected.txt
+++ b/test/1337-gc-coverage/expected-stdout.txt
diff --git a/test/1338-gc-no-los/expected.txt b/test/1338-gc-no-los/expected-stdout.txt
index 36bec43b8b..36bec43b8b 100644
--- a/test/1338-gc-no-los/expected.txt
+++ b/test/1338-gc-no-los/expected-stdout.txt
diff --git a/test/1339-dead-reference-safe/Android.bp b/test/1339-dead-reference-safe/Android.bp
index f4c14fa87e..52131679ea 100644
--- a/test/1339-dead-reference-safe/Android.bp
+++ b/test/1339-dead-reference-safe/Android.bp
@@ -8,13 +8,13 @@ java_test {
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-1339-dead-reference-safe-expected"],
+    data: [":art-run-test-1339-dead-reference-safe-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-1339-dead-reference-safe-expected",
-    out: ["art-run-test-1339-dead-reference-safe-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-1339-dead-reference-safe-expected-stdout",
+    out: ["art-run-test-1339-dead-reference-safe-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/1339-dead-reference-safe/expected.txt b/test/1339-dead-reference-safe/expected-stdout.txt
index abafce4476..abafce4476 100644
--- a/test/1339-dead-reference-safe/expected.txt
+++ b/test/1339-dead-reference-safe/expected-stdout.txt
diff --git a/test/134-reg-promotion/expected.txt b/test/134-reg-promotion/expected-stdout.txt
index e69de29bb2..e69de29bb2 100644
--- a/test/134-reg-promotion/expected.txt
+++ b/test/134-reg-promotion/expected-stdout.txt
diff --git a/test/135-MirandaDispatch/expected.txt b/test/135-MirandaDispatch/expected-stdout.txt
index 5b098e5fac..5b098e5fac 100644
--- a/test/135-MirandaDispatch/expected.txt
+++ b/test/135-MirandaDispatch/expected-stdout.txt
diff --git a/test/136-daemon-jni-shutdown/Android.bp b/test/136-daemon-jni-shutdown/Android.bp
index 03c923187c..e32e4a602c 100644
--- a/test/136-daemon-jni-shutdown/Android.bp
+++ b/test/136-daemon-jni-shutdown/Android.bp
@@ -8,13 +8,13 @@ java_test {
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-136-daemon-jni-shutdown-expected"],
+    data: [":art-run-test-136-daemon-jni-shutdown-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-136-daemon-jni-shutdown-expected",
-    out: ["art-run-test-136-daemon-jni-shutdown-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-136-daemon-jni-shutdown-expected-stdout",
+    out: ["art-run-test-136-daemon-jni-shutdown-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/136-daemon-jni-shutdown/expected.txt b/test/136-daemon-jni-shutdown/expected-stdout.txt
index f0b6353e9f..f0b6353e9f 100644
--- a/test/136-daemon-jni-shutdown/expected.txt
+++ b/test/136-daemon-jni-shutdown/expected-stdout.txt
diff --git a/test/137-cfi/expected.txt b/test/137-cfi/expected-stdout.txt
index 54f35a3888..54f35a3888 100644
--- a/test/137-cfi/expected.txt
+++ b/test/137-cfi/expected-stdout.txt
diff --git a/test/138-duplicate-classes-check/expected.txt b/test/138-duplicate-classes-check/expected-stdout.txt
index b2f7f08c17..b2f7f08c17 100644
--- a/test/138-duplicate-classes-check/expected.txt
+++ b/test/138-duplicate-classes-check/expected-stdout.txt
diff --git a/test/138-duplicate-classes-check2/expected.txt b/test/138-duplicate-classes-check2/expected-stdout.txt
index b2f7f08c17..b2f7f08c17 100644
--- a/test/138-duplicate-classes-check2/expected.txt
+++ b/test/138-duplicate-classes-check2/expected-stdout.txt
diff --git a/test/139-register-natives/Android.bp b/test/139-register-natives/Android.bp
index b1fc5b82be..ba932f284f 100644
--- a/test/139-register-natives/Android.bp
+++ b/test/139-register-natives/Android.bp
@@ -8,13 +8,13 @@ java_test {
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-139-register-natives-expected"],
+    data: [":art-run-test-139-register-natives-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-139-register-natives-expected",
-    out: ["art-run-test-139-register-natives-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-139-register-natives-expected-stdout",
+    out: ["art-run-test-139-register-natives-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/139-register-natives/expected.txt b/test/139-register-natives/expected-stdout.txt
index 6a5618ebc6..6a5618ebc6 100644
--- a/test/139-register-natives/expected.txt
+++ b/test/139-register-natives/expected-stdout.txt
diff --git a/test/140-dce-regression/Android.bp b/test/140-dce-regression/Android.bp
index 1e90f5a7fc..0a0ca80198 100644
--- a/test/140-dce-regression/Android.bp
+++ b/test/140-dce-regression/Android.bp
@@ -8,13 +8,13 @@ java_test {
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-140-dce-regression-expected"],
+    data: [":art-run-test-140-dce-regression-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-140-dce-regression-expected",
-    out: ["art-run-test-140-dce-regression-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-140-dce-regression-expected-stdout",
+    out: ["art-run-test-140-dce-regression-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/140-dce-regression/expected.txt b/test/140-dce-regression/expected-stdout.txt
index 863339fb8c..863339fb8c 100644
--- a/test/140-dce-regression/expected.txt
+++ b/test/140-dce-regression/expected-stdout.txt
diff --git a/test/140-field-packing/Android.bp b/test/140-field-packing/Android.bp
index 25714109f8..9ea71f8161 100644
--- a/test/140-field-packing/Android.bp
+++ b/test/140-field-packing/Android.bp
@@ -8,13 +8,13 @@ java_test {
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-140-field-packing-expected"],
+    data: [":art-run-test-140-field-packing-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-140-field-packing-expected",
-    out: ["art-run-test-140-field-packing-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-140-field-packing-expected-stdout",
+    out: ["art-run-test-140-field-packing-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/140-field-packing/expected.txt b/test/140-field-packing/expected-stdout.txt
index 2b0a2ce905..2b0a2ce905 100644
--- a/test/140-field-packing/expected.txt
+++ b/test/140-field-packing/expected-stdout.txt
diff --git a/test/141-class-unload/expected.txt b/test/141-class-unload/expected-stdout.txt
index a1c5fa8a2f..a1c5fa8a2f 100644
--- a/test/141-class-unload/expected.txt
+++ b/test/141-class-unload/expected-stdout.txt
diff --git a/test/142-classloader2/expected.txt b/test/142-classloader2/expected-stdout.txt
index 056d9785de..056d9785de 100644
--- a/test/142-classloader2/expected.txt
+++ b/test/142-classloader2/expected-stdout.txt
diff --git a/test/143-string-value/Android.bp b/test/143-string-value/Android.bp
index 548be9c05c..0cca6205cd 100644
--- a/test/143-string-value/Android.bp
+++ b/test/143-string-value/Android.bp
@@ -8,13 +8,13 @@ java_test {
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-143-string-value-expected"],
+    data: [":art-run-test-143-string-value-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-143-string-value-expected",
-    out: ["art-run-test-143-string-value-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-143-string-value-expected-stdout",
+    out: ["art-run-test-143-string-value-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/143-string-value/expected.txt b/test/143-string-value/expected-stdout.txt
index 06cdb89e90..06cdb89e90 100644
--- a/test/143-string-value/expected.txt
+++ b/test/143-string-value/expected-stdout.txt
diff --git a/test/144-static-field-sigquit/Android.bp b/test/144-static-field-sigquit/Android.bp
index d92ad363c9..43348969c7 100644
--- a/test/144-static-field-sigquit/Android.bp
+++ b/test/144-static-field-sigquit/Android.bp
@@ -8,13 +8,13 @@ java_test {
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-144-static-field-sigquit-expected"],
+    data: [":art-run-test-144-static-field-sigquit-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-144-static-field-sigquit-expected",
-    out: ["art-run-test-144-static-field-sigquit-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-144-static-field-sigquit-expected-stdout",
+    out: ["art-run-test-144-static-field-sigquit-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/144-static-field-sigquit/expected.txt b/test/144-static-field-sigquit/expected-stdout.txt
index e0c3e90221..e0c3e90221 100644
--- a/test/144-static-field-sigquit/expected.txt
+++ b/test/144-static-field-sigquit/expected-stdout.txt
diff --git a/test/145-alloc-tracking-stress/expected.txt b/test/145-alloc-tracking-stress/expected-stdout.txt
index 134d8d0b47..134d8d0b47 100644
--- a/test/145-alloc-tracking-stress/expected.txt
+++ b/test/145-alloc-tracking-stress/expected-stdout.txt
diff --git a/test/146-bad-interface/expected.txt b/test/146-bad-interface/expected-stdout.txt
index 344196674f..344196674f 100644
--- a/test/146-bad-interface/expected.txt
+++ b/test/146-bad-interface/expected-stdout.txt
diff --git a/test/148-multithread-gc-annotations/Android.bp b/test/148-multithread-gc-annotations/Android.bp
index c54e9d365b..3cdf02a0f5 100644
--- a/test/148-multithread-gc-annotations/Android.bp
+++ b/test/148-multithread-gc-annotations/Android.bp
@@ -8,13 +8,13 @@ java_test {
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-148-multithread-gc-annotations-expected"],
+    data: [":art-run-test-148-multithread-gc-annotations-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-148-multithread-gc-annotations-expected",
-    out: ["art-run-test-148-multithread-gc-annotations-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-148-multithread-gc-annotations-expected-stdout",
+    out: ["art-run-test-148-multithread-gc-annotations-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/148-multithread-gc-annotations/expected.txt b/test/148-multithread-gc-annotations/expected-stdout.txt
index e69de29bb2..e69de29bb2 100644
--- a/test/148-multithread-gc-annotations/expected.txt
+++ b/test/148-multithread-gc-annotations/expected-stdout.txt
diff --git a/test/149-suspend-all-stress/Android.bp b/test/149-suspend-all-stress/Android.bp
index b5077c7331..8745cc7e9e 100644
--- a/test/149-suspend-all-stress/Android.bp
+++ b/test/149-suspend-all-stress/Android.bp
@@ -8,13 +8,13 @@ java_test {
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-149-suspend-all-stress-expected"],
+    data: [":art-run-test-149-suspend-all-stress-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-149-suspend-all-stress-expected",
-    out: ["art-run-test-149-suspend-all-stress-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-149-suspend-all-stress-expected-stdout",
+    out: ["art-run-test-149-suspend-all-stress-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/149-suspend-all-stress/expected.txt b/test/149-suspend-all-stress/expected-stdout.txt
index 134d8d0b47..134d8d0b47 100644
--- a/test/149-suspend-all-stress/expected.txt
+++ b/test/149-suspend-all-stress/expected-stdout.txt
diff --git a/test/150-loadlibrary/Android.bp b/test/150-loadlibrary/Android.bp
index feb71aa214..ac773ecfca 100644
--- a/test/150-loadlibrary/Android.bp
+++ b/test/150-loadlibrary/Android.bp
@@ -8,13 +8,13 @@ java_test {
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-150-loadlibrary-expected"],
+    data: [":art-run-test-150-loadlibrary-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-150-loadlibrary-expected",
-    out: ["art-run-test-150-loadlibrary-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-150-loadlibrary-expected-stdout",
+    out: ["art-run-test-150-loadlibrary-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/150-loadlibrary/expected.txt b/test/150-loadlibrary/expected-stdout.txt
index ecf40b61f0..ecf40b61f0 100644
--- a/test/150-loadlibrary/expected.txt
+++ b/test/150-loadlibrary/expected-stdout.txt
diff --git a/test/151-OpenFileLimit/Android.bp b/test/151-OpenFileLimit/Android.bp
index fa9caf9ae0..748795e9c9 100644
--- a/test/151-OpenFileLimit/Android.bp
+++ b/test/151-OpenFileLimit/Android.bp
@@ -8,13 +8,13 @@ java_test {
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-151-OpenFileLimit-expected"],
+    data: [":art-run-test-151-OpenFileLimit-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-151-OpenFileLimit-expected",
-    out: ["art-run-test-151-OpenFileLimit-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-151-OpenFileLimit-expected-stdout",
+    out: ["art-run-test-151-OpenFileLimit-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/151-OpenFileLimit/expected.txt b/test/151-OpenFileLimit/expected-stdout.txt
index 6bc45ef24d..6bc45ef24d 100644
--- a/test/151-OpenFileLimit/expected.txt
+++ b/test/151-OpenFileLimit/expected-stdout.txt
diff --git a/test/152-dead-large-object/Android.bp b/test/152-dead-large-object/Android.bp
index fa030eab1d..2444fa549b 100644
--- a/test/152-dead-large-object/Android.bp
+++ b/test/152-dead-large-object/Android.bp
@@ -8,13 +8,13 @@ java_test {
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-152-dead-large-object-expected"],
+    data: [":art-run-test-152-dead-large-object-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-152-dead-large-object-expected",
-    out: ["art-run-test-152-dead-large-object-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-152-dead-large-object-expected-stdout",
+    out: ["art-run-test-152-dead-large-object-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/152-dead-large-object/expected.txt b/test/152-dead-large-object/expected-stdout.txt
index e69de29bb2..e69de29bb2 100644
--- a/test/152-dead-large-object/expected.txt
+++ b/test/152-dead-large-object/expected-stdout.txt
diff --git a/test/153-reference-stress/Android.bp b/test/153-reference-stress/Android.bp
index cdc0dd2153..04ab5d2eac 100644
--- a/test/153-reference-stress/Android.bp
+++ b/test/153-reference-stress/Android.bp
@@ -8,13 +8,13 @@ java_test {
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-153-reference-stress-expected"],
+    data: [":art-run-test-153-reference-stress-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-153-reference-stress-expected",
-    out: ["art-run-test-153-reference-stress-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-153-reference-stress-expected-stdout",
+    out: ["art-run-test-153-reference-stress-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/153-reference-stress/expected.txt b/test/153-reference-stress/expected-stdout.txt
index 7ef22e9a43..7ef22e9a43 100644
--- a/test/153-reference-stress/expected.txt
+++ b/test/153-reference-stress/expected-stdout.txt
diff --git a/test/154-gc-loop/Android.bp b/test/154-gc-loop/Android.bp
index e0f5955fd5..2073e8b58d 100644
--- a/test/154-gc-loop/Android.bp
+++ b/test/154-gc-loop/Android.bp
@@ -8,13 +8,13 @@ java_test {
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-154-gc-loop-expected"],
+    data: [":art-run-test-154-gc-loop-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-154-gc-loop-expected",
-    out: ["art-run-test-154-gc-loop-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-154-gc-loop-expected-stdout",
+    out: ["art-run-test-154-gc-loop-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/154-gc-loop/expected.txt b/test/154-gc-loop/expected-stdout.txt
index 6106818c79..6106818c79 100644
--- a/test/154-gc-loop/expected.txt
+++ b/test/154-gc-loop/expected-stdout.txt
diff --git a/test/155-java-set-resolved-type/expected.txt b/test/155-java-set-resolved-type/expected-stdout.txt
index 6a5618ebc6..6a5618ebc6 100644
--- a/test/155-java-set-resolved-type/expected.txt
+++ b/test/155-java-set-resolved-type/expected-stdout.txt
diff --git a/test/155-java-set-resolved-type/src/Main.java b/test/155-java-set-resolved-type/src/Main.java
index 44278a1c9a..45f6737946 100644
--- a/test/155-java-set-resolved-type/src/Main.java
+++ b/test/155-java-set-resolved-type/src/Main.java
@@ -26,7 +26,7 @@ public class Main {
             System.loadLibrary(args[0]);
         } catch (ClassNotFoundException e) {
             usingRI = true;
-            // Add expected JNI_OnLoad log line to match expected.txt.
+            // Add expected JNI_OnLoad log line to match expected-stdout.txt.
             System.out.println("JNI_OnLoad called");
         }
         try {
diff --git a/test/156-register-dex-file-multi-loader/Android.bp b/test/156-register-dex-file-multi-loader/Android.bp
index 2ccebee7a1..62accd249e 100644
--- a/test/156-register-dex-file-multi-loader/Android.bp
+++ b/test/156-register-dex-file-multi-loader/Android.bp
@@ -8,13 +8,13 @@ java_test {
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-156-register-dex-file-multi-loader-expected"],
+    data: [":art-run-test-156-register-dex-file-multi-loader-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-156-register-dex-file-multi-loader-expected",
-    out: ["art-run-test-156-register-dex-file-multi-loader-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-156-register-dex-file-multi-loader-expected-stdout",
+    out: ["art-run-test-156-register-dex-file-multi-loader-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/156-register-dex-file-multi-loader/expected.txt b/test/156-register-dex-file-multi-loader/expected-stdout.txt
index e69de29bb2..e69de29bb2 100644
--- a/test/156-register-dex-file-multi-loader/expected.txt
+++ b/test/156-register-dex-file-multi-loader/expected-stdout.txt
diff --git a/test/157-void-class/expected.txt b/test/157-void-class/expected-stdout.txt
index 3f61c0b5b0..3f61c0b5b0 100644
--- a/test/157-void-class/expected.txt
+++ b/test/157-void-class/expected-stdout.txt
diff --git a/test/157-void-class/src-art/Main.java b/test/157-void-class/src-art/Main.java
index 322b705f1d..25e3eba659 100644
--- a/test/157-void-class/src-art/Main.java
+++ b/test/157-void-class/src-art/Main.java
@@ -24,7 +24,7 @@ public class Main {
             System.loadLibrary(args[0]);
         } catch (ClassNotFoundException e) {
             usingRI = true;
-            // Add expected JNI_OnLoad log line to match expected.txt.
+            // Add expected JNI_OnLoad log line to match expected-stdout.txt.
             System.out.println("JNI_OnLoad called");
         }
         try {
diff --git a/test/158-app-image-class-table/Android.bp b/test/158-app-image-class-table/Android.bp
index a6bedba1ac..eb9c48ce29 100644
--- a/test/158-app-image-class-table/Android.bp
+++ b/test/158-app-image-class-table/Android.bp
@@ -8,13 +8,13 @@ java_test {
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-158-app-image-class-table-expected"],
+    data: [":art-run-test-158-app-image-class-table-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-158-app-image-class-table-expected",
-    out: ["art-run-test-158-app-image-class-table-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-158-app-image-class-table-expected-stdout",
+    out: ["art-run-test-158-app-image-class-table-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/158-app-image-class-table/expected.txt b/test/158-app-image-class-table/expected-stdout.txt
index 6a5618ebc6..6a5618ebc6 100644
--- a/test/158-app-image-class-table/expected.txt
+++ b/test/158-app-image-class-table/expected-stdout.txt
diff --git a/test/158-app-image-class-table/src/Main.java b/test/158-app-image-class-table/src/Main.java
index 97aa14d4b1..f4274315b7 100644
--- a/test/158-app-image-class-table/src/Main.java
+++ b/test/158-app-image-class-table/src/Main.java
@@ -23,7 +23,7 @@ public class Main {
             System.loadLibrary(args[0]);
         } catch (ClassNotFoundException e) {
             usingRI = true;
-            // Add expected JNI_OnLoad log line to match expected.txt.
+            // Add expected JNI_OnLoad log line to match expected-stdout.txt.
             System.out.println("JNI_OnLoad called");
         }
         try {
diff --git a/test/159-app-image-fields/Android.bp b/test/159-app-image-fields/Android.bp
index 471854caed..7b1a9c22c2 100644
--- a/test/159-app-image-fields/Android.bp
+++ b/test/159-app-image-fields/Android.bp
@@ -8,13 +8,13 @@ java_test {
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-159-app-image-fields-expected"],
+    data: [":art-run-test-159-app-image-fields-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-159-app-image-fields-expected",
-    out: ["art-run-test-159-app-image-fields-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-159-app-image-fields-expected-stdout",
+    out: ["art-run-test-159-app-image-fields-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/159-app-image-fields/expected.txt b/test/159-app-image-fields/expected-stdout.txt
index f63e8e302f..f63e8e302f 100644
--- a/test/159-app-image-fields/expected.txt
+++ b/test/159-app-image-fields/expected-stdout.txt
diff --git a/test/160-read-barrier-stress/Android.bp b/test/160-read-barrier-stress/Android.bp
index c83dd9322e..234801db60 100644
--- a/test/160-read-barrier-stress/Android.bp
+++ b/test/160-read-barrier-stress/Android.bp
@@ -8,13 +8,13 @@ java_test {
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-160-read-barrier-stress-expected"],
+    data: [":art-run-test-160-read-barrier-stress-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-160-read-barrier-stress-expected",
-    out: ["art-run-test-160-read-barrier-stress-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-160-read-barrier-stress-expected-stdout",
+    out: ["art-run-test-160-read-barrier-stress-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/160-read-barrier-stress/expected.txt b/test/160-read-barrier-stress/expected-stdout.txt
index e69de29bb2..e69de29bb2 100644
--- a/test/160-read-barrier-stress/expected.txt
+++ b/test/160-read-barrier-stress/expected-stdout.txt
diff --git a/test/161-final-abstract-class/expected.txt b/test/161-final-abstract-class/expected-stdout.txt
index 1e635844cc..1e635844cc 100644
--- a/test/161-final-abstract-class/expected.txt
+++ b/test/161-final-abstract-class/expected-stdout.txt
diff --git a/test/162-method-resolution/expected.txt b/test/162-method-resolution/expected-stdout.txt
index 9b48a4cc8f..9b48a4cc8f 100644
--- a/test/162-method-resolution/expected.txt
+++ b/test/162-method-resolution/expected-stdout.txt
diff --git a/test/162-method-resolution/src/Main.java b/test/162-method-resolution/src/Main.java
index 864c87850b..2a84fe666a 100644
--- a/test/162-method-resolution/src/Main.java
+++ b/test/162-method-resolution/src/Main.java
@@ -312,7 +312,7 @@ public class Main {
         } else {
             invokeUserTest("Test7User");
             // For ART, just print the expected output to hide the divergence. Bug: 63624936.
-            // The expected.txt lists the desired behavior, not the current behavior.
+            // The expected-stdout.txt lists the desired behavior, not the current behavior.
             System.out.println("Calling Test7User2.test():\n" +
                                "Caught java.lang.reflect.InvocationTargetException\n" +
                                "  caused by java.lang.IllegalAccessError");
diff --git a/test/163-app-image-methods/Android.bp b/test/163-app-image-methods/Android.bp
index bc3676a1ac..2bbb251355 100644
--- a/test/163-app-image-methods/Android.bp
+++ b/test/163-app-image-methods/Android.bp
@@ -8,13 +8,13 @@ java_test {
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-163-app-image-methods-expected"],
+    data: [":art-run-test-163-app-image-methods-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-163-app-image-methods-expected",
-    out: ["art-run-test-163-app-image-methods-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-163-app-image-methods-expected-stdout",
+    out: ["art-run-test-163-app-image-methods-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/163-app-image-methods/expected.txt b/test/163-app-image-methods/expected-stdout.txt
index f63e8e302f..f63e8e302f 100644
--- a/test/163-app-image-methods/expected.txt
+++ b/test/163-app-image-methods/expected-stdout.txt
diff --git a/test/164-resolution-trampoline-dex-cache/expected.txt b/test/164-resolution-trampoline-dex-cache/expected-stdout.txt
index d549cb1664..d549cb1664 100644
--- a/test/164-resolution-trampoline-dex-cache/expected.txt
+++ b/test/164-resolution-trampoline-dex-cache/expected-stdout.txt
diff --git a/test/165-lock-owner-proxy/Android.bp b/test/165-lock-owner-proxy/Android.bp
index 4a12cfd635..c7b32123dd 100644
--- a/test/165-lock-owner-proxy/Android.bp
+++ b/test/165-lock-owner-proxy/Android.bp
@@ -8,13 +8,13 @@ java_test {
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-165-lock-owner-proxy-expected"],
+    data: [":art-run-test-165-lock-owner-proxy-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-165-lock-owner-proxy-expected",
-    out: ["art-run-test-165-lock-owner-proxy-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-165-lock-owner-proxy-expected-stdout",
+    out: ["art-run-test-165-lock-owner-proxy-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/165-lock-owner-proxy/expected.txt b/test/165-lock-owner-proxy/expected-stdout.txt
index e69de29bb2..e69de29bb2 100644
--- a/test/165-lock-owner-proxy/expected.txt
+++ b/test/165-lock-owner-proxy/expected-stdout.txt
diff --git a/test/166-bad-interface-super/expected.txt b/test/166-bad-interface-super/expected-stdout.txt
index c49f6d255f..c49f6d255f 100644
--- a/test/166-bad-interface-super/expected.txt
+++ b/test/166-bad-interface-super/expected-stdout.txt
diff --git a/test/167-visit-locks/expected.txt b/test/167-visit-locks/expected-stdout.txt
index 5157c64c83..5157c64c83 100644
--- a/test/167-visit-locks/expected.txt
+++ b/test/167-visit-locks/expected-stdout.txt
diff --git a/test/168-vmstack-annotated/Android.bp b/test/168-vmstack-annotated/Android.bp
index 6353961282..8f04a69f86 100644
--- a/test/168-vmstack-annotated/Android.bp
+++ b/test/168-vmstack-annotated/Android.bp
@@ -8,13 +8,13 @@ java_test {
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-168-vmstack-annotated-expected"],
+    data: [":art-run-test-168-vmstack-annotated-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-168-vmstack-annotated-expected",
-    out: ["art-run-test-168-vmstack-annotated-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-168-vmstack-annotated-expected-stdout",
+    out: ["art-run-test-168-vmstack-annotated-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/168-vmstack-annotated/expected.txt b/test/168-vmstack-annotated/expected-stdout.txt
index e69de29bb2..e69de29bb2 100644
--- a/test/168-vmstack-annotated/expected.txt
+++ b/test/168-vmstack-annotated/expected-stdout.txt
diff --git a/test/169-threadgroup-jni/Android.bp b/test/169-threadgroup-jni/Android.bp
index 7a82116b3f..7a82613ef6 100644
--- a/test/169-threadgroup-jni/Android.bp
+++ b/test/169-threadgroup-jni/Android.bp
@@ -8,13 +8,13 @@ java_test {
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-169-threadgroup-jni-expected"],
+    data: [":art-run-test-169-threadgroup-jni-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-169-threadgroup-jni-expected",
-    out: ["art-run-test-169-threadgroup-jni-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-169-threadgroup-jni-expected-stdout",
+    out: ["art-run-test-169-threadgroup-jni-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/169-threadgroup-jni/expected.txt b/test/169-threadgroup-jni/expected-stdout.txt
index 6a5618ebc6..6a5618ebc6 100644
--- a/test/169-threadgroup-jni/expected.txt
+++ b/test/169-threadgroup-jni/expected-stdout.txt
diff --git a/test/170-interface-init/Android.bp b/test/170-interface-init/Android.bp
index f9b6b51d07..dee00f5b40 100644
--- a/test/170-interface-init/Android.bp
+++ b/test/170-interface-init/Android.bp
@@ -8,13 +8,13 @@ java_test {
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-170-interface-init-expected"],
+    data: [":art-run-test-170-interface-init-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-170-interface-init-expected",
-    out: ["art-run-test-170-interface-init-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-170-interface-init-expected-stdout",
+    out: ["art-run-test-170-interface-init-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/170-interface-init/expected.txt b/test/170-interface-init/expected-stdout.txt
index 619c56180b..619c56180b 100644
--- a/test/170-interface-init/expected.txt
+++ b/test/170-interface-init/expected-stdout.txt
diff --git a/test/171-init-aste/expected.txt b/test/171-init-aste/expected-stdout.txt
index b0aad4deb5..b0aad4deb5 100644
--- a/test/171-init-aste/expected.txt
+++ b/test/171-init-aste/expected-stdout.txt
diff --git a/test/172-app-image-twice/Android.bp b/test/172-app-image-twice/Android.bp
index 5989be1250..10f1b1945a 100644
--- a/test/172-app-image-twice/Android.bp
+++ b/test/172-app-image-twice/Android.bp
@@ -8,13 +8,13 @@ java_test {
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-172-app-image-twice-expected"],
+    data: [":art-run-test-172-app-image-twice-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-172-app-image-twice-expected",
-    out: ["art-run-test-172-app-image-twice-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-172-app-image-twice-expected-stdout",
+    out: ["art-run-test-172-app-image-twice-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/172-app-image-twice/expected.txt b/test/172-app-image-twice/expected-stdout.txt
index b0aad4deb5..b0aad4deb5 100644
--- a/test/172-app-image-twice/expected.txt
+++ b/test/172-app-image-twice/expected-stdout.txt
diff --git a/test/173-missing-field-type/expected.txt b/test/173-missing-field-type/expected-stdout.txt
index e69de29bb2..e69de29bb2 100644
--- a/test/173-missing-field-type/expected.txt
+++ b/test/173-missing-field-type/expected-stdout.txt
diff --git a/test/174-escaping-instance-of-bad-class/Android.bp b/test/174-escaping-instance-of-bad-class/Android.bp
index 71826d8d4d..7d0460170c 100644
--- a/test/174-escaping-instance-of-bad-class/Android.bp
+++ b/test/174-escaping-instance-of-bad-class/Android.bp
@@ -8,13 +8,13 @@ java_test {
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-174-escaping-instance-of-bad-class-expected"],
+    data: [":art-run-test-174-escaping-instance-of-bad-class-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-174-escaping-instance-of-bad-class-expected",
-    out: ["art-run-test-174-escaping-instance-of-bad-class-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-174-escaping-instance-of-bad-class-expected-stdout",
+    out: ["art-run-test-174-escaping-instance-of-bad-class-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/174-escaping-instance-of-bad-class/expected.txt b/test/174-escaping-instance-of-bad-class/expected-stdout.txt
index 4da6a09999..4da6a09999 100644
--- a/test/174-escaping-instance-of-bad-class/expected.txt
+++ b/test/174-escaping-instance-of-bad-class/expected-stdout.txt
diff --git a/test/175-alloc-big-bignums/Android.bp b/test/175-alloc-big-bignums/Android.bp
index 7284fc70cd..e0eb298852 100644
--- a/test/175-alloc-big-bignums/Android.bp
+++ b/test/175-alloc-big-bignums/Android.bp
@@ -8,13 +8,13 @@ java_test {
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-175-alloc-big-bignums-expected"],
+    data: [":art-run-test-175-alloc-big-bignums-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-175-alloc-big-bignums-expected",
-    out: ["art-run-test-175-alloc-big-bignums-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-175-alloc-big-bignums-expected-stdout",
+    out: ["art-run-test-175-alloc-big-bignums-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/175-alloc-big-bignums/expected.txt b/test/175-alloc-big-bignums/expected-stdout.txt
index f75da10caf..f75da10caf 100644
--- a/test/175-alloc-big-bignums/expected.txt
+++ b/test/175-alloc-big-bignums/expected-stdout.txt
diff --git a/test/176-app-image-string/Android.bp b/test/176-app-image-string/Android.bp
index 5e6185cf04..f032c7e356 100644
--- a/test/176-app-image-string/Android.bp
+++ b/test/176-app-image-string/Android.bp
@@ -8,13 +8,13 @@ java_test {
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-176-app-image-string-expected"],
+    data: [":art-run-test-176-app-image-string-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-176-app-image-string-expected",
-    out: ["art-run-test-176-app-image-string-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-176-app-image-string-expected-stdout",
+    out: ["art-run-test-176-app-image-string-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/176-app-image-string/expected.txt b/test/176-app-image-string/expected-stdout.txt
index 2ae28399f5..2ae28399f5 100644
--- a/test/176-app-image-string/expected.txt
+++ b/test/176-app-image-string/expected-stdout.txt
diff --git a/test/177-visibly-initialized-deadlock/Android.bp b/test/177-visibly-initialized-deadlock/Android.bp
index 0ee52c099d..2c2d1e4c53 100644
--- a/test/177-visibly-initialized-deadlock/Android.bp
+++ b/test/177-visibly-initialized-deadlock/Android.bp
@@ -8,13 +8,13 @@ java_test {
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-177-visibly-initialized-deadlock-expected"],
+    data: [":art-run-test-177-visibly-initialized-deadlock-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-177-visibly-initialized-deadlock-expected",
-    out: ["art-run-test-177-visibly-initialized-deadlock-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-177-visibly-initialized-deadlock-expected-stdout",
+    out: ["art-run-test-177-visibly-initialized-deadlock-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/177-visibly-initialized-deadlock/expected.txt b/test/177-visibly-initialized-deadlock/expected-stdout.txt
index 6a5618ebc6..6a5618ebc6 100644
--- a/test/177-visibly-initialized-deadlock/expected.txt
+++ b/test/177-visibly-initialized-deadlock/expected-stdout.txt
diff --git a/test/178-app-image-native-method/Android.bp b/test/178-app-image-native-method/Android.bp
index 58ffea3af8..62a9afb520 100644
--- a/test/178-app-image-native-method/Android.bp
+++ b/test/178-app-image-native-method/Android.bp
@@ -8,13 +8,13 @@ java_test {
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-178-app-image-native-method-expected"],
+    data: [":art-run-test-178-app-image-native-method-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-178-app-image-native-method-expected",
-    out: ["art-run-test-178-app-image-native-method-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-178-app-image-native-method-expected-stdout",
+    out: ["art-run-test-178-app-image-native-method-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/178-app-image-native-method/expected.txt b/test/178-app-image-native-method/expected-stdout.txt
index c6014b652e..c6014b652e 100644
--- a/test/178-app-image-native-method/expected.txt
+++ b/test/178-app-image-native-method/expected-stdout.txt
diff --git a/test/179-nonvirtual-jni/Android.bp b/test/179-nonvirtual-jni/Android.bp
index a3f8c7e895..1a93cc03d3 100644
--- a/test/179-nonvirtual-jni/Android.bp
+++ b/test/179-nonvirtual-jni/Android.bp
@@ -8,13 +8,13 @@ java_test {
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-179-nonvirtual-jni-expected"],
+    data: [":art-run-test-179-nonvirtual-jni-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-179-nonvirtual-jni-expected",
-    out: ["art-run-test-179-nonvirtual-jni-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-179-nonvirtual-jni-expected-stdout",
+    out: ["art-run-test-179-nonvirtual-jni-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/179-nonvirtual-jni/expected.txt b/test/179-nonvirtual-jni/expected-stdout.txt
index 7b603b1cc5..7b603b1cc5 100644
--- a/test/179-nonvirtual-jni/expected.txt
+++ b/test/179-nonvirtual-jni/expected-stdout.txt
diff --git a/test/180-native-default-method/expected.txt b/test/180-native-default-method/expected-stdout.txt
index b0aad4deb5..b0aad4deb5 100644
--- a/test/180-native-default-method/expected.txt
+++ b/test/180-native-default-method/expected-stdout.txt
diff --git a/test/1900-track-alloc/Android.bp b/test/1900-track-alloc/Android.bp
index 866e76b6ce..899a3690e5 100644
--- a/test/1900-track-alloc/Android.bp
+++ b/test/1900-track-alloc/Android.bp
@@ -8,13 +8,13 @@ java_test {
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-1900-track-alloc-expected"],
+    data: [":art-run-test-1900-track-alloc-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-1900-track-alloc-expected",
-    out: ["art-run-test-1900-track-alloc-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-1900-track-alloc-expected-stdout",
+    out: ["art-run-test-1900-track-alloc-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/1900-track-alloc/expected.txt b/test/1900-track-alloc/expected-stdout.txt
index e69de29bb2..e69de29bb2 100644
--- a/test/1900-track-alloc/expected.txt
+++ b/test/1900-track-alloc/expected-stdout.txt
diff --git a/test/1901-get-bytecodes/Android.bp b/test/1901-get-bytecodes/Android.bp
index fa3c57e1b6..8d46b095f8 100644
--- a/test/1901-get-bytecodes/Android.bp
+++ b/test/1901-get-bytecodes/Android.bp
@@ -8,13 +8,13 @@ java_test {
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-1901-get-bytecodes-expected"],
+    data: [":art-run-test-1901-get-bytecodes-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-1901-get-bytecodes-expected",
-    out: ["art-run-test-1901-get-bytecodes-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-1901-get-bytecodes-expected-stdout",
+    out: ["art-run-test-1901-get-bytecodes-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/1901-get-bytecodes/expected.txt b/test/1901-get-bytecodes/expected-stdout.txt
index e69de29bb2..e69de29bb2 100644
--- a/test/1901-get-bytecodes/expected.txt
+++ b/test/1901-get-bytecodes/expected-stdout.txt
diff --git a/test/1902-suspend/Android.bp b/test/1902-suspend/Android.bp
index 987bc24b2c..211ddead7a 100644
--- a/test/1902-suspend/Android.bp
+++ b/test/1902-suspend/Android.bp
@@ -8,13 +8,13 @@ java_test {
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-1902-suspend-expected"],
+    data: [":art-run-test-1902-suspend-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-1902-suspend-expected",
-    out: ["art-run-test-1902-suspend-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-1902-suspend-expected-stdout",
+    out: ["art-run-test-1902-suspend-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/1902-suspend/expected.txt b/test/1902-suspend/expected-stdout.txt
index e69de29bb2..e69de29bb2 100644
--- a/test/1902-suspend/expected.txt
+++ b/test/1902-suspend/expected-stdout.txt
diff --git a/test/1903-suspend-self/Android.bp b/test/1903-suspend-self/Android.bp
index 67ca9b4459..6914be3c02 100644
--- a/test/1903-suspend-self/Android.bp
+++ b/test/1903-suspend-self/Android.bp
@@ -8,13 +8,13 @@ java_test {
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-1903-suspend-self-expected"],
+    data: [":art-run-test-1903-suspend-self-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-1903-suspend-self-expected",
-    out: ["art-run-test-1903-suspend-self-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-1903-suspend-self-expected-stdout",
+    out: ["art-run-test-1903-suspend-self-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/1903-suspend-self/expected.txt b/test/1903-suspend-self/expected-stdout.txt
index e69de29bb2..e69de29bb2 100644
--- a/test/1903-suspend-self/expected.txt
+++ b/test/1903-suspend-self/expected-stdout.txt
diff --git a/test/1904-double-suspend/Android.bp b/test/1904-double-suspend/Android.bp
index 44b8b8698b..0abf3f7fe9 100644
--- a/test/1904-double-suspend/Android.bp
+++ b/test/1904-double-suspend/Android.bp
@@ -8,13 +8,13 @@ java_test {
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-1904-double-suspend-expected"],
+    data: [":art-run-test-1904-double-suspend-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-1904-double-suspend-expected",
-    out: ["art-run-test-1904-double-suspend-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-1904-double-suspend-expected-stdout",
+    out: ["art-run-test-1904-double-suspend-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/1904-double-suspend/expected.txt b/test/1904-double-suspend/expected-stdout.txt
index 321b8a34f1..321b8a34f1 100644
--- a/test/1904-double-suspend/expected.txt
+++ b/test/1904-double-suspend/expected-stdout.txt
diff --git a/test/1905-suspend-native/Android.bp b/test/1905-suspend-native/Android.bp
index 35a7a5e7ae..382b96abcd 100644
--- a/test/1905-suspend-native/Android.bp
+++ b/test/1905-suspend-native/Android.bp
@@ -8,13 +8,13 @@ java_test {
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-1905-suspend-native-expected"],
+    data: [":art-run-test-1905-suspend-native-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-1905-suspend-native-expected",
-    out: ["art-run-test-1905-suspend-native-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-1905-suspend-native-expected-stdout",
+    out: ["art-run-test-1905-suspend-native-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/1905-suspend-native/expected.txt b/test/1905-suspend-native/expected-stdout.txt
index 43b2669fab..43b2669fab 100644
--- a/test/1905-suspend-native/expected.txt
+++ b/test/1905-suspend-native/expected-stdout.txt
diff --git a/test/1906-suspend-list-me-first/Android.bp b/test/1906-suspend-list-me-first/Android.bp
index a900ca8261..377fdcc9da 100644
--- a/test/1906-suspend-list-me-first/Android.bp
+++ b/test/1906-suspend-list-me-first/Android.bp
@@ -8,13 +8,13 @@ java_test {
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-1906-suspend-list-me-first-expected"],
+    data: [":art-run-test-1906-suspend-list-me-first-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-1906-suspend-list-me-first-expected",
-    out: ["art-run-test-1906-suspend-list-me-first-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-1906-suspend-list-me-first-expected-stdout",
+    out: ["art-run-test-1906-suspend-list-me-first-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/1906-suspend-list-me-first/expected.txt b/test/1906-suspend-list-me-first/expected-stdout.txt
index 503d728cb0..503d728cb0 100644
--- a/test/1906-suspend-list-me-first/expected.txt
+++ b/test/1906-suspend-list-me-first/expected-stdout.txt
diff --git a/test/1907-suspend-list-self-twice/Android.bp b/test/1907-suspend-list-self-twice/Android.bp
index 8ef235f898..0985684c36 100644
--- a/test/1907-suspend-list-self-twice/Android.bp
+++ b/test/1907-suspend-list-self-twice/Android.bp
@@ -8,13 +8,13 @@ java_test {
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-1907-suspend-list-self-twice-expected"],
+    data: [":art-run-test-1907-suspend-list-self-twice-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-1907-suspend-list-self-twice-expected",
-    out: ["art-run-test-1907-suspend-list-self-twice-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-1907-suspend-list-self-twice-expected-stdout",
+    out: ["art-run-test-1907-suspend-list-self-twice-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/1907-suspend-list-self-twice/expected.txt b/test/1907-suspend-list-self-twice/expected-stdout.txt
index cd9b53f4a8..cd9b53f4a8 100644
--- a/test/1907-suspend-list-self-twice/expected.txt
+++ b/test/1907-suspend-list-self-twice/expected-stdout.txt
diff --git a/test/1908-suspend-native-resume-self/Android.bp b/test/1908-suspend-native-resume-self/Android.bp
index 845872d11d..24f60d7240 100644
--- a/test/1908-suspend-native-resume-self/Android.bp
+++ b/test/1908-suspend-native-resume-self/Android.bp
@@ -8,13 +8,13 @@ java_test {
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-1908-suspend-native-resume-self-expected"],
+    data: [":art-run-test-1908-suspend-native-resume-self-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-1908-suspend-native-resume-self-expected",
-    out: ["art-run-test-1908-suspend-native-resume-self-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-1908-suspend-native-resume-self-expected-stdout",
+    out: ["art-run-test-1908-suspend-native-resume-self-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/1908-suspend-native-resume-self/expected.txt b/test/1908-suspend-native-resume-self/expected-stdout.txt
index 13cc517d68..13cc517d68 100644
--- a/test/1908-suspend-native-resume-self/expected.txt
+++ b/test/1908-suspend-native-resume-self/expected-stdout.txt
diff --git a/test/1909-per-agent-tls/Android.bp b/test/1909-per-agent-tls/Android.bp
index 603db802da..58deecfc67 100644
--- a/test/1909-per-agent-tls/Android.bp
+++ b/test/1909-per-agent-tls/Android.bp
@@ -8,13 +8,13 @@ java_test {
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-1909-per-agent-tls-expected"],
+    data: [":art-run-test-1909-per-agent-tls-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-1909-per-agent-tls-expected",
-    out: ["art-run-test-1909-per-agent-tls-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-1909-per-agent-tls-expected-stdout",
+    out: ["art-run-test-1909-per-agent-tls-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/1909-per-agent-tls/expected.txt b/test/1909-per-agent-tls/expected-stdout.txt
index 386f3d2fd8..386f3d2fd8 100644
--- a/test/1909-per-agent-tls/expected.txt
+++ b/test/1909-per-agent-tls/expected-stdout.txt
diff --git a/test/1910-transform-with-default/Android.bp b/test/1910-transform-with-default/Android.bp
index 9746611304..fde60f6320 100644
--- a/test/1910-transform-with-default/Android.bp
+++ b/test/1910-transform-with-default/Android.bp
@@ -8,13 +8,13 @@ java_test {
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-1910-transform-with-default-expected"],
+    data: [":art-run-test-1910-transform-with-default-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-1910-transform-with-default-expected",
-    out: ["art-run-test-1910-transform-with-default-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-1910-transform-with-default-expected-stdout",
+    out: ["art-run-test-1910-transform-with-default-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/1910-transform-with-default/expected.txt b/test/1910-transform-with-default/expected-stdout.txt
index f43ef61ec9..f43ef61ec9 100644
--- a/test/1910-transform-with-default/expected.txt
+++ b/test/1910-transform-with-default/expected-stdout.txt
diff --git a/test/1911-get-local-var-table/Android.bp b/test/1911-get-local-var-table/Android.bp
index 7694b281f6..bec6853739 100644
--- a/test/1911-get-local-var-table/Android.bp
+++ b/test/1911-get-local-var-table/Android.bp
@@ -8,13 +8,13 @@ java_test {
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-1911-get-local-var-table-expected"],
+    data: [":art-run-test-1911-get-local-var-table-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-1911-get-local-var-table-expected",
-    out: ["art-run-test-1911-get-local-var-table-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-1911-get-local-var-table-expected-stdout",
+    out: ["art-run-test-1911-get-local-var-table-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/1911-get-local-var-table/expected.txt b/test/1911-get-local-var-table/expected-stdout.txt
index e69de29bb2..e69de29bb2 100644
--- a/test/1911-get-local-var-table/expected.txt
+++ b/test/1911-get-local-var-table/expected-stdout.txt
diff --git a/test/1912-get-set-local-primitive/Android.bp b/test/1912-get-set-local-primitive/Android.bp
index 7155d439df..eaa8b018a6 100644
--- a/test/1912-get-set-local-primitive/Android.bp
+++ b/test/1912-get-set-local-primitive/Android.bp
@@ -8,13 +8,13 @@ java_test {
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-1912-get-set-local-primitive-expected"],
+    data: [":art-run-test-1912-get-set-local-primitive-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-1912-get-set-local-primitive-expected",
-    out: ["art-run-test-1912-get-set-local-primitive-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-1912-get-set-local-primitive-expected-stdout",
+    out: ["art-run-test-1912-get-set-local-primitive-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/1912-get-set-local-primitive/expected.txt b/test/1912-get-set-local-primitive/expected-stdout.txt
index 8a0356644d..8a0356644d 100644
--- a/test/1912-get-set-local-primitive/expected.txt
+++ b/test/1912-get-set-local-primitive/expected-stdout.txt
diff --git a/test/1913-get-set-local-objects/Android.bp b/test/1913-get-set-local-objects/Android.bp
index 7df00e2512..d58183c459 100644
--- a/test/1913-get-set-local-objects/Android.bp
+++ b/test/1913-get-set-local-objects/Android.bp
@@ -8,13 +8,13 @@ java_test {
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-1913-get-set-local-objects-expected"],
+    data: [":art-run-test-1913-get-set-local-objects-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-1913-get-set-local-objects-expected",
-    out: ["art-run-test-1913-get-set-local-objects-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-1913-get-set-local-objects-expected-stdout",
+    out: ["art-run-test-1913-get-set-local-objects-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/1913-get-set-local-objects/expected.txt b/test/1913-get-set-local-objects/expected-stdout.txt
index 2338915635..2338915635 100644
--- a/test/1913-get-set-local-objects/expected.txt
+++ b/test/1913-get-set-local-objects/expected-stdout.txt
diff --git a/test/1914-get-local-instance/Android.bp b/test/1914-get-local-instance/Android.bp
index 361dac5a5e..68006e3dee 100644
--- a/test/1914-get-local-instance/Android.bp
+++ b/test/1914-get-local-instance/Android.bp
@@ -8,13 +8,13 @@ java_test {
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-1914-get-local-instance-expected"],
+    data: [":art-run-test-1914-get-local-instance-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-1914-get-local-instance-expected",
-    out: ["art-run-test-1914-get-local-instance-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-1914-get-local-instance-expected-stdout",
+    out: ["art-run-test-1914-get-local-instance-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/1914-get-local-instance/expected.txt b/test/1914-get-local-instance/expected-stdout.txt
index 09f0df1937..09f0df1937 100644
--- a/test/1914-get-local-instance/expected.txt
+++ b/test/1914-get-local-instance/expected-stdout.txt
diff --git a/test/1915-get-set-local-current-thread/Android.bp b/test/1915-get-set-local-current-thread/Android.bp
index c93992c373..d756070684 100644
--- a/test/1915-get-set-local-current-thread/Android.bp
+++ b/test/1915-get-set-local-current-thread/Android.bp
@@ -8,13 +8,13 @@ java_test {
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-1915-get-set-local-current-thread-expected"],
+    data: [":art-run-test-1915-get-set-local-current-thread-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-1915-get-set-local-current-thread-expected",
-    out: ["art-run-test-1915-get-set-local-current-thread-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-1915-get-set-local-current-thread-expected-stdout",
+    out: ["art-run-test-1915-get-set-local-current-thread-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/1915-get-set-local-current-thread/expected.txt b/test/1915-get-set-local-current-thread/expected-stdout.txt
index de39ca9554..de39ca9554 100644
--- a/test/1915-get-set-local-current-thread/expected.txt
+++ b/test/1915-get-set-local-current-thread/expected-stdout.txt
diff --git a/test/1916-get-set-current-frame/Android.bp b/test/1916-get-set-current-frame/Android.bp
index 8536bcd575..151378ddfa 100644
--- a/test/1916-get-set-current-frame/Android.bp
+++ b/test/1916-get-set-current-frame/Android.bp
@@ -8,13 +8,13 @@ java_test {
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-1916-get-set-current-frame-expected"],
+    data: [":art-run-test-1916-get-set-current-frame-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-1916-get-set-current-frame-expected",
-    out: ["art-run-test-1916-get-set-current-frame-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-1916-get-set-current-frame-expected-stdout",
+    out: ["art-run-test-1916-get-set-current-frame-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/1916-get-set-current-frame/expected.txt b/test/1916-get-set-current-frame/expected-stdout.txt
index 343d49310e..343d49310e 100644
--- a/test/1916-get-set-current-frame/expected.txt
+++ b/test/1916-get-set-current-frame/expected-stdout.txt
diff --git a/test/1917-get-stack-frame/Android.bp b/test/1917-get-stack-frame/Android.bp
index cecfff51e1..27a55ed9d3 100644
--- a/test/1917-get-stack-frame/Android.bp
+++ b/test/1917-get-stack-frame/Android.bp
@@ -8,13 +8,13 @@ java_test {
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-1917-get-stack-frame-expected"],
+    data: [":art-run-test-1917-get-stack-frame-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-1917-get-stack-frame-expected",
-    out: ["art-run-test-1917-get-stack-frame-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-1917-get-stack-frame-expected-stdout",
+    out: ["art-run-test-1917-get-stack-frame-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/1917-get-stack-frame/expected.txt b/test/1917-get-stack-frame/expected-stdout.txt
index 06f5873d76..06f5873d76 100644
--- a/test/1917-get-stack-frame/expected.txt
+++ b/test/1917-get-stack-frame/expected-stdout.txt
diff --git a/test/1919-vminit-thread-start-timing/Android.bp b/test/1919-vminit-thread-start-timing/Android.bp
index 93f7c3c812..50f7809434 100644
--- a/test/1919-vminit-thread-start-timing/Android.bp
+++ b/test/1919-vminit-thread-start-timing/Android.bp
@@ -8,13 +8,13 @@ java_test {
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-1919-vminit-thread-start-timing-expected"],
+    data: [":art-run-test-1919-vminit-thread-start-timing-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-1919-vminit-thread-start-timing-expected",
-    out: ["art-run-test-1919-vminit-thread-start-timing-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-1919-vminit-thread-start-timing-expected-stdout",
+    out: ["art-run-test-1919-vminit-thread-start-timing-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/1919-vminit-thread-start-timing/expected.txt b/test/1919-vminit-thread-start-timing/expected-stdout.txt
index 63614512cf..63614512cf 100644
--- a/test/1919-vminit-thread-start-timing/expected.txt
+++ b/test/1919-vminit-thread-start-timing/expected-stdout.txt
diff --git a/test/1920-suspend-native-monitor/Android.bp b/test/1920-suspend-native-monitor/Android.bp
index 843124bfbd..1074e68dc6 100644
--- a/test/1920-suspend-native-monitor/Android.bp
+++ b/test/1920-suspend-native-monitor/Android.bp
@@ -8,13 +8,13 @@ java_test {
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-1920-suspend-native-monitor-expected"],
+    data: [":art-run-test-1920-suspend-native-monitor-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-1920-suspend-native-monitor-expected",
-    out: ["art-run-test-1920-suspend-native-monitor-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-1920-suspend-native-monitor-expected-stdout",
+    out: ["art-run-test-1920-suspend-native-monitor-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/1920-suspend-native-monitor/expected.txt b/test/1920-suspend-native-monitor/expected-stdout.txt
index 2b1db089d9..2b1db089d9 100644
--- a/test/1920-suspend-native-monitor/expected.txt
+++ b/test/1920-suspend-native-monitor/expected-stdout.txt
diff --git a/test/1921-suspend-native-recursive-monitor/Android.bp b/test/1921-suspend-native-recursive-monitor/Android.bp
index b31085fc15..c1434008a0 100644
--- a/test/1921-suspend-native-recursive-monitor/Android.bp
+++ b/test/1921-suspend-native-recursive-monitor/Android.bp
@@ -8,13 +8,13 @@ java_test {
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-1921-suspend-native-recursive-monitor-expected"],
+    data: [":art-run-test-1921-suspend-native-recursive-monitor-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-1921-suspend-native-recursive-monitor-expected",
-    out: ["art-run-test-1921-suspend-native-recursive-monitor-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-1921-suspend-native-recursive-monitor-expected-stdout",
+    out: ["art-run-test-1921-suspend-native-recursive-monitor-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/1921-suspend-native-recursive-monitor/expected.txt b/test/1921-suspend-native-recursive-monitor/expected-stdout.txt
index 2b1db089d9..2b1db089d9 100644
--- a/test/1921-suspend-native-recursive-monitor/expected.txt
+++ b/test/1921-suspend-native-recursive-monitor/expected-stdout.txt
diff --git a/test/1922-owned-monitors-info/Android.bp b/test/1922-owned-monitors-info/Android.bp
index f0b9b84ce3..6f0600d881 100644
--- a/test/1922-owned-monitors-info/Android.bp
+++ b/test/1922-owned-monitors-info/Android.bp
@@ -8,13 +8,13 @@ java_test {
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-1922-owned-monitors-info-expected"],
+    data: [":art-run-test-1922-owned-monitors-info-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-1922-owned-monitors-info-expected",
-    out: ["art-run-test-1922-owned-monitors-info-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-1922-owned-monitors-info-expected-stdout",
+    out: ["art-run-test-1922-owned-monitors-info-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/1922-owned-monitors-info/expected.txt b/test/1922-owned-monitors-info/expected-stdout.txt
index f66d1d584e..f66d1d584e 100644
--- a/test/1922-owned-monitors-info/expected.txt
+++ b/test/1922-owned-monitors-info/expected-stdout.txt
diff --git a/test/1923-frame-pop/Android.bp b/test/1923-frame-pop/Android.bp
index 560eb1fa6b..47dde46fcd 100644
--- a/test/1923-frame-pop/Android.bp
+++ b/test/1923-frame-pop/Android.bp
@@ -8,13 +8,13 @@ java_test {
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-1923-frame-pop-expected"],
+    data: [":art-run-test-1923-frame-pop-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-1923-frame-pop-expected",
-    out: ["art-run-test-1923-frame-pop-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-1923-frame-pop-expected-stdout",
+    out: ["art-run-test-1923-frame-pop-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/1923-frame-pop/expected.txt b/test/1923-frame-pop/expected-stdout.txt
index 7bc001da6c..7bc001da6c 100644
--- a/test/1923-frame-pop/expected.txt
+++ b/test/1923-frame-pop/expected-stdout.txt
diff --git a/test/1924-frame-pop-toggle/Android.bp b/test/1924-frame-pop-toggle/Android.bp
index 3e43f06cf9..95dd0e47f6 100644
--- a/test/1924-frame-pop-toggle/Android.bp
+++ b/test/1924-frame-pop-toggle/Android.bp
@@ -8,13 +8,13 @@ java_test {
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-1924-frame-pop-toggle-expected"],
+    data: [":art-run-test-1924-frame-pop-toggle-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-1924-frame-pop-toggle-expected",
-    out: ["art-run-test-1924-frame-pop-toggle-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-1924-frame-pop-toggle-expected-stdout",
+    out: ["art-run-test-1924-frame-pop-toggle-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/1924-frame-pop-toggle/expected.txt b/test/1924-frame-pop-toggle/expected-stdout.txt
index 64ca9db74b..64ca9db74b 100644
--- a/test/1924-frame-pop-toggle/expected.txt
+++ b/test/1924-frame-pop-toggle/expected-stdout.txt
diff --git a/test/1925-self-frame-pop/Android.bp b/test/1925-self-frame-pop/Android.bp
index 0bcdcf4bbb..9fdc253fe4 100644
--- a/test/1925-self-frame-pop/Android.bp
+++ b/test/1925-self-frame-pop/Android.bp
@@ -8,13 +8,13 @@ java_test {
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-1925-self-frame-pop-expected"],
+    data: [":art-run-test-1925-self-frame-pop-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-1925-self-frame-pop-expected",
-    out: ["art-run-test-1925-self-frame-pop-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-1925-self-frame-pop-expected-stdout",
+    out: ["art-run-test-1925-self-frame-pop-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/1925-self-frame-pop/expected.txt b/test/1925-self-frame-pop/expected-stdout.txt
index f154205a0f..f154205a0f 100644
--- a/test/1925-self-frame-pop/expected.txt
+++ b/test/1925-self-frame-pop/expected-stdout.txt
diff --git a/test/1926-missed-frame-pop/Android.bp b/test/1926-missed-frame-pop/Android.bp
index 720c9efae7..e3c7709f31 100644
--- a/test/1926-missed-frame-pop/Android.bp
+++ b/test/1926-missed-frame-pop/Android.bp
@@ -8,13 +8,13 @@ java_test {
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-1926-missed-frame-pop-expected"],
+    data: [":art-run-test-1926-missed-frame-pop-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-1926-missed-frame-pop-expected",
-    out: ["art-run-test-1926-missed-frame-pop-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-1926-missed-frame-pop-expected-stdout",
+    out: ["art-run-test-1926-missed-frame-pop-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/1926-missed-frame-pop/expected.txt b/test/1926-missed-frame-pop/expected-stdout.txt
index 20e723f3ee..20e723f3ee 100644
--- a/test/1926-missed-frame-pop/expected.txt
+++ b/test/1926-missed-frame-pop/expected-stdout.txt
diff --git a/test/1927-exception-event/Android.bp b/test/1927-exception-event/Android.bp
index 4fe46ffc23..493980c944 100644
--- a/test/1927-exception-event/Android.bp
+++ b/test/1927-exception-event/Android.bp
@@ -8,13 +8,13 @@ java_test {
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-1927-exception-event-expected"],
+    data: [":art-run-test-1927-exception-event-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-1927-exception-event-expected",
-    out: ["art-run-test-1927-exception-event-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-1927-exception-event-expected-stdout",
+    out: ["art-run-test-1927-exception-event-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/1927-exception-event/expected.txt b/test/1927-exception-event/expected-stdout.txt
index fcdd814977..fcdd814977 100644
--- a/test/1927-exception-event/expected.txt
+++ b/test/1927-exception-event/expected-stdout.txt
diff --git a/test/1928-exception-event-exception/Android.bp b/test/1928-exception-event-exception/Android.bp
index 88224b1656..776699b5dd 100644
--- a/test/1928-exception-event-exception/Android.bp
+++ b/test/1928-exception-event-exception/Android.bp
@@ -8,13 +8,13 @@ java_test {
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-1928-exception-event-exception-expected"],
+    data: [":art-run-test-1928-exception-event-exception-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-1928-exception-event-exception-expected",
-    out: ["art-run-test-1928-exception-event-exception-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-1928-exception-event-exception-expected-stdout",
+    out: ["art-run-test-1928-exception-event-exception-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/1928-exception-event-exception/expected.txt b/test/1928-exception-event-exception/expected-stdout.txt
index 73c69727aa..73c69727aa 100644
--- a/test/1928-exception-event-exception/expected.txt
+++ b/test/1928-exception-event-exception/expected-stdout.txt
diff --git a/test/1929-exception-catch-exception/expected.txt b/test/1929-exception-catch-exception/expected-stdout.txt
index a82b732eda..a82b732eda 100644
--- a/test/1929-exception-catch-exception/expected.txt
+++ b/test/1929-exception-catch-exception/expected-stdout.txt
diff --git a/test/1930-monitor-info/Android.bp b/test/1930-monitor-info/Android.bp
index 32d5da3320..4fd007f1f7 100644
--- a/test/1930-monitor-info/Android.bp
+++ b/test/1930-monitor-info/Android.bp
@@ -8,13 +8,13 @@ java_test {
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-1930-monitor-info-expected"],
+    data: [":art-run-test-1930-monitor-info-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-1930-monitor-info-expected",
-    out: ["art-run-test-1930-monitor-info-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-1930-monitor-info-expected-stdout",
+    out: ["art-run-test-1930-monitor-info-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/1930-monitor-info/expected.txt b/test/1930-monitor-info/expected-stdout.txt
index b43f1b20b6..b43f1b20b6 100644
--- a/test/1930-monitor-info/expected.txt
+++ b/test/1930-monitor-info/expected-stdout.txt
diff --git a/test/1931-monitor-events/Android.bp b/test/1931-monitor-events/Android.bp
index 692a185eb5..b47c6e5e12 100644
--- a/test/1931-monitor-events/Android.bp
+++ b/test/1931-monitor-events/Android.bp
@@ -8,13 +8,13 @@ java_test {
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-1931-monitor-events-expected"],
+    data: [":art-run-test-1931-monitor-events-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-1931-monitor-events-expected",
-    out: ["art-run-test-1931-monitor-events-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-1931-monitor-events-expected-stdout",
+    out: ["art-run-test-1931-monitor-events-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/1931-monitor-events/check b/test/1931-monitor-events/check
index 8a7f844283..53d6a4a337 100644
--- a/test/1931-monitor-events/check
+++ b/test/1931-monitor-events/check
@@ -16,7 +16,7 @@
 
 # Art sends events for park/unpark, and the RI doesn't. Remove it from the expected output.
 if [[ "$TEST_RUNTIME" == "jvm" ]]; then
-  patch -p0 expected.txt < jvm-expected.patch >/dev/null
+  patch -p0 expected-stdout.txt < jvm-expected.patch >/dev/null
 fi
 
 ./default-check "$@"
diff --git a/test/1931-monitor-events/expected.txt b/test/1931-monitor-events/expected-stdout.txt
index f368ae20be..f368ae20be 100644
--- a/test/1931-monitor-events/expected.txt
+++ b/test/1931-monitor-events/expected-stdout.txt
diff --git a/test/1932-monitor-events-misc/Android.bp b/test/1932-monitor-events-misc/Android.bp
index 940e92a3c1..a081663ce7 100644
--- a/test/1932-monitor-events-misc/Android.bp
+++ b/test/1932-monitor-events-misc/Android.bp
@@ -8,13 +8,13 @@ java_test {
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-1932-monitor-events-misc-expected"],
+    data: [":art-run-test-1932-monitor-events-misc-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-1932-monitor-events-misc-expected",
-    out: ["art-run-test-1932-monitor-events-misc-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-1932-monitor-events-misc-expected-stdout",
+    out: ["art-run-test-1932-monitor-events-misc-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/1932-monitor-events-misc/check b/test/1932-monitor-events-misc/check
index 8a84388a8f..05cbb5f700 100644
--- a/test/1932-monitor-events-misc/check
+++ b/test/1932-monitor-events-misc/check
@@ -16,7 +16,7 @@
 
 # The RI sends an extra event that art doesn't. Add it to the expected output.
 if [[ "$TEST_RUNTIME" == "jvm" ]]; then
-  patch -p0 expected.txt < jvm-expected.patch >/dev/null
+  patch -p0 expected-stdout.txt < jvm-expected.patch >/dev/null
 fi
 
 ./default-check "$@"
diff --git a/test/1932-monitor-events-misc/expected.txt b/test/1932-monitor-events-misc/expected-stdout.txt
index b33aa7d3a3..b33aa7d3a3 100644
--- a/test/1932-monitor-events-misc/expected.txt
+++ b/test/1932-monitor-events-misc/expected-stdout.txt
diff --git a/test/1933-monitor-current-contended/Android.bp b/test/1933-monitor-current-contended/Android.bp
index 19d881a20a..7e7e81281c 100644
--- a/test/1933-monitor-current-contended/Android.bp
+++ b/test/1933-monitor-current-contended/Android.bp
@@ -8,13 +8,13 @@ java_test {
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-1933-monitor-current-contended-expected"],
+    data: [":art-run-test-1933-monitor-current-contended-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-1933-monitor-current-contended-expected",
-    out: ["art-run-test-1933-monitor-current-contended-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-1933-monitor-current-contended-expected-stdout",
+    out: ["art-run-test-1933-monitor-current-contended-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/1933-monitor-current-contended/expected.txt b/test/1933-monitor-current-contended/expected-stdout.txt
index d27c21c115..d27c21c115 100644
--- a/test/1933-monitor-current-contended/expected.txt
+++ b/test/1933-monitor-current-contended/expected-stdout.txt
diff --git a/test/1934-jvmti-signal-thread/Android.bp b/test/1934-jvmti-signal-thread/Android.bp
index c1a73ea455..74cfd88135 100644
--- a/test/1934-jvmti-signal-thread/Android.bp
+++ b/test/1934-jvmti-signal-thread/Android.bp
@@ -8,13 +8,13 @@ java_test {
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-1934-jvmti-signal-thread-expected"],
+    data: [":art-run-test-1934-jvmti-signal-thread-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-1934-jvmti-signal-thread-expected",
-    out: ["art-run-test-1934-jvmti-signal-thread-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-1934-jvmti-signal-thread-expected-stdout",
+    out: ["art-run-test-1934-jvmti-signal-thread-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/1934-jvmti-signal-thread/expected.txt b/test/1934-jvmti-signal-thread/expected-stdout.txt
index 69a0e9e9db..69a0e9e9db 100644
--- a/test/1934-jvmti-signal-thread/expected.txt
+++ b/test/1934-jvmti-signal-thread/expected-stdout.txt
diff --git a/test/1935-get-set-current-frame-jit/Android.bp b/test/1935-get-set-current-frame-jit/Android.bp
index 0f51baaa00..684ed9b0eb 100644
--- a/test/1935-get-set-current-frame-jit/Android.bp
+++ b/test/1935-get-set-current-frame-jit/Android.bp
@@ -8,13 +8,13 @@ java_test {
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-1935-get-set-current-frame-jit-expected"],
+    data: [":art-run-test-1935-get-set-current-frame-jit-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-1935-get-set-current-frame-jit-expected",
-    out: ["art-run-test-1935-get-set-current-frame-jit-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-1935-get-set-current-frame-jit-expected-stdout",
+    out: ["art-run-test-1935-get-set-current-frame-jit-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/1935-get-set-current-frame-jit/expected.txt b/test/1935-get-set-current-frame-jit/expected-stdout.txt
index a685891775..a685891775 100644
--- a/test/1935-get-set-current-frame-jit/expected.txt
+++ b/test/1935-get-set-current-frame-jit/expected-stdout.txt
diff --git a/test/1936-thread-end-events/Android.bp b/test/1936-thread-end-events/Android.bp
index 53fd795a40..fe13d5113f 100644
--- a/test/1936-thread-end-events/Android.bp
+++ b/test/1936-thread-end-events/Android.bp
@@ -8,13 +8,13 @@ java_test {
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-1936-thread-end-events-expected"],
+    data: [":art-run-test-1936-thread-end-events-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-1936-thread-end-events-expected",
-    out: ["art-run-test-1936-thread-end-events-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-1936-thread-end-events-expected-stdout",
+    out: ["art-run-test-1936-thread-end-events-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/1936-thread-end-events/check b/test/1936-thread-end-events/check
index 8a84388a8f..05cbb5f700 100644
--- a/test/1936-thread-end-events/check
+++ b/test/1936-thread-end-events/check
@@ -16,7 +16,7 @@
 
 # The RI sends an extra event that art doesn't. Add it to the expected output.
 if [[ "$TEST_RUNTIME" == "jvm" ]]; then
-  patch -p0 expected.txt < jvm-expected.patch >/dev/null
+  patch -p0 expected-stdout.txt < jvm-expected.patch >/dev/null
 fi
 
 ./default-check "$@"
diff --git a/test/1936-thread-end-events/expected.txt b/test/1936-thread-end-events/expected-stdout.txt
index 6b71c5e2c5..6b71c5e2c5 100644
--- a/test/1936-thread-end-events/expected.txt
+++ b/test/1936-thread-end-events/expected-stdout.txt
diff --git a/test/1937-transform-soft-fail/Android.bp b/test/1937-transform-soft-fail/Android.bp
index c9fb982085..2ca7b27c01 100644
--- a/test/1937-transform-soft-fail/Android.bp
+++ b/test/1937-transform-soft-fail/Android.bp
@@ -8,13 +8,13 @@ java_test {
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-1937-transform-soft-fail-expected"],
+    data: [":art-run-test-1937-transform-soft-fail-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-1937-transform-soft-fail-expected",
-    out: ["art-run-test-1937-transform-soft-fail-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-1937-transform-soft-fail-expected-stdout",
+    out: ["art-run-test-1937-transform-soft-fail-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/1937-transform-soft-fail/expected.txt b/test/1937-transform-soft-fail/expected-stdout.txt
index f0f6ac80fc..f0f6ac80fc 100644
--- a/test/1937-transform-soft-fail/expected.txt
+++ b/test/1937-transform-soft-fail/expected-stdout.txt
diff --git a/test/1938-transform-abstract-single-impl/Android.bp b/test/1938-transform-abstract-single-impl/Android.bp
index 0802186226..d1312efed9 100644
--- a/test/1938-transform-abstract-single-impl/Android.bp
+++ b/test/1938-transform-abstract-single-impl/Android.bp
@@ -8,13 +8,13 @@ java_test {
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-1938-transform-abstract-single-impl-expected"],
+    data: [":art-run-test-1938-transform-abstract-single-impl-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-1938-transform-abstract-single-impl-expected",
-    out: ["art-run-test-1938-transform-abstract-single-impl-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-1938-transform-abstract-single-impl-expected-stdout",
+    out: ["art-run-test-1938-transform-abstract-single-impl-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/1938-transform-abstract-single-impl/expected.txt b/test/1938-transform-abstract-single-impl/expected-stdout.txt
index 6a06f9baab..6a06f9baab 100644
--- a/test/1938-transform-abstract-single-impl/expected.txt
+++ b/test/1938-transform-abstract-single-impl/expected-stdout.txt
diff --git a/test/1939-proxy-frames/Android.bp b/test/1939-proxy-frames/Android.bp
index ff3d5cdc05..40c224e16f 100644
--- a/test/1939-proxy-frames/Android.bp
+++ b/test/1939-proxy-frames/Android.bp
@@ -8,13 +8,13 @@ java_test {
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-1939-proxy-frames-expected"],
+    data: [":art-run-test-1939-proxy-frames-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-1939-proxy-frames-expected",
-    out: ["art-run-test-1939-proxy-frames-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-1939-proxy-frames-expected-stdout",
+    out: ["art-run-test-1939-proxy-frames-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/1939-proxy-frames/expected.txt b/test/1939-proxy-frames/expected-stdout.txt
index 3aafd16a08..3aafd16a08 100644
--- a/test/1939-proxy-frames/expected.txt
+++ b/test/1939-proxy-frames/expected-stdout.txt
diff --git a/test/1940-ddms-ext/expected.txt b/test/1940-ddms-ext/expected-stdout.txt
index 5af111676b..5af111676b 100644
--- a/test/1940-ddms-ext/expected.txt
+++ b/test/1940-ddms-ext/expected-stdout.txt
diff --git a/test/1941-dispose-stress/Android.bp b/test/1941-dispose-stress/Android.bp
index ac6fb5c5a6..6bb5c36f4b 100644
--- a/test/1941-dispose-stress/Android.bp
+++ b/test/1941-dispose-stress/Android.bp
@@ -8,13 +8,13 @@ java_test {
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-1941-dispose-stress-expected"],
+    data: [":art-run-test-1941-dispose-stress-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-1941-dispose-stress-expected",
-    out: ["art-run-test-1941-dispose-stress-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-1941-dispose-stress-expected-stdout",
+    out: ["art-run-test-1941-dispose-stress-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/1941-dispose-stress/expected.txt b/test/1941-dispose-stress/expected-stdout.txt
index ca2eddc7b8..ca2eddc7b8 100644
--- a/test/1941-dispose-stress/expected.txt
+++ b/test/1941-dispose-stress/expected-stdout.txt
diff --git a/test/1942-suspend-raw-monitor-exit/Android.bp b/test/1942-suspend-raw-monitor-exit/Android.bp
index cf1886f340..b2b80700e2 100644
--- a/test/1942-suspend-raw-monitor-exit/Android.bp
+++ b/test/1942-suspend-raw-monitor-exit/Android.bp
@@ -8,13 +8,13 @@ java_test {
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-1942-suspend-raw-monitor-exit-expected"],
+    data: [":art-run-test-1942-suspend-raw-monitor-exit-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-1942-suspend-raw-monitor-exit-expected",
-    out: ["art-run-test-1942-suspend-raw-monitor-exit-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-1942-suspend-raw-monitor-exit-expected-stdout",
+    out: ["art-run-test-1942-suspend-raw-monitor-exit-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/1942-suspend-raw-monitor-exit/expected.txt b/test/1942-suspend-raw-monitor-exit/expected-stdout.txt
index 182e197c05..182e197c05 100644
--- a/test/1942-suspend-raw-monitor-exit/expected.txt
+++ b/test/1942-suspend-raw-monitor-exit/expected-stdout.txt
diff --git a/test/1943-suspend-raw-monitor-wait/Android.bp b/test/1943-suspend-raw-monitor-wait/Android.bp
index 1aa2636e57..902cb48384 100644
--- a/test/1943-suspend-raw-monitor-wait/Android.bp
+++ b/test/1943-suspend-raw-monitor-wait/Android.bp
@@ -8,13 +8,13 @@ java_test {
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-1943-suspend-raw-monitor-wait-expected"],
+    data: [":art-run-test-1943-suspend-raw-monitor-wait-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-1943-suspend-raw-monitor-wait-expected",
-    out: ["art-run-test-1943-suspend-raw-monitor-wait-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-1943-suspend-raw-monitor-wait-expected-stdout",
+    out: ["art-run-test-1943-suspend-raw-monitor-wait-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/1943-suspend-raw-monitor-wait/expected.txt b/test/1943-suspend-raw-monitor-wait/expected-stdout.txt
index 9bb1ca37d0..9bb1ca37d0 100644
--- a/test/1943-suspend-raw-monitor-wait/expected.txt
+++ b/test/1943-suspend-raw-monitor-wait/expected-stdout.txt
diff --git a/test/1945-proxy-method-arguments/Android.bp b/test/1945-proxy-method-arguments/Android.bp
index b5db6d7515..7236fd18c6 100644
--- a/test/1945-proxy-method-arguments/Android.bp
+++ b/test/1945-proxy-method-arguments/Android.bp
@@ -8,13 +8,13 @@ java_test {
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-1945-proxy-method-arguments-expected"],
+    data: [":art-run-test-1945-proxy-method-arguments-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-1945-proxy-method-arguments-expected",
-    out: ["art-run-test-1945-proxy-method-arguments-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-1945-proxy-method-arguments-expected-stdout",
+    out: ["art-run-test-1945-proxy-method-arguments-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/1945-proxy-method-arguments/expected.txt b/test/1945-proxy-method-arguments/expected-stdout.txt
index 1824953202..1824953202 100644
--- a/test/1945-proxy-method-arguments/expected.txt
+++ b/test/1945-proxy-method-arguments/expected-stdout.txt
diff --git a/test/1946-list-descriptors/expected.txt b/test/1946-list-descriptors/expected-stdout.txt
index 53e0935967..53e0935967 100644
--- a/test/1946-list-descriptors/expected.txt
+++ b/test/1946-list-descriptors/expected-stdout.txt
diff --git a/test/1947-breakpoint-redefine-deopt/Android.bp b/test/1947-breakpoint-redefine-deopt/Android.bp
index ce1eff91a0..9aaa7df2f0 100644
--- a/test/1947-breakpoint-redefine-deopt/Android.bp
+++ b/test/1947-breakpoint-redefine-deopt/Android.bp
@@ -8,13 +8,13 @@ java_test {
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-1947-breakpoint-redefine-deopt-expected"],
+    data: [":art-run-test-1947-breakpoint-redefine-deopt-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-1947-breakpoint-redefine-deopt-expected",
-    out: ["art-run-test-1947-breakpoint-redefine-deopt-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-1947-breakpoint-redefine-deopt-expected-stdout",
+    out: ["art-run-test-1947-breakpoint-redefine-deopt-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/1947-breakpoint-redefine-deopt/expected.txt b/test/1947-breakpoint-redefine-deopt/expected-stdout.txt
index 558e2a8036..558e2a8036 100644
--- a/test/1947-breakpoint-redefine-deopt/expected.txt
+++ b/test/1947-breakpoint-redefine-deopt/expected-stdout.txt
diff --git a/test/1948-obsolete-const-method-handle/expected.txt b/test/1948-obsolete-const-method-handle/expected-stdout.txt
index a0b80a4726..a0b80a4726 100644
--- a/test/1948-obsolete-const-method-handle/expected.txt
+++ b/test/1948-obsolete-const-method-handle/expected-stdout.txt
diff --git a/test/1949-short-dex-file/Android.bp b/test/1949-short-dex-file/Android.bp
index ca92e7332a..8e6c72de9d 100644
--- a/test/1949-short-dex-file/Android.bp
+++ b/test/1949-short-dex-file/Android.bp
@@ -8,13 +8,13 @@ java_test {
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-1949-short-dex-file-expected"],
+    data: [":art-run-test-1949-short-dex-file-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-1949-short-dex-file-expected",
-    out: ["art-run-test-1949-short-dex-file-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-1949-short-dex-file-expected-stdout",
+    out: ["art-run-test-1949-short-dex-file-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/1949-short-dex-file/expected.txt b/test/1949-short-dex-file/expected-stdout.txt
index 863339fb8c..863339fb8c 100644
--- a/test/1949-short-dex-file/expected.txt
+++ b/test/1949-short-dex-file/expected-stdout.txt
diff --git a/test/1950-unprepared-transform/check b/test/1950-unprepared-transform/check
index 8a84388a8f..05cbb5f700 100755
--- a/test/1950-unprepared-transform/check
+++ b/test/1950-unprepared-transform/check
@@ -16,7 +16,7 @@
 
 # The RI sends an extra event that art doesn't. Add it to the expected output.
 if [[ "$TEST_RUNTIME" == "jvm" ]]; then
-  patch -p0 expected.txt < jvm-expected.patch >/dev/null
+  patch -p0 expected-stdout.txt < jvm-expected.patch >/dev/null
 fi
 
 ./default-check "$@"
diff --git a/test/1950-unprepared-transform/expected.txt b/test/1950-unprepared-transform/expected-stdout.txt
index 3be28a5696..3be28a5696 100644
--- a/test/1950-unprepared-transform/expected.txt
+++ b/test/1950-unprepared-transform/expected-stdout.txt
diff --git a/test/1951-monitor-enter-no-suspend/Android.bp b/test/1951-monitor-enter-no-suspend/Android.bp
index a4b699c094..00d271c090 100644
--- a/test/1951-monitor-enter-no-suspend/Android.bp
+++ b/test/1951-monitor-enter-no-suspend/Android.bp
@@ -8,13 +8,13 @@ java_test {
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-1951-monitor-enter-no-suspend-expected"],
+    data: [":art-run-test-1951-monitor-enter-no-suspend-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-1951-monitor-enter-no-suspend-expected",
-    out: ["art-run-test-1951-monitor-enter-no-suspend-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-1951-monitor-enter-no-suspend-expected-stdout",
+    out: ["art-run-test-1951-monitor-enter-no-suspend-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/1951-monitor-enter-no-suspend/expected.txt b/test/1951-monitor-enter-no-suspend/expected-stdout.txt
index 35821117c8..35821117c8 100644
--- a/test/1951-monitor-enter-no-suspend/expected.txt
+++ b/test/1951-monitor-enter-no-suspend/expected-stdout.txt
diff --git a/test/1953-pop-frame/Android.bp b/test/1953-pop-frame/Android.bp
index 0110ff882c..25b74e8426 100644
--- a/test/1953-pop-frame/Android.bp
+++ b/test/1953-pop-frame/Android.bp
@@ -8,13 +8,13 @@ java_test {
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-1953-pop-frame-expected"],
+    data: [":art-run-test-1953-pop-frame-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-1953-pop-frame-expected",
-    out: ["art-run-test-1953-pop-frame-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-1953-pop-frame-expected-stdout",
+    out: ["art-run-test-1953-pop-frame-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/1953-pop-frame/check b/test/1953-pop-frame/check
index d552272bca..43a9218f7a 100755
--- a/test/1953-pop-frame/check
+++ b/test/1953-pop-frame/check
@@ -18,4 +18,4 @@
 # See b/116003018. Some configurations cannot handle the class load events in
 # quite the right way so they are disabled there too.
 ./default-check "$@" || \
-  (patch -p0 expected.txt < class-loading-expected.patch >/dev/null && ./default-check "$@")
+  (patch -p0 expected-stdout.txt < class-loading-expected.patch >/dev/null && ./default-check "$@")
diff --git a/test/1953-pop-frame/expected.txt b/test/1953-pop-frame/expected-stdout.txt
index dafc6b4c92..dafc6b4c92 100644
--- a/test/1953-pop-frame/expected.txt
+++ b/test/1953-pop-frame/expected-stdout.txt
diff --git a/test/1954-pop-frame-jit/Android.bp b/test/1954-pop-frame-jit/Android.bp
index 06e2505a85..6c695a6f87 100644
--- a/test/1954-pop-frame-jit/Android.bp
+++ b/test/1954-pop-frame-jit/Android.bp
@@ -8,13 +8,13 @@ java_test {
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-1954-pop-frame-jit-expected"],
+    data: [":art-run-test-1954-pop-frame-jit-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-1954-pop-frame-jit-expected",
-    out: ["art-run-test-1954-pop-frame-jit-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-1954-pop-frame-jit-expected-stdout",
+    out: ["art-run-test-1954-pop-frame-jit-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/1954-pop-frame-jit/check b/test/1954-pop-frame-jit/check
index 10b87cc286..c3678b7b4a 100755
--- a/test/1954-pop-frame-jit/check
+++ b/test/1954-pop-frame-jit/check
@@ -18,4 +18,4 @@
 # See b/116003018. Some configurations cannot handle the class load events in
 # quite the right way so they are disabled there too.
 ./default-check "$@" || \
-  (patch -p0 expected.txt < jvm-expected.patch >/dev/null && ./default-check "$@")
+  (patch -p0 expected-stdout.txt < jvm-expected.patch >/dev/null && ./default-check "$@")
diff --git a/test/1954-pop-frame-jit/expected.txt b/test/1954-pop-frame-jit/expected-stdout.txt
index e75ea64855..e75ea64855 100644
--- a/test/1954-pop-frame-jit/expected.txt
+++ b/test/1954-pop-frame-jit/expected-stdout.txt
diff --git a/test/1955-pop-frame-jit-called/Android.bp b/test/1955-pop-frame-jit-called/Android.bp
index f862f69854..cd2c03ffc5 100644
--- a/test/1955-pop-frame-jit-called/Android.bp
+++ b/test/1955-pop-frame-jit-called/Android.bp
@@ -8,13 +8,13 @@ java_test {
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-1955-pop-frame-jit-called-expected"],
+    data: [":art-run-test-1955-pop-frame-jit-called-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-1955-pop-frame-jit-called-expected",
-    out: ["art-run-test-1955-pop-frame-jit-called-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-1955-pop-frame-jit-called-expected-stdout",
+    out: ["art-run-test-1955-pop-frame-jit-called-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/1955-pop-frame-jit-called/check b/test/1955-pop-frame-jit-called/check
index 10b87cc286..c3678b7b4a 100755
--- a/test/1955-pop-frame-jit-called/check
+++ b/test/1955-pop-frame-jit-called/check
@@ -18,4 +18,4 @@
 # See b/116003018. Some configurations cannot handle the class load events in
 # quite the right way so they are disabled there too.
 ./default-check "$@" || \
-  (patch -p0 expected.txt < jvm-expected.patch >/dev/null && ./default-check "$@")
+  (patch -p0 expected-stdout.txt < jvm-expected.patch >/dev/null && ./default-check "$@")
diff --git a/test/1955-pop-frame-jit-called/expected.txt b/test/1955-pop-frame-jit-called/expected-stdout.txt
index e75ea64855..e75ea64855 100644
--- a/test/1955-pop-frame-jit-called/expected.txt
+++ b/test/1955-pop-frame-jit-called/expected-stdout.txt
diff --git a/test/1956-pop-frame-jit-calling/Android.bp b/test/1956-pop-frame-jit-calling/Android.bp
index 9a967fa169..6ee48427fc 100644
--- a/test/1956-pop-frame-jit-calling/Android.bp
+++ b/test/1956-pop-frame-jit-calling/Android.bp
@@ -8,13 +8,13 @@ java_test {
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-1956-pop-frame-jit-calling-expected"],
+    data: [":art-run-test-1956-pop-frame-jit-calling-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-1956-pop-frame-jit-calling-expected",
-    out: ["art-run-test-1956-pop-frame-jit-calling-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-1956-pop-frame-jit-calling-expected-stdout",
+    out: ["art-run-test-1956-pop-frame-jit-calling-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/1956-pop-frame-jit-calling/check b/test/1956-pop-frame-jit-calling/check
index 10b87cc286..c3678b7b4a 100755
--- a/test/1956-pop-frame-jit-calling/check
+++ b/test/1956-pop-frame-jit-calling/check
@@ -18,4 +18,4 @@
 # See b/116003018. Some configurations cannot handle the class load events in
 # quite the right way so they are disabled there too.
 ./default-check "$@" || \
-  (patch -p0 expected.txt < jvm-expected.patch >/dev/null && ./default-check "$@")
+  (patch -p0 expected-stdout.txt < jvm-expected.patch >/dev/null && ./default-check "$@")
diff --git a/test/1956-pop-frame-jit-calling/expected.txt b/test/1956-pop-frame-jit-calling/expected-stdout.txt
index e75ea64855..e75ea64855 100644
--- a/test/1956-pop-frame-jit-calling/expected.txt
+++ b/test/1956-pop-frame-jit-calling/expected-stdout.txt
diff --git a/test/1957-error-ext/Android.bp b/test/1957-error-ext/Android.bp
index 9b5394837f..6bf9f21e56 100644
--- a/test/1957-error-ext/Android.bp
+++ b/test/1957-error-ext/Android.bp
@@ -8,13 +8,13 @@ java_test {
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-1957-error-ext-expected"],
+    data: [":art-run-test-1957-error-ext-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-1957-error-ext-expected",
-    out: ["art-run-test-1957-error-ext-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-1957-error-ext-expected-stdout",
+    out: ["art-run-test-1957-error-ext-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/1957-error-ext/expected.txt b/test/1957-error-ext/expected-stdout.txt
index bfe7033c67..bfe7033c67 100644
--- a/test/1957-error-ext/expected.txt
+++ b/test/1957-error-ext/expected-stdout.txt
diff --git a/test/1958-transform-try-jit/Android.bp b/test/1958-transform-try-jit/Android.bp
index 1653b94664..61097f6d4f 100644
--- a/test/1958-transform-try-jit/Android.bp
+++ b/test/1958-transform-try-jit/Android.bp
@@ -8,13 +8,13 @@ java_test {
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-1958-transform-try-jit-expected"],
+    data: [":art-run-test-1958-transform-try-jit-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-1958-transform-try-jit-expected",
-    out: ["art-run-test-1958-transform-try-jit-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-1958-transform-try-jit-expected-stdout",
+    out: ["art-run-test-1958-transform-try-jit-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/1958-transform-try-jit/expected.txt b/test/1958-transform-try-jit/expected-stdout.txt
index 8cfaea2be0..8cfaea2be0 100644
--- a/test/1958-transform-try-jit/expected.txt
+++ b/test/1958-transform-try-jit/expected-stdout.txt
diff --git a/test/1959-redefine-object-instrument/Android.bp b/test/1959-redefine-object-instrument/Android.bp
index db9ab8c110..ca8088df93 100644
--- a/test/1959-redefine-object-instrument/Android.bp
+++ b/test/1959-redefine-object-instrument/Android.bp
@@ -8,13 +8,13 @@ java_test {
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-1959-redefine-object-instrument-expected"],
+    data: [":art-run-test-1959-redefine-object-instrument-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-1959-redefine-object-instrument-expected",
-    out: ["art-run-test-1959-redefine-object-instrument-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-1959-redefine-object-instrument-expected-stdout",
+    out: ["art-run-test-1959-redefine-object-instrument-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/1959-redefine-object-instrument/expected.txt b/test/1959-redefine-object-instrument/expected-stdout.txt
index e69de29bb2..e69de29bb2 100644
--- a/test/1959-redefine-object-instrument/expected.txt
+++ b/test/1959-redefine-object-instrument/expected-stdout.txt
diff --git a/test/1960-checker-bounds-codegen/Android.bp b/test/1960-checker-bounds-codegen/Android.bp
index 6e104f4a30..a3d8079aae 100644
--- a/test/1960-checker-bounds-codegen/Android.bp
+++ b/test/1960-checker-bounds-codegen/Android.bp
@@ -8,7 +8,7 @@ java_test {
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-1960-checker-bounds-codegen-expected"],
+    data: [":art-run-test-1960-checker-bounds-codegen-expected-stdout"],
     // Include the Java source files in the test's artifacts, to make Checker assertions
     // available to the TradeFed test runner.
     include_srcs: true,
@@ -16,8 +16,8 @@ java_test {
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-1960-checker-bounds-codegen-expected",
-    out: ["art-run-test-1960-checker-bounds-codegen-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-1960-checker-bounds-codegen-expected-stdout",
+    out: ["art-run-test-1960-checker-bounds-codegen-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/1960-checker-bounds-codegen/expected.txt b/test/1960-checker-bounds-codegen/expected-stdout.txt
index b0aad4deb5..b0aad4deb5 100644
--- a/test/1960-checker-bounds-codegen/expected.txt
+++ b/test/1960-checker-bounds-codegen/expected-stdout.txt
diff --git a/test/1960-obsolete-jit-multithread-native/Android.bp b/test/1960-obsolete-jit-multithread-native/Android.bp
index 27372c8695..41f5cf93d1 100644
--- a/test/1960-obsolete-jit-multithread-native/Android.bp
+++ b/test/1960-obsolete-jit-multithread-native/Android.bp
@@ -8,13 +8,13 @@ java_test {
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-1960-obsolete-jit-multithread-native-expected"],
+    data: [":art-run-test-1960-obsolete-jit-multithread-native-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-1960-obsolete-jit-multithread-native-expected",
-    out: ["art-run-test-1960-obsolete-jit-multithread-native-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-1960-obsolete-jit-multithread-native-expected-stdout",
+    out: ["art-run-test-1960-obsolete-jit-multithread-native-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/1960-obsolete-jit-multithread-native/expected.txt b/test/1960-obsolete-jit-multithread-native/expected-stdout.txt
index 4c47677443..4c47677443 100644
--- a/test/1960-obsolete-jit-multithread-native/expected.txt
+++ b/test/1960-obsolete-jit-multithread-native/expected-stdout.txt
diff --git a/test/1961-checker-loop-vectorizer/Android.bp b/test/1961-checker-loop-vectorizer/Android.bp
index 2ad48616e7..4a7c094140 100644
--- a/test/1961-checker-loop-vectorizer/Android.bp
+++ b/test/1961-checker-loop-vectorizer/Android.bp
@@ -8,7 +8,7 @@ java_test {
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-1961-checker-loop-vectorizer-expected"],
+    data: [":art-run-test-1961-checker-loop-vectorizer-expected-stdout"],
     // Include the Java source files in the test's artifacts, to make Checker assertions
     // available to the TradeFed test runner.
     include_srcs: true,
@@ -16,8 +16,8 @@ java_test {
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-1961-checker-loop-vectorizer-expected",
-    out: ["art-run-test-1961-checker-loop-vectorizer-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-1961-checker-loop-vectorizer-expected-stdout",
+    out: ["art-run-test-1961-checker-loop-vectorizer-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/1961-checker-loop-vectorizer/expected.txt b/test/1961-checker-loop-vectorizer/expected-stdout.txt
index e25e266500..e25e266500 100644
--- a/test/1961-checker-loop-vectorizer/expected.txt
+++ b/test/1961-checker-loop-vectorizer/expected-stdout.txt
diff --git a/test/1961-obsolete-jit-multithread/Android.bp b/test/1961-obsolete-jit-multithread/Android.bp
index 6d4767476e..aaacaf6ff1 100644
--- a/test/1961-obsolete-jit-multithread/Android.bp
+++ b/test/1961-obsolete-jit-multithread/Android.bp
@@ -8,13 +8,13 @@ java_test {
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-1961-obsolete-jit-multithread-expected"],
+    data: [":art-run-test-1961-obsolete-jit-multithread-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-1961-obsolete-jit-multithread-expected",
-    out: ["art-run-test-1961-obsolete-jit-multithread-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-1961-obsolete-jit-multithread-expected-stdout",
+    out: ["art-run-test-1961-obsolete-jit-multithread-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/1961-obsolete-jit-multithread/expected.txt b/test/1961-obsolete-jit-multithread/expected-stdout.txt
index 4c47677443..4c47677443 100644
--- a/test/1961-obsolete-jit-multithread/expected.txt
+++ b/test/1961-obsolete-jit-multithread/expected-stdout.txt
diff --git a/test/1962-multi-thread-events/Android.bp b/test/1962-multi-thread-events/Android.bp
index ed8f5e3193..005ecf2dd6 100644
--- a/test/1962-multi-thread-events/Android.bp
+++ b/test/1962-multi-thread-events/Android.bp
@@ -8,13 +8,13 @@ java_test {
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-1962-multi-thread-events-expected"],
+    data: [":art-run-test-1962-multi-thread-events-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-1962-multi-thread-events-expected",
-    out: ["art-run-test-1962-multi-thread-events-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-1962-multi-thread-events-expected-stdout",
+    out: ["art-run-test-1962-multi-thread-events-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/1962-multi-thread-events/expected.txt b/test/1962-multi-thread-events/expected-stdout.txt
index 841eb8b8ae..841eb8b8ae 100644
--- a/test/1962-multi-thread-events/expected.txt
+++ b/test/1962-multi-thread-events/expected-stdout.txt
diff --git a/test/1963-add-to-dex-classloader-in-memory/Android.bp b/test/1963-add-to-dex-classloader-in-memory/Android.bp
index bf915ed782..a9eb0d0317 100644
--- a/test/1963-add-to-dex-classloader-in-memory/Android.bp
+++ b/test/1963-add-to-dex-classloader-in-memory/Android.bp
@@ -8,13 +8,13 @@ java_test {
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-1963-add-to-dex-classloader-in-memory-expected"],
+    data: [":art-run-test-1963-add-to-dex-classloader-in-memory-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-1963-add-to-dex-classloader-in-memory-expected",
-    out: ["art-run-test-1963-add-to-dex-classloader-in-memory-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-1963-add-to-dex-classloader-in-memory-expected-stdout",
+    out: ["art-run-test-1963-add-to-dex-classloader-in-memory-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/1963-add-to-dex-classloader-in-memory/expected.txt b/test/1963-add-to-dex-classloader-in-memory/expected-stdout.txt
index c3cc448178..c3cc448178 100644
--- a/test/1963-add-to-dex-classloader-in-memory/expected.txt
+++ b/test/1963-add-to-dex-classloader-in-memory/expected-stdout.txt
diff --git a/test/1964-add-to-dex-classloader-file/expected.txt b/test/1964-add-to-dex-classloader-file/expected-stdout.txt
index 58b86ef896..58b86ef896 100644
--- a/test/1964-add-to-dex-classloader-file/expected.txt
+++ b/test/1964-add-to-dex-classloader-file/expected-stdout.txt
diff --git a/test/1965-get-set-local-primitive-no-tables/expected.txt b/test/1965-get-set-local-primitive-no-tables/expected-stdout.txt
index 97f8ab0594..97f8ab0594 100644
--- a/test/1965-get-set-local-primitive-no-tables/expected.txt
+++ b/test/1965-get-set-local-primitive-no-tables/expected-stdout.txt
diff --git a/test/1966-get-set-local-objects-no-table/expected.txt b/test/1966-get-set-local-objects-no-table/expected-stdout.txt
index f24dfe78a5..f24dfe78a5 100644
--- a/test/1966-get-set-local-objects-no-table/expected.txt
+++ b/test/1966-get-set-local-objects-no-table/expected-stdout.txt
diff --git a/test/1967-get-set-local-bad-slot/Android.bp b/test/1967-get-set-local-bad-slot/Android.bp
index 654b7e6214..8eec585613 100644
--- a/test/1967-get-set-local-bad-slot/Android.bp
+++ b/test/1967-get-set-local-bad-slot/Android.bp
@@ -8,13 +8,13 @@ java_test {
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-1967-get-set-local-bad-slot-expected"],
+    data: [":art-run-test-1967-get-set-local-bad-slot-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-1967-get-set-local-bad-slot-expected",
-    out: ["art-run-test-1967-get-set-local-bad-slot-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-1967-get-set-local-bad-slot-expected-stdout",
+    out: ["art-run-test-1967-get-set-local-bad-slot-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/1967-get-set-local-bad-slot/expected.txt b/test/1967-get-set-local-bad-slot/expected-stdout.txt
index e2b3ff566f..e2b3ff566f 100644
--- a/test/1967-get-set-local-bad-slot/expected.txt
+++ b/test/1967-get-set-local-bad-slot/expected-stdout.txt
diff --git a/test/1968-force-early-return/Android.bp b/test/1968-force-early-return/Android.bp
index 0dcd0ae837..c7c74fc31f 100644
--- a/test/1968-force-early-return/Android.bp
+++ b/test/1968-force-early-return/Android.bp
@@ -8,13 +8,13 @@ java_test {
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-1968-force-early-return-expected"],
+    data: [":art-run-test-1968-force-early-return-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-1968-force-early-return-expected",
-    out: ["art-run-test-1968-force-early-return-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-1968-force-early-return-expected-stdout",
+    out: ["art-run-test-1968-force-early-return-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/1968-force-early-return/expected.txt b/test/1968-force-early-return/expected-stdout.txt
index bd3859068f..bd3859068f 100644
--- a/test/1968-force-early-return/expected.txt
+++ b/test/1968-force-early-return/expected-stdout.txt
diff --git a/test/1969-force-early-return-void/Android.bp b/test/1969-force-early-return-void/Android.bp
index 7d5d40fac8..f08a3dd061 100644
--- a/test/1969-force-early-return-void/Android.bp
+++ b/test/1969-force-early-return-void/Android.bp
@@ -8,13 +8,13 @@ java_test {
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-1969-force-early-return-void-expected"],
+    data: [":art-run-test-1969-force-early-return-void-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-1969-force-early-return-void-expected",
-    out: ["art-run-test-1969-force-early-return-void-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-1969-force-early-return-void-expected-stdout",
+    out: ["art-run-test-1969-force-early-return-void-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/1969-force-early-return-void/check b/test/1969-force-early-return-void/check
index d552272bca..43a9218f7a 100755
--- a/test/1969-force-early-return-void/check
+++ b/test/1969-force-early-return-void/check
@@ -18,4 +18,4 @@
 # See b/116003018. Some configurations cannot handle the class load events in
 # quite the right way so they are disabled there too.
 ./default-check "$@" || \
-  (patch -p0 expected.txt < class-loading-expected.patch >/dev/null && ./default-check "$@")
+  (patch -p0 expected-stdout.txt < class-loading-expected.patch >/dev/null && ./default-check "$@")
diff --git a/test/1969-force-early-return-void/expected.txt b/test/1969-force-early-return-void/expected-stdout.txt
index fc685b4fee..fc685b4fee 100644
--- a/test/1969-force-early-return-void/expected.txt
+++ b/test/1969-force-early-return-void/expected-stdout.txt
diff --git a/test/1970-force-early-return-long/Android.bp b/test/1970-force-early-return-long/Android.bp
index 754362ecbc..5d51ae0deb 100644
--- a/test/1970-force-early-return-long/Android.bp
+++ b/test/1970-force-early-return-long/Android.bp
@@ -8,13 +8,13 @@ java_test {
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-1970-force-early-return-long-expected"],
+    data: [":art-run-test-1970-force-early-return-long-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-1970-force-early-return-long-expected",
-    out: ["art-run-test-1970-force-early-return-long-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-1970-force-early-return-long-expected-stdout",
+    out: ["art-run-test-1970-force-early-return-long-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/1970-force-early-return-long/expected.txt b/test/1970-force-early-return-long/expected-stdout.txt
index ab79587646..ab79587646 100644
--- a/test/1970-force-early-return-long/expected.txt
+++ b/test/1970-force-early-return-long/expected-stdout.txt
diff --git a/test/1971-multi-force-early-return/Android.bp b/test/1971-multi-force-early-return/Android.bp
index 07e015d1bc..83b7523dfd 100644
--- a/test/1971-multi-force-early-return/Android.bp
+++ b/test/1971-multi-force-early-return/Android.bp
@@ -8,13 +8,13 @@ java_test {
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-1971-multi-force-early-return-expected"],
+    data: [":art-run-test-1971-multi-force-early-return-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-1971-multi-force-early-return-expected",
-    out: ["art-run-test-1971-multi-force-early-return-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-1971-multi-force-early-return-expected-stdout",
+    out: ["art-run-test-1971-multi-force-early-return-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/1971-multi-force-early-return/expected.txt b/test/1971-multi-force-early-return/expected-stdout.txt
index 2d62363c43..2d62363c43 100644
--- a/test/1971-multi-force-early-return/expected.txt
+++ b/test/1971-multi-force-early-return/expected-stdout.txt
diff --git a/test/1972-jni-id-swap-indices/Android.bp b/test/1972-jni-id-swap-indices/Android.bp
index 17a052a1c9..db4921c9ae 100644
--- a/test/1972-jni-id-swap-indices/Android.bp
+++ b/test/1972-jni-id-swap-indices/Android.bp
@@ -8,13 +8,13 @@ java_test {
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-1972-jni-id-swap-indices-expected"],
+    data: [":art-run-test-1972-jni-id-swap-indices-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-1972-jni-id-swap-indices-expected",
-    out: ["art-run-test-1972-jni-id-swap-indices-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-1972-jni-id-swap-indices-expected-stdout",
+    out: ["art-run-test-1972-jni-id-swap-indices-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/1972-jni-id-swap-indices/expected.txt b/test/1972-jni-id-swap-indices/expected-stdout.txt
index a22979ff8d..a22979ff8d 100644
--- a/test/1972-jni-id-swap-indices/expected.txt
+++ b/test/1972-jni-id-swap-indices/expected-stdout.txt
diff --git a/test/1973-jni-id-swap-pointer/Android.bp b/test/1973-jni-id-swap-pointer/Android.bp
index ac64c79367..192fcb62c7 100644
--- a/test/1973-jni-id-swap-pointer/Android.bp
+++ b/test/1973-jni-id-swap-pointer/Android.bp
@@ -8,13 +8,13 @@ java_test {
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-1973-jni-id-swap-pointer-expected"],
+    data: [":art-run-test-1973-jni-id-swap-pointer-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-1973-jni-id-swap-pointer-expected",
-    out: ["art-run-test-1973-jni-id-swap-pointer-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-1973-jni-id-swap-pointer-expected-stdout",
+    out: ["art-run-test-1973-jni-id-swap-pointer-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/1973-jni-id-swap-pointer/expected.txt b/test/1973-jni-id-swap-pointer/expected-stdout.txt
index 5ea78580ae..5ea78580ae 100644
--- a/test/1973-jni-id-swap-pointer/expected.txt
+++ b/test/1973-jni-id-swap-pointer/expected-stdout.txt
diff --git a/test/1974-resize-array/Android.bp b/test/1974-resize-array/Android.bp
index ae6603381b..86cc1d40b4 100644
--- a/test/1974-resize-array/Android.bp
+++ b/test/1974-resize-array/Android.bp
@@ -8,13 +8,13 @@ java_test {
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-1974-resize-array-expected"],
+    data: [":art-run-test-1974-resize-array-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-1974-resize-array-expected",
-    out: ["art-run-test-1974-resize-array-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-1974-resize-array-expected-stdout",
+    out: ["art-run-test-1974-resize-array-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/1974-resize-array/expected.txt b/test/1974-resize-array/expected-stdout.txt
index 997b22ca28..997b22ca28 100644
--- a/test/1974-resize-array/expected.txt
+++ b/test/1974-resize-array/expected-stdout.txt
diff --git a/test/1975-hello-structural-transformation/Android.bp b/test/1975-hello-structural-transformation/Android.bp
index b82fdf10ab..26718e0cff 100644
--- a/test/1975-hello-structural-transformation/Android.bp
+++ b/test/1975-hello-structural-transformation/Android.bp
@@ -8,13 +8,13 @@ java_test {
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-1975-hello-structural-transformation-expected"],
+    data: [":art-run-test-1975-hello-structural-transformation-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-1975-hello-structural-transformation-expected",
-    out: ["art-run-test-1975-hello-structural-transformation-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-1975-hello-structural-transformation-expected-stdout",
+    out: ["art-run-test-1975-hello-structural-transformation-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/1975-hello-structural-transformation/expected.txt b/test/1975-hello-structural-transformation/expected-stdout.txt
index 07d3ac2d6c..07d3ac2d6c 100644
--- a/test/1975-hello-structural-transformation/expected.txt
+++ b/test/1975-hello-structural-transformation/expected-stdout.txt
diff --git a/test/1976-hello-structural-static-methods/Android.bp b/test/1976-hello-structural-static-methods/Android.bp
index e062149d93..a3e251b8b2 100644
--- a/test/1976-hello-structural-static-methods/Android.bp
+++ b/test/1976-hello-structural-static-methods/Android.bp
@@ -8,13 +8,13 @@ java_test {
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-1976-hello-structural-static-methods-expected"],
+    data: [":art-run-test-1976-hello-structural-static-methods-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-1976-hello-structural-static-methods-expected",
-    out: ["art-run-test-1976-hello-structural-static-methods-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-1976-hello-structural-static-methods-expected-stdout",
+    out: ["art-run-test-1976-hello-structural-static-methods-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/1976-hello-structural-static-methods/expected.txt b/test/1976-hello-structural-static-methods/expected-stdout.txt
index 944cc0b409..944cc0b409 100644
--- a/test/1976-hello-structural-static-methods/expected.txt
+++ b/test/1976-hello-structural-static-methods/expected-stdout.txt
diff --git a/test/1977-hello-structural-obsolescence/Android.bp b/test/1977-hello-structural-obsolescence/Android.bp
index 44e0f9f9c1..5ec242d161 100644
--- a/test/1977-hello-structural-obsolescence/Android.bp
+++ b/test/1977-hello-structural-obsolescence/Android.bp
@@ -8,13 +8,13 @@ java_test {
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-1977-hello-structural-obsolescence-expected"],
+    data: [":art-run-test-1977-hello-structural-obsolescence-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-1977-hello-structural-obsolescence-expected",
-    out: ["art-run-test-1977-hello-structural-obsolescence-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-1977-hello-structural-obsolescence-expected-stdout",
+    out: ["art-run-test-1977-hello-structural-obsolescence-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/1977-hello-structural-obsolescence/expected.txt b/test/1977-hello-structural-obsolescence/expected-stdout.txt
index ae68bdb9b1..ae68bdb9b1 100644
--- a/test/1977-hello-structural-obsolescence/expected.txt
+++ b/test/1977-hello-structural-obsolescence/expected-stdout.txt
diff --git a/test/1978-regular-obsolete-then-structural-obsolescence/Android.bp b/test/1978-regular-obsolete-then-structural-obsolescence/Android.bp
index 12fa774c10..bcb3ee84c3 100644
--- a/test/1978-regular-obsolete-then-structural-obsolescence/Android.bp
+++ b/test/1978-regular-obsolete-then-structural-obsolescence/Android.bp
@@ -8,13 +8,13 @@ java_test {
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-1978-regular-obsolete-then-structural-obsolescence-expected"],
+    data: [":art-run-test-1978-regular-obsolete-then-structural-obsolescence-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-1978-regular-obsolete-then-structural-obsolescence-expected",
-    out: ["art-run-test-1978-regular-obsolete-then-structural-obsolescence-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-1978-regular-obsolete-then-structural-obsolescence-expected-stdout",
+    out: ["art-run-test-1978-regular-obsolete-then-structural-obsolescence-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/1978-regular-obsolete-then-structural-obsolescence/expected.txt b/test/1978-regular-obsolete-then-structural-obsolescence/expected-stdout.txt
index 2bad9f2d50..2bad9f2d50 100644
--- a/test/1978-regular-obsolete-then-structural-obsolescence/expected.txt
+++ b/test/1978-regular-obsolete-then-structural-obsolescence/expected-stdout.txt
diff --git a/test/1979-threaded-structural-transformation/Android.bp b/test/1979-threaded-structural-transformation/Android.bp
index 23727fce4a..f08e65a58d 100644
--- a/test/1979-threaded-structural-transformation/Android.bp
+++ b/test/1979-threaded-structural-transformation/Android.bp
@@ -8,13 +8,13 @@ java_test {
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-1979-threaded-structural-transformation-expected"],
+    data: [":art-run-test-1979-threaded-structural-transformation-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-1979-threaded-structural-transformation-expected",
-    out: ["art-run-test-1979-threaded-structural-transformation-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-1979-threaded-structural-transformation-expected-stdout",
+    out: ["art-run-test-1979-threaded-structural-transformation-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/1979-threaded-structural-transformation/expected.txt b/test/1979-threaded-structural-transformation/expected-stdout.txt
index ffe96bbabb..ffe96bbabb 100644
--- a/test/1979-threaded-structural-transformation/expected.txt
+++ b/test/1979-threaded-structural-transformation/expected-stdout.txt
diff --git a/test/1980-obsolete-object-cleared/Android.bp b/test/1980-obsolete-object-cleared/Android.bp
index 08bb5d852c..20268ee915 100644
--- a/test/1980-obsolete-object-cleared/Android.bp
+++ b/test/1980-obsolete-object-cleared/Android.bp
@@ -8,13 +8,13 @@ java_test {
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-1980-obsolete-object-cleared-expected"],
+    data: [":art-run-test-1980-obsolete-object-cleared-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-1980-obsolete-object-cleared-expected",
-    out: ["art-run-test-1980-obsolete-object-cleared-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-1980-obsolete-object-cleared-expected-stdout",
+    out: ["art-run-test-1980-obsolete-object-cleared-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/1980-obsolete-object-cleared/expected.txt b/test/1980-obsolete-object-cleared/expected-stdout.txt
index 77569eeb32..77569eeb32 100644
--- a/test/1980-obsolete-object-cleared/expected.txt
+++ b/test/1980-obsolete-object-cleared/expected-stdout.txt
diff --git a/test/1981-structural-redef-private-method-handles/expected.txt b/test/1981-structural-redef-private-method-handles/expected-stdout.txt
index 0c0ac6e9c0..0c0ac6e9c0 100644
--- a/test/1981-structural-redef-private-method-handles/expected.txt
+++ b/test/1981-structural-redef-private-method-handles/expected-stdout.txt
diff --git a/test/1982-no-virtuals-structural-redefinition/Android.bp b/test/1982-no-virtuals-structural-redefinition/Android.bp
index 02a5df5e4a..5a752d8ba1 100644
--- a/test/1982-no-virtuals-structural-redefinition/Android.bp
+++ b/test/1982-no-virtuals-structural-redefinition/Android.bp
@@ -8,13 +8,13 @@ java_test {
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-1982-no-virtuals-structural-redefinition-expected"],
+    data: [":art-run-test-1982-no-virtuals-structural-redefinition-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-1982-no-virtuals-structural-redefinition-expected",
-    out: ["art-run-test-1982-no-virtuals-structural-redefinition-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-1982-no-virtuals-structural-redefinition-expected-stdout",
+    out: ["art-run-test-1982-no-virtuals-structural-redefinition-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/1982-no-virtuals-structural-redefinition/expected.txt b/test/1982-no-virtuals-structural-redefinition/expected-stdout.txt
index 604145d631..604145d631 100644
--- a/test/1982-no-virtuals-structural-redefinition/expected.txt
+++ b/test/1982-no-virtuals-structural-redefinition/expected-stdout.txt
diff --git a/test/1983-structural-redefinition-failures/expected.txt b/test/1983-structural-redefinition-failures/expected-stdout.txt
index faa752830c..faa752830c 100644
--- a/test/1983-structural-redefinition-failures/expected.txt
+++ b/test/1983-structural-redefinition-failures/expected-stdout.txt
diff --git a/test/1984-structural-redefine-field-trace/Android.bp b/test/1984-structural-redefine-field-trace/Android.bp
index 00762d1aa3..ec347665d2 100644
--- a/test/1984-structural-redefine-field-trace/Android.bp
+++ b/test/1984-structural-redefine-field-trace/Android.bp
@@ -8,13 +8,13 @@ java_test {
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-1984-structural-redefine-field-trace-expected"],
+    data: [":art-run-test-1984-structural-redefine-field-trace-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-1984-structural-redefine-field-trace-expected",
-    out: ["art-run-test-1984-structural-redefine-field-trace-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-1984-structural-redefine-field-trace-expected-stdout",
+    out: ["art-run-test-1984-structural-redefine-field-trace-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/1984-structural-redefine-field-trace/expected.txt b/test/1984-structural-redefine-field-trace/expected-stdout.txt
index 6153d7e789..6153d7e789 100644
--- a/test/1984-structural-redefine-field-trace/expected.txt
+++ b/test/1984-structural-redefine-field-trace/expected-stdout.txt
diff --git a/test/1985-structural-redefine-stack-scope/Android.bp b/test/1985-structural-redefine-stack-scope/Android.bp
index a9c42c2877..99967f6569 100644
--- a/test/1985-structural-redefine-stack-scope/Android.bp
+++ b/test/1985-structural-redefine-stack-scope/Android.bp
@@ -8,13 +8,13 @@ java_test {
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-1985-structural-redefine-stack-scope-expected"],
+    data: [":art-run-test-1985-structural-redefine-stack-scope-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-1985-structural-redefine-stack-scope-expected",
-    out: ["art-run-test-1985-structural-redefine-stack-scope-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-1985-structural-redefine-stack-scope-expected-stdout",
+    out: ["art-run-test-1985-structural-redefine-stack-scope-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/1985-structural-redefine-stack-scope/expected.txt b/test/1985-structural-redefine-stack-scope/expected-stdout.txt
index 6a5618ebc6..6a5618ebc6 100644
--- a/test/1985-structural-redefine-stack-scope/expected.txt
+++ b/test/1985-structural-redefine-stack-scope/expected-stdout.txt
diff --git a/test/1986-structural-redefine-multi-thread-stack-scope/Android.bp b/test/1986-structural-redefine-multi-thread-stack-scope/Android.bp
index d452642b34..a00bc1b420 100644
--- a/test/1986-structural-redefine-multi-thread-stack-scope/Android.bp
+++ b/test/1986-structural-redefine-multi-thread-stack-scope/Android.bp
@@ -8,13 +8,13 @@ java_test {
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-1986-structural-redefine-multi-thread-stack-scope-expected"],
+    data: [":art-run-test-1986-structural-redefine-multi-thread-stack-scope-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-1986-structural-redefine-multi-thread-stack-scope-expected",
-    out: ["art-run-test-1986-structural-redefine-multi-thread-stack-scope-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-1986-structural-redefine-multi-thread-stack-scope-expected-stdout",
+    out: ["art-run-test-1986-structural-redefine-multi-thread-stack-scope-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/1986-structural-redefine-multi-thread-stack-scope/expected.txt b/test/1986-structural-redefine-multi-thread-stack-scope/expected-stdout.txt
index 6a5618ebc6..6a5618ebc6 100644
--- a/test/1986-structural-redefine-multi-thread-stack-scope/expected.txt
+++ b/test/1986-structural-redefine-multi-thread-stack-scope/expected-stdout.txt
diff --git a/test/1987-structural-redefine-recursive-stack-scope/Android.bp b/test/1987-structural-redefine-recursive-stack-scope/Android.bp
index 75dac8b4f0..52bab7d35a 100644
--- a/test/1987-structural-redefine-recursive-stack-scope/Android.bp
+++ b/test/1987-structural-redefine-recursive-stack-scope/Android.bp
@@ -8,13 +8,13 @@ java_test {
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-1987-structural-redefine-recursive-stack-scope-expected"],
+    data: [":art-run-test-1987-structural-redefine-recursive-stack-scope-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-1987-structural-redefine-recursive-stack-scope-expected",
-    out: ["art-run-test-1987-structural-redefine-recursive-stack-scope-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-1987-structural-redefine-recursive-stack-scope-expected-stdout",
+    out: ["art-run-test-1987-structural-redefine-recursive-stack-scope-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/1987-structural-redefine-recursive-stack-scope/expected.txt b/test/1987-structural-redefine-recursive-stack-scope/expected-stdout.txt
index 288bed82b3..288bed82b3 100644
--- a/test/1987-structural-redefine-recursive-stack-scope/expected.txt
+++ b/test/1987-structural-redefine-recursive-stack-scope/expected-stdout.txt
diff --git a/test/1988-multi-structural-redefine/Android.bp b/test/1988-multi-structural-redefine/Android.bp
index b58b6df653..f6e07015b8 100644
--- a/test/1988-multi-structural-redefine/Android.bp
+++ b/test/1988-multi-structural-redefine/Android.bp
@@ -8,13 +8,13 @@ java_test {
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-1988-multi-structural-redefine-expected"],
+    data: [":art-run-test-1988-multi-structural-redefine-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-1988-multi-structural-redefine-expected",
-    out: ["art-run-test-1988-multi-structural-redefine-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-1988-multi-structural-redefine-expected-stdout",
+    out: ["art-run-test-1988-multi-structural-redefine-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/1988-multi-structural-redefine/expected.txt b/test/1988-multi-structural-redefine/expected-stdout.txt
index 00aea886c4..00aea886c4 100644
--- a/test/1988-multi-structural-redefine/expected.txt
+++ b/test/1988-multi-structural-redefine/expected-stdout.txt
diff --git a/test/1989-transform-bad-monitor/Android.bp b/test/1989-transform-bad-monitor/Android.bp
index 40342db29c..9d37e5a5c9 100644
--- a/test/1989-transform-bad-monitor/Android.bp
+++ b/test/1989-transform-bad-monitor/Android.bp
@@ -8,13 +8,13 @@ java_test {
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-1989-transform-bad-monitor-expected"],
+    data: [":art-run-test-1989-transform-bad-monitor-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-1989-transform-bad-monitor-expected",
-    out: ["art-run-test-1989-transform-bad-monitor-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-1989-transform-bad-monitor-expected-stdout",
+    out: ["art-run-test-1989-transform-bad-monitor-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/1989-transform-bad-monitor/expected.txt b/test/1989-transform-bad-monitor/expected-stdout.txt
index 65ec72d5ef..65ec72d5ef 100644
--- a/test/1989-transform-bad-monitor/expected.txt
+++ b/test/1989-transform-bad-monitor/expected-stdout.txt
diff --git a/test/1990-structural-bad-verify/Android.bp b/test/1990-structural-bad-verify/Android.bp
index 2bbdb3cc3c..e9447ad064 100644
--- a/test/1990-structural-bad-verify/Android.bp
+++ b/test/1990-structural-bad-verify/Android.bp
@@ -8,13 +8,13 @@ java_test {
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-1990-structural-bad-verify-expected"],
+    data: [":art-run-test-1990-structural-bad-verify-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-1990-structural-bad-verify-expected",
-    out: ["art-run-test-1990-structural-bad-verify-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-1990-structural-bad-verify-expected-stdout",
+    out: ["art-run-test-1990-structural-bad-verify-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/1990-structural-bad-verify/expected.txt b/test/1990-structural-bad-verify/expected-stdout.txt
index 7478dda33a..7478dda33a 100644
--- a/test/1990-structural-bad-verify/expected.txt
+++ b/test/1990-structural-bad-verify/expected-stdout.txt
diff --git a/test/1991-hello-structural-retransform/Android.bp b/test/1991-hello-structural-retransform/Android.bp
index 3411cf1eb5..3b48d4a4f6 100644
--- a/test/1991-hello-structural-retransform/Android.bp
+++ b/test/1991-hello-structural-retransform/Android.bp
@@ -8,13 +8,13 @@ java_test {
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-1991-hello-structural-retransform-expected"],
+    data: [":art-run-test-1991-hello-structural-retransform-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-1991-hello-structural-retransform-expected",
-    out: ["art-run-test-1991-hello-structural-retransform-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-1991-hello-structural-retransform-expected-stdout",
+    out: ["art-run-test-1991-hello-structural-retransform-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/1991-hello-structural-retransform/expected.txt b/test/1991-hello-structural-retransform/expected-stdout.txt
index 7478dda33a..7478dda33a 100644
--- a/test/1991-hello-structural-retransform/expected.txt
+++ b/test/1991-hello-structural-retransform/expected-stdout.txt
diff --git a/test/1992-retransform-no-such-field/Android.bp b/test/1992-retransform-no-such-field/Android.bp
index 8621df75d8..4921500305 100644
--- a/test/1992-retransform-no-such-field/Android.bp
+++ b/test/1992-retransform-no-such-field/Android.bp
@@ -8,13 +8,13 @@ java_test {
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-1992-retransform-no-such-field-expected"],
+    data: [":art-run-test-1992-retransform-no-such-field-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-1992-retransform-no-such-field-expected",
-    out: ["art-run-test-1992-retransform-no-such-field-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-1992-retransform-no-such-field-expected-stdout",
+    out: ["art-run-test-1992-retransform-no-such-field-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/1992-retransform-no-such-field/expected.txt b/test/1992-retransform-no-such-field/expected-stdout.txt
index 53de32a31a..53de32a31a 100644
--- a/test/1992-retransform-no-such-field/expected.txt
+++ b/test/1992-retransform-no-such-field/expected-stdout.txt
diff --git a/test/1993-fallback-non-structural/Android.bp b/test/1993-fallback-non-structural/Android.bp
index 6b7a326c74..8ba0636298 100644
--- a/test/1993-fallback-non-structural/Android.bp
+++ b/test/1993-fallback-non-structural/Android.bp
@@ -8,13 +8,13 @@ java_test {
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-1993-fallback-non-structural-expected"],
+    data: [":art-run-test-1993-fallback-non-structural-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-1993-fallback-non-structural-expected",
-    out: ["art-run-test-1993-fallback-non-structural-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-1993-fallback-non-structural-expected-stdout",
+    out: ["art-run-test-1993-fallback-non-structural-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/1993-fallback-non-structural/expected.txt b/test/1993-fallback-non-structural/expected-stdout.txt
index f523e706b2..f523e706b2 100644
--- a/test/1993-fallback-non-structural/expected.txt
+++ b/test/1993-fallback-non-structural/expected-stdout.txt
diff --git a/test/1994-final-virtual-structural/Android.bp b/test/1994-final-virtual-structural/Android.bp
index 676f9626e5..90c6e96b73 100644
--- a/test/1994-final-virtual-structural/Android.bp
+++ b/test/1994-final-virtual-structural/Android.bp
@@ -8,13 +8,13 @@ java_test {
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-1994-final-virtual-structural-expected"],
+    data: [":art-run-test-1994-final-virtual-structural-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-1994-final-virtual-structural-expected",
-    out: ["art-run-test-1994-final-virtual-structural-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-1994-final-virtual-structural-expected-stdout",
+    out: ["art-run-test-1994-final-virtual-structural-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/1994-final-virtual-structural/expected.txt b/test/1994-final-virtual-structural/expected-stdout.txt
index 9b74d30dd9..9b74d30dd9 100644
--- a/test/1994-final-virtual-structural/expected.txt
+++ b/test/1994-final-virtual-structural/expected-stdout.txt
diff --git a/test/1995-final-virtual-structural-multithread/Android.bp b/test/1995-final-virtual-structural-multithread/Android.bp
index 49b205c935..fbed287027 100644
--- a/test/1995-final-virtual-structural-multithread/Android.bp
+++ b/test/1995-final-virtual-structural-multithread/Android.bp
@@ -8,13 +8,13 @@ java_test {
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-1995-final-virtual-structural-multithread-expected"],
+    data: [":art-run-test-1995-final-virtual-structural-multithread-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-1995-final-virtual-structural-multithread-expected",
-    out: ["art-run-test-1995-final-virtual-structural-multithread-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-1995-final-virtual-structural-multithread-expected-stdout",
+    out: ["art-run-test-1995-final-virtual-structural-multithread-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/1995-final-virtual-structural-multithread/expected.txt b/test/1995-final-virtual-structural-multithread/expected-stdout.txt
index e69de29bb2..e69de29bb2 100644
--- a/test/1995-final-virtual-structural-multithread/expected.txt
+++ b/test/1995-final-virtual-structural-multithread/expected-stdout.txt
diff --git a/test/1996-final-override-virtual-structural/Android.bp b/test/1996-final-override-virtual-structural/Android.bp
index 3322a266b9..674646e55b 100644
--- a/test/1996-final-override-virtual-structural/Android.bp
+++ b/test/1996-final-override-virtual-structural/Android.bp
@@ -8,13 +8,13 @@ java_test {
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-1996-final-override-virtual-structural-expected"],
+    data: [":art-run-test-1996-final-override-virtual-structural-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-1996-final-override-virtual-structural-expected",
-    out: ["art-run-test-1996-final-override-virtual-structural-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-1996-final-override-virtual-structural-expected-stdout",
+    out: ["art-run-test-1996-final-override-virtual-structural-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/1996-final-override-virtual-structural/expected.txt b/test/1996-final-override-virtual-structural/expected-stdout.txt
index 20cd98f1ac..20cd98f1ac 100644
--- a/test/1996-final-override-virtual-structural/expected.txt
+++ b/test/1996-final-override-virtual-structural/expected-stdout.txt
diff --git a/test/1997-structural-shadow-method/Android.bp b/test/1997-structural-shadow-method/Android.bp
index 0f971c9a3e..7dd0b2b49d 100644
--- a/test/1997-structural-shadow-method/Android.bp
+++ b/test/1997-structural-shadow-method/Android.bp
@@ -8,13 +8,13 @@ java_test {
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-1997-structural-shadow-method-expected"],
+    data: [":art-run-test-1997-structural-shadow-method-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-1997-structural-shadow-method-expected",
-    out: ["art-run-test-1997-structural-shadow-method-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-1997-structural-shadow-method-expected-stdout",
+    out: ["art-run-test-1997-structural-shadow-method-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/1997-structural-shadow-method/expected.txt b/test/1997-structural-shadow-method/expected-stdout.txt
index 3a8b8de39b..3a8b8de39b 100644
--- a/test/1997-structural-shadow-method/expected.txt
+++ b/test/1997-structural-shadow-method/expected-stdout.txt
diff --git a/test/1998-structural-shadow-field/Android.bp b/test/1998-structural-shadow-field/Android.bp
index 4d09189e1c..927b972b0e 100644
--- a/test/1998-structural-shadow-field/Android.bp
+++ b/test/1998-structural-shadow-field/Android.bp
@@ -8,13 +8,13 @@ java_test {
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-1998-structural-shadow-field-expected"],
+    data: [":art-run-test-1998-structural-shadow-field-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-1998-structural-shadow-field-expected",
-    out: ["art-run-test-1998-structural-shadow-field-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-1998-structural-shadow-field-expected-stdout",
+    out: ["art-run-test-1998-structural-shadow-field-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/1998-structural-shadow-field/expected.txt b/test/1998-structural-shadow-field/expected-stdout.txt
index 9ae530e728..9ae530e728 100644
--- a/test/1998-structural-shadow-field/expected.txt
+++ b/test/1998-structural-shadow-field/expected-stdout.txt
diff --git a/test/1999-virtual-structural/Android.bp b/test/1999-virtual-structural/Android.bp
index 4def4c6adb..5dfe4d61c8 100644
--- a/test/1999-virtual-structural/Android.bp
+++ b/test/1999-virtual-structural/Android.bp
@@ -8,13 +8,13 @@ java_test {
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-1999-virtual-structural-expected"],
+    data: [":art-run-test-1999-virtual-structural-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-1999-virtual-structural-expected",
-    out: ["art-run-test-1999-virtual-structural-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-1999-virtual-structural-expected-stdout",
+    out: ["art-run-test-1999-virtual-structural-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/1999-virtual-structural/expected.txt b/test/1999-virtual-structural/expected-stdout.txt
index 335b5d73d9..335b5d73d9 100644
--- a/test/1999-virtual-structural/expected.txt
+++ b/test/1999-virtual-structural/expected-stdout.txt
diff --git a/test/2000-virtual-list-structural/expected.txt b/test/2000-virtual-list-structural/expected-stdout.txt
index 9d3e1b6a4a..9d3e1b6a4a 100644
--- a/test/2000-virtual-list-structural/expected.txt
+++ b/test/2000-virtual-list-structural/expected-stdout.txt
diff --git a/test/2001-virtual-structural-multithread/expected.txt b/test/2001-virtual-structural-multithread/expected-stdout.txt
index e69de29bb2..e69de29bb2 100644
--- a/test/2001-virtual-structural-multithread/expected.txt
+++ b/test/2001-virtual-structural-multithread/expected-stdout.txt
diff --git a/test/2002-virtual-structural-initializing/expected.txt b/test/2002-virtual-structural-initializing/expected-stdout.txt
index c1c8a70a8b..c1c8a70a8b 100644
--- a/test/2002-virtual-structural-initializing/expected.txt
+++ b/test/2002-virtual-structural-initializing/expected-stdout.txt
diff --git a/test/2003-double-virtual-structural/Android.bp b/test/2003-double-virtual-structural/Android.bp
index 3b6cdcafce..f41bd4bc6e 100644
--- a/test/2003-double-virtual-structural/Android.bp
+++ b/test/2003-double-virtual-structural/Android.bp
@@ -8,13 +8,13 @@ java_test {
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-2003-double-virtual-structural-expected"],
+    data: [":art-run-test-2003-double-virtual-structural-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-2003-double-virtual-structural-expected",
-    out: ["art-run-test-2003-double-virtual-structural-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-2003-double-virtual-structural-expected-stdout",
+    out: ["art-run-test-2003-double-virtual-structural-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/2003-double-virtual-structural/expected.txt b/test/2003-double-virtual-structural/expected-stdout.txt
index 3ace4f3981..3ace4f3981 100644
--- a/test/2003-double-virtual-structural/expected.txt
+++ b/test/2003-double-virtual-structural/expected-stdout.txt
diff --git a/test/2004-double-virtual-structural-abstract/Android.bp b/test/2004-double-virtual-structural-abstract/Android.bp
index 60980f38c5..90acdd7abe 100644
--- a/test/2004-double-virtual-structural-abstract/Android.bp
+++ b/test/2004-double-virtual-structural-abstract/Android.bp
@@ -8,13 +8,13 @@ java_test {
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-2004-double-virtual-structural-abstract-expected"],
+    data: [":art-run-test-2004-double-virtual-structural-abstract-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-2004-double-virtual-structural-abstract-expected",
-    out: ["art-run-test-2004-double-virtual-structural-abstract-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-2004-double-virtual-structural-abstract-expected-stdout",
+    out: ["art-run-test-2004-double-virtual-structural-abstract-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/2004-double-virtual-structural-abstract/expected.txt b/test/2004-double-virtual-structural-abstract/expected-stdout.txt
index c70527027e..c70527027e 100644
--- a/test/2004-double-virtual-structural-abstract/expected.txt
+++ b/test/2004-double-virtual-structural-abstract/expected-stdout.txt
diff --git a/test/2005-pause-all-redefine-multithreaded/Android.bp b/test/2005-pause-all-redefine-multithreaded/Android.bp
index 67aa6f58cd..20298b53b8 100644
--- a/test/2005-pause-all-redefine-multithreaded/Android.bp
+++ b/test/2005-pause-all-redefine-multithreaded/Android.bp
@@ -8,13 +8,13 @@ java_test {
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-2005-pause-all-redefine-multithreaded-expected"],
+    data: [":art-run-test-2005-pause-all-redefine-multithreaded-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-2005-pause-all-redefine-multithreaded-expected",
-    out: ["art-run-test-2005-pause-all-redefine-multithreaded-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-2005-pause-all-redefine-multithreaded-expected-stdout",
+    out: ["art-run-test-2005-pause-all-redefine-multithreaded-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/2005-pause-all-redefine-multithreaded/expected.txt b/test/2005-pause-all-redefine-multithreaded/expected-stdout.txt
index e69de29bb2..e69de29bb2 100644
--- a/test/2005-pause-all-redefine-multithreaded/expected.txt
+++ b/test/2005-pause-all-redefine-multithreaded/expected-stdout.txt
diff --git a/test/2006-virtual-structural-finalizing/expected.txt b/test/2006-virtual-structural-finalizing/expected-stdout.txt
index e9653575c1..e9653575c1 100644
--- a/test/2006-virtual-structural-finalizing/expected.txt
+++ b/test/2006-virtual-structural-finalizing/expected-stdout.txt
diff --git a/test/2007-virtual-structural-finalizable/expected.txt b/test/2007-virtual-structural-finalizable/expected-stdout.txt
index 781fc9ae5d..781fc9ae5d 100644
--- a/test/2007-virtual-structural-finalizable/expected.txt
+++ b/test/2007-virtual-structural-finalizable/expected-stdout.txt
diff --git a/test/2008-redefine-then-old-reflect-field/Android.bp b/test/2008-redefine-then-old-reflect-field/Android.bp
index 07302a3aac..eb5163928b 100644
--- a/test/2008-redefine-then-old-reflect-field/Android.bp
+++ b/test/2008-redefine-then-old-reflect-field/Android.bp
@@ -8,13 +8,13 @@ java_test {
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-2008-redefine-then-old-reflect-field-expected"],
+    data: [":art-run-test-2008-redefine-then-old-reflect-field-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-2008-redefine-then-old-reflect-field-expected",
-    out: ["art-run-test-2008-redefine-then-old-reflect-field-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-2008-redefine-then-old-reflect-field-expected-stdout",
+    out: ["art-run-test-2008-redefine-then-old-reflect-field-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/2008-redefine-then-old-reflect-field/expected.txt b/test/2008-redefine-then-old-reflect-field/expected-stdout.txt
index e767888e04..e767888e04 100644
--- a/test/2008-redefine-then-old-reflect-field/expected.txt
+++ b/test/2008-redefine-then-old-reflect-field/expected-stdout.txt
diff --git a/test/2009-structural-local-ref/expected.txt b/test/2009-structural-local-ref/expected-stdout.txt
index 3ad1fbdf0d..3ad1fbdf0d 100644
--- a/test/2009-structural-local-ref/expected.txt
+++ b/test/2009-structural-local-ref/expected-stdout.txt
diff --git a/test/201-built-in-except-detail-messages/Android.bp b/test/201-built-in-except-detail-messages/Android.bp
index 23a3dddef5..8e09d7eb29 100644
--- a/test/201-built-in-except-detail-messages/Android.bp
+++ b/test/201-built-in-except-detail-messages/Android.bp
@@ -8,13 +8,13 @@ java_test {
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-201-built-in-except-detail-messages-expected"],
+    data: [":art-run-test-201-built-in-except-detail-messages-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-201-built-in-except-detail-messages-expected",
-    out: ["art-run-test-201-built-in-except-detail-messages-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-201-built-in-except-detail-messages-expected-stdout",
+    out: ["art-run-test-201-built-in-except-detail-messages-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/201-built-in-except-detail-messages/expected.txt b/test/201-built-in-except-detail-messages/expected-stdout.txt
index e69de29bb2..e69de29bb2 100644
--- a/test/201-built-in-except-detail-messages/expected.txt
+++ b/test/201-built-in-except-detail-messages/expected-stdout.txt
diff --git a/test/2011-stack-walk-concurrent-instrument/Android.bp b/test/2011-stack-walk-concurrent-instrument/Android.bp
index efaf2116be..5c17498978 100644
--- a/test/2011-stack-walk-concurrent-instrument/Android.bp
+++ b/test/2011-stack-walk-concurrent-instrument/Android.bp
@@ -8,13 +8,13 @@ java_test {
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-2011-stack-walk-concurrent-instrument-expected"],
+    data: [":art-run-test-2011-stack-walk-concurrent-instrument-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-2011-stack-walk-concurrent-instrument-expected",
-    out: ["art-run-test-2011-stack-walk-concurrent-instrument-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-2011-stack-walk-concurrent-instrument-expected-stdout",
+    out: ["art-run-test-2011-stack-walk-concurrent-instrument-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/2011-stack-walk-concurrent-instrument/expected.txt b/test/2011-stack-walk-concurrent-instrument/expected-stdout.txt
index 77a1486479..77a1486479 100644
--- a/test/2011-stack-walk-concurrent-instrument/expected.txt
+++ b/test/2011-stack-walk-concurrent-instrument/expected-stdout.txt
diff --git a/test/2012-structural-redefinition-failures-jni-id/expected.txt b/test/2012-structural-redefinition-failures-jni-id/expected-stdout.txt
index 4c3dd9886d..4c3dd9886d 100644
--- a/test/2012-structural-redefinition-failures-jni-id/expected.txt
+++ b/test/2012-structural-redefinition-failures-jni-id/expected-stdout.txt
diff --git a/test/2019-constantcalculationsinking/Android.bp b/test/2019-constantcalculationsinking/Android.bp
index bab9f747e6..99ea2e7aa6 100644
--- a/test/2019-constantcalculationsinking/Android.bp
+++ b/test/2019-constantcalculationsinking/Android.bp
@@ -8,13 +8,13 @@ java_test {
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-2019-constantcalculationsinking-expected"],
+    data: [":art-run-test-2019-constantcalculationsinking-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-2019-constantcalculationsinking-expected",
-    out: ["art-run-test-2019-constantcalculationsinking-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-2019-constantcalculationsinking-expected-stdout",
+    out: ["art-run-test-2019-constantcalculationsinking-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/2019-constantcalculationsinking/expected.txt b/test/2019-constantcalculationsinking/expected-stdout.txt
index e69de29bb2..e69de29bb2 100644
--- a/test/2019-constantcalculationsinking/expected.txt
+++ b/test/2019-constantcalculationsinking/expected-stdout.txt
diff --git a/test/202-thread-oome/Android.bp b/test/202-thread-oome/Android.bp
index 928b9f8d33..83d4cd307f 100644
--- a/test/202-thread-oome/Android.bp
+++ b/test/202-thread-oome/Android.bp
@@ -8,13 +8,13 @@ java_test {
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-202-thread-oome-expected"],
+    data: [":art-run-test-202-thread-oome-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-202-thread-oome-expected",
-    out: ["art-run-test-202-thread-oome-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-202-thread-oome-expected-stdout",
+    out: ["art-run-test-202-thread-oome-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/202-thread-oome/expected.txt b/test/202-thread-oome/expected-stdout.txt
index e69de29bb2..e69de29bb2 100644
--- a/test/202-thread-oome/expected.txt
+++ b/test/202-thread-oome/expected-stdout.txt
diff --git a/test/2020-InvokeVirtual-Inlining/Android.bp b/test/2020-InvokeVirtual-Inlining/Android.bp
index 134820b9c7..1dd5815342 100644
--- a/test/2020-InvokeVirtual-Inlining/Android.bp
+++ b/test/2020-InvokeVirtual-Inlining/Android.bp
@@ -8,13 +8,13 @@ java_test {
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-2020-InvokeVirtual-Inlining-expected"],
+    data: [":art-run-test-2020-InvokeVirtual-Inlining-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-2020-InvokeVirtual-Inlining-expected",
-    out: ["art-run-test-2020-InvokeVirtual-Inlining-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-2020-InvokeVirtual-Inlining-expected-stdout",
+    out: ["art-run-test-2020-InvokeVirtual-Inlining-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/2020-InvokeVirtual-Inlining/expected.txt b/test/2020-InvokeVirtual-Inlining/expected-stdout.txt
index e69de29bb2..e69de29bb2 100644
--- a/test/2020-InvokeVirtual-Inlining/expected.txt
+++ b/test/2020-InvokeVirtual-Inlining/expected-stdout.txt
diff --git a/test/2021-InvokeStatic-Inlining/Android.bp b/test/2021-InvokeStatic-Inlining/Android.bp
index 682d811e23..f53f42d9f6 100644
--- a/test/2021-InvokeStatic-Inlining/Android.bp
+++ b/test/2021-InvokeStatic-Inlining/Android.bp
@@ -8,13 +8,13 @@ java_test {
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-2021-InvokeStatic-Inlining-expected"],
+    data: [":art-run-test-2021-InvokeStatic-Inlining-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-2021-InvokeStatic-Inlining-expected",
-    out: ["art-run-test-2021-InvokeStatic-Inlining-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-2021-InvokeStatic-Inlining-expected-stdout",
+    out: ["art-run-test-2021-InvokeStatic-Inlining-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/2021-InvokeStatic-Inlining/expected.txt b/test/2021-InvokeStatic-Inlining/expected-stdout.txt
index e69de29bb2..e69de29bb2 100644
--- a/test/2021-InvokeStatic-Inlining/expected.txt
+++ b/test/2021-InvokeStatic-Inlining/expected-stdout.txt
diff --git a/test/2022-Invariantloops/Android.bp b/test/2022-Invariantloops/Android.bp
index a9118e3590..c13a3374c0 100644
--- a/test/2022-Invariantloops/Android.bp
+++ b/test/2022-Invariantloops/Android.bp
@@ -8,13 +8,13 @@ java_test {
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-2022-Invariantloops-expected"],
+    data: [":art-run-test-2022-Invariantloops-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-2022-Invariantloops-expected",
-    out: ["art-run-test-2022-Invariantloops-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-2022-Invariantloops-expected-stdout",
+    out: ["art-run-test-2022-Invariantloops-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/2022-Invariantloops/expected.txt b/test/2022-Invariantloops/expected-stdout.txt
index e69de29bb2..e69de29bb2 100644
--- a/test/2022-Invariantloops/expected.txt
+++ b/test/2022-Invariantloops/expected-stdout.txt
diff --git a/test/2023-InvariantLoops_typecast/Android.bp b/test/2023-InvariantLoops_typecast/Android.bp
index f993d61190..cf4cb4f723 100644
--- a/test/2023-InvariantLoops_typecast/Android.bp
+++ b/test/2023-InvariantLoops_typecast/Android.bp
@@ -8,13 +8,13 @@ java_test {
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-2023-InvariantLoops_typecast-expected"],
+    data: [":art-run-test-2023-InvariantLoops_typecast-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-2023-InvariantLoops_typecast-expected",
-    out: ["art-run-test-2023-InvariantLoops_typecast-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-2023-InvariantLoops_typecast-expected-stdout",
+    out: ["art-run-test-2023-InvariantLoops_typecast-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/2023-InvariantLoops_typecast/expected.txt b/test/2023-InvariantLoops_typecast/expected-stdout.txt
index e69de29bb2..e69de29bb2 100644
--- a/test/2023-InvariantLoops_typecast/expected.txt
+++ b/test/2023-InvariantLoops_typecast/expected-stdout.txt
diff --git a/test/2024-InvariantNegativeLoop/Android.bp b/test/2024-InvariantNegativeLoop/Android.bp
index 115f101dad..aa7c9429e4 100644
--- a/test/2024-InvariantNegativeLoop/Android.bp
+++ b/test/2024-InvariantNegativeLoop/Android.bp
@@ -8,13 +8,13 @@ java_test {
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-2024-InvariantNegativeLoop-expected"],
+    data: [":art-run-test-2024-InvariantNegativeLoop-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-2024-InvariantNegativeLoop-expected",
-    out: ["art-run-test-2024-InvariantNegativeLoop-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-2024-InvariantNegativeLoop-expected-stdout",
+    out: ["art-run-test-2024-InvariantNegativeLoop-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/2024-InvariantNegativeLoop/expected.txt b/test/2024-InvariantNegativeLoop/expected-stdout.txt
index e69de29bb2..e69de29bb2 100644
--- a/test/2024-InvariantNegativeLoop/expected.txt
+++ b/test/2024-InvariantNegativeLoop/expected-stdout.txt
diff --git a/test/2025-ChangedArrayValue/Android.bp b/test/2025-ChangedArrayValue/Android.bp
index 6260dc9c9b..0efec8afff 100644
--- a/test/2025-ChangedArrayValue/Android.bp
+++ b/test/2025-ChangedArrayValue/Android.bp
@@ -8,13 +8,13 @@ java_test {
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-2025-ChangedArrayValue-expected"],
+    data: [":art-run-test-2025-ChangedArrayValue-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-2025-ChangedArrayValue-expected",
-    out: ["art-run-test-2025-ChangedArrayValue-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-2025-ChangedArrayValue-expected-stdout",
+    out: ["art-run-test-2025-ChangedArrayValue-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/2025-ChangedArrayValue/expected.txt b/test/2025-ChangedArrayValue/expected-stdout.txt
index e69de29bb2..e69de29bb2 100644
--- a/test/2025-ChangedArrayValue/expected.txt
+++ b/test/2025-ChangedArrayValue/expected-stdout.txt
diff --git a/test/2026-DifferentMemoryLSCouples/Android.bp b/test/2026-DifferentMemoryLSCouples/Android.bp
index 0d2cd3cee8..e7ba56fc57 100644
--- a/test/2026-DifferentMemoryLSCouples/Android.bp
+++ b/test/2026-DifferentMemoryLSCouples/Android.bp
@@ -8,13 +8,13 @@ java_test {
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-2026-DifferentMemoryLSCouples-expected"],
+    data: [":art-run-test-2026-DifferentMemoryLSCouples-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-2026-DifferentMemoryLSCouples-expected",
-    out: ["art-run-test-2026-DifferentMemoryLSCouples-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-2026-DifferentMemoryLSCouples-expected-stdout",
+    out: ["art-run-test-2026-DifferentMemoryLSCouples-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/2026-DifferentMemoryLSCouples/expected.txt b/test/2026-DifferentMemoryLSCouples/expected-stdout.txt
index e69de29bb2..e69de29bb2 100644
--- a/test/2026-DifferentMemoryLSCouples/expected.txt
+++ b/test/2026-DifferentMemoryLSCouples/expected-stdout.txt
diff --git a/test/2027-TwiceTheSameMemoryCouple/Android.bp b/test/2027-TwiceTheSameMemoryCouple/Android.bp
index 2ff6a913fe..f6e645df11 100644
--- a/test/2027-TwiceTheSameMemoryCouple/Android.bp
+++ b/test/2027-TwiceTheSameMemoryCouple/Android.bp
@@ -8,13 +8,13 @@ java_test {
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-2027-TwiceTheSameMemoryCouple-expected"],
+    data: [":art-run-test-2027-TwiceTheSameMemoryCouple-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-2027-TwiceTheSameMemoryCouple-expected",
-    out: ["art-run-test-2027-TwiceTheSameMemoryCouple-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-2027-TwiceTheSameMemoryCouple-expected-stdout",
+    out: ["art-run-test-2027-TwiceTheSameMemoryCouple-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/2027-TwiceTheSameMemoryCouple/expected.txt b/test/2027-TwiceTheSameMemoryCouple/expected-stdout.txt
index e69de29bb2..e69de29bb2 100644
--- a/test/2027-TwiceTheSameMemoryCouple/expected.txt
+++ b/test/2027-TwiceTheSameMemoryCouple/expected-stdout.txt
diff --git a/test/2028-MultiBackward/Android.bp b/test/2028-MultiBackward/Android.bp
index 45e5e63167..73666ae1b6 100644
--- a/test/2028-MultiBackward/Android.bp
+++ b/test/2028-MultiBackward/Android.bp
@@ -8,13 +8,13 @@ java_test {
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-2028-MultiBackward-expected"],
+    data: [":art-run-test-2028-MultiBackward-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-2028-MultiBackward-expected",
-    out: ["art-run-test-2028-MultiBackward-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-2028-MultiBackward-expected-stdout",
+    out: ["art-run-test-2028-MultiBackward-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/2028-MultiBackward/expected.txt b/test/2028-MultiBackward/expected-stdout.txt
index e69de29bb2..e69de29bb2 100644
--- a/test/2028-MultiBackward/expected.txt
+++ b/test/2028-MultiBackward/expected-stdout.txt
diff --git a/test/2029-contended-monitors/Android.bp b/test/2029-contended-monitors/Android.bp
index 9c0067b051..fe5e4cef89 100644
--- a/test/2029-contended-monitors/Android.bp
+++ b/test/2029-contended-monitors/Android.bp
@@ -8,13 +8,13 @@ java_test {
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-2029-contended-monitors-expected"],
+    data: [":art-run-test-2029-contended-monitors-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-2029-contended-monitors-expected",
-    out: ["art-run-test-2029-contended-monitors-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-2029-contended-monitors-expected-stdout",
+    out: ["art-run-test-2029-contended-monitors-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/2029-contended-monitors/expected.txt b/test/2029-contended-monitors/expected-stdout.txt
index 4fa00bcb24..4fa00bcb24 100644
--- a/test/2029-contended-monitors/expected.txt
+++ b/test/2029-contended-monitors/expected-stdout.txt
diff --git a/test/203-multi-checkpoint/Android.bp b/test/203-multi-checkpoint/Android.bp
index 80d557ad94..780a264402 100644
--- a/test/203-multi-checkpoint/Android.bp
+++ b/test/203-multi-checkpoint/Android.bp
@@ -8,13 +8,13 @@ java_test {
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-203-multi-checkpoint-expected"],
+    data: [":art-run-test-203-multi-checkpoint-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-203-multi-checkpoint-expected",
-    out: ["art-run-test-203-multi-checkpoint-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-203-multi-checkpoint-expected-stdout",
+    out: ["art-run-test-203-multi-checkpoint-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/203-multi-checkpoint/expected.txt b/test/203-multi-checkpoint/expected-stdout.txt
index e1e30e3f1d..e1e30e3f1d 100644
--- a/test/203-multi-checkpoint/expected.txt
+++ b/test/203-multi-checkpoint/expected-stdout.txt
diff --git a/test/2030-long-running-child/Android.bp b/test/2030-long-running-child/Android.bp
index cfdb7a0414..cb6187348f 100644
--- a/test/2030-long-running-child/Android.bp
+++ b/test/2030-long-running-child/Android.bp
@@ -8,13 +8,13 @@ java_test {
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-2030-long-running-child-expected"],
+    data: [":art-run-test-2030-long-running-child-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-2030-long-running-child-expected",
-    out: ["art-run-test-2030-long-running-child-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-2030-long-running-child-expected-stdout",
+    out: ["art-run-test-2030-long-running-child-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/2030-long-running-child/expected.txt b/test/2030-long-running-child/expected-stdout.txt
index 5180c39b7e..5180c39b7e 100644
--- a/test/2030-long-running-child/expected.txt
+++ b/test/2030-long-running-child/expected-stdout.txt
diff --git a/test/2031-zygote-compiled-frame-deopt/Android.bp b/test/2031-zygote-compiled-frame-deopt/Android.bp
index 6419655954..bbd36b4ca0 100644
--- a/test/2031-zygote-compiled-frame-deopt/Android.bp
+++ b/test/2031-zygote-compiled-frame-deopt/Android.bp
@@ -8,13 +8,13 @@ java_test {
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-2031-zygote-compiled-frame-deopt-expected"],
+    data: [":art-run-test-2031-zygote-compiled-frame-deopt-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-2031-zygote-compiled-frame-deopt-expected",
-    out: ["art-run-test-2031-zygote-compiled-frame-deopt-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-2031-zygote-compiled-frame-deopt-expected-stdout",
+    out: ["art-run-test-2031-zygote-compiled-frame-deopt-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/2031-zygote-compiled-frame-deopt/expected.txt b/test/2031-zygote-compiled-frame-deopt/expected-stdout.txt
index 21a75cfbfd..21a75cfbfd 100644
--- a/test/2031-zygote-compiled-frame-deopt/expected.txt
+++ b/test/2031-zygote-compiled-frame-deopt/expected-stdout.txt
diff --git a/test/2032-default-method-private-override/expected.txt b/test/2032-default-method-private-override/expected-stdout.txt
index 349ae32173..349ae32173 100644
--- a/test/2032-default-method-private-override/expected.txt
+++ b/test/2032-default-method-private-override/expected-stdout.txt
diff --git a/test/2033-shutdown-mechanics/Android.bp b/test/2033-shutdown-mechanics/Android.bp
index f36b49f83b..8adfa8217b 100644
--- a/test/2033-shutdown-mechanics/Android.bp
+++ b/test/2033-shutdown-mechanics/Android.bp
@@ -8,13 +8,13 @@ java_test {
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-2033-shutdown-mechanics-expected"],
+    data: [":art-run-test-2033-shutdown-mechanics-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-2033-shutdown-mechanics-expected",
-    out: ["art-run-test-2033-shutdown-mechanics-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-2033-shutdown-mechanics-expected-stdout",
+    out: ["art-run-test-2033-shutdown-mechanics-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/2033-shutdown-mechanics/expected.txt b/test/2033-shutdown-mechanics/expected-stdout.txt
index c95f39f761..c95f39f761 100644
--- a/test/2033-shutdown-mechanics/expected.txt
+++ b/test/2033-shutdown-mechanics/expected-stdout.txt
diff --git a/test/2034-spaces-in-SimpleName/expected.txt b/test/2034-spaces-in-SimpleName/expected-stdout.txt
index af5626b4a1..af5626b4a1 100644
--- a/test/2034-spaces-in-SimpleName/expected.txt
+++ b/test/2034-spaces-in-SimpleName/expected-stdout.txt
diff --git a/test/2035-structural-native-method/expected.txt b/test/2035-structural-native-method/expected-stdout.txt
index c782b8f83a..c782b8f83a 100644
--- a/test/2035-structural-native-method/expected.txt
+++ b/test/2035-structural-native-method/expected-stdout.txt
diff --git a/test/2036-jni-filechannel/Android.bp b/test/2036-jni-filechannel/Android.bp
index 588794e7b8..f29fc193d2 100644
--- a/test/2036-jni-filechannel/Android.bp
+++ b/test/2036-jni-filechannel/Android.bp
@@ -8,13 +8,13 @@ java_test {
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-2036-jni-filechannel-expected"],
+    data: [":art-run-test-2036-jni-filechannel-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-2036-jni-filechannel-expected",
-    out: ["art-run-test-2036-jni-filechannel-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-2036-jni-filechannel-expected-stdout",
+    out: ["art-run-test-2036-jni-filechannel-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/2036-jni-filechannel/expected.txt b/test/2036-jni-filechannel/expected-stdout.txt
index 98ea70abc8..98ea70abc8 100644
--- a/test/2036-jni-filechannel/expected.txt
+++ b/test/2036-jni-filechannel/expected-stdout.txt
diff --git a/test/2036-structural-subclass-shadow/expected.txt b/test/2036-structural-subclass-shadow/expected-stdout.txt
index 7fb86e3dce..7fb86e3dce 100644
--- a/test/2036-structural-subclass-shadow/expected.txt
+++ b/test/2036-structural-subclass-shadow/expected-stdout.txt
diff --git a/test/2037-thread-name-inherit/Android.bp b/test/2037-thread-name-inherit/Android.bp
index e17a8cf0bb..0812c010ea 100644
--- a/test/2037-thread-name-inherit/Android.bp
+++ b/test/2037-thread-name-inherit/Android.bp
@@ -8,13 +8,13 @@ java_test {
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-2037-thread-name-inherit-expected"],
+    data: [":art-run-test-2037-thread-name-inherit-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-2037-thread-name-inherit-expected",
-    out: ["art-run-test-2037-thread-name-inherit-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-2037-thread-name-inherit-expected-stdout",
+    out: ["art-run-test-2037-thread-name-inherit-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/2037-thread-name-inherit/expected.txt b/test/2037-thread-name-inherit/expected-stdout.txt
index 6a5618ebc6..6a5618ebc6 100644
--- a/test/2037-thread-name-inherit/expected.txt
+++ b/test/2037-thread-name-inherit/expected-stdout.txt
diff --git a/test/2230-profile-save-hotness/expected.txt b/test/2230-profile-save-hotness/expected-stdout.txt
index 6a5618ebc6..6a5618ebc6 100644
--- a/test/2230-profile-save-hotness/expected.txt
+++ b/test/2230-profile-save-hotness/expected-stdout.txt
diff --git a/test/2231-checker-heap-poisoning/Android.bp b/test/2231-checker-heap-poisoning/Android.bp
index f873518807..f91683c2e8 100644
--- a/test/2231-checker-heap-poisoning/Android.bp
+++ b/test/2231-checker-heap-poisoning/Android.bp
@@ -8,7 +8,7 @@ java_test {
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-2231-checker-heap-poisoning-expected"],
+    data: [":art-run-test-2231-checker-heap-poisoning-expected-stdout"],
     // Include the Java source files in the test's artifacts, to make Checker assertions
     // available to the TradeFed test runner.
     include_srcs: true,
@@ -16,8 +16,8 @@ java_test {
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-2231-checker-heap-poisoning-expected",
-    out: ["art-run-test-2231-checker-heap-poisoning-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-2231-checker-heap-poisoning-expected-stdout",
+    out: ["art-run-test-2231-checker-heap-poisoning-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/2231-checker-heap-poisoning/expected.txt b/test/2231-checker-heap-poisoning/expected-stdout.txt
index b0aad4deb5..b0aad4deb5 100644
--- a/test/2231-checker-heap-poisoning/expected.txt
+++ b/test/2231-checker-heap-poisoning/expected-stdout.txt
diff --git a/test/300-package-override/Android.bp b/test/300-package-override/Android.bp
index c1092072d8..953d2d3349 100644
--- a/test/300-package-override/Android.bp
+++ b/test/300-package-override/Android.bp
@@ -8,13 +8,13 @@ java_test {
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-300-package-override-expected"],
+    data: [":art-run-test-300-package-override-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-300-package-override-expected",
-    out: ["art-run-test-300-package-override-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-300-package-override-expected-stdout",
+    out: ["art-run-test-300-package-override-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/300-package-override/expected.txt b/test/300-package-override/expected-stdout.txt
index a2c3f20029..a2c3f20029 100644
--- a/test/300-package-override/expected.txt
+++ b/test/300-package-override/expected-stdout.txt
diff --git a/test/301-abstract-protected/Android.bp b/test/301-abstract-protected/Android.bp
index a4cc45cc50..df0cc91687 100644
--- a/test/301-abstract-protected/Android.bp
+++ b/test/301-abstract-protected/Android.bp
@@ -8,13 +8,13 @@ java_test {
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-301-abstract-protected-expected"],
+    data: [":art-run-test-301-abstract-protected-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-301-abstract-protected-expected",
-    out: ["art-run-test-301-abstract-protected-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-301-abstract-protected-expected-stdout",
+    out: ["art-run-test-301-abstract-protected-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/301-abstract-protected/expected.txt b/test/301-abstract-protected/expected-stdout.txt
index b0aad4deb5..b0aad4deb5 100644
--- a/test/301-abstract-protected/expected.txt
+++ b/test/301-abstract-protected/expected-stdout.txt
diff --git a/test/302-float-conversion/Android.bp b/test/302-float-conversion/Android.bp
index 721a34a94a..66a15fe1d6 100644
--- a/test/302-float-conversion/Android.bp
+++ b/test/302-float-conversion/Android.bp
@@ -8,13 +8,13 @@ java_test {
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-302-float-conversion-expected"],
+    data: [":art-run-test-302-float-conversion-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-302-float-conversion-expected",
-    out: ["art-run-test-302-float-conversion-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-302-float-conversion-expected-stdout",
+    out: ["art-run-test-302-float-conversion-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/302-float-conversion/expected.txt b/test/302-float-conversion/expected-stdout.txt
index 04230761af..04230761af 100644
--- a/test/302-float-conversion/expected.txt
+++ b/test/302-float-conversion/expected-stdout.txt
diff --git a/test/303-verification-stress/expected.txt b/test/303-verification-stress/expected-stdout.txt
index 4fa1b5733d..4fa1b5733d 100644
--- a/test/303-verification-stress/expected.txt
+++ b/test/303-verification-stress/expected-stdout.txt
diff --git a/test/304-method-tracing/Android.bp b/test/304-method-tracing/Android.bp
index 388dd389e3..4a3de9312d 100644
--- a/test/304-method-tracing/Android.bp
+++ b/test/304-method-tracing/Android.bp
@@ -8,13 +8,13 @@ java_test {
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-304-method-tracing-expected"],
+    data: [":art-run-test-304-method-tracing-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-304-method-tracing-expected",
-    out: ["art-run-test-304-method-tracing-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-304-method-tracing-expected-stdout",
+    out: ["art-run-test-304-method-tracing-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/304-method-tracing/expected.txt b/test/304-method-tracing/expected-stdout.txt
index e69de29bb2..e69de29bb2 100644
--- a/test/304-method-tracing/expected.txt
+++ b/test/304-method-tracing/expected-stdout.txt
diff --git a/test/305-other-fault-handler/Android.bp b/test/305-other-fault-handler/Android.bp
index 37a05d99f3..d241ea5597 100644
--- a/test/305-other-fault-handler/Android.bp
+++ b/test/305-other-fault-handler/Android.bp
@@ -8,13 +8,13 @@ java_test {
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-305-other-fault-handler-expected"],
+    data: [":art-run-test-305-other-fault-handler-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-305-other-fault-handler-expected",
-    out: ["art-run-test-305-other-fault-handler-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-305-other-fault-handler-expected-stdout",
+    out: ["art-run-test-305-other-fault-handler-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/305-other-fault-handler/expected.txt b/test/305-other-fault-handler/expected-stdout.txt
index 6221e8e853..6221e8e853 100644
--- a/test/305-other-fault-handler/expected.txt
+++ b/test/305-other-fault-handler/expected-stdout.txt
diff --git a/test/370-dex-v37/expected.txt b/test/370-dex-v37/expected-stdout.txt
index af5626b4a1..af5626b4a1 100644
--- a/test/370-dex-v37/expected.txt
+++ b/test/370-dex-v37/expected-stdout.txt
diff --git a/test/401-optimizing-compiler/Android.bp b/test/401-optimizing-compiler/Android.bp
index 19cc94a8ed..6dffa22d54 100644
--- a/test/401-optimizing-compiler/Android.bp
+++ b/test/401-optimizing-compiler/Android.bp
@@ -8,13 +8,13 @@ java_test {
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-401-optimizing-compiler-expected"],
+    data: [":art-run-test-401-optimizing-compiler-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-401-optimizing-compiler-expected",
-    out: ["art-run-test-401-optimizing-compiler-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-401-optimizing-compiler-expected-stdout",
+    out: ["art-run-test-401-optimizing-compiler-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/401-optimizing-compiler/expected.txt b/test/401-optimizing-compiler/expected-stdout.txt
index d6ef64b96b..d6ef64b96b 100644
--- a/test/401-optimizing-compiler/expected.txt
+++ b/test/401-optimizing-compiler/expected-stdout.txt
diff --git a/test/402-optimizing-control-flow/Android.bp b/test/402-optimizing-control-flow/Android.bp
index ddc024437d..7dd12eb66e 100644
--- a/test/402-optimizing-control-flow/Android.bp
+++ b/test/402-optimizing-control-flow/Android.bp
@@ -8,13 +8,13 @@ java_test {
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-402-optimizing-control-flow-expected"],
+    data: [":art-run-test-402-optimizing-control-flow-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-402-optimizing-control-flow-expected",
-    out: ["art-run-test-402-optimizing-control-flow-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-402-optimizing-control-flow-expected-stdout",
+    out: ["art-run-test-402-optimizing-control-flow-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/402-optimizing-control-flow/expected.txt b/test/402-optimizing-control-flow/expected-stdout.txt
index e69de29bb2..e69de29bb2 100644
--- a/test/402-optimizing-control-flow/expected.txt
+++ b/test/402-optimizing-control-flow/expected-stdout.txt
diff --git a/test/403-optimizing-long/Android.bp b/test/403-optimizing-long/Android.bp
index 9c6fac3b29..af58501cad 100644
--- a/test/403-optimizing-long/Android.bp
+++ b/test/403-optimizing-long/Android.bp
@@ -8,13 +8,13 @@ java_test {
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-403-optimizing-long-expected"],
+    data: [":art-run-test-403-optimizing-long-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-403-optimizing-long-expected",
-    out: ["art-run-test-403-optimizing-long-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-403-optimizing-long-expected-stdout",
+    out: ["art-run-test-403-optimizing-long-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/403-optimizing-long/expected.txt b/test/403-optimizing-long/expected-stdout.txt
index dff83cf9b8..dff83cf9b8 100644
--- a/test/403-optimizing-long/expected.txt
+++ b/test/403-optimizing-long/expected-stdout.txt
diff --git a/test/404-optimizing-allocator/Android.bp b/test/404-optimizing-allocator/Android.bp
index d7ca988a18..ec38c4e04f 100644
--- a/test/404-optimizing-allocator/Android.bp
+++ b/test/404-optimizing-allocator/Android.bp
@@ -8,13 +8,13 @@ java_test {
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-404-optimizing-allocator-expected"],
+    data: [":art-run-test-404-optimizing-allocator-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-404-optimizing-allocator-expected",
-    out: ["art-run-test-404-optimizing-allocator-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-404-optimizing-allocator-expected-stdout",
+    out: ["art-run-test-404-optimizing-allocator-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/404-optimizing-allocator/expected.txt b/test/404-optimizing-allocator/expected-stdout.txt
index e69de29bb2..e69de29bb2 100644
--- a/test/404-optimizing-allocator/expected.txt
+++ b/test/404-optimizing-allocator/expected-stdout.txt
diff --git a/test/405-optimizing-long-allocator/Android.bp b/test/405-optimizing-long-allocator/Android.bp
index 50251fc942..aea309e0ba 100644
--- a/test/405-optimizing-long-allocator/Android.bp
+++ b/test/405-optimizing-long-allocator/Android.bp
@@ -8,13 +8,13 @@ java_test {
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-405-optimizing-long-allocator-expected"],
+    data: [":art-run-test-405-optimizing-long-allocator-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-405-optimizing-long-allocator-expected",
-    out: ["art-run-test-405-optimizing-long-allocator-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-405-optimizing-long-allocator-expected-stdout",
+    out: ["art-run-test-405-optimizing-long-allocator-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/405-optimizing-long-allocator/expected.txt b/test/405-optimizing-long-allocator/expected-stdout.txt
index e69de29bb2..e69de29bb2 100644
--- a/test/405-optimizing-long-allocator/expected.txt
+++ b/test/405-optimizing-long-allocator/expected-stdout.txt
diff --git a/test/406-fields/Android.bp b/test/406-fields/Android.bp
index 6a08f78200..68a7812488 100644
--- a/test/406-fields/Android.bp
+++ b/test/406-fields/Android.bp
@@ -8,13 +8,13 @@ java_test {
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-406-fields-expected"],
+    data: [":art-run-test-406-fields-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-406-fields-expected",
-    out: ["art-run-test-406-fields-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-406-fields-expected-stdout",
+    out: ["art-run-test-406-fields-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/406-fields/expected.txt b/test/406-fields/expected-stdout.txt
index e69de29bb2..e69de29bb2 100644
--- a/test/406-fields/expected.txt
+++ b/test/406-fields/expected-stdout.txt
diff --git a/test/407-arrays/Android.bp b/test/407-arrays/Android.bp
index 175cfa6634..4698ddedc3 100644
--- a/test/407-arrays/Android.bp
+++ b/test/407-arrays/Android.bp
@@ -8,13 +8,13 @@ java_test {
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-407-arrays-expected"],
+    data: [":art-run-test-407-arrays-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-407-arrays-expected",
-    out: ["art-run-test-407-arrays-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-407-arrays-expected-stdout",
+    out: ["art-run-test-407-arrays-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/407-arrays/expected.txt b/test/407-arrays/expected-stdout.txt
index e69de29bb2..e69de29bb2 100644
--- a/test/407-arrays/expected.txt
+++ b/test/407-arrays/expected-stdout.txt
diff --git a/test/408-move-bug/Android.bp b/test/408-move-bug/Android.bp
index b050b8b05a..1c2a816465 100644
--- a/test/408-move-bug/Android.bp
+++ b/test/408-move-bug/Android.bp
@@ -8,13 +8,13 @@ java_test {
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-408-move-bug-expected"],
+    data: [":art-run-test-408-move-bug-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-408-move-bug-expected",
-    out: ["art-run-test-408-move-bug-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-408-move-bug-expected-stdout",
+    out: ["art-run-test-408-move-bug-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/408-move-bug/expected.txt b/test/408-move-bug/expected-stdout.txt
index e69de29bb2..e69de29bb2 100644
--- a/test/408-move-bug/expected.txt
+++ b/test/408-move-bug/expected-stdout.txt
diff --git a/test/409-materialized-condition/Android.bp b/test/409-materialized-condition/Android.bp
index b41312fd0e..0994a0751a 100644
--- a/test/409-materialized-condition/Android.bp
+++ b/test/409-materialized-condition/Android.bp
@@ -8,13 +8,13 @@ java_test {
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-409-materialized-condition-expected"],
+    data: [":art-run-test-409-materialized-condition-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-409-materialized-condition-expected",
-    out: ["art-run-test-409-materialized-condition-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-409-materialized-condition-expected-stdout",
+    out: ["art-run-test-409-materialized-condition-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/409-materialized-condition/expected.txt b/test/409-materialized-condition/expected-stdout.txt
index a0796cde77..a0796cde77 100644
--- a/test/409-materialized-condition/expected.txt
+++ b/test/409-materialized-condition/expected-stdout.txt
diff --git a/test/410-floats/Android.bp b/test/410-floats/Android.bp
index 509ea62623..09c43174e8 100644
--- a/test/410-floats/Android.bp
+++ b/test/410-floats/Android.bp
@@ -8,13 +8,13 @@ java_test {
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-410-floats-expected"],
+    data: [":art-run-test-410-floats-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-410-floats-expected",
-    out: ["art-run-test-410-floats-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-410-floats-expected-stdout",
+    out: ["art-run-test-410-floats-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/410-floats/expected.txt b/test/410-floats/expected-stdout.txt
index e69de29bb2..e69de29bb2 100644
--- a/test/410-floats/expected.txt
+++ b/test/410-floats/expected-stdout.txt
diff --git a/test/411-checker-hdiv-hrem-const/Android.bp b/test/411-checker-hdiv-hrem-const/Android.bp
index b527c35061..b10f824074 100644
--- a/test/411-checker-hdiv-hrem-const/Android.bp
+++ b/test/411-checker-hdiv-hrem-const/Android.bp
@@ -8,7 +8,7 @@ java_test {
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-411-checker-hdiv-hrem-const-expected"],
+    data: [":art-run-test-411-checker-hdiv-hrem-const-expected-stdout"],
     // Include the Java source files in the test's artifacts, to make Checker assertions
     // available to the TradeFed test runner.
     include_srcs: true,
@@ -16,8 +16,8 @@ java_test {
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-411-checker-hdiv-hrem-const-expected",
-    out: ["art-run-test-411-checker-hdiv-hrem-const-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-411-checker-hdiv-hrem-const-expected-stdout",
+    out: ["art-run-test-411-checker-hdiv-hrem-const-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/411-checker-hdiv-hrem-const/expected.txt b/test/411-checker-hdiv-hrem-const/expected-stdout.txt
index e69de29bb2..e69de29bb2 100644
--- a/test/411-checker-hdiv-hrem-const/expected.txt
+++ b/test/411-checker-hdiv-hrem-const/expected-stdout.txt
diff --git a/test/411-checker-hdiv-hrem-pow2/Android.bp b/test/411-checker-hdiv-hrem-pow2/Android.bp
index 5dc3f09c05..c67375cae1 100644
--- a/test/411-checker-hdiv-hrem-pow2/Android.bp
+++ b/test/411-checker-hdiv-hrem-pow2/Android.bp
@@ -8,7 +8,7 @@ java_test {
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-411-checker-hdiv-hrem-pow2-expected"],
+    data: [":art-run-test-411-checker-hdiv-hrem-pow2-expected-stdout"],
     // Include the Java source files in the test's artifacts, to make Checker assertions
     // available to the TradeFed test runner.
     include_srcs: true,
@@ -16,8 +16,8 @@ java_test {
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-411-checker-hdiv-hrem-pow2-expected",
-    out: ["art-run-test-411-checker-hdiv-hrem-pow2-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-411-checker-hdiv-hrem-pow2-expected-stdout",
+    out: ["art-run-test-411-checker-hdiv-hrem-pow2-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/411-checker-hdiv-hrem-pow2/expected.txt b/test/411-checker-hdiv-hrem-pow2/expected-stdout.txt
index e69de29bb2..e69de29bb2 100644
--- a/test/411-checker-hdiv-hrem-pow2/expected.txt
+++ b/test/411-checker-hdiv-hrem-pow2/expected-stdout.txt
diff --git a/test/411-checker-instruct-simplifier-hrem/Android.bp b/test/411-checker-instruct-simplifier-hrem/Android.bp
index 6268107ab1..57be3f9338 100644
--- a/test/411-checker-instruct-simplifier-hrem/Android.bp
+++ b/test/411-checker-instruct-simplifier-hrem/Android.bp
@@ -8,7 +8,7 @@ java_test {
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-411-checker-instruct-simplifier-hrem-expected"],
+    data: [":art-run-test-411-checker-instruct-simplifier-hrem-expected-stdout"],
     // Include the Java source files in the test's artifacts, to make Checker assertions
     // available to the TradeFed test runner.
     include_srcs: true,
@@ -16,8 +16,8 @@ java_test {
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-411-checker-instruct-simplifier-hrem-expected",
-    out: ["art-run-test-411-checker-instruct-simplifier-hrem-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-411-checker-instruct-simplifier-hrem-expected-stdout",
+    out: ["art-run-test-411-checker-instruct-simplifier-hrem-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/411-checker-instruct-simplifier-hrem/expected.txt b/test/411-checker-instruct-simplifier-hrem/expected-stdout.txt
index e69de29bb2..e69de29bb2 100644
--- a/test/411-checker-instruct-simplifier-hrem/expected.txt
+++ b/test/411-checker-instruct-simplifier-hrem/expected-stdout.txt
diff --git a/test/411-optimizing-arith/Android.bp b/test/411-optimizing-arith/Android.bp
index ab74289940..a2402f599f 100644
--- a/test/411-optimizing-arith/Android.bp
+++ b/test/411-optimizing-arith/Android.bp
@@ -8,13 +8,13 @@ java_test {
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-411-optimizing-arith-expected"],
+    data: [":art-run-test-411-optimizing-arith-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-411-optimizing-arith-expected",
-    out: ["art-run-test-411-optimizing-arith-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-411-optimizing-arith-expected-stdout",
+    out: ["art-run-test-411-optimizing-arith-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/411-optimizing-arith/expected.txt b/test/411-optimizing-arith/expected-stdout.txt
index e69de29bb2..e69de29bb2 100644
--- a/test/411-optimizing-arith/expected.txt
+++ b/test/411-optimizing-arith/expected-stdout.txt
diff --git a/test/412-new-array/expected.txt b/test/412-new-array/expected-stdout.txt
index e69de29bb2..e69de29bb2 100644
--- a/test/412-new-array/expected.txt
+++ b/test/412-new-array/expected-stdout.txt
diff --git a/test/413-regalloc-regression/Android.bp b/test/413-regalloc-regression/Android.bp
index b03afd8794..159519bf92 100644
--- a/test/413-regalloc-regression/Android.bp
+++ b/test/413-regalloc-regression/Android.bp
@@ -8,13 +8,13 @@ java_test {
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-413-regalloc-regression-expected"],
+    data: [":art-run-test-413-regalloc-regression-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-413-regalloc-regression-expected",
-    out: ["art-run-test-413-regalloc-regression-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-413-regalloc-regression-expected-stdout",
+    out: ["art-run-test-413-regalloc-regression-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/413-regalloc-regression/expected.txt b/test/413-regalloc-regression/expected-stdout.txt
index e69de29bb2..e69de29bb2 100644
--- a/test/413-regalloc-regression/expected.txt
+++ b/test/413-regalloc-regression/expected-stdout.txt
diff --git a/test/414-static-fields/Android.bp b/test/414-static-fields/Android.bp
index 5ae7f5b585..1de8ec13eb 100644
--- a/test/414-static-fields/Android.bp
+++ b/test/414-static-fields/Android.bp
@@ -8,13 +8,13 @@ java_test {
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-414-static-fields-expected"],
+    data: [":art-run-test-414-static-fields-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-414-static-fields-expected",
-    out: ["art-run-test-414-static-fields-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-414-static-fields-expected-stdout",
+    out: ["art-run-test-414-static-fields-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/414-static-fields/expected.txt b/test/414-static-fields/expected-stdout.txt
index e69de29bb2..e69de29bb2 100644
--- a/test/414-static-fields/expected.txt
+++ b/test/414-static-fields/expected-stdout.txt
diff --git a/test/416-optimizing-arith-not/expected.txt b/test/416-optimizing-arith-not/expected-stdout.txt
index e69de29bb2..e69de29bb2 100644
--- a/test/416-optimizing-arith-not/expected.txt
+++ b/test/416-optimizing-arith-not/expected-stdout.txt
diff --git a/test/418-const-string/Android.bp b/test/418-const-string/Android.bp
index 6dc20671f0..6078a443fb 100644
--- a/test/418-const-string/Android.bp
+++ b/test/418-const-string/Android.bp
@@ -8,13 +8,13 @@ java_test {
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-418-const-string-expected"],
+    data: [":art-run-test-418-const-string-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-418-const-string-expected",
-    out: ["art-run-test-418-const-string-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-418-const-string-expected-stdout",
+    out: ["art-run-test-418-const-string-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/418-const-string/expected.txt b/test/418-const-string/expected-stdout.txt
index 8254f875c6..8254f875c6 100644
--- a/test/418-const-string/expected.txt
+++ b/test/418-const-string/expected-stdout.txt
diff --git a/test/419-long-parameter/Android.bp b/test/419-long-parameter/Android.bp
index 90f1fc2dc4..694b09ef24 100644
--- a/test/419-long-parameter/Android.bp
+++ b/test/419-long-parameter/Android.bp
@@ -8,13 +8,13 @@ java_test {
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-419-long-parameter-expected"],
+    data: [":art-run-test-419-long-parameter-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-419-long-parameter-expected",
-    out: ["art-run-test-419-long-parameter-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-419-long-parameter-expected-stdout",
+    out: ["art-run-test-419-long-parameter-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/419-long-parameter/expected.txt b/test/419-long-parameter/expected-stdout.txt
index e69de29bb2..e69de29bb2 100644
--- a/test/419-long-parameter/expected.txt
+++ b/test/419-long-parameter/expected-stdout.txt
diff --git a/test/420-const-class/Android.bp b/test/420-const-class/Android.bp
index 8c08f06629..25864dfcc9 100644
--- a/test/420-const-class/Android.bp
+++ b/test/420-const-class/Android.bp
@@ -8,13 +8,13 @@ java_test {
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-420-const-class-expected"],
+    data: [":art-run-test-420-const-class-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-420-const-class-expected",
-    out: ["art-run-test-420-const-class-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-420-const-class-expected-stdout",
+    out: ["art-run-test-420-const-class-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/420-const-class/expected.txt b/test/420-const-class/expected-stdout.txt
index 3213026619..3213026619 100644
--- a/test/420-const-class/expected.txt
+++ b/test/420-const-class/expected-stdout.txt
diff --git a/test/421-exceptions/Android.bp b/test/421-exceptions/Android.bp
index 1313ad5a80..6bb4c844ed 100644
--- a/test/421-exceptions/Android.bp
+++ b/test/421-exceptions/Android.bp
@@ -8,13 +8,13 @@ java_test {
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-421-exceptions-expected"],
+    data: [":art-run-test-421-exceptions-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-421-exceptions-expected",
-    out: ["art-run-test-421-exceptions-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-421-exceptions-expected-stdout",
+    out: ["art-run-test-421-exceptions-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/421-exceptions/expected.txt b/test/421-exceptions/expected-stdout.txt
index 94db350a03..94db350a03 100644
--- a/test/421-exceptions/expected.txt
+++ b/test/421-exceptions/expected-stdout.txt
diff --git a/test/421-large-frame/Android.bp b/test/421-large-frame/Android.bp
index f51a0b1d04..6cc678e253 100644
--- a/test/421-large-frame/Android.bp
+++ b/test/421-large-frame/Android.bp
@@ -8,13 +8,13 @@ java_test {
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-421-large-frame-expected"],
+    data: [":art-run-test-421-large-frame-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-421-large-frame-expected",
-    out: ["art-run-test-421-large-frame-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-421-large-frame-expected-stdout",
+    out: ["art-run-test-421-large-frame-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/421-large-frame/expected.txt b/test/421-large-frame/expected-stdout.txt
index e69de29bb2..e69de29bb2 100644
--- a/test/421-large-frame/expected.txt
+++ b/test/421-large-frame/expected-stdout.txt
diff --git a/test/422-instanceof/Android.bp b/test/422-instanceof/Android.bp
index e35486922c..9e1da09ff7 100644
--- a/test/422-instanceof/Android.bp
+++ b/test/422-instanceof/Android.bp
@@ -8,13 +8,13 @@ java_test {
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-422-instanceof-expected"],
+    data: [":art-run-test-422-instanceof-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-422-instanceof-expected",
-    out: ["art-run-test-422-instanceof-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-422-instanceof-expected-stdout",
+    out: ["art-run-test-422-instanceof-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/422-instanceof/expected.txt b/test/422-instanceof/expected-stdout.txt
index e69de29bb2..e69de29bb2 100644
--- a/test/422-instanceof/expected.txt
+++ b/test/422-instanceof/expected-stdout.txt
diff --git a/test/422-type-conversion/Android.bp b/test/422-type-conversion/Android.bp
index 5c5468c1b7..256845b041 100644
--- a/test/422-type-conversion/Android.bp
+++ b/test/422-type-conversion/Android.bp
@@ -8,13 +8,13 @@ java_test {
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-422-type-conversion-expected"],
+    data: [":art-run-test-422-type-conversion-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-422-type-conversion-expected",
-    out: ["art-run-test-422-type-conversion-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-422-type-conversion-expected-stdout",
+    out: ["art-run-test-422-type-conversion-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/422-type-conversion/expected.txt b/test/422-type-conversion/expected-stdout.txt
index e69de29bb2..e69de29bb2 100644
--- a/test/422-type-conversion/expected.txt
+++ b/test/422-type-conversion/expected-stdout.txt
diff --git a/test/423-invoke-interface/Android.bp b/test/423-invoke-interface/Android.bp
index ed88de5a53..404d530c22 100644
--- a/test/423-invoke-interface/Android.bp
+++ b/test/423-invoke-interface/Android.bp
@@ -8,13 +8,13 @@ java_test {
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-423-invoke-interface-expected"],
+    data: [":art-run-test-423-invoke-interface-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-423-invoke-interface-expected",
-    out: ["art-run-test-423-invoke-interface-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-423-invoke-interface-expected-stdout",
+    out: ["art-run-test-423-invoke-interface-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/423-invoke-interface/expected.txt b/test/423-invoke-interface/expected-stdout.txt
index e69de29bb2..e69de29bb2 100644
--- a/test/423-invoke-interface/expected.txt
+++ b/test/423-invoke-interface/expected-stdout.txt
diff --git a/test/424-checkcast/Android.bp b/test/424-checkcast/Android.bp
index 167ef90d71..b6cfd5f99f 100644
--- a/test/424-checkcast/Android.bp
+++ b/test/424-checkcast/Android.bp
@@ -8,13 +8,13 @@ java_test {
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-424-checkcast-expected"],
+    data: [":art-run-test-424-checkcast-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-424-checkcast-expected",
-    out: ["art-run-test-424-checkcast-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-424-checkcast-expected-stdout",
+    out: ["art-run-test-424-checkcast-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/424-checkcast/expected.txt b/test/424-checkcast/expected-stdout.txt
index e69de29bb2..e69de29bb2 100644
--- a/test/424-checkcast/expected.txt
+++ b/test/424-checkcast/expected-stdout.txt
diff --git a/test/425-invoke-super/expected.txt b/test/425-invoke-super/expected-stdout.txt
index f7f6ae4911..f7f6ae4911 100644
--- a/test/425-invoke-super/expected.txt
+++ b/test/425-invoke-super/expected-stdout.txt
diff --git a/test/426-monitor/Android.bp b/test/426-monitor/Android.bp
index 587f407616..82eb2fbac7 100644
--- a/test/426-monitor/Android.bp
+++ b/test/426-monitor/Android.bp
@@ -8,13 +8,13 @@ java_test {
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-426-monitor-expected"],
+    data: [":art-run-test-426-monitor-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-426-monitor-expected",
-    out: ["art-run-test-426-monitor-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-426-monitor-expected-stdout",
+    out: ["art-run-test-426-monitor-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/426-monitor/expected.txt b/test/426-monitor/expected-stdout.txt
index 2ffeff4be3..2ffeff4be3 100644
--- a/test/426-monitor/expected.txt
+++ b/test/426-monitor/expected-stdout.txt
diff --git a/test/427-bitwise/Android.bp b/test/427-bitwise/Android.bp
index c2c457836e..c619fab7c5 100644
--- a/test/427-bitwise/Android.bp
+++ b/test/427-bitwise/Android.bp
@@ -8,13 +8,13 @@ java_test {
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-427-bitwise-expected"],
+    data: [":art-run-test-427-bitwise-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-427-bitwise-expected",
-    out: ["art-run-test-427-bitwise-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-427-bitwise-expected-stdout",
+    out: ["art-run-test-427-bitwise-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/427-bitwise/expected.txt b/test/427-bitwise/expected-stdout.txt
index e69de29bb2..e69de29bb2 100644
--- a/test/427-bitwise/expected.txt
+++ b/test/427-bitwise/expected-stdout.txt
diff --git a/test/427-bounds/Android.bp b/test/427-bounds/Android.bp
index 01d4feb797..62237be1e6 100644
--- a/test/427-bounds/Android.bp
+++ b/test/427-bounds/Android.bp
@@ -8,13 +8,13 @@ java_test {
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-427-bounds-expected"],
+    data: [":art-run-test-427-bounds-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-427-bounds-expected",
-    out: ["art-run-test-427-bounds-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-427-bounds-expected-stdout",
+    out: ["art-run-test-427-bounds-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/427-bounds/expected.txt b/test/427-bounds/expected-stdout.txt
index e69de29bb2..e69de29bb2 100644
--- a/test/427-bounds/expected.txt
+++ b/test/427-bounds/expected-stdout.txt
diff --git a/test/429-ssa-builder/Android.bp b/test/429-ssa-builder/Android.bp
index ce181421c9..2956222ae9 100644
--- a/test/429-ssa-builder/Android.bp
+++ b/test/429-ssa-builder/Android.bp
@@ -8,13 +8,13 @@ java_test {
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-429-ssa-builder-expected"],
+    data: [":art-run-test-429-ssa-builder-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-429-ssa-builder-expected",
-    out: ["art-run-test-429-ssa-builder-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-429-ssa-builder-expected-stdout",
+    out: ["art-run-test-429-ssa-builder-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/429-ssa-builder/expected.txt b/test/429-ssa-builder/expected-stdout.txt
index e69de29bb2..e69de29bb2 100644
--- a/test/429-ssa-builder/expected.txt
+++ b/test/429-ssa-builder/expected-stdout.txt
diff --git a/test/430-live-register-slow-path/Android.bp b/test/430-live-register-slow-path/Android.bp
index 3220b482b6..697309ca16 100644
--- a/test/430-live-register-slow-path/Android.bp
+++ b/test/430-live-register-slow-path/Android.bp
@@ -8,13 +8,13 @@ java_test {
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-430-live-register-slow-path-expected"],
+    data: [":art-run-test-430-live-register-slow-path-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-430-live-register-slow-path-expected",
-    out: ["art-run-test-430-live-register-slow-path-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-430-live-register-slow-path-expected-stdout",
+    out: ["art-run-test-430-live-register-slow-path-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/430-live-register-slow-path/expected.txt b/test/430-live-register-slow-path/expected-stdout.txt
index e69de29bb2..e69de29bb2 100644
--- a/test/430-live-register-slow-path/expected.txt
+++ b/test/430-live-register-slow-path/expected-stdout.txt
diff --git a/test/431-type-propagation/expected.txt b/test/431-type-propagation/expected-stdout.txt
index ccaf6f8f0f..ccaf6f8f0f 100644
--- a/test/431-type-propagation/expected.txt
+++ b/test/431-type-propagation/expected-stdout.txt
diff --git a/test/432-optimizing-cmp/expected.txt b/test/432-optimizing-cmp/expected-stdout.txt
index e69de29bb2..e69de29bb2 100644
--- a/test/432-optimizing-cmp/expected.txt
+++ b/test/432-optimizing-cmp/expected-stdout.txt
diff --git a/test/433-gvn/Android.bp b/test/433-gvn/Android.bp
index 1cd72424b3..926498c47a 100644
--- a/test/433-gvn/Android.bp
+++ b/test/433-gvn/Android.bp
@@ -8,13 +8,13 @@ java_test {
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-433-gvn-expected"],
+    data: [":art-run-test-433-gvn-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-433-gvn-expected",
-    out: ["art-run-test-433-gvn-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-433-gvn-expected-stdout",
+    out: ["art-run-test-433-gvn-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/433-gvn/expected.txt b/test/433-gvn/expected-stdout.txt
index d81cc0710e..d81cc0710e 100644
--- a/test/433-gvn/expected.txt
+++ b/test/433-gvn/expected-stdout.txt
diff --git a/test/434-invoke-direct/expected.txt b/test/434-invoke-direct/expected-stdout.txt
index e69de29bb2..e69de29bb2 100644
--- a/test/434-invoke-direct/expected.txt
+++ b/test/434-invoke-direct/expected-stdout.txt
diff --git a/test/434-shifter-operand/Android.bp b/test/434-shifter-operand/Android.bp
index 736a3c80b8..5473d8256c 100644
--- a/test/434-shifter-operand/Android.bp
+++ b/test/434-shifter-operand/Android.bp
@@ -8,13 +8,13 @@ java_test {
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-434-shifter-operand-expected"],
+    data: [":art-run-test-434-shifter-operand-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-434-shifter-operand-expected",
-    out: ["art-run-test-434-shifter-operand-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-434-shifter-operand-expected-stdout",
+    out: ["art-run-test-434-shifter-operand-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/434-shifter-operand/expected.txt b/test/434-shifter-operand/expected-stdout.txt
index 52289c68f9..52289c68f9 100644
--- a/test/434-shifter-operand/expected.txt
+++ b/test/434-shifter-operand/expected-stdout.txt
diff --git a/test/435-new-instance/expected.txt b/test/435-new-instance/expected-stdout.txt
index e69de29bb2..e69de29bb2 100644
--- a/test/435-new-instance/expected.txt
+++ b/test/435-new-instance/expected-stdout.txt
diff --git a/test/435-try-finally-without-catch/Android.bp b/test/435-try-finally-without-catch/Android.bp
index 1b1f8bca15..6f2ad2f935 100644
--- a/test/435-try-finally-without-catch/Android.bp
+++ b/test/435-try-finally-without-catch/Android.bp
@@ -8,13 +8,13 @@ java_test {
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-435-try-finally-without-catch-expected"],
+    data: [":art-run-test-435-try-finally-without-catch-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-435-try-finally-without-catch-expected",
-    out: ["art-run-test-435-try-finally-without-catch-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-435-try-finally-without-catch-expected-stdout",
+    out: ["art-run-test-435-try-finally-without-catch-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/435-try-finally-without-catch/expected.txt b/test/435-try-finally-without-catch/expected-stdout.txt
index 8a67802d72..8a67802d72 100644
--- a/test/435-try-finally-without-catch/expected.txt
+++ b/test/435-try-finally-without-catch/expected-stdout.txt
diff --git a/test/436-rem-float/Android.bp b/test/436-rem-float/Android.bp
index 1271417536..febe50f189 100644
--- a/test/436-rem-float/Android.bp
+++ b/test/436-rem-float/Android.bp
@@ -8,13 +8,13 @@ java_test {
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-436-rem-float-expected"],
+    data: [":art-run-test-436-rem-float-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-436-rem-float-expected",
-    out: ["art-run-test-436-rem-float-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-436-rem-float-expected-stdout",
+    out: ["art-run-test-436-rem-float-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/436-rem-float/expected.txt b/test/436-rem-float/expected-stdout.txt
index e69de29bb2..e69de29bb2 100644
--- a/test/436-rem-float/expected.txt
+++ b/test/436-rem-float/expected-stdout.txt
diff --git a/test/436-shift-constant/Android.bp b/test/436-shift-constant/Android.bp
index a53ddc4423..ef6f3d164a 100644
--- a/test/436-shift-constant/Android.bp
+++ b/test/436-shift-constant/Android.bp
@@ -8,13 +8,13 @@ java_test {
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-436-shift-constant-expected"],
+    data: [":art-run-test-436-shift-constant-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-436-shift-constant-expected",
-    out: ["art-run-test-436-shift-constant-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-436-shift-constant-expected-stdout",
+    out: ["art-run-test-436-shift-constant-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/436-shift-constant/expected.txt b/test/436-shift-constant/expected-stdout.txt
index e69de29bb2..e69de29bb2 100644
--- a/test/436-shift-constant/expected.txt
+++ b/test/436-shift-constant/expected-stdout.txt
diff --git a/test/437-inline/Android.bp b/test/437-inline/Android.bp
index 6d4079d37f..e4f02dcb26 100644
--- a/test/437-inline/Android.bp
+++ b/test/437-inline/Android.bp
@@ -8,13 +8,13 @@ java_test {
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-437-inline-expected"],
+    data: [":art-run-test-437-inline-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-437-inline-expected",
-    out: ["art-run-test-437-inline-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-437-inline-expected-stdout",
+    out: ["art-run-test-437-inline-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/437-inline/expected.txt b/test/437-inline/expected-stdout.txt
index e69de29bb2..e69de29bb2 100644
--- a/test/437-inline/expected.txt
+++ b/test/437-inline/expected-stdout.txt
diff --git a/test/438-volatile/Android.bp b/test/438-volatile/Android.bp
index c87914d8d3..94f5613fbe 100644
--- a/test/438-volatile/Android.bp
+++ b/test/438-volatile/Android.bp
@@ -8,13 +8,13 @@ java_test {
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-438-volatile-expected"],
+    data: [":art-run-test-438-volatile-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-438-volatile-expected",
-    out: ["art-run-test-438-volatile-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-438-volatile-expected-stdout",
+    out: ["art-run-test-438-volatile-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/438-volatile/expected.txt b/test/438-volatile/expected-stdout.txt
index e69de29bb2..e69de29bb2 100644
--- a/test/438-volatile/expected.txt
+++ b/test/438-volatile/expected-stdout.txt
diff --git a/test/439-npe/Android.bp b/test/439-npe/Android.bp
index a9402bd7b3..317d2474da 100644
--- a/test/439-npe/Android.bp
+++ b/test/439-npe/Android.bp
@@ -8,13 +8,13 @@ java_test {
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-439-npe-expected"],
+    data: [":art-run-test-439-npe-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-439-npe-expected",
-    out: ["art-run-test-439-npe-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-439-npe-expected-stdout",
+    out: ["art-run-test-439-npe-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/439-npe/expected.txt b/test/439-npe/expected-stdout.txt
index b4fd6bb002..b4fd6bb002 100644
--- a/test/439-npe/expected.txt
+++ b/test/439-npe/expected-stdout.txt
diff --git a/test/439-swap-double/Android.bp b/test/439-swap-double/Android.bp
index c29d7f7b72..eba39a7480 100644
--- a/test/439-swap-double/Android.bp
+++ b/test/439-swap-double/Android.bp
@@ -8,13 +8,13 @@ java_test {
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-439-swap-double-expected"],
+    data: [":art-run-test-439-swap-double-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-439-swap-double-expected",
-    out: ["art-run-test-439-swap-double-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-439-swap-double-expected-stdout",
+    out: ["art-run-test-439-swap-double-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/439-swap-double/expected.txt b/test/439-swap-double/expected-stdout.txt
index 019c90149e..019c90149e 100644
--- a/test/439-swap-double/expected.txt
+++ b/test/439-swap-double/expected-stdout.txt
diff --git a/test/440-stmp/Android.bp b/test/440-stmp/Android.bp
index d6316ebbe7..895d21191c 100644
--- a/test/440-stmp/Android.bp
+++ b/test/440-stmp/Android.bp
@@ -8,13 +8,13 @@ java_test {
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-440-stmp-expected"],
+    data: [":art-run-test-440-stmp-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-440-stmp-expected",
-    out: ["art-run-test-440-stmp-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-440-stmp-expected-stdout",
+    out: ["art-run-test-440-stmp-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/440-stmp/expected.txt b/test/440-stmp/expected-stdout.txt
index e995b056a7..e995b056a7 100644
--- a/test/440-stmp/expected.txt
+++ b/test/440-stmp/expected-stdout.txt
diff --git a/test/441-checker-inliner/Android.bp b/test/441-checker-inliner/Android.bp
index 867399d466..1bf981d937 100644
--- a/test/441-checker-inliner/Android.bp
+++ b/test/441-checker-inliner/Android.bp
@@ -8,7 +8,7 @@ java_test {
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-441-checker-inliner-expected"],
+    data: [":art-run-test-441-checker-inliner-expected-stdout"],
     // Include the Java source files in the test's artifacts, to make Checker assertions
     // available to the TradeFed test runner.
     include_srcs: true,
@@ -16,8 +16,8 @@ java_test {
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-441-checker-inliner-expected",
-    out: ["art-run-test-441-checker-inliner-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-441-checker-inliner-expected-stdout",
+    out: ["art-run-test-441-checker-inliner-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/441-checker-inliner/expected.txt b/test/441-checker-inliner/expected-stdout.txt
index e69de29bb2..e69de29bb2 100644
--- a/test/441-checker-inliner/expected.txt
+++ b/test/441-checker-inliner/expected-stdout.txt
diff --git a/test/442-checker-constant-folding/expected.txt b/test/442-checker-constant-folding/expected-stdout.txt
index e69de29bb2..e69de29bb2 100644
--- a/test/442-checker-constant-folding/expected.txt
+++ b/test/442-checker-constant-folding/expected-stdout.txt
diff --git a/test/443-not-bool-inline/Android.bp b/test/443-not-bool-inline/Android.bp
index f6e8e9b622..b5174d4836 100644
--- a/test/443-not-bool-inline/Android.bp
+++ b/test/443-not-bool-inline/Android.bp
@@ -8,13 +8,13 @@ java_test {
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-443-not-bool-inline-expected"],
+    data: [":art-run-test-443-not-bool-inline-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-443-not-bool-inline-expected",
-    out: ["art-run-test-443-not-bool-inline-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-443-not-bool-inline-expected-stdout",
+    out: ["art-run-test-443-not-bool-inline-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/443-not-bool-inline/expected.txt b/test/443-not-bool-inline/expected-stdout.txt
index 3ee3849364..3ee3849364 100644
--- a/test/443-not-bool-inline/expected.txt
+++ b/test/443-not-bool-inline/expected-stdout.txt
diff --git a/test/444-checker-nce/Android.bp b/test/444-checker-nce/Android.bp
index 30aed54745..dac7527af6 100644
--- a/test/444-checker-nce/Android.bp
+++ b/test/444-checker-nce/Android.bp
@@ -8,7 +8,7 @@ java_test {
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-444-checker-nce-expected"],
+    data: [":art-run-test-444-checker-nce-expected-stdout"],
     // Include the Java source files in the test's artifacts, to make Checker assertions
     // available to the TradeFed test runner.
     include_srcs: true,
@@ -16,8 +16,8 @@ java_test {
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-444-checker-nce-expected",
-    out: ["art-run-test-444-checker-nce-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-444-checker-nce-expected-stdout",
+    out: ["art-run-test-444-checker-nce-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/444-checker-nce/expected.txt b/test/444-checker-nce/expected-stdout.txt
index e69de29bb2..e69de29bb2 100644
--- a/test/444-checker-nce/expected.txt
+++ b/test/444-checker-nce/expected-stdout.txt
diff --git a/test/445-checker-licm/Android.bp b/test/445-checker-licm/Android.bp
index c113483846..7e704a9659 100644
--- a/test/445-checker-licm/Android.bp
+++ b/test/445-checker-licm/Android.bp
@@ -8,7 +8,7 @@ java_test {
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-445-checker-licm-expected"],
+    data: [":art-run-test-445-checker-licm-expected-stdout"],
     // Include the Java source files in the test's artifacts, to make Checker assertions
     // available to the TradeFed test runner.
     include_srcs: true,
@@ -16,8 +16,8 @@ java_test {
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-445-checker-licm-expected",
-    out: ["art-run-test-445-checker-licm-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-445-checker-licm-expected-stdout",
+    out: ["art-run-test-445-checker-licm-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/445-checker-licm/expected.txt b/test/445-checker-licm/expected-stdout.txt
index b0aad4deb5..b0aad4deb5 100644
--- a/test/445-checker-licm/expected.txt
+++ b/test/445-checker-licm/expected-stdout.txt
diff --git a/test/446-checker-inliner2/Android.bp b/test/446-checker-inliner2/Android.bp
index cd2c5f6d0d..de61507f44 100644
--- a/test/446-checker-inliner2/Android.bp
+++ b/test/446-checker-inliner2/Android.bp
@@ -8,7 +8,7 @@ java_test {
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-446-checker-inliner2-expected"],
+    data: [":art-run-test-446-checker-inliner2-expected-stdout"],
     // Include the Java source files in the test's artifacts, to make Checker assertions
     // available to the TradeFed test runner.
     include_srcs: true,
@@ -16,8 +16,8 @@ java_test {
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-446-checker-inliner2-expected",
-    out: ["art-run-test-446-checker-inliner2-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-446-checker-inliner2-expected-stdout",
+    out: ["art-run-test-446-checker-inliner2-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/446-checker-inliner2/expected.txt b/test/446-checker-inliner2/expected-stdout.txt
index e69de29bb2..e69de29bb2 100644
--- a/test/446-checker-inliner2/expected.txt
+++ b/test/446-checker-inliner2/expected-stdout.txt
diff --git a/test/447-checker-inliner3/Android.bp b/test/447-checker-inliner3/Android.bp
index 7ff8f729d7..664cdae177 100644
--- a/test/447-checker-inliner3/Android.bp
+++ b/test/447-checker-inliner3/Android.bp
@@ -8,7 +8,7 @@ java_test {
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-447-checker-inliner3-expected"],
+    data: [":art-run-test-447-checker-inliner3-expected-stdout"],
     // Include the Java source files in the test's artifacts, to make Checker assertions
     // available to the TradeFed test runner.
     include_srcs: true,
@@ -16,8 +16,8 @@ java_test {
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-447-checker-inliner3-expected",
-    out: ["art-run-test-447-checker-inliner3-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-447-checker-inliner3-expected-stdout",
+    out: ["art-run-test-447-checker-inliner3-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/447-checker-inliner3/expected.txt b/test/447-checker-inliner3/expected-stdout.txt
index e69de29bb2..e69de29bb2 100644
--- a/test/447-checker-inliner3/expected.txt
+++ b/test/447-checker-inliner3/expected-stdout.txt
diff --git a/test/448-multiple-returns/expected.txt b/test/448-multiple-returns/expected-stdout.txt
index e69de29bb2..e69de29bb2 100644
--- a/test/448-multiple-returns/expected.txt
+++ b/test/448-multiple-returns/expected-stdout.txt
diff --git a/test/449-checker-bce-rem/Android.bp b/test/449-checker-bce-rem/Android.bp
index b1a7aa71bf..472c7c9377 100644
--- a/test/449-checker-bce-rem/Android.bp
+++ b/test/449-checker-bce-rem/Android.bp
@@ -8,7 +8,7 @@ java_test {
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-449-checker-bce-rem-expected"],
+    data: [":art-run-test-449-checker-bce-rem-expected-stdout"],
     // Include the Java source files in the test's artifacts, to make Checker assertions
     // available to the TradeFed test runner.
     include_srcs: true,
@@ -16,8 +16,8 @@ java_test {
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-449-checker-bce-rem-expected",
-    out: ["art-run-test-449-checker-bce-rem-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-449-checker-bce-rem-expected-stdout",
+    out: ["art-run-test-449-checker-bce-rem-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/449-checker-bce-rem/expected.txt b/test/449-checker-bce-rem/expected-stdout.txt
index e69de29bb2..e69de29bb2 100644
--- a/test/449-checker-bce-rem/expected.txt
+++ b/test/449-checker-bce-rem/expected-stdout.txt
diff --git a/test/449-checker-bce/Android.bp b/test/449-checker-bce/Android.bp
index 7c48bbcc7c..1cbd3032cd 100644
--- a/test/449-checker-bce/Android.bp
+++ b/test/449-checker-bce/Android.bp
@@ -8,7 +8,7 @@ java_test {
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-449-checker-bce-expected"],
+    data: [":art-run-test-449-checker-bce-expected-stdout"],
     // Include the Java source files in the test's artifacts, to make Checker assertions
     // available to the TradeFed test runner.
     include_srcs: true,
@@ -16,8 +16,8 @@ java_test {
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-449-checker-bce-expected",
-    out: ["art-run-test-449-checker-bce-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-449-checker-bce-expected-stdout",
+    out: ["art-run-test-449-checker-bce-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/449-checker-bce/expected.txt b/test/449-checker-bce/expected-stdout.txt
index 4665d7af8b..4665d7af8b 100644
--- a/test/449-checker-bce/expected.txt
+++ b/test/449-checker-bce/expected-stdout.txt
diff --git a/test/450-checker-types/Android.bp b/test/450-checker-types/Android.bp
index ff1bb3bf25..2ac311b666 100644
--- a/test/450-checker-types/Android.bp
+++ b/test/450-checker-types/Android.bp
@@ -8,7 +8,7 @@ java_test {
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-450-checker-types-expected"],
+    data: [":art-run-test-450-checker-types-expected-stdout"],
     // Include the Java source files in the test's artifacts, to make Checker assertions
     // available to the TradeFed test runner.
     include_srcs: true,
@@ -16,8 +16,8 @@ java_test {
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-450-checker-types-expected",
-    out: ["art-run-test-450-checker-types-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-450-checker-types-expected-stdout",
+    out: ["art-run-test-450-checker-types-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/450-checker-types/expected.txt b/test/450-checker-types/expected-stdout.txt
index e69de29bb2..e69de29bb2 100644
--- a/test/450-checker-types/expected.txt
+++ b/test/450-checker-types/expected-stdout.txt
diff --git a/test/451-regression-add-float/Android.bp b/test/451-regression-add-float/Android.bp
index ddf7285d0b..9b0fa842d9 100644
--- a/test/451-regression-add-float/Android.bp
+++ b/test/451-regression-add-float/Android.bp
@@ -8,13 +8,13 @@ java_test {
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-451-regression-add-float-expected"],
+    data: [":art-run-test-451-regression-add-float-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-451-regression-add-float-expected",
-    out: ["art-run-test-451-regression-add-float-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-451-regression-add-float-expected-stdout",
+    out: ["art-run-test-451-regression-add-float-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/451-regression-add-float/expected.txt b/test/451-regression-add-float/expected-stdout.txt
index e69de29bb2..e69de29bb2 100644
--- a/test/451-regression-add-float/expected.txt
+++ b/test/451-regression-add-float/expected-stdout.txt
diff --git a/test/451-spill-splot/Android.bp b/test/451-spill-splot/Android.bp
index b4e33a2eaf..2207e61447 100644
--- a/test/451-spill-splot/Android.bp
+++ b/test/451-spill-splot/Android.bp
@@ -8,13 +8,13 @@ java_test {
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-451-spill-splot-expected"],
+    data: [":art-run-test-451-spill-splot-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-451-spill-splot-expected",
-    out: ["art-run-test-451-spill-splot-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-451-spill-splot-expected-stdout",
+    out: ["art-run-test-451-spill-splot-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/451-spill-splot/expected.txt b/test/451-spill-splot/expected-stdout.txt
index efc3f2e7bd..efc3f2e7bd 100644
--- a/test/451-spill-splot/expected.txt
+++ b/test/451-spill-splot/expected-stdout.txt
diff --git a/test/452-multiple-returns2/expected.txt b/test/452-multiple-returns2/expected-stdout.txt
index e69de29bb2..e69de29bb2 100644
--- a/test/452-multiple-returns2/expected.txt
+++ b/test/452-multiple-returns2/expected-stdout.txt
diff --git a/test/453-not-byte/expected.txt b/test/453-not-byte/expected-stdout.txt
index e69de29bb2..e69de29bb2 100644
--- a/test/453-not-byte/expected.txt
+++ b/test/453-not-byte/expected-stdout.txt
diff --git a/test/454-get-vreg/Android.bp b/test/454-get-vreg/Android.bp
index 08b8ee9989..2202c14a90 100644
--- a/test/454-get-vreg/Android.bp
+++ b/test/454-get-vreg/Android.bp
@@ -8,13 +8,13 @@ java_test {
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-454-get-vreg-expected"],
+    data: [":art-run-test-454-get-vreg-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-454-get-vreg-expected",
-    out: ["art-run-test-454-get-vreg-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-454-get-vreg-expected-stdout",
+    out: ["art-run-test-454-get-vreg-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/454-get-vreg/expected.txt b/test/454-get-vreg/expected-stdout.txt
index 6a5618ebc6..6a5618ebc6 100644
--- a/test/454-get-vreg/expected.txt
+++ b/test/454-get-vreg/expected-stdout.txt
diff --git a/test/455-checker-gvn/Android.bp b/test/455-checker-gvn/Android.bp
index 7523c35330..aa498821ad 100644
--- a/test/455-checker-gvn/Android.bp
+++ b/test/455-checker-gvn/Android.bp
@@ -8,7 +8,7 @@ java_test {
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-455-checker-gvn-expected"],
+    data: [":art-run-test-455-checker-gvn-expected-stdout"],
     // Include the Java source files in the test's artifacts, to make Checker assertions
     // available to the TradeFed test runner.
     include_srcs: true,
@@ -16,8 +16,8 @@ java_test {
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-455-checker-gvn-expected",
-    out: ["art-run-test-455-checker-gvn-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-455-checker-gvn-expected-stdout",
+    out: ["art-run-test-455-checker-gvn-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/455-checker-gvn/expected.txt b/test/455-checker-gvn/expected-stdout.txt
index 32dd8f5ab1..32dd8f5ab1 100644
--- a/test/455-checker-gvn/expected.txt
+++ b/test/455-checker-gvn/expected-stdout.txt
diff --git a/test/456-baseline-array-set/Android.bp b/test/456-baseline-array-set/Android.bp
index c348ddec7b..a4e716e59a 100644
--- a/test/456-baseline-array-set/Android.bp
+++ b/test/456-baseline-array-set/Android.bp
@@ -8,13 +8,13 @@ java_test {
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-456-baseline-array-set-expected"],
+    data: [":art-run-test-456-baseline-array-set-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-456-baseline-array-set-expected",
-    out: ["art-run-test-456-baseline-array-set-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-456-baseline-array-set-expected-stdout",
+    out: ["art-run-test-456-baseline-array-set-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/456-baseline-array-set/expected.txt b/test/456-baseline-array-set/expected-stdout.txt
index e69de29bb2..e69de29bb2 100644
--- a/test/456-baseline-array-set/expected.txt
+++ b/test/456-baseline-array-set/expected-stdout.txt
diff --git a/test/457-regs/expected.txt b/test/457-regs/expected-stdout.txt
index 8db7853696..8db7853696 100644
--- a/test/457-regs/expected.txt
+++ b/test/457-regs/expected-stdout.txt
diff --git a/test/458-checker-instruct-simplification/expected.txt b/test/458-checker-instruct-simplification/expected-stdout.txt
index e69de29bb2..e69de29bb2 100644
--- a/test/458-checker-instruct-simplification/expected.txt
+++ b/test/458-checker-instruct-simplification/expected-stdout.txt
diff --git a/test/458-long-to-fpu/Android.bp b/test/458-long-to-fpu/Android.bp
index 404a13cf6e..0e158f5aa3 100644
--- a/test/458-long-to-fpu/Android.bp
+++ b/test/458-long-to-fpu/Android.bp
@@ -8,13 +8,13 @@ java_test {
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-458-long-to-fpu-expected"],
+    data: [":art-run-test-458-long-to-fpu-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-458-long-to-fpu-expected",
-    out: ["art-run-test-458-long-to-fpu-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-458-long-to-fpu-expected-stdout",
+    out: ["art-run-test-458-long-to-fpu-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/458-long-to-fpu/expected.txt b/test/458-long-to-fpu/expected-stdout.txt
index daaac9e303..daaac9e303 100644
--- a/test/458-long-to-fpu/expected.txt
+++ b/test/458-long-to-fpu/expected-stdout.txt
diff --git a/test/459-dead-phi/expected.txt b/test/459-dead-phi/expected-stdout.txt
index ba66466c2a..ba66466c2a 100644
--- a/test/459-dead-phi/expected.txt
+++ b/test/459-dead-phi/expected-stdout.txt
diff --git a/test/460-multiple-returns3/expected.txt b/test/460-multiple-returns3/expected-stdout.txt
index e69de29bb2..e69de29bb2 100644
--- a/test/460-multiple-returns3/expected.txt
+++ b/test/460-multiple-returns3/expected-stdout.txt
diff --git a/test/461-get-reference-vreg/Android.bp b/test/461-get-reference-vreg/Android.bp
index a43250f279..87762cc1d3 100644
--- a/test/461-get-reference-vreg/Android.bp
+++ b/test/461-get-reference-vreg/Android.bp
@@ -8,13 +8,13 @@ java_test {
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-461-get-reference-vreg-expected"],
+    data: [":art-run-test-461-get-reference-vreg-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-461-get-reference-vreg-expected",
-    out: ["art-run-test-461-get-reference-vreg-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-461-get-reference-vreg-expected-stdout",
+    out: ["art-run-test-461-get-reference-vreg-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/461-get-reference-vreg/expected.txt b/test/461-get-reference-vreg/expected-stdout.txt
index 6a5618ebc6..6a5618ebc6 100644
--- a/test/461-get-reference-vreg/expected.txt
+++ b/test/461-get-reference-vreg/expected-stdout.txt
diff --git a/test/462-checker-inlining-dex-files/expected.txt b/test/462-checker-inlining-dex-files/expected-stdout.txt
index e69de29bb2..e69de29bb2 100644
--- a/test/462-checker-inlining-dex-files/expected.txt
+++ b/test/462-checker-inlining-dex-files/expected-stdout.txt
diff --git a/test/463-checker-boolean-simplifier/expected.txt b/test/463-checker-boolean-simplifier/expected-stdout.txt
index e69de29bb2..e69de29bb2 100644
--- a/test/463-checker-boolean-simplifier/expected.txt
+++ b/test/463-checker-boolean-simplifier/expected-stdout.txt
diff --git a/test/464-checker-inline-sharpen-calls/Android.bp b/test/464-checker-inline-sharpen-calls/Android.bp
index 15344534cf..80931f645f 100644
--- a/test/464-checker-inline-sharpen-calls/Android.bp
+++ b/test/464-checker-inline-sharpen-calls/Android.bp
@@ -8,7 +8,7 @@ java_test {
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-464-checker-inline-sharpen-calls-expected"],
+    data: [":art-run-test-464-checker-inline-sharpen-calls-expected-stdout"],
     // Include the Java source files in the test's artifacts, to make Checker assertions
     // available to the TradeFed test runner.
     include_srcs: true,
@@ -16,8 +16,8 @@ java_test {
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-464-checker-inline-sharpen-calls-expected",
-    out: ["art-run-test-464-checker-inline-sharpen-calls-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-464-checker-inline-sharpen-calls-expected-stdout",
+    out: ["art-run-test-464-checker-inline-sharpen-calls-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/464-checker-inline-sharpen-calls/expected.txt b/test/464-checker-inline-sharpen-calls/expected-stdout.txt
index e69de29bb2..e69de29bb2 100644
--- a/test/464-checker-inline-sharpen-calls/expected.txt
+++ b/test/464-checker-inline-sharpen-calls/expected-stdout.txt
diff --git a/test/465-checker-clinit-gvn/Android.bp b/test/465-checker-clinit-gvn/Android.bp
index bc97e6a815..3aadfe8469 100644
--- a/test/465-checker-clinit-gvn/Android.bp
+++ b/test/465-checker-clinit-gvn/Android.bp
@@ -8,7 +8,7 @@ java_test {
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-465-checker-clinit-gvn-expected"],
+    data: [":art-run-test-465-checker-clinit-gvn-expected-stdout"],
     // Include the Java source files in the test's artifacts, to make Checker assertions
     // available to the TradeFed test runner.
     include_srcs: true,
@@ -16,8 +16,8 @@ java_test {
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-465-checker-clinit-gvn-expected",
-    out: ["art-run-test-465-checker-clinit-gvn-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-465-checker-clinit-gvn-expected-stdout",
+    out: ["art-run-test-465-checker-clinit-gvn-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/465-checker-clinit-gvn/expected.txt b/test/465-checker-clinit-gvn/expected-stdout.txt
index e69de29bb2..e69de29bb2 100644
--- a/test/465-checker-clinit-gvn/expected.txt
+++ b/test/465-checker-clinit-gvn/expected-stdout.txt
diff --git a/test/466-get-live-vreg/Android.bp b/test/466-get-live-vreg/Android.bp
index d9fd66a2a1..8d1ec30fe8 100644
--- a/test/466-get-live-vreg/Android.bp
+++ b/test/466-get-live-vreg/Android.bp
@@ -8,13 +8,13 @@ java_test {
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-466-get-live-vreg-expected"],
+    data: [":art-run-test-466-get-live-vreg-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-466-get-live-vreg-expected",
-    out: ["art-run-test-466-get-live-vreg-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-466-get-live-vreg-expected-stdout",
+    out: ["art-run-test-466-get-live-vreg-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/466-get-live-vreg/expected.txt b/test/466-get-live-vreg/expected-stdout.txt
index 6a5618ebc6..6a5618ebc6 100644
--- a/test/466-get-live-vreg/expected.txt
+++ b/test/466-get-live-vreg/expected-stdout.txt
diff --git a/test/467-regalloc-pair/expected.txt b/test/467-regalloc-pair/expected-stdout.txt
index da39d9da2b..da39d9da2b 100644
--- a/test/467-regalloc-pair/expected.txt
+++ b/test/467-regalloc-pair/expected-stdout.txt
diff --git a/test/468-checker-bool-simplif-regression/expected.txt b/test/468-checker-bool-simplif-regression/expected-stdout.txt
index e69de29bb2..e69de29bb2 100644
--- a/test/468-checker-bool-simplif-regression/expected.txt
+++ b/test/468-checker-bool-simplif-regression/expected-stdout.txt
diff --git a/test/469-condition-materialization/Android.bp b/test/469-condition-materialization/Android.bp
index 3d3926eb0c..b2c551e026 100644
--- a/test/469-condition-materialization/Android.bp
+++ b/test/469-condition-materialization/Android.bp
@@ -8,13 +8,13 @@ java_test {
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-469-condition-materialization-expected"],
+    data: [":art-run-test-469-condition-materialization-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-469-condition-materialization-expected",
-    out: ["art-run-test-469-condition-materialization-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-469-condition-materialization-expected-stdout",
+    out: ["art-run-test-469-condition-materialization-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/469-condition-materialization/expected.txt b/test/469-condition-materialization/expected-stdout.txt
index e69de29bb2..e69de29bb2 100644
--- a/test/469-condition-materialization/expected.txt
+++ b/test/469-condition-materialization/expected-stdout.txt
diff --git a/test/470-huge-method/Android.bp b/test/470-huge-method/Android.bp
index e077583e56..a35b641d05 100644
--- a/test/470-huge-method/Android.bp
+++ b/test/470-huge-method/Android.bp
@@ -8,13 +8,13 @@ java_test {
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-470-huge-method-expected"],
+    data: [":art-run-test-470-huge-method-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-470-huge-method-expected",
-    out: ["art-run-test-470-huge-method-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-470-huge-method-expected-stdout",
+    out: ["art-run-test-470-huge-method-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/470-huge-method/expected.txt b/test/470-huge-method/expected-stdout.txt
index e69de29bb2..e69de29bb2 100644
--- a/test/470-huge-method/expected.txt
+++ b/test/470-huge-method/expected-stdout.txt
diff --git a/test/471-deopt-environment/Android.bp b/test/471-deopt-environment/Android.bp
index 7fa8c36c7f..21e64bb179 100644
--- a/test/471-deopt-environment/Android.bp
+++ b/test/471-deopt-environment/Android.bp
@@ -8,13 +8,13 @@ java_test {
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-471-deopt-environment-expected"],
+    data: [":art-run-test-471-deopt-environment-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-471-deopt-environment-expected",
-    out: ["art-run-test-471-deopt-environment-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-471-deopt-environment-expected-stdout",
+    out: ["art-run-test-471-deopt-environment-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/471-deopt-environment/expected.txt b/test/471-deopt-environment/expected-stdout.txt
index e69de29bb2..e69de29bb2 100644
--- a/test/471-deopt-environment/expected.txt
+++ b/test/471-deopt-environment/expected-stdout.txt
diff --git a/test/471-uninitialized-locals/expected.txt b/test/471-uninitialized-locals/expected-stdout.txt
index e69de29bb2..e69de29bb2 100644
--- a/test/471-uninitialized-locals/expected.txt
+++ b/test/471-uninitialized-locals/expected-stdout.txt
diff --git a/test/472-type-propagation/Android.bp b/test/472-type-propagation/Android.bp
index 7b7e195067..bd716e79d3 100644
--- a/test/472-type-propagation/Android.bp
+++ b/test/472-type-propagation/Android.bp
@@ -8,13 +8,13 @@ java_test {
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-472-type-propagation-expected"],
+    data: [":art-run-test-472-type-propagation-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-472-type-propagation-expected",
-    out: ["art-run-test-472-type-propagation-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-472-type-propagation-expected-stdout",
+    out: ["art-run-test-472-type-propagation-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/472-type-propagation/expected.txt b/test/472-type-propagation/expected-stdout.txt
index 0b29bb1f8d..0b29bb1f8d 100644
--- a/test/472-type-propagation/expected.txt
+++ b/test/472-type-propagation/expected-stdout.txt
diff --git a/test/472-unreachable-if-regression/expected.txt b/test/472-unreachable-if-regression/expected-stdout.txt
index 9fc8bea9e2..9fc8bea9e2 100644
--- a/test/472-unreachable-if-regression/expected.txt
+++ b/test/472-unreachable-if-regression/expected-stdout.txt
diff --git a/test/473-checker-inliner-constants/Android.bp b/test/473-checker-inliner-constants/Android.bp
index d9403fffd3..6bf8d367a0 100644
--- a/test/473-checker-inliner-constants/Android.bp
+++ b/test/473-checker-inliner-constants/Android.bp
@@ -8,7 +8,7 @@ java_test {
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-473-checker-inliner-constants-expected"],
+    data: [":art-run-test-473-checker-inliner-constants-expected-stdout"],
     // Include the Java source files in the test's artifacts, to make Checker assertions
     // available to the TradeFed test runner.
     include_srcs: true,
@@ -16,8 +16,8 @@ java_test {
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-473-checker-inliner-constants-expected",
-    out: ["art-run-test-473-checker-inliner-constants-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-473-checker-inliner-constants-expected-stdout",
+    out: ["art-run-test-473-checker-inliner-constants-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/473-checker-inliner-constants/expected.txt b/test/473-checker-inliner-constants/expected-stdout.txt
index e69de29bb2..e69de29bb2 100644
--- a/test/473-checker-inliner-constants/expected.txt
+++ b/test/473-checker-inliner-constants/expected-stdout.txt
diff --git a/test/473-remove-dead-block/Android.bp b/test/473-remove-dead-block/Android.bp
index 1fb3d985b2..8c6ab7175b 100644
--- a/test/473-remove-dead-block/Android.bp
+++ b/test/473-remove-dead-block/Android.bp
@@ -8,13 +8,13 @@ java_test {
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-473-remove-dead-block-expected"],
+    data: [":art-run-test-473-remove-dead-block-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-473-remove-dead-block-expected",
-    out: ["art-run-test-473-remove-dead-block-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-473-remove-dead-block-expected-stdout",
+    out: ["art-run-test-473-remove-dead-block-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/473-remove-dead-block/expected.txt b/test/473-remove-dead-block/expected-stdout.txt
index c09201e9dd..c09201e9dd 100644
--- a/test/473-remove-dead-block/expected.txt
+++ b/test/473-remove-dead-block/expected-stdout.txt
diff --git a/test/474-checker-boolean-input/Android.bp b/test/474-checker-boolean-input/Android.bp
index 129f14d1cd..ab7306c544 100644
--- a/test/474-checker-boolean-input/Android.bp
+++ b/test/474-checker-boolean-input/Android.bp
@@ -8,7 +8,7 @@ java_test {
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-474-checker-boolean-input-expected"],
+    data: [":art-run-test-474-checker-boolean-input-expected-stdout"],
     // Include the Java source files in the test's artifacts, to make Checker assertions
     // available to the TradeFed test runner.
     include_srcs: true,
@@ -16,8 +16,8 @@ java_test {
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-474-checker-boolean-input-expected",
-    out: ["art-run-test-474-checker-boolean-input-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-474-checker-boolean-input-expected-stdout",
+    out: ["art-run-test-474-checker-boolean-input-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/474-checker-boolean-input/expected.txt b/test/474-checker-boolean-input/expected-stdout.txt
index e69de29bb2..e69de29bb2 100644
--- a/test/474-checker-boolean-input/expected.txt
+++ b/test/474-checker-boolean-input/expected-stdout.txt
diff --git a/test/474-fp-sub-neg/Android.bp b/test/474-fp-sub-neg/Android.bp
index 279d7aa3c0..a3d236a9ca 100644
--- a/test/474-fp-sub-neg/Android.bp
+++ b/test/474-fp-sub-neg/Android.bp
@@ -8,13 +8,13 @@ java_test {
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-474-fp-sub-neg-expected"],
+    data: [":art-run-test-474-fp-sub-neg-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-474-fp-sub-neg-expected",
-    out: ["art-run-test-474-fp-sub-neg-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-474-fp-sub-neg-expected-stdout",
+    out: ["art-run-test-474-fp-sub-neg-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/474-fp-sub-neg/expected.txt b/test/474-fp-sub-neg/expected-stdout.txt
index 1c7ded3ca8..1c7ded3ca8 100644
--- a/test/474-fp-sub-neg/expected.txt
+++ b/test/474-fp-sub-neg/expected-stdout.txt
diff --git a/test/475-regression-inliner-ids/expected.txt b/test/475-regression-inliner-ids/expected-stdout.txt
index e69de29bb2..e69de29bb2 100644
--- a/test/475-regression-inliner-ids/expected.txt
+++ b/test/475-regression-inliner-ids/expected-stdout.txt
diff --git a/test/475-simplify-mul-zero/Android.bp b/test/475-simplify-mul-zero/Android.bp
index 05df6f8249..9b6161a615 100644
--- a/test/475-simplify-mul-zero/Android.bp
+++ b/test/475-simplify-mul-zero/Android.bp
@@ -8,13 +8,13 @@ java_test {
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-475-simplify-mul-zero-expected"],
+    data: [":art-run-test-475-simplify-mul-zero-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-475-simplify-mul-zero-expected",
-    out: ["art-run-test-475-simplify-mul-zero-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-475-simplify-mul-zero-expected-stdout",
+    out: ["art-run-test-475-simplify-mul-zero-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/475-simplify-mul-zero/expected.txt b/test/475-simplify-mul-zero/expected-stdout.txt
index 7ed6ff82de..7ed6ff82de 100644
--- a/test/475-simplify-mul-zero/expected.txt
+++ b/test/475-simplify-mul-zero/expected-stdout.txt
diff --git a/test/476-checker-ctor-fence-redun-elim/Android.bp b/test/476-checker-ctor-fence-redun-elim/Android.bp
index bf1dbabb4c..c9417da285 100644
--- a/test/476-checker-ctor-fence-redun-elim/Android.bp
+++ b/test/476-checker-ctor-fence-redun-elim/Android.bp
@@ -8,7 +8,7 @@ java_test {
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-476-checker-ctor-fence-redun-elim-expected"],
+    data: [":art-run-test-476-checker-ctor-fence-redun-elim-expected-stdout"],
     // Include the Java source files in the test's artifacts, to make Checker assertions
     // available to the TradeFed test runner.
     include_srcs: true,
@@ -16,8 +16,8 @@ java_test {
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-476-checker-ctor-fence-redun-elim-expected",
-    out: ["art-run-test-476-checker-ctor-fence-redun-elim-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-476-checker-ctor-fence-redun-elim-expected-stdout",
+    out: ["art-run-test-476-checker-ctor-fence-redun-elim-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/476-checker-ctor-fence-redun-elim/expected.txt b/test/476-checker-ctor-fence-redun-elim/expected-stdout.txt
index e69de29bb2..e69de29bb2 100644
--- a/test/476-checker-ctor-fence-redun-elim/expected.txt
+++ b/test/476-checker-ctor-fence-redun-elim/expected-stdout.txt
diff --git a/test/476-checker-ctor-memory-barrier/Android.bp b/test/476-checker-ctor-memory-barrier/Android.bp
index d607a21198..dd27d34c66 100644
--- a/test/476-checker-ctor-memory-barrier/Android.bp
+++ b/test/476-checker-ctor-memory-barrier/Android.bp
@@ -8,7 +8,7 @@ java_test {
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-476-checker-ctor-memory-barrier-expected"],
+    data: [":art-run-test-476-checker-ctor-memory-barrier-expected-stdout"],
     // Include the Java source files in the test's artifacts, to make Checker assertions
     // available to the TradeFed test runner.
     include_srcs: true,
@@ -16,8 +16,8 @@ java_test {
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-476-checker-ctor-memory-barrier-expected",
-    out: ["art-run-test-476-checker-ctor-memory-barrier-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-476-checker-ctor-memory-barrier-expected-stdout",
+    out: ["art-run-test-476-checker-ctor-memory-barrier-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/476-checker-ctor-memory-barrier/expected.txt b/test/476-checker-ctor-memory-barrier/expected-stdout.txt
index e69de29bb2..e69de29bb2 100644
--- a/test/476-checker-ctor-memory-barrier/expected.txt
+++ b/test/476-checker-ctor-memory-barrier/expected-stdout.txt
diff --git a/test/476-clinit-inline-static-invoke/Android.bp b/test/476-clinit-inline-static-invoke/Android.bp
index 37483e8d65..f43cf4694d 100644
--- a/test/476-clinit-inline-static-invoke/Android.bp
+++ b/test/476-clinit-inline-static-invoke/Android.bp
@@ -8,13 +8,13 @@ java_test {
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-476-clinit-inline-static-invoke-expected"],
+    data: [":art-run-test-476-clinit-inline-static-invoke-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-476-clinit-inline-static-invoke-expected",
-    out: ["art-run-test-476-clinit-inline-static-invoke-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-476-clinit-inline-static-invoke-expected-stdout",
+    out: ["art-run-test-476-clinit-inline-static-invoke-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/476-clinit-inline-static-invoke/expected.txt b/test/476-clinit-inline-static-invoke/expected-stdout.txt
index c55bf72369..c55bf72369 100644
--- a/test/476-clinit-inline-static-invoke/expected.txt
+++ b/test/476-clinit-inline-static-invoke/expected-stdout.txt
diff --git a/test/477-checker-bound-type/Android.bp b/test/477-checker-bound-type/Android.bp
index c83c2fcdc2..f6ca5526e2 100644
--- a/test/477-checker-bound-type/Android.bp
+++ b/test/477-checker-bound-type/Android.bp
@@ -8,7 +8,7 @@ java_test {
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-477-checker-bound-type-expected"],
+    data: [":art-run-test-477-checker-bound-type-expected-stdout"],
     // Include the Java source files in the test's artifacts, to make Checker assertions
     // available to the TradeFed test runner.
     include_srcs: true,
@@ -16,8 +16,8 @@ java_test {
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-477-checker-bound-type-expected",
-    out: ["art-run-test-477-checker-bound-type-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-477-checker-bound-type-expected-stdout",
+    out: ["art-run-test-477-checker-bound-type-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/477-checker-bound-type/expected.txt b/test/477-checker-bound-type/expected-stdout.txt
index e69de29bb2..e69de29bb2 100644
--- a/test/477-checker-bound-type/expected.txt
+++ b/test/477-checker-bound-type/expected-stdout.txt
diff --git a/test/477-long-2-float-convers-precision/Android.bp b/test/477-long-2-float-convers-precision/Android.bp
index 916f23c8e6..c11f556858 100644
--- a/test/477-long-2-float-convers-precision/Android.bp
+++ b/test/477-long-2-float-convers-precision/Android.bp
@@ -8,13 +8,13 @@ java_test {
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-477-long-2-float-convers-precision-expected"],
+    data: [":art-run-test-477-long-2-float-convers-precision-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-477-long-2-float-convers-precision-expected",
-    out: ["art-run-test-477-long-2-float-convers-precision-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-477-long-2-float-convers-precision-expected-stdout",
+    out: ["art-run-test-477-long-2-float-convers-precision-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/477-long-2-float-convers-precision/expected.txt b/test/477-long-2-float-convers-precision/expected-stdout.txt
index e69de29bb2..e69de29bb2 100644
--- a/test/477-long-2-float-convers-precision/expected.txt
+++ b/test/477-long-2-float-convers-precision/expected-stdout.txt
diff --git a/test/478-checker-clinit-check-pruning/Android.bp b/test/478-checker-clinit-check-pruning/Android.bp
index 70685632a1..cacc5f82b8 100644
--- a/test/478-checker-clinit-check-pruning/Android.bp
+++ b/test/478-checker-clinit-check-pruning/Android.bp
@@ -8,7 +8,7 @@ java_test {
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-478-checker-clinit-check-pruning-expected"],
+    data: [":art-run-test-478-checker-clinit-check-pruning-expected-stdout"],
     // Include the Java source files in the test's artifacts, to make Checker assertions
     // available to the TradeFed test runner.
     include_srcs: true,
@@ -16,8 +16,8 @@ java_test {
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-478-checker-clinit-check-pruning-expected",
-    out: ["art-run-test-478-checker-clinit-check-pruning-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-478-checker-clinit-check-pruning-expected-stdout",
+    out: ["art-run-test-478-checker-clinit-check-pruning-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/478-checker-clinit-check-pruning/expected.txt b/test/478-checker-clinit-check-pruning/expected-stdout.txt
index 1f6e9d9337..1f6e9d9337 100644
--- a/test/478-checker-clinit-check-pruning/expected.txt
+++ b/test/478-checker-clinit-check-pruning/expected-stdout.txt
diff --git a/test/478-checker-inline-noreturn/Android.bp b/test/478-checker-inline-noreturn/Android.bp
index 5c4b30215e..919fdc165a 100644
--- a/test/478-checker-inline-noreturn/Android.bp
+++ b/test/478-checker-inline-noreturn/Android.bp
@@ -8,7 +8,7 @@ java_test {
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-478-checker-inline-noreturn-expected"],
+    data: [":art-run-test-478-checker-inline-noreturn-expected-stdout"],
     // Include the Java source files in the test's artifacts, to make Checker assertions
     // available to the TradeFed test runner.
     include_srcs: true,
@@ -16,8 +16,8 @@ java_test {
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-478-checker-inline-noreturn-expected",
-    out: ["art-run-test-478-checker-inline-noreturn-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-478-checker-inline-noreturn-expected-stdout",
+    out: ["art-run-test-478-checker-inline-noreturn-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/478-checker-inline-noreturn/expected.txt b/test/478-checker-inline-noreturn/expected-stdout.txt
index e69de29bb2..e69de29bb2 100644
--- a/test/478-checker-inline-noreturn/expected.txt
+++ b/test/478-checker-inline-noreturn/expected-stdout.txt
diff --git a/test/478-checker-inliner-nested-loop/Android.bp b/test/478-checker-inliner-nested-loop/Android.bp
index ed03cb333b..4ceb7b1150 100644
--- a/test/478-checker-inliner-nested-loop/Android.bp
+++ b/test/478-checker-inliner-nested-loop/Android.bp
@@ -8,7 +8,7 @@ java_test {
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-478-checker-inliner-nested-loop-expected"],
+    data: [":art-run-test-478-checker-inliner-nested-loop-expected-stdout"],
     // Include the Java source files in the test's artifacts, to make Checker assertions
     // available to the TradeFed test runner.
     include_srcs: true,
@@ -16,8 +16,8 @@ java_test {
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-478-checker-inliner-nested-loop-expected",
-    out: ["art-run-test-478-checker-inliner-nested-loop-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-478-checker-inliner-nested-loop-expected-stdout",
+    out: ["art-run-test-478-checker-inliner-nested-loop-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/478-checker-inliner-nested-loop/expected.txt b/test/478-checker-inliner-nested-loop/expected-stdout.txt
index e69de29bb2..e69de29bb2 100644
--- a/test/478-checker-inliner-nested-loop/expected.txt
+++ b/test/478-checker-inliner-nested-loop/expected-stdout.txt
diff --git a/test/479-regression-implicit-null-check/Android.bp b/test/479-regression-implicit-null-check/Android.bp
index ce7b79ba89..000aa0cf9a 100644
--- a/test/479-regression-implicit-null-check/Android.bp
+++ b/test/479-regression-implicit-null-check/Android.bp
@@ -8,13 +8,13 @@ java_test {
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-479-regression-implicit-null-check-expected"],
+    data: [":art-run-test-479-regression-implicit-null-check-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-479-regression-implicit-null-check-expected",
-    out: ["art-run-test-479-regression-implicit-null-check-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-479-regression-implicit-null-check-expected-stdout",
+    out: ["art-run-test-479-regression-implicit-null-check-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/479-regression-implicit-null-check/expected.txt b/test/479-regression-implicit-null-check/expected-stdout.txt
index e69de29bb2..e69de29bb2 100644
--- a/test/479-regression-implicit-null-check/expected.txt
+++ b/test/479-regression-implicit-null-check/expected-stdout.txt
diff --git a/test/480-checker-dead-blocks/Android.bp b/test/480-checker-dead-blocks/Android.bp
index 7d502354c8..76e6fefeca 100644
--- a/test/480-checker-dead-blocks/Android.bp
+++ b/test/480-checker-dead-blocks/Android.bp
@@ -8,7 +8,7 @@ java_test {
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-480-checker-dead-blocks-expected"],
+    data: [":art-run-test-480-checker-dead-blocks-expected-stdout"],
     // Include the Java source files in the test's artifacts, to make Checker assertions
     // available to the TradeFed test runner.
     include_srcs: true,
@@ -16,8 +16,8 @@ java_test {
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-480-checker-dead-blocks-expected",
-    out: ["art-run-test-480-checker-dead-blocks-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-480-checker-dead-blocks-expected-stdout",
+    out: ["art-run-test-480-checker-dead-blocks-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/480-checker-dead-blocks/expected.txt b/test/480-checker-dead-blocks/expected-stdout.txt
index e69de29bb2..e69de29bb2 100644
--- a/test/480-checker-dead-blocks/expected.txt
+++ b/test/480-checker-dead-blocks/expected-stdout.txt
diff --git a/test/481-regression-phi-cond/Android.bp b/test/481-regression-phi-cond/Android.bp
index 2e3b4ca5c9..4c907085a2 100644
--- a/test/481-regression-phi-cond/Android.bp
+++ b/test/481-regression-phi-cond/Android.bp
@@ -8,13 +8,13 @@ java_test {
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-481-regression-phi-cond-expected"],
+    data: [":art-run-test-481-regression-phi-cond-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-481-regression-phi-cond-expected",
-    out: ["art-run-test-481-regression-phi-cond-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-481-regression-phi-cond-expected-stdout",
+    out: ["art-run-test-481-regression-phi-cond-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/481-regression-phi-cond/expected.txt b/test/481-regression-phi-cond/expected-stdout.txt
index e69de29bb2..e69de29bb2 100644
--- a/test/481-regression-phi-cond/expected.txt
+++ b/test/481-regression-phi-cond/expected-stdout.txt
diff --git a/test/482-checker-loop-back-edge-use/Android.bp b/test/482-checker-loop-back-edge-use/Android.bp
index 76b3de00d5..e8d20b8405 100644
--- a/test/482-checker-loop-back-edge-use/Android.bp
+++ b/test/482-checker-loop-back-edge-use/Android.bp
@@ -8,7 +8,7 @@ java_test {
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-482-checker-loop-back-edge-use-expected"],
+    data: [":art-run-test-482-checker-loop-back-edge-use-expected-stdout"],
     // Include the Java source files in the test's artifacts, to make Checker assertions
     // available to the TradeFed test runner.
     include_srcs: true,
@@ -16,8 +16,8 @@ java_test {
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-482-checker-loop-back-edge-use-expected",
-    out: ["art-run-test-482-checker-loop-back-edge-use-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-482-checker-loop-back-edge-use-expected-stdout",
+    out: ["art-run-test-482-checker-loop-back-edge-use-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/482-checker-loop-back-edge-use/expected.txt b/test/482-checker-loop-back-edge-use/expected-stdout.txt
index e69de29bb2..e69de29bb2 100644
--- a/test/482-checker-loop-back-edge-use/expected.txt
+++ b/test/482-checker-loop-back-edge-use/expected-stdout.txt
diff --git a/test/483-dce-block/Android.bp b/test/483-dce-block/Android.bp
index f08faa2c89..c258a68d5f 100644
--- a/test/483-dce-block/Android.bp
+++ b/test/483-dce-block/Android.bp
@@ -8,13 +8,13 @@ java_test {
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-483-dce-block-expected"],
+    data: [":art-run-test-483-dce-block-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-483-dce-block-expected",
-    out: ["art-run-test-483-dce-block-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-483-dce-block-expected-stdout",
+    out: ["art-run-test-483-dce-block-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/483-dce-block/expected.txt b/test/483-dce-block/expected-stdout.txt
index ef4862580b..ef4862580b 100644
--- a/test/483-dce-block/expected.txt
+++ b/test/483-dce-block/expected-stdout.txt
diff --git a/test/484-checker-register-hints/expected.txt b/test/484-checker-register-hints/expected-stdout.txt
index e69de29bb2..e69de29bb2 100644
--- a/test/484-checker-register-hints/expected.txt
+++ b/test/484-checker-register-hints/expected-stdout.txt
diff --git a/test/485-checker-dce-loop-update/expected.txt b/test/485-checker-dce-loop-update/expected-stdout.txt
index e69de29bb2..e69de29bb2 100644
--- a/test/485-checker-dce-loop-update/expected.txt
+++ b/test/485-checker-dce-loop-update/expected-stdout.txt
diff --git a/test/485-checker-dce-switch/Android.bp b/test/485-checker-dce-switch/Android.bp
index 97d0355bd8..a07c2df927 100644
--- a/test/485-checker-dce-switch/Android.bp
+++ b/test/485-checker-dce-switch/Android.bp
@@ -8,7 +8,7 @@ java_test {
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-485-checker-dce-switch-expected"],
+    data: [":art-run-test-485-checker-dce-switch-expected-stdout"],
     // Include the Java source files in the test's artifacts, to make Checker assertions
     // available to the TradeFed test runner.
     include_srcs: true,
@@ -16,8 +16,8 @@ java_test {
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-485-checker-dce-switch-expected",
-    out: ["art-run-test-485-checker-dce-switch-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-485-checker-dce-switch-expected-stdout",
+    out: ["art-run-test-485-checker-dce-switch-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/485-checker-dce-switch/expected.txt b/test/485-checker-dce-switch/expected-stdout.txt
index e69de29bb2..e69de29bb2 100644
--- a/test/485-checker-dce-switch/expected.txt
+++ b/test/485-checker-dce-switch/expected-stdout.txt
diff --git a/test/486-checker-must-do-null-check/Android.bp b/test/486-checker-must-do-null-check/Android.bp
index 1dc030f1a8..81f104dc28 100644
--- a/test/486-checker-must-do-null-check/Android.bp
+++ b/test/486-checker-must-do-null-check/Android.bp
@@ -8,7 +8,7 @@ java_test {
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-486-checker-must-do-null-check-expected"],
+    data: [":art-run-test-486-checker-must-do-null-check-expected-stdout"],
     // Include the Java source files in the test's artifacts, to make Checker assertions
     // available to the TradeFed test runner.
     include_srcs: true,
@@ -16,8 +16,8 @@ java_test {
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-486-checker-must-do-null-check-expected",
-    out: ["art-run-test-486-checker-must-do-null-check-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-486-checker-must-do-null-check-expected-stdout",
+    out: ["art-run-test-486-checker-must-do-null-check-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/486-checker-must-do-null-check/expected.txt b/test/486-checker-must-do-null-check/expected-stdout.txt
index e69de29bb2..e69de29bb2 100644
--- a/test/486-checker-must-do-null-check/expected.txt
+++ b/test/486-checker-must-do-null-check/expected-stdout.txt
diff --git a/test/487-checker-inline-calls/Android.bp b/test/487-checker-inline-calls/Android.bp
index 4114e3e676..5322806cc7 100644
--- a/test/487-checker-inline-calls/Android.bp
+++ b/test/487-checker-inline-calls/Android.bp
@@ -8,7 +8,7 @@ java_test {
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-487-checker-inline-calls-expected"],
+    data: [":art-run-test-487-checker-inline-calls-expected-stdout"],
     // Include the Java source files in the test's artifacts, to make Checker assertions
     // available to the TradeFed test runner.
     include_srcs: true,
@@ -16,8 +16,8 @@ java_test {
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-487-checker-inline-calls-expected",
-    out: ["art-run-test-487-checker-inline-calls-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-487-checker-inline-calls-expected-stdout",
+    out: ["art-run-test-487-checker-inline-calls-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/487-checker-inline-calls/expected.txt b/test/487-checker-inline-calls/expected-stdout.txt
index 2230482312..2230482312 100644
--- a/test/487-checker-inline-calls/expected.txt
+++ b/test/487-checker-inline-calls/expected-stdout.txt
diff --git a/test/488-checker-inline-recursive-calls/Android.bp b/test/488-checker-inline-recursive-calls/Android.bp
index aa78a3350b..854660f3d9 100644
--- a/test/488-checker-inline-recursive-calls/Android.bp
+++ b/test/488-checker-inline-recursive-calls/Android.bp
@@ -8,7 +8,7 @@ java_test {
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-488-checker-inline-recursive-calls-expected"],
+    data: [":art-run-test-488-checker-inline-recursive-calls-expected-stdout"],
     // Include the Java source files in the test's artifacts, to make Checker assertions
     // available to the TradeFed test runner.
     include_srcs: true,
@@ -16,8 +16,8 @@ java_test {
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-488-checker-inline-recursive-calls-expected",
-    out: ["art-run-test-488-checker-inline-recursive-calls-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-488-checker-inline-recursive-calls-expected-stdout",
+    out: ["art-run-test-488-checker-inline-recursive-calls-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/488-checker-inline-recursive-calls/expected.txt b/test/488-checker-inline-recursive-calls/expected-stdout.txt
index f615d3a9a2..f615d3a9a2 100644
--- a/test/488-checker-inline-recursive-calls/expected.txt
+++ b/test/488-checker-inline-recursive-calls/expected-stdout.txt
diff --git a/test/489-current-method-regression/Android.bp b/test/489-current-method-regression/Android.bp
index f762e63241..723ae1070a 100644
--- a/test/489-current-method-regression/Android.bp
+++ b/test/489-current-method-regression/Android.bp
@@ -8,13 +8,13 @@ java_test {
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-489-current-method-regression-expected"],
+    data: [":art-run-test-489-current-method-regression-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-489-current-method-regression-expected",
-    out: ["art-run-test-489-current-method-regression-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-489-current-method-regression-expected-stdout",
+    out: ["art-run-test-489-current-method-regression-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/489-current-method-regression/expected.txt b/test/489-current-method-regression/expected-stdout.txt
index cced94c787..cced94c787 100644
--- a/test/489-current-method-regression/expected.txt
+++ b/test/489-current-method-regression/expected-stdout.txt
diff --git a/test/490-checker-inline/Android.bp b/test/490-checker-inline/Android.bp
index 3126b3c3a9..1e833b6a7f 100644
--- a/test/490-checker-inline/Android.bp
+++ b/test/490-checker-inline/Android.bp
@@ -8,7 +8,7 @@ java_test {
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-490-checker-inline-expected"],
+    data: [":art-run-test-490-checker-inline-expected-stdout"],
     // Include the Java source files in the test's artifacts, to make Checker assertions
     // available to the TradeFed test runner.
     include_srcs: true,
@@ -16,8 +16,8 @@ java_test {
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-490-checker-inline-expected",
-    out: ["art-run-test-490-checker-inline-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-490-checker-inline-expected-stdout",
+    out: ["art-run-test-490-checker-inline-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/490-checker-inline/expected.txt b/test/490-checker-inline/expected-stdout.txt
index e69de29bb2..e69de29bb2 100644
--- a/test/490-checker-inline/expected.txt
+++ b/test/490-checker-inline/expected-stdout.txt
diff --git a/test/491-current-method/Android.bp b/test/491-current-method/Android.bp
index d4063ad0ca..78e8688bad 100644
--- a/test/491-current-method/Android.bp
+++ b/test/491-current-method/Android.bp
@@ -8,13 +8,13 @@ java_test {
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-491-current-method-expected"],
+    data: [":art-run-test-491-current-method-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-491-current-method-expected",
-    out: ["art-run-test-491-current-method-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-491-current-method-expected-stdout",
+    out: ["art-run-test-491-current-method-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/491-current-method/expected.txt b/test/491-current-method/expected-stdout.txt
index e69de29bb2..e69de29bb2 100644
--- a/test/491-current-method/expected.txt
+++ b/test/491-current-method/expected-stdout.txt
diff --git a/test/492-checker-inline-invoke-interface/Android.bp b/test/492-checker-inline-invoke-interface/Android.bp
index eb99ee81e6..9e1a3f1cc2 100644
--- a/test/492-checker-inline-invoke-interface/Android.bp
+++ b/test/492-checker-inline-invoke-interface/Android.bp
@@ -8,7 +8,7 @@ java_test {
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-492-checker-inline-invoke-interface-expected"],
+    data: [":art-run-test-492-checker-inline-invoke-interface-expected-stdout"],
     // Include the Java source files in the test's artifacts, to make Checker assertions
     // available to the TradeFed test runner.
     include_srcs: true,
@@ -16,8 +16,8 @@ java_test {
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-492-checker-inline-invoke-interface-expected",
-    out: ["art-run-test-492-checker-inline-invoke-interface-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-492-checker-inline-invoke-interface-expected-stdout",
+    out: ["art-run-test-492-checker-inline-invoke-interface-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/492-checker-inline-invoke-interface/expected.txt b/test/492-checker-inline-invoke-interface/expected-stdout.txt
index 42b331f722..42b331f722 100644
--- a/test/492-checker-inline-invoke-interface/expected.txt
+++ b/test/492-checker-inline-invoke-interface/expected-stdout.txt
diff --git a/test/493-checker-inline-invoke-interface/Android.bp b/test/493-checker-inline-invoke-interface/Android.bp
index 7437472489..72be63b0dc 100644
--- a/test/493-checker-inline-invoke-interface/Android.bp
+++ b/test/493-checker-inline-invoke-interface/Android.bp
@@ -8,7 +8,7 @@ java_test {
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-493-checker-inline-invoke-interface-expected"],
+    data: [":art-run-test-493-checker-inline-invoke-interface-expected-stdout"],
     // Include the Java source files in the test's artifacts, to make Checker assertions
     // available to the TradeFed test runner.
     include_srcs: true,
@@ -16,8 +16,8 @@ java_test {
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-493-checker-inline-invoke-interface-expected",
-    out: ["art-run-test-493-checker-inline-invoke-interface-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-493-checker-inline-invoke-interface-expected-stdout",
+    out: ["art-run-test-493-checker-inline-invoke-interface-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/493-checker-inline-invoke-interface/expected.txt b/test/493-checker-inline-invoke-interface/expected-stdout.txt
index 93620a6fb5..93620a6fb5 100644
--- a/test/493-checker-inline-invoke-interface/expected.txt
+++ b/test/493-checker-inline-invoke-interface/expected-stdout.txt
diff --git a/test/494-checker-instanceof-tests/Android.bp b/test/494-checker-instanceof-tests/Android.bp
index c04b433507..c139c0de95 100644
--- a/test/494-checker-instanceof-tests/Android.bp
+++ b/test/494-checker-instanceof-tests/Android.bp
@@ -8,7 +8,7 @@ java_test {
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-494-checker-instanceof-tests-expected"],
+    data: [":art-run-test-494-checker-instanceof-tests-expected-stdout"],
     // Include the Java source files in the test's artifacts, to make Checker assertions
     // available to the TradeFed test runner.
     include_srcs: true,
@@ -16,8 +16,8 @@ java_test {
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-494-checker-instanceof-tests-expected",
-    out: ["art-run-test-494-checker-instanceof-tests-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-494-checker-instanceof-tests-expected-stdout",
+    out: ["art-run-test-494-checker-instanceof-tests-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/494-checker-instanceof-tests/expected.txt b/test/494-checker-instanceof-tests/expected-stdout.txt
index e69de29bb2..e69de29bb2 100644
--- a/test/494-checker-instanceof-tests/expected.txt
+++ b/test/494-checker-instanceof-tests/expected-stdout.txt
diff --git a/test/495-checker-checkcast-tests/Android.bp b/test/495-checker-checkcast-tests/Android.bp
index 2538927206..acf24cdb6a 100644
--- a/test/495-checker-checkcast-tests/Android.bp
+++ b/test/495-checker-checkcast-tests/Android.bp
@@ -8,7 +8,7 @@ java_test {
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-495-checker-checkcast-tests-expected"],
+    data: [":art-run-test-495-checker-checkcast-tests-expected-stdout"],
     // Include the Java source files in the test's artifacts, to make Checker assertions
     // available to the TradeFed test runner.
     include_srcs: true,
@@ -16,8 +16,8 @@ java_test {
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-495-checker-checkcast-tests-expected",
-    out: ["art-run-test-495-checker-checkcast-tests-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-495-checker-checkcast-tests-expected-stdout",
+    out: ["art-run-test-495-checker-checkcast-tests-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/495-checker-checkcast-tests/expected.txt b/test/495-checker-checkcast-tests/expected-stdout.txt
index e69de29bb2..e69de29bb2 100644
--- a/test/495-checker-checkcast-tests/expected.txt
+++ b/test/495-checker-checkcast-tests/expected-stdout.txt
diff --git a/test/496-checker-inlining-class-loader/Android.bp b/test/496-checker-inlining-class-loader/Android.bp
index 48e0591637..7c684c5502 100644
--- a/test/496-checker-inlining-class-loader/Android.bp
+++ b/test/496-checker-inlining-class-loader/Android.bp
@@ -8,7 +8,7 @@ java_test {
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-496-checker-inlining-class-loader-expected"],
+    data: [":art-run-test-496-checker-inlining-class-loader-expected-stdout"],
     // Include the Java source files in the test's artifacts, to make Checker assertions
     // available to the TradeFed test runner.
     include_srcs: true,
@@ -16,8 +16,8 @@ java_test {
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-496-checker-inlining-class-loader-expected",
-    out: ["art-run-test-496-checker-inlining-class-loader-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-496-checker-inlining-class-loader-expected-stdout",
+    out: ["art-run-test-496-checker-inlining-class-loader-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/496-checker-inlining-class-loader/expected.txt b/test/496-checker-inlining-class-loader/expected-stdout.txt
index 312c28f8b0..312c28f8b0 100644
--- a/test/496-checker-inlining-class-loader/expected.txt
+++ b/test/496-checker-inlining-class-loader/expected-stdout.txt
diff --git a/test/497-inlining-and-class-loader/Android.bp b/test/497-inlining-and-class-loader/Android.bp
index e08e796044..539b42ce98 100644
--- a/test/497-inlining-and-class-loader/Android.bp
+++ b/test/497-inlining-and-class-loader/Android.bp
@@ -8,13 +8,13 @@ java_test {
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-497-inlining-and-class-loader-expected"],
+    data: [":art-run-test-497-inlining-and-class-loader-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-497-inlining-and-class-loader-expected",
-    out: ["art-run-test-497-inlining-and-class-loader-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-497-inlining-and-class-loader-expected-stdout",
+    out: ["art-run-test-497-inlining-and-class-loader-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/497-inlining-and-class-loader/expected.txt b/test/497-inlining-and-class-loader/expected-stdout.txt
index 905dbfd2cb..905dbfd2cb 100644
--- a/test/497-inlining-and-class-loader/expected.txt
+++ b/test/497-inlining-and-class-loader/expected-stdout.txt
diff --git a/test/498-type-propagation/expected.txt b/test/498-type-propagation/expected-stdout.txt
index ccaf6f8f0f..ccaf6f8f0f 100644
--- a/test/498-type-propagation/expected.txt
+++ b/test/498-type-propagation/expected-stdout.txt
diff --git a/test/499-bce-phi-array-length/Android.bp b/test/499-bce-phi-array-length/Android.bp
index 3dadc76122..d11b508524 100644
--- a/test/499-bce-phi-array-length/Android.bp
+++ b/test/499-bce-phi-array-length/Android.bp
@@ -8,13 +8,13 @@ java_test {
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-499-bce-phi-array-length-expected"],
+    data: [":art-run-test-499-bce-phi-array-length-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-499-bce-phi-array-length-expected",
-    out: ["art-run-test-499-bce-phi-array-length-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-499-bce-phi-array-length-expected-stdout",
+    out: ["art-run-test-499-bce-phi-array-length-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/499-bce-phi-array-length/expected.txt b/test/499-bce-phi-array-length/expected-stdout.txt
index e69de29bb2..e69de29bb2 100644
--- a/test/499-bce-phi-array-length/expected.txt
+++ b/test/499-bce-phi-array-length/expected-stdout.txt
diff --git a/test/500-instanceof/Android.bp b/test/500-instanceof/Android.bp
index 666993c07b..9a54922064 100644
--- a/test/500-instanceof/Android.bp
+++ b/test/500-instanceof/Android.bp
@@ -8,13 +8,13 @@ java_test {
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-500-instanceof-expected"],
+    data: [":art-run-test-500-instanceof-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-500-instanceof-expected",
-    out: ["art-run-test-500-instanceof-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-500-instanceof-expected-stdout",
+    out: ["art-run-test-500-instanceof-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/500-instanceof/expected.txt b/test/500-instanceof/expected-stdout.txt
index e69de29bb2..e69de29bb2 100644
--- a/test/500-instanceof/expected.txt
+++ b/test/500-instanceof/expected-stdout.txt
diff --git a/test/501-null-constant-dce/expected.txt b/test/501-null-constant-dce/expected-stdout.txt
index ccaf6f8f0f..ccaf6f8f0f 100644
--- a/test/501-null-constant-dce/expected.txt
+++ b/test/501-null-constant-dce/expected-stdout.txt
diff --git a/test/501-regression-packed-switch/expected.txt b/test/501-regression-packed-switch/expected-stdout.txt
index e69de29bb2..e69de29bb2 100644
--- a/test/501-regression-packed-switch/expected.txt
+++ b/test/501-regression-packed-switch/expected-stdout.txt
diff --git a/test/503-dead-instructions/expected.txt b/test/503-dead-instructions/expected-stdout.txt
index ccaf6f8f0f..ccaf6f8f0f 100644
--- a/test/503-dead-instructions/expected.txt
+++ b/test/503-dead-instructions/expected-stdout.txt
diff --git a/test/504-regression-baseline-entry/expected.txt b/test/504-regression-baseline-entry/expected-stdout.txt
index e69de29bb2..e69de29bb2 100644
--- a/test/504-regression-baseline-entry/expected.txt
+++ b/test/504-regression-baseline-entry/expected-stdout.txt
diff --git a/test/505-simplifier-type-propagation/Android.bp b/test/505-simplifier-type-propagation/Android.bp
index 4c64f7202e..82c3218b92 100644
--- a/test/505-simplifier-type-propagation/Android.bp
+++ b/test/505-simplifier-type-propagation/Android.bp
@@ -8,13 +8,13 @@ java_test {
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-505-simplifier-type-propagation-expected"],
+    data: [":art-run-test-505-simplifier-type-propagation-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-505-simplifier-type-propagation-expected",
-    out: ["art-run-test-505-simplifier-type-propagation-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-505-simplifier-type-propagation-expected-stdout",
+    out: ["art-run-test-505-simplifier-type-propagation-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/505-simplifier-type-propagation/expected.txt b/test/505-simplifier-type-propagation/expected-stdout.txt
index e69de29bb2..e69de29bb2 100644
--- a/test/505-simplifier-type-propagation/expected.txt
+++ b/test/505-simplifier-type-propagation/expected-stdout.txt
diff --git a/test/506-verify-aput/expected.txt b/test/506-verify-aput/expected-stdout.txt
index ccaf6f8f0f..ccaf6f8f0f 100644
--- a/test/506-verify-aput/expected.txt
+++ b/test/506-verify-aput/expected-stdout.txt
diff --git a/test/507-boolean-test/Android.bp b/test/507-boolean-test/Android.bp
index 1125f2c98a..6cf0514292 100644
--- a/test/507-boolean-test/Android.bp
+++ b/test/507-boolean-test/Android.bp
@@ -8,13 +8,13 @@ java_test {
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-507-boolean-test-expected"],
+    data: [":art-run-test-507-boolean-test-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-507-boolean-test-expected",
-    out: ["art-run-test-507-boolean-test-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-507-boolean-test-expected-stdout",
+    out: ["art-run-test-507-boolean-test-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/507-boolean-test/expected.txt b/test/507-boolean-test/expected-stdout.txt
index e69de29bb2..e69de29bb2 100644
--- a/test/507-boolean-test/expected.txt
+++ b/test/507-boolean-test/expected-stdout.txt
diff --git a/test/507-referrer/Android.bp b/test/507-referrer/Android.bp
index 749ffa70c4..f1b24ffe37 100644
--- a/test/507-referrer/Android.bp
+++ b/test/507-referrer/Android.bp
@@ -8,13 +8,13 @@ java_test {
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-507-referrer-expected"],
+    data: [":art-run-test-507-referrer-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-507-referrer-expected",
-    out: ["art-run-test-507-referrer-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-507-referrer-expected-stdout",
+    out: ["art-run-test-507-referrer-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/507-referrer/expected.txt b/test/507-referrer/expected-stdout.txt
index e69de29bb2..e69de29bb2 100644
--- a/test/507-referrer/expected.txt
+++ b/test/507-referrer/expected-stdout.txt
diff --git a/test/508-checker-disassembly/Android.bp b/test/508-checker-disassembly/Android.bp
index 47d90b887f..0b2d45f714 100644
--- a/test/508-checker-disassembly/Android.bp
+++ b/test/508-checker-disassembly/Android.bp
@@ -8,7 +8,7 @@ java_test {
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-508-checker-disassembly-expected"],
+    data: [":art-run-test-508-checker-disassembly-expected-stdout"],
     // Include the Java source files in the test's artifacts, to make Checker assertions
     // available to the TradeFed test runner.
     include_srcs: true,
@@ -16,8 +16,8 @@ java_test {
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-508-checker-disassembly-expected",
-    out: ["art-run-test-508-checker-disassembly-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-508-checker-disassembly-expected-stdout",
+    out: ["art-run-test-508-checker-disassembly-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/508-checker-disassembly/expected.txt b/test/508-checker-disassembly/expected-stdout.txt
index e69de29bb2..e69de29bb2 100644
--- a/test/508-checker-disassembly/expected.txt
+++ b/test/508-checker-disassembly/expected-stdout.txt
diff --git a/test/508-referrer-method/Android.bp b/test/508-referrer-method/Android.bp
index 53e4d0363d..fb26624d4e 100644
--- a/test/508-referrer-method/Android.bp
+++ b/test/508-referrer-method/Android.bp
@@ -8,13 +8,13 @@ java_test {
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-508-referrer-method-expected"],
+    data: [":art-run-test-508-referrer-method-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-508-referrer-method-expected",
-    out: ["art-run-test-508-referrer-method-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-508-referrer-method-expected-stdout",
+    out: ["art-run-test-508-referrer-method-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/508-referrer-method/expected.txt b/test/508-referrer-method/expected-stdout.txt
index e69de29bb2..e69de29bb2 100644
--- a/test/508-referrer-method/expected.txt
+++ b/test/508-referrer-method/expected-stdout.txt
diff --git a/test/509-pre-header/expected.txt b/test/509-pre-header/expected-stdout.txt
index ccaf6f8f0f..ccaf6f8f0f 100644
--- a/test/509-pre-header/expected.txt
+++ b/test/509-pre-header/expected-stdout.txt
diff --git a/test/510-checker-try-catch/expected.txt b/test/510-checker-try-catch/expected-stdout.txt
index e69de29bb2..e69de29bb2 100644
--- a/test/510-checker-try-catch/expected.txt
+++ b/test/510-checker-try-catch/expected-stdout.txt
diff --git a/test/511-clinit-interface/expected.txt b/test/511-clinit-interface/expected-stdout.txt
index ccaf6f8f0f..ccaf6f8f0f 100644
--- a/test/511-clinit-interface/expected.txt
+++ b/test/511-clinit-interface/expected-stdout.txt
diff --git a/test/513-array-deopt/Android.bp b/test/513-array-deopt/Android.bp
index 2310b46af1..4236ad72e2 100644
--- a/test/513-array-deopt/Android.bp
+++ b/test/513-array-deopt/Android.bp
@@ -8,13 +8,13 @@ java_test {
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-513-array-deopt-expected"],
+    data: [":art-run-test-513-array-deopt-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-513-array-deopt-expected",
-    out: ["art-run-test-513-array-deopt-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-513-array-deopt-expected-stdout",
+    out: ["art-run-test-513-array-deopt-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/513-array-deopt/expected.txt b/test/513-array-deopt/expected-stdout.txt
index e69de29bb2..e69de29bb2 100644
--- a/test/513-array-deopt/expected.txt
+++ b/test/513-array-deopt/expected-stdout.txt
diff --git a/test/514-shifts/Android.bp b/test/514-shifts/Android.bp
index 359e441947..26f4a3d677 100644
--- a/test/514-shifts/Android.bp
+++ b/test/514-shifts/Android.bp
@@ -8,13 +8,13 @@ java_test {
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-514-shifts-expected"],
+    data: [":art-run-test-514-shifts-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-514-shifts-expected",
-    out: ["art-run-test-514-shifts-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-514-shifts-expected-stdout",
+    out: ["art-run-test-514-shifts-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/514-shifts/expected.txt b/test/514-shifts/expected-stdout.txt
index e69de29bb2..e69de29bb2 100644
--- a/test/514-shifts/expected.txt
+++ b/test/514-shifts/expected-stdout.txt
diff --git a/test/515-dce-dominator/expected.txt b/test/515-dce-dominator/expected-stdout.txt
index ccaf6f8f0f..ccaf6f8f0f 100644
--- a/test/515-dce-dominator/expected.txt
+++ b/test/515-dce-dominator/expected-stdout.txt
diff --git a/test/516-dead-move-result/expected.txt b/test/516-dead-move-result/expected-stdout.txt
index e69de29bb2..e69de29bb2 100644
--- a/test/516-dead-move-result/expected.txt
+++ b/test/516-dead-move-result/expected-stdout.txt
diff --git a/test/517-checker-builder-fallthrough/expected.txt b/test/517-checker-builder-fallthrough/expected-stdout.txt
index e69de29bb2..e69de29bb2 100644
--- a/test/517-checker-builder-fallthrough/expected.txt
+++ b/test/517-checker-builder-fallthrough/expected-stdout.txt
diff --git a/test/518-null-array-get/expected.txt b/test/518-null-array-get/expected-stdout.txt
index ae5318e53d..ae5318e53d 100644
--- a/test/518-null-array-get/expected.txt
+++ b/test/518-null-array-get/expected-stdout.txt
diff --git a/test/519-bound-load-class/Android.bp b/test/519-bound-load-class/Android.bp
index b97502a5ad..0c373565a7 100644
--- a/test/519-bound-load-class/Android.bp
+++ b/test/519-bound-load-class/Android.bp
@@ -8,13 +8,13 @@ java_test {
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-519-bound-load-class-expected"],
+    data: [":art-run-test-519-bound-load-class-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-519-bound-load-class-expected",
-    out: ["art-run-test-519-bound-load-class-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-519-bound-load-class-expected-stdout",
+    out: ["art-run-test-519-bound-load-class-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/519-bound-load-class/expected.txt b/test/519-bound-load-class/expected-stdout.txt
index e69de29bb2..e69de29bb2 100644
--- a/test/519-bound-load-class/expected.txt
+++ b/test/519-bound-load-class/expected-stdout.txt
diff --git a/test/520-equivalent-phi/expected.txt b/test/520-equivalent-phi/expected-stdout.txt
index e69de29bb2..e69de29bb2 100644
--- a/test/520-equivalent-phi/expected.txt
+++ b/test/520-equivalent-phi/expected-stdout.txt
diff --git a/test/521-checker-array-set-null/Android.bp b/test/521-checker-array-set-null/Android.bp
index bfeb94b60f..3a11247a94 100644
--- a/test/521-checker-array-set-null/Android.bp
+++ b/test/521-checker-array-set-null/Android.bp
@@ -8,7 +8,7 @@ java_test {
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-521-checker-array-set-null-expected"],
+    data: [":art-run-test-521-checker-array-set-null-expected-stdout"],
     // Include the Java source files in the test's artifacts, to make Checker assertions
     // available to the TradeFed test runner.
     include_srcs: true,
@@ -16,8 +16,8 @@ java_test {
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-521-checker-array-set-null-expected",
-    out: ["art-run-test-521-checker-array-set-null-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-521-checker-array-set-null-expected-stdout",
+    out: ["art-run-test-521-checker-array-set-null-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/521-checker-array-set-null/expected.txt b/test/521-checker-array-set-null/expected-stdout.txt
index e69de29bb2..e69de29bb2 100644
--- a/test/521-checker-array-set-null/expected.txt
+++ b/test/521-checker-array-set-null/expected-stdout.txt
diff --git a/test/521-regression-integer-field-set/Android.bp b/test/521-regression-integer-field-set/Android.bp
index a84031a466..cd32bba3e1 100644
--- a/test/521-regression-integer-field-set/Android.bp
+++ b/test/521-regression-integer-field-set/Android.bp
@@ -8,13 +8,13 @@ java_test {
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-521-regression-integer-field-set-expected"],
+    data: [":art-run-test-521-regression-integer-field-set-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-521-regression-integer-field-set-expected",
-    out: ["art-run-test-521-regression-integer-field-set-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-521-regression-integer-field-set-expected-stdout",
+    out: ["art-run-test-521-regression-integer-field-set-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/521-regression-integer-field-set/expected.txt b/test/521-regression-integer-field-set/expected-stdout.txt
index e69de29bb2..e69de29bb2 100644
--- a/test/521-regression-integer-field-set/expected.txt
+++ b/test/521-regression-integer-field-set/expected-stdout.txt
diff --git a/test/522-checker-regression-monitor-exit/expected.txt b/test/522-checker-regression-monitor-exit/expected-stdout.txt
index e69de29bb2..e69de29bb2 100644
--- a/test/522-checker-regression-monitor-exit/expected.txt
+++ b/test/522-checker-regression-monitor-exit/expected-stdout.txt
diff --git a/test/523-checker-can-throw-regression/expected.txt b/test/523-checker-can-throw-regression/expected-stdout.txt
index e69de29bb2..e69de29bb2 100644
--- a/test/523-checker-can-throw-regression/expected.txt
+++ b/test/523-checker-can-throw-regression/expected-stdout.txt
diff --git a/test/524-boolean-simplifier-regression/Android.bp b/test/524-boolean-simplifier-regression/Android.bp
index 31e4da677e..4a58143799 100644
--- a/test/524-boolean-simplifier-regression/Android.bp
+++ b/test/524-boolean-simplifier-regression/Android.bp
@@ -8,13 +8,13 @@ java_test {
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-524-boolean-simplifier-regression-expected"],
+    data: [":art-run-test-524-boolean-simplifier-regression-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-524-boolean-simplifier-regression-expected",
-    out: ["art-run-test-524-boolean-simplifier-regression-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-524-boolean-simplifier-regression-expected-stdout",
+    out: ["art-run-test-524-boolean-simplifier-regression-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/524-boolean-simplifier-regression/expected.txt b/test/524-boolean-simplifier-regression/expected-stdout.txt
index 863339fb8c..863339fb8c 100644
--- a/test/524-boolean-simplifier-regression/expected.txt
+++ b/test/524-boolean-simplifier-regression/expected-stdout.txt
diff --git a/test/525-checker-arrays-fields1/Android.bp b/test/525-checker-arrays-fields1/Android.bp
index 91f26eadc8..0bf84becc0 100644
--- a/test/525-checker-arrays-fields1/Android.bp
+++ b/test/525-checker-arrays-fields1/Android.bp
@@ -8,7 +8,7 @@ java_test {
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-525-checker-arrays-fields1-expected"],
+    data: [":art-run-test-525-checker-arrays-fields1-expected-stdout"],
     // Include the Java source files in the test's artifacts, to make Checker assertions
     // available to the TradeFed test runner.
     include_srcs: true,
@@ -16,8 +16,8 @@ java_test {
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-525-checker-arrays-fields1-expected",
-    out: ["art-run-test-525-checker-arrays-fields1-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-525-checker-arrays-fields1-expected-stdout",
+    out: ["art-run-test-525-checker-arrays-fields1-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/525-checker-arrays-fields1/expected.txt b/test/525-checker-arrays-fields1/expected-stdout.txt
index b0aad4deb5..b0aad4deb5 100644
--- a/test/525-checker-arrays-fields1/expected.txt
+++ b/test/525-checker-arrays-fields1/expected-stdout.txt
diff --git a/test/525-checker-arrays-fields2/Android.bp b/test/525-checker-arrays-fields2/Android.bp
index aec6f3d86f..e6036948c9 100644
--- a/test/525-checker-arrays-fields2/Android.bp
+++ b/test/525-checker-arrays-fields2/Android.bp
@@ -8,7 +8,7 @@ java_test {
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-525-checker-arrays-fields2-expected"],
+    data: [":art-run-test-525-checker-arrays-fields2-expected-stdout"],
     // Include the Java source files in the test's artifacts, to make Checker assertions
     // available to the TradeFed test runner.
     include_srcs: true,
@@ -16,8 +16,8 @@ java_test {
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-525-checker-arrays-fields2-expected",
-    out: ["art-run-test-525-checker-arrays-fields2-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-525-checker-arrays-fields2-expected-stdout",
+    out: ["art-run-test-525-checker-arrays-fields2-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/525-checker-arrays-fields2/expected.txt b/test/525-checker-arrays-fields2/expected-stdout.txt
index b0aad4deb5..b0aad4deb5 100644
--- a/test/525-checker-arrays-fields2/expected.txt
+++ b/test/525-checker-arrays-fields2/expected-stdout.txt
diff --git a/test/526-checker-caller-callee-regs/Android.bp b/test/526-checker-caller-callee-regs/Android.bp
index d91f2e00c8..19a7d1e06b 100644
--- a/test/526-checker-caller-callee-regs/Android.bp
+++ b/test/526-checker-caller-callee-regs/Android.bp
@@ -8,7 +8,7 @@ java_test {
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-526-checker-caller-callee-regs-expected"],
+    data: [":art-run-test-526-checker-caller-callee-regs-expected-stdout"],
     // Include the Java source files in the test's artifacts, to make Checker assertions
     // available to the TradeFed test runner.
     include_srcs: true,
@@ -16,8 +16,8 @@ java_test {
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-526-checker-caller-callee-regs-expected",
-    out: ["art-run-test-526-checker-caller-callee-regs-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-526-checker-caller-callee-regs-expected-stdout",
+    out: ["art-run-test-526-checker-caller-callee-regs-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/526-checker-caller-callee-regs/expected.txt b/test/526-checker-caller-callee-regs/expected-stdout.txt
index e69de29bb2..e69de29bb2 100644
--- a/test/526-checker-caller-callee-regs/expected.txt
+++ b/test/526-checker-caller-callee-regs/expected-stdout.txt
diff --git a/test/526-long-regalloc/Android.bp b/test/526-long-regalloc/Android.bp
index 4654558949..dd907a24e4 100644
--- a/test/526-long-regalloc/Android.bp
+++ b/test/526-long-regalloc/Android.bp
@@ -8,13 +8,13 @@ java_test {
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-526-long-regalloc-expected"],
+    data: [":art-run-test-526-long-regalloc-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-526-long-regalloc-expected",
-    out: ["art-run-test-526-long-regalloc-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-526-long-regalloc-expected-stdout",
+    out: ["art-run-test-526-long-regalloc-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/526-long-regalloc/expected.txt b/test/526-long-regalloc/expected-stdout.txt
index e69de29bb2..e69de29bb2 100644
--- a/test/526-long-regalloc/expected.txt
+++ b/test/526-long-regalloc/expected-stdout.txt
diff --git a/test/527-checker-array-access-simd/Android.bp b/test/527-checker-array-access-simd/Android.bp
index bb17d0a2df..82b88481c6 100644
--- a/test/527-checker-array-access-simd/Android.bp
+++ b/test/527-checker-array-access-simd/Android.bp
@@ -8,7 +8,7 @@ java_test {
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-527-checker-array-access-simd-expected"],
+    data: [":art-run-test-527-checker-array-access-simd-expected-stdout"],
     // Include the Java source files in the test's artifacts, to make Checker assertions
     // available to the TradeFed test runner.
     include_srcs: true,
@@ -16,8 +16,8 @@ java_test {
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-527-checker-array-access-simd-expected",
-    out: ["art-run-test-527-checker-array-access-simd-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-527-checker-array-access-simd-expected-stdout",
+    out: ["art-run-test-527-checker-array-access-simd-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/527-checker-array-access-simd/expected.txt b/test/527-checker-array-access-simd/expected-stdout.txt
index e69de29bb2..e69de29bb2 100644
--- a/test/527-checker-array-access-simd/expected.txt
+++ b/test/527-checker-array-access-simd/expected-stdout.txt
diff --git a/test/527-checker-array-access-split/Android.bp b/test/527-checker-array-access-split/Android.bp
index 09b10b60e5..db92aec8d3 100644
--- a/test/527-checker-array-access-split/Android.bp
+++ b/test/527-checker-array-access-split/Android.bp
@@ -8,7 +8,7 @@ java_test {
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-527-checker-array-access-split-expected"],
+    data: [":art-run-test-527-checker-array-access-split-expected-stdout"],
     // Include the Java source files in the test's artifacts, to make Checker assertions
     // available to the TradeFed test runner.
     include_srcs: true,
@@ -16,8 +16,8 @@ java_test {
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-527-checker-array-access-split-expected",
-    out: ["art-run-test-527-checker-array-access-split-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-527-checker-array-access-split-expected-stdout",
+    out: ["art-run-test-527-checker-array-access-split-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/527-checker-array-access-split/expected.txt b/test/527-checker-array-access-split/expected-stdout.txt
index e69de29bb2..e69de29bb2 100644
--- a/test/527-checker-array-access-split/expected.txt
+++ b/test/527-checker-array-access-split/expected-stdout.txt
diff --git a/test/528-long-hint/Android.bp b/test/528-long-hint/Android.bp
index edcc1f86b0..6155c438aa 100644
--- a/test/528-long-hint/Android.bp
+++ b/test/528-long-hint/Android.bp
@@ -8,13 +8,13 @@ java_test {
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-528-long-hint-expected"],
+    data: [":art-run-test-528-long-hint-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-528-long-hint-expected",
-    out: ["art-run-test-528-long-hint-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-528-long-hint-expected-stdout",
+    out: ["art-run-test-528-long-hint-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/528-long-hint/expected.txt b/test/528-long-hint/expected-stdout.txt
index e69de29bb2..e69de29bb2 100644
--- a/test/528-long-hint/expected.txt
+++ b/test/528-long-hint/expected-stdout.txt
diff --git a/test/529-checker-unresolved/expected.txt b/test/529-checker-unresolved/expected-stdout.txt
index 1590a2a280..1590a2a280 100644
--- a/test/529-checker-unresolved/expected.txt
+++ b/test/529-checker-unresolved/expected-stdout.txt
diff --git a/test/529-long-split/Android.bp b/test/529-long-split/Android.bp
index 8bc67a2840..ae0555098e 100644
--- a/test/529-long-split/Android.bp
+++ b/test/529-long-split/Android.bp
@@ -8,13 +8,13 @@ java_test {
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-529-long-split-expected"],
+    data: [":art-run-test-529-long-split-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-529-long-split-expected",
-    out: ["art-run-test-529-long-split-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-529-long-split-expected-stdout",
+    out: ["art-run-test-529-long-split-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/529-long-split/expected.txt b/test/529-long-split/expected-stdout.txt
index e69de29bb2..e69de29bb2 100644
--- a/test/529-long-split/expected.txt
+++ b/test/529-long-split/expected-stdout.txt
diff --git a/test/530-checker-loops1/Android.bp b/test/530-checker-loops1/Android.bp
index f5572fb2dc..2baadaef48 100644
--- a/test/530-checker-loops1/Android.bp
+++ b/test/530-checker-loops1/Android.bp
@@ -8,7 +8,7 @@ java_test {
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-530-checker-loops1-expected"],
+    data: [":art-run-test-530-checker-loops1-expected-stdout"],
     // Include the Java source files in the test's artifacts, to make Checker assertions
     // available to the TradeFed test runner.
     include_srcs: true,
@@ -16,8 +16,8 @@ java_test {
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-530-checker-loops1-expected",
-    out: ["art-run-test-530-checker-loops1-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-530-checker-loops1-expected-stdout",
+    out: ["art-run-test-530-checker-loops1-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/530-checker-loops1/expected.txt b/test/530-checker-loops1/expected-stdout.txt
index b0aad4deb5..b0aad4deb5 100644
--- a/test/530-checker-loops1/expected.txt
+++ b/test/530-checker-loops1/expected-stdout.txt
diff --git a/test/530-checker-loops2/Android.bp b/test/530-checker-loops2/Android.bp
index 8d8fa3ae55..c3c75a2530 100644
--- a/test/530-checker-loops2/Android.bp
+++ b/test/530-checker-loops2/Android.bp
@@ -8,7 +8,7 @@ java_test {
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-530-checker-loops2-expected"],
+    data: [":art-run-test-530-checker-loops2-expected-stdout"],
     // Include the Java source files in the test's artifacts, to make Checker assertions
     // available to the TradeFed test runner.
     include_srcs: true,
@@ -16,8 +16,8 @@ java_test {
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-530-checker-loops2-expected",
-    out: ["art-run-test-530-checker-loops2-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-530-checker-loops2-expected-stdout",
+    out: ["art-run-test-530-checker-loops2-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/530-checker-loops2/expected.txt b/test/530-checker-loops2/expected-stdout.txt
index b0aad4deb5..b0aad4deb5 100644
--- a/test/530-checker-loops2/expected.txt
+++ b/test/530-checker-loops2/expected-stdout.txt
diff --git a/test/530-checker-loops3/Android.bp b/test/530-checker-loops3/Android.bp
index 2abe4a576b..5c39784232 100644
--- a/test/530-checker-loops3/Android.bp
+++ b/test/530-checker-loops3/Android.bp
@@ -8,7 +8,7 @@ java_test {
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-530-checker-loops3-expected"],
+    data: [":art-run-test-530-checker-loops3-expected-stdout"],
     // Include the Java source files in the test's artifacts, to make Checker assertions
     // available to the TradeFed test runner.
     include_srcs: true,
@@ -16,8 +16,8 @@ java_test {
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-530-checker-loops3-expected",
-    out: ["art-run-test-530-checker-loops3-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-530-checker-loops3-expected-stdout",
+    out: ["art-run-test-530-checker-loops3-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/530-checker-loops3/expected.txt b/test/530-checker-loops3/expected-stdout.txt
index b0aad4deb5..b0aad4deb5 100644
--- a/test/530-checker-loops3/expected.txt
+++ b/test/530-checker-loops3/expected-stdout.txt
diff --git a/test/530-checker-loops4/Android.bp b/test/530-checker-loops4/Android.bp
index c89fc9c143..390dad9bc2 100644
--- a/test/530-checker-loops4/Android.bp
+++ b/test/530-checker-loops4/Android.bp
@@ -8,7 +8,7 @@ java_test {
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-530-checker-loops4-expected"],
+    data: [":art-run-test-530-checker-loops4-expected-stdout"],
     // Include the Java source files in the test's artifacts, to make Checker assertions
     // available to the TradeFed test runner.
     include_srcs: true,
@@ -16,8 +16,8 @@ java_test {
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-530-checker-loops4-expected",
-    out: ["art-run-test-530-checker-loops4-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-530-checker-loops4-expected-stdout",
+    out: ["art-run-test-530-checker-loops4-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/530-checker-loops4/expected.txt b/test/530-checker-loops4/expected-stdout.txt
index b0aad4deb5..b0aad4deb5 100644
--- a/test/530-checker-loops4/expected.txt
+++ b/test/530-checker-loops4/expected-stdout.txt
diff --git a/test/530-checker-loops5/Android.bp b/test/530-checker-loops5/Android.bp
index 98b856f702..12487ed7d1 100644
--- a/test/530-checker-loops5/Android.bp
+++ b/test/530-checker-loops5/Android.bp
@@ -8,7 +8,7 @@ java_test {
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-530-checker-loops5-expected"],
+    data: [":art-run-test-530-checker-loops5-expected-stdout"],
     // Include the Java source files in the test's artifacts, to make Checker assertions
     // available to the TradeFed test runner.
     include_srcs: true,
@@ -16,8 +16,8 @@ java_test {
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-530-checker-loops5-expected",
-    out: ["art-run-test-530-checker-loops5-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-530-checker-loops5-expected-stdout",
+    out: ["art-run-test-530-checker-loops5-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/530-checker-loops5/expected.txt b/test/530-checker-loops5/expected-stdout.txt
index b0aad4deb5..b0aad4deb5 100644
--- a/test/530-checker-loops5/expected.txt
+++ b/test/530-checker-loops5/expected-stdout.txt
diff --git a/test/530-checker-lse-ctor-fences/Android.bp b/test/530-checker-lse-ctor-fences/Android.bp
index d84a66a86f..5e9a2657c0 100644
--- a/test/530-checker-lse-ctor-fences/Android.bp
+++ b/test/530-checker-lse-ctor-fences/Android.bp
@@ -8,7 +8,7 @@ java_test {
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-530-checker-lse-ctor-fences-expected"],
+    data: [":art-run-test-530-checker-lse-ctor-fences-expected-stdout"],
     // Include the Java source files in the test's artifacts, to make Checker assertions
     // available to the TradeFed test runner.
     include_srcs: true,
@@ -16,8 +16,8 @@ java_test {
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-530-checker-lse-ctor-fences-expected",
-    out: ["art-run-test-530-checker-lse-ctor-fences-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-530-checker-lse-ctor-fences-expected-stdout",
+    out: ["art-run-test-530-checker-lse-ctor-fences-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/530-checker-lse-ctor-fences/expected.txt b/test/530-checker-lse-ctor-fences/expected-stdout.txt
index e69de29bb2..e69de29bb2 100644
--- a/test/530-checker-lse-ctor-fences/expected.txt
+++ b/test/530-checker-lse-ctor-fences/expected-stdout.txt
diff --git a/test/530-checker-lse-simd/Android.bp b/test/530-checker-lse-simd/Android.bp
index daf10664f4..88dc1ad373 100644
--- a/test/530-checker-lse-simd/Android.bp
+++ b/test/530-checker-lse-simd/Android.bp
@@ -8,7 +8,7 @@ java_test {
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-530-checker-lse-simd-expected"],
+    data: [":art-run-test-530-checker-lse-simd-expected-stdout"],
     // Include the Java source files in the test's artifacts, to make Checker assertions
     // available to the TradeFed test runner.
     include_srcs: true,
@@ -16,8 +16,8 @@ java_test {
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-530-checker-lse-simd-expected",
-    out: ["art-run-test-530-checker-lse-simd-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-530-checker-lse-simd-expected-stdout",
+    out: ["art-run-test-530-checker-lse-simd-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/530-checker-lse-simd/expected.txt b/test/530-checker-lse-simd/expected-stdout.txt
index 03bb57b545..03bb57b545 100644
--- a/test/530-checker-lse-simd/expected.txt
+++ b/test/530-checker-lse-simd/expected-stdout.txt
diff --git a/test/530-checker-lse/Android.bp b/test/530-checker-lse/Android.bp
index 78edc59649..82f0a79264 100644
--- a/test/530-checker-lse/Android.bp
+++ b/test/530-checker-lse/Android.bp
@@ -8,7 +8,7 @@ java_test {
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-530-checker-lse-expected"],
+    data: [":art-run-test-530-checker-lse-expected-stdout"],
     // Include the Java source files in the test's artifacts, to make Checker assertions
     // available to the TradeFed test runner.
     include_srcs: true,
@@ -16,8 +16,8 @@ java_test {
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-530-checker-lse-expected",
-    out: ["art-run-test-530-checker-lse-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-530-checker-lse-expected-stdout",
+    out: ["art-run-test-530-checker-lse-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/530-checker-lse/expected.txt b/test/530-checker-lse/expected-stdout.txt
index 90fcfc5349..90fcfc5349 100644
--- a/test/530-checker-lse/expected.txt
+++ b/test/530-checker-lse/expected-stdout.txt
diff --git a/test/530-checker-lse2/Android.bp b/test/530-checker-lse2/Android.bp
index fd0a483aca..e74b268736 100644
--- a/test/530-checker-lse2/Android.bp
+++ b/test/530-checker-lse2/Android.bp
@@ -8,7 +8,7 @@ java_test {
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-530-checker-lse2-expected"],
+    data: [":art-run-test-530-checker-lse2-expected-stdout"],
     // Include the Java source files in the test's artifacts, to make Checker assertions
     // available to the TradeFed test runner.
     include_srcs: true,
@@ -16,8 +16,8 @@ java_test {
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-530-checker-lse2-expected",
-    out: ["art-run-test-530-checker-lse2-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-530-checker-lse2-expected-stdout",
+    out: ["art-run-test-530-checker-lse2-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/530-checker-lse2/expected.txt b/test/530-checker-lse2/expected-stdout.txt
index e18fc7e1f8..e18fc7e1f8 100644
--- a/test/530-checker-lse2/expected.txt
+++ b/test/530-checker-lse2/expected-stdout.txt
diff --git a/test/530-checker-lse3/expected.txt b/test/530-checker-lse3/expected-stdout.txt
index e69de29bb2..e69de29bb2 100644
--- a/test/530-checker-lse3/expected.txt
+++ b/test/530-checker-lse3/expected-stdout.txt
diff --git a/test/530-checker-peel-unroll/expected.txt b/test/530-checker-peel-unroll/expected-stdout.txt
index b0aad4deb5..b0aad4deb5 100644
--- a/test/530-checker-peel-unroll/expected.txt
+++ b/test/530-checker-peel-unroll/expected-stdout.txt
diff --git a/test/530-checker-regression-reftyp-final/expected.txt b/test/530-checker-regression-reftyp-final/expected-stdout.txt
index e69de29bb2..e69de29bb2 100644
--- a/test/530-checker-regression-reftyp-final/expected.txt
+++ b/test/530-checker-regression-reftyp-final/expected-stdout.txt
diff --git a/test/530-instanceof-checkcast/Android.bp b/test/530-instanceof-checkcast/Android.bp
index 077fda395b..858a5af585 100644
--- a/test/530-instanceof-checkcast/Android.bp
+++ b/test/530-instanceof-checkcast/Android.bp
@@ -8,13 +8,13 @@ java_test {
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-530-instanceof-checkcast-expected"],
+    data: [":art-run-test-530-instanceof-checkcast-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-530-instanceof-checkcast-expected",
-    out: ["art-run-test-530-instanceof-checkcast-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-530-instanceof-checkcast-expected-stdout",
+    out: ["art-run-test-530-instanceof-checkcast-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/530-instanceof-checkcast/expected.txt b/test/530-instanceof-checkcast/expected-stdout.txt
index e69de29bb2..e69de29bb2 100644
--- a/test/530-instanceof-checkcast/expected.txt
+++ b/test/530-instanceof-checkcast/expected-stdout.txt
diff --git a/test/530-regression-lse/Android.bp b/test/530-regression-lse/Android.bp
index 366ff331e2..e9c2d43ef6 100644
--- a/test/530-regression-lse/Android.bp
+++ b/test/530-regression-lse/Android.bp
@@ -8,13 +8,13 @@ java_test {
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-530-regression-lse-expected"],
+    data: [":art-run-test-530-regression-lse-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-530-regression-lse-expected",
-    out: ["art-run-test-530-regression-lse-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-530-regression-lse-expected-stdout",
+    out: ["art-run-test-530-regression-lse-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/530-regression-lse/expected.txt b/test/530-regression-lse/expected-stdout.txt
index e69de29bb2..e69de29bb2 100644
--- a/test/530-regression-lse/expected.txt
+++ b/test/530-regression-lse/expected-stdout.txt
diff --git a/test/531-regression-debugphi/expected.txt b/test/531-regression-debugphi/expected-stdout.txt
index e69de29bb2..e69de29bb2 100644
--- a/test/531-regression-debugphi/expected.txt
+++ b/test/531-regression-debugphi/expected-stdout.txt
diff --git a/test/532-checker-nonnull-arrayset/Android.bp b/test/532-checker-nonnull-arrayset/Android.bp
index 28e67eb2c2..b165e2a41d 100644
--- a/test/532-checker-nonnull-arrayset/Android.bp
+++ b/test/532-checker-nonnull-arrayset/Android.bp
@@ -8,7 +8,7 @@ java_test {
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-532-checker-nonnull-arrayset-expected"],
+    data: [":art-run-test-532-checker-nonnull-arrayset-expected-stdout"],
     // Include the Java source files in the test's artifacts, to make Checker assertions
     // available to the TradeFed test runner.
     include_srcs: true,
@@ -16,8 +16,8 @@ java_test {
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-532-checker-nonnull-arrayset-expected",
-    out: ["art-run-test-532-checker-nonnull-arrayset-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-532-checker-nonnull-arrayset-expected-stdout",
+    out: ["art-run-test-532-checker-nonnull-arrayset-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/532-checker-nonnull-arrayset/expected.txt b/test/532-checker-nonnull-arrayset/expected-stdout.txt
index e69de29bb2..e69de29bb2 100644
--- a/test/532-checker-nonnull-arrayset/expected.txt
+++ b/test/532-checker-nonnull-arrayset/expected-stdout.txt
diff --git a/test/533-regression-debugphi/expected.txt b/test/533-regression-debugphi/expected-stdout.txt
index e69de29bb2..e69de29bb2 100644
--- a/test/533-regression-debugphi/expected.txt
+++ b/test/533-regression-debugphi/expected-stdout.txt
diff --git a/test/534-checker-bce-deoptimization/Android.bp b/test/534-checker-bce-deoptimization/Android.bp
index f70803ef2e..82c94a887e 100644
--- a/test/534-checker-bce-deoptimization/Android.bp
+++ b/test/534-checker-bce-deoptimization/Android.bp
@@ -8,7 +8,7 @@ java_test {
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-534-checker-bce-deoptimization-expected"],
+    data: [":art-run-test-534-checker-bce-deoptimization-expected-stdout"],
     // Include the Java source files in the test's artifacts, to make Checker assertions
     // available to the TradeFed test runner.
     include_srcs: true,
@@ -16,8 +16,8 @@ java_test {
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-534-checker-bce-deoptimization-expected",
-    out: ["art-run-test-534-checker-bce-deoptimization-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-534-checker-bce-deoptimization-expected-stdout",
+    out: ["art-run-test-534-checker-bce-deoptimization-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/534-checker-bce-deoptimization/expected.txt b/test/534-checker-bce-deoptimization/expected-stdout.txt
index b9a1e27550..b9a1e27550 100644
--- a/test/534-checker-bce-deoptimization/expected.txt
+++ b/test/534-checker-bce-deoptimization/expected-stdout.txt
diff --git a/test/535-deopt-and-inlining/Android.bp b/test/535-deopt-and-inlining/Android.bp
index b85e6a5cdd..e48d1a14e2 100644
--- a/test/535-deopt-and-inlining/Android.bp
+++ b/test/535-deopt-and-inlining/Android.bp
@@ -8,13 +8,13 @@ java_test {
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-535-deopt-and-inlining-expected"],
+    data: [":art-run-test-535-deopt-and-inlining-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-535-deopt-and-inlining-expected",
-    out: ["art-run-test-535-deopt-and-inlining-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-535-deopt-and-inlining-expected-stdout",
+    out: ["art-run-test-535-deopt-and-inlining-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/535-deopt-and-inlining/expected.txt b/test/535-deopt-and-inlining/expected-stdout.txt
index e69de29bb2..e69de29bb2 100644
--- a/test/535-deopt-and-inlining/expected.txt
+++ b/test/535-deopt-and-inlining/expected-stdout.txt
diff --git a/test/535-regression-const-val/expected.txt b/test/535-regression-const-val/expected-stdout.txt
index e69de29bb2..e69de29bb2 100644
--- a/test/535-regression-const-val/expected.txt
+++ b/test/535-regression-const-val/expected-stdout.txt
diff --git a/test/536-checker-intrinsic-optimization/Android.bp b/test/536-checker-intrinsic-optimization/Android.bp
index 270170a8b9..92079a9af2 100644
--- a/test/536-checker-intrinsic-optimization/Android.bp
+++ b/test/536-checker-intrinsic-optimization/Android.bp
@@ -8,7 +8,7 @@ java_test {
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-536-checker-intrinsic-optimization-expected"],
+    data: [":art-run-test-536-checker-intrinsic-optimization-expected-stdout"],
     // Include the Java source files in the test's artifacts, to make Checker assertions
     // available to the TradeFed test runner.
     include_srcs: true,
@@ -16,8 +16,8 @@ java_test {
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-536-checker-intrinsic-optimization-expected",
-    out: ["art-run-test-536-checker-intrinsic-optimization-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-536-checker-intrinsic-optimization-expected-stdout",
+    out: ["art-run-test-536-checker-intrinsic-optimization-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/536-checker-intrinsic-optimization/expected.txt b/test/536-checker-intrinsic-optimization/expected-stdout.txt
index e69de29bb2..e69de29bb2 100644
--- a/test/536-checker-intrinsic-optimization/expected.txt
+++ b/test/536-checker-intrinsic-optimization/expected-stdout.txt
diff --git a/test/536-checker-needs-access-check/expected.txt b/test/536-checker-needs-access-check/expected-stdout.txt
index 4acae95b70..4acae95b70 100644
--- a/test/536-checker-needs-access-check/expected.txt
+++ b/test/536-checker-needs-access-check/expected-stdout.txt
diff --git a/test/537-checker-arraycopy/Android.bp b/test/537-checker-arraycopy/Android.bp
index 19f454b235..3b3fc68862 100644
--- a/test/537-checker-arraycopy/Android.bp
+++ b/test/537-checker-arraycopy/Android.bp
@@ -8,7 +8,7 @@ java_test {
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-537-checker-arraycopy-expected"],
+    data: [":art-run-test-537-checker-arraycopy-expected-stdout"],
     // Include the Java source files in the test's artifacts, to make Checker assertions
     // available to the TradeFed test runner.
     include_srcs: true,
@@ -16,8 +16,8 @@ java_test {
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-537-checker-arraycopy-expected",
-    out: ["art-run-test-537-checker-arraycopy-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-537-checker-arraycopy-expected-stdout",
+    out: ["art-run-test-537-checker-arraycopy-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/537-checker-arraycopy/expected.txt b/test/537-checker-arraycopy/expected-stdout.txt
index e69de29bb2..e69de29bb2 100644
--- a/test/537-checker-arraycopy/expected.txt
+++ b/test/537-checker-arraycopy/expected-stdout.txt
diff --git a/test/537-checker-debuggable/expected.txt b/test/537-checker-debuggable/expected-stdout.txt
index e69de29bb2..e69de29bb2 100644
--- a/test/537-checker-debuggable/expected.txt
+++ b/test/537-checker-debuggable/expected-stdout.txt
diff --git a/test/537-checker-inline-and-unverified/expected.txt b/test/537-checker-inline-and-unverified/expected-stdout.txt
index e69de29bb2..e69de29bb2 100644
--- a/test/537-checker-inline-and-unverified/expected.txt
+++ b/test/537-checker-inline-and-unverified/expected-stdout.txt
diff --git a/test/537-checker-jump-over-jump/Android.bp b/test/537-checker-jump-over-jump/Android.bp
index 216a63a4b2..6ab9bb5af8 100644
--- a/test/537-checker-jump-over-jump/Android.bp
+++ b/test/537-checker-jump-over-jump/Android.bp
@@ -8,7 +8,7 @@ java_test {
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-537-checker-jump-over-jump-expected"],
+    data: [":art-run-test-537-checker-jump-over-jump-expected-stdout"],
     // Include the Java source files in the test's artifacts, to make Checker assertions
     // available to the TradeFed test runner.
     include_srcs: true,
@@ -16,8 +16,8 @@ java_test {
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-537-checker-jump-over-jump-expected",
-    out: ["art-run-test-537-checker-jump-over-jump-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-537-checker-jump-over-jump-expected-stdout",
+    out: ["art-run-test-537-checker-jump-over-jump-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/537-checker-jump-over-jump/expected.txt b/test/537-checker-jump-over-jump/expected-stdout.txt
index e69de29bb2..e69de29bb2 100644
--- a/test/537-checker-jump-over-jump/expected.txt
+++ b/test/537-checker-jump-over-jump/expected-stdout.txt
diff --git a/test/538-checker-embed-constants/Android.bp b/test/538-checker-embed-constants/Android.bp
index 8f8daa6386..97be862565 100644
--- a/test/538-checker-embed-constants/Android.bp
+++ b/test/538-checker-embed-constants/Android.bp
@@ -8,7 +8,7 @@ java_test {
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-538-checker-embed-constants-expected"],
+    data: [":art-run-test-538-checker-embed-constants-expected-stdout"],
     // Include the Java source files in the test's artifacts, to make Checker assertions
     // available to the TradeFed test runner.
     include_srcs: true,
@@ -16,8 +16,8 @@ java_test {
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-538-checker-embed-constants-expected",
-    out: ["art-run-test-538-checker-embed-constants-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-538-checker-embed-constants-expected-stdout",
+    out: ["art-run-test-538-checker-embed-constants-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/538-checker-embed-constants/expected.txt b/test/538-checker-embed-constants/expected-stdout.txt
index e69de29bb2..e69de29bb2 100644
--- a/test/538-checker-embed-constants/expected.txt
+++ b/test/538-checker-embed-constants/expected-stdout.txt
diff --git a/test/540-checker-rtp-bug/Android.bp b/test/540-checker-rtp-bug/Android.bp
index 086a83fb09..34b4550e96 100644
--- a/test/540-checker-rtp-bug/Android.bp
+++ b/test/540-checker-rtp-bug/Android.bp
@@ -8,7 +8,7 @@ java_test {
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-540-checker-rtp-bug-expected"],
+    data: [":art-run-test-540-checker-rtp-bug-expected-stdout"],
     // Include the Java source files in the test's artifacts, to make Checker assertions
     // available to the TradeFed test runner.
     include_srcs: true,
@@ -16,8 +16,8 @@ java_test {
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-540-checker-rtp-bug-expected",
-    out: ["art-run-test-540-checker-rtp-bug-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-540-checker-rtp-bug-expected-stdout",
+    out: ["art-run-test-540-checker-rtp-bug-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/540-checker-rtp-bug/expected.txt b/test/540-checker-rtp-bug/expected-stdout.txt
index 2cf2842aa5..2cf2842aa5 100644
--- a/test/540-checker-rtp-bug/expected.txt
+++ b/test/540-checker-rtp-bug/expected-stdout.txt
diff --git a/test/541-regression-inlined-deopt/expected.txt b/test/541-regression-inlined-deopt/expected-stdout.txt
index e69de29bb2..e69de29bb2 100644
--- a/test/541-regression-inlined-deopt/expected.txt
+++ b/test/541-regression-inlined-deopt/expected-stdout.txt
diff --git a/test/542-bitfield-rotates/Android.bp b/test/542-bitfield-rotates/Android.bp
index 51ec13aa1b..c0f22fcb53 100644
--- a/test/542-bitfield-rotates/Android.bp
+++ b/test/542-bitfield-rotates/Android.bp
@@ -8,13 +8,13 @@ java_test {
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-542-bitfield-rotates-expected"],
+    data: [":art-run-test-542-bitfield-rotates-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-542-bitfield-rotates-expected",
-    out: ["art-run-test-542-bitfield-rotates-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-542-bitfield-rotates-expected-stdout",
+    out: ["art-run-test-542-bitfield-rotates-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/542-bitfield-rotates/expected.txt b/test/542-bitfield-rotates/expected-stdout.txt
index e69de29bb2..e69de29bb2 100644
--- a/test/542-bitfield-rotates/expected.txt
+++ b/test/542-bitfield-rotates/expected-stdout.txt
diff --git a/test/542-inline-trycatch/Android.bp b/test/542-inline-trycatch/Android.bp
index 7c2eef7e24..a87d1dae9e 100644
--- a/test/542-inline-trycatch/Android.bp
+++ b/test/542-inline-trycatch/Android.bp
@@ -8,13 +8,13 @@ java_test {
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-542-inline-trycatch-expected"],
+    data: [":art-run-test-542-inline-trycatch-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-542-inline-trycatch-expected",
-    out: ["art-run-test-542-inline-trycatch-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-542-inline-trycatch-expected-stdout",
+    out: ["art-run-test-542-inline-trycatch-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/542-inline-trycatch/expected.txt b/test/542-inline-trycatch/expected-stdout.txt
index e69de29bb2..e69de29bb2 100644
--- a/test/542-inline-trycatch/expected.txt
+++ b/test/542-inline-trycatch/expected-stdout.txt
diff --git a/test/542-unresolved-access-check/Android.bp b/test/542-unresolved-access-check/Android.bp
index 75910196ff..8fcc49da8f 100644
--- a/test/542-unresolved-access-check/Android.bp
+++ b/test/542-unresolved-access-check/Android.bp
@@ -8,13 +8,13 @@ java_test {
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-542-unresolved-access-check-expected"],
+    data: [":art-run-test-542-unresolved-access-check-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-542-unresolved-access-check-expected",
-    out: ["art-run-test-542-unresolved-access-check-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-542-unresolved-access-check-expected-stdout",
+    out: ["art-run-test-542-unresolved-access-check-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/542-unresolved-access-check/expected.txt b/test/542-unresolved-access-check/expected-stdout.txt
index e69de29bb2..e69de29bb2 100644
--- a/test/542-unresolved-access-check/expected.txt
+++ b/test/542-unresolved-access-check/expected-stdout.txt
diff --git a/test/543-checker-dce-trycatch/expected.txt b/test/543-checker-dce-trycatch/expected-stdout.txt
index e69de29bb2..e69de29bb2 100644
--- a/test/543-checker-dce-trycatch/expected.txt
+++ b/test/543-checker-dce-trycatch/expected-stdout.txt
diff --git a/test/543-env-long-ref/expected.txt b/test/543-env-long-ref/expected-stdout.txt
index 89f155b8c9..89f155b8c9 100644
--- a/test/543-env-long-ref/expected.txt
+++ b/test/543-env-long-ref/expected-stdout.txt
diff --git a/test/545-tracing-and-jit/Android.bp b/test/545-tracing-and-jit/Android.bp
index dc48e565c8..378459fd5d 100644
--- a/test/545-tracing-and-jit/Android.bp
+++ b/test/545-tracing-and-jit/Android.bp
@@ -8,13 +8,13 @@ java_test {
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-545-tracing-and-jit-expected"],
+    data: [":art-run-test-545-tracing-and-jit-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-545-tracing-and-jit-expected",
-    out: ["art-run-test-545-tracing-and-jit-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-545-tracing-and-jit-expected-stdout",
+    out: ["art-run-test-545-tracing-and-jit-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/545-tracing-and-jit/expected.txt b/test/545-tracing-and-jit/expected-stdout.txt
index e69de29bb2..e69de29bb2 100644
--- a/test/545-tracing-and-jit/expected.txt
+++ b/test/545-tracing-and-jit/expected-stdout.txt
diff --git a/test/546-regression-simplify-catch/expected.txt b/test/546-regression-simplify-catch/expected-stdout.txt
index e69de29bb2..e69de29bb2 100644
--- a/test/546-regression-simplify-catch/expected.txt
+++ b/test/546-regression-simplify-catch/expected-stdout.txt
diff --git a/test/547-regression-trycatch-critic-edge/expected.txt b/test/547-regression-trycatch-critic-edge/expected-stdout.txt
index e69de29bb2..e69de29bb2 100644
--- a/test/547-regression-trycatch-critic-edge/expected.txt
+++ b/test/547-regression-trycatch-critic-edge/expected-stdout.txt
diff --git a/test/548-checker-inlining-and-dce/Android.bp b/test/548-checker-inlining-and-dce/Android.bp
index 5d103298db..66fa5a925a 100644
--- a/test/548-checker-inlining-and-dce/Android.bp
+++ b/test/548-checker-inlining-and-dce/Android.bp
@@ -8,7 +8,7 @@ java_test {
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-548-checker-inlining-and-dce-expected"],
+    data: [":art-run-test-548-checker-inlining-and-dce-expected-stdout"],
     // Include the Java source files in the test's artifacts, to make Checker assertions
     // available to the TradeFed test runner.
     include_srcs: true,
@@ -16,8 +16,8 @@ java_test {
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-548-checker-inlining-and-dce-expected",
-    out: ["art-run-test-548-checker-inlining-and-dce-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-548-checker-inlining-and-dce-expected-stdout",
+    out: ["art-run-test-548-checker-inlining-and-dce-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/548-checker-inlining-and-dce/expected.txt b/test/548-checker-inlining-and-dce/expected-stdout.txt
index e69de29bb2..e69de29bb2 100644
--- a/test/548-checker-inlining-and-dce/expected.txt
+++ b/test/548-checker-inlining-and-dce/expected-stdout.txt
diff --git a/test/549-checker-types-merge/Android.bp b/test/549-checker-types-merge/Android.bp
index 1735c463ac..7673fb5913 100644
--- a/test/549-checker-types-merge/Android.bp
+++ b/test/549-checker-types-merge/Android.bp
@@ -8,7 +8,7 @@ java_test {
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-549-checker-types-merge-expected"],
+    data: [":art-run-test-549-checker-types-merge-expected-stdout"],
     // Include the Java source files in the test's artifacts, to make Checker assertions
     // available to the TradeFed test runner.
     include_srcs: true,
@@ -16,8 +16,8 @@ java_test {
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-549-checker-types-merge-expected",
-    out: ["art-run-test-549-checker-types-merge-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-549-checker-types-merge-expected-stdout",
+    out: ["art-run-test-549-checker-types-merge-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/549-checker-types-merge/expected.txt b/test/549-checker-types-merge/expected-stdout.txt
index e69de29bb2..e69de29bb2 100644
--- a/test/549-checker-types-merge/expected.txt
+++ b/test/549-checker-types-merge/expected-stdout.txt
diff --git a/test/550-checker-multiply-accumulate/Android.bp b/test/550-checker-multiply-accumulate/Android.bp
index 5b125222b9..149872cd38 100644
--- a/test/550-checker-multiply-accumulate/Android.bp
+++ b/test/550-checker-multiply-accumulate/Android.bp
@@ -8,7 +8,7 @@ java_test {
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-550-checker-multiply-accumulate-expected"],
+    data: [":art-run-test-550-checker-multiply-accumulate-expected-stdout"],
     // Include the Java source files in the test's artifacts, to make Checker assertions
     // available to the TradeFed test runner.
     include_srcs: true,
@@ -16,8 +16,8 @@ java_test {
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-550-checker-multiply-accumulate-expected",
-    out: ["art-run-test-550-checker-multiply-accumulate-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-550-checker-multiply-accumulate-expected-stdout",
+    out: ["art-run-test-550-checker-multiply-accumulate-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/550-checker-multiply-accumulate/expected.txt b/test/550-checker-multiply-accumulate/expected-stdout.txt
index e69de29bb2..e69de29bb2 100644
--- a/test/550-checker-multiply-accumulate/expected.txt
+++ b/test/550-checker-multiply-accumulate/expected-stdout.txt
diff --git a/test/550-checker-regression-wide-store/expected.txt b/test/550-checker-regression-wide-store/expected-stdout.txt
index e69de29bb2..e69de29bb2 100644
--- a/test/550-checker-regression-wide-store/expected.txt
+++ b/test/550-checker-regression-wide-store/expected-stdout.txt
diff --git a/test/550-new-instance-clinit/Android.bp b/test/550-new-instance-clinit/Android.bp
index 6892cba0bc..edd6bbe12b 100644
--- a/test/550-new-instance-clinit/Android.bp
+++ b/test/550-new-instance-clinit/Android.bp
@@ -8,13 +8,13 @@ java_test {
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-550-new-instance-clinit-expected"],
+    data: [":art-run-test-550-new-instance-clinit-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-550-new-instance-clinit-expected",
-    out: ["art-run-test-550-new-instance-clinit-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-550-new-instance-clinit-expected-stdout",
+    out: ["art-run-test-550-new-instance-clinit-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/550-new-instance-clinit/expected.txt b/test/550-new-instance-clinit/expected-stdout.txt
index e69de29bb2..e69de29bb2 100644
--- a/test/550-new-instance-clinit/expected.txt
+++ b/test/550-new-instance-clinit/expected-stdout.txt
diff --git a/test/551-checker-clinit/Android.bp b/test/551-checker-clinit/Android.bp
index 6098755097..14ec30ec46 100644
--- a/test/551-checker-clinit/Android.bp
+++ b/test/551-checker-clinit/Android.bp
@@ -8,7 +8,7 @@ java_test {
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-551-checker-clinit-expected"],
+    data: [":art-run-test-551-checker-clinit-expected-stdout"],
     // Include the Java source files in the test's artifacts, to make Checker assertions
     // available to the TradeFed test runner.
     include_srcs: true,
@@ -16,8 +16,8 @@ java_test {
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-551-checker-clinit-expected",
-    out: ["art-run-test-551-checker-clinit-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-551-checker-clinit-expected-stdout",
+    out: ["art-run-test-551-checker-clinit-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/551-checker-clinit/expected.txt b/test/551-checker-clinit/expected-stdout.txt
index e69de29bb2..e69de29bb2 100644
--- a/test/551-checker-clinit/expected.txt
+++ b/test/551-checker-clinit/expected-stdout.txt
diff --git a/test/551-checker-shifter-operand/Android.bp b/test/551-checker-shifter-operand/Android.bp
index 6d1147862d..a68f861455 100644
--- a/test/551-checker-shifter-operand/Android.bp
+++ b/test/551-checker-shifter-operand/Android.bp
@@ -8,7 +8,7 @@ java_test {
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-551-checker-shifter-operand-expected"],
+    data: [":art-run-test-551-checker-shifter-operand-expected-stdout"],
     // Include the Java source files in the test's artifacts, to make Checker assertions
     // available to the TradeFed test runner.
     include_srcs: true,
@@ -16,8 +16,8 @@ java_test {
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-551-checker-shifter-operand-expected",
-    out: ["art-run-test-551-checker-shifter-operand-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-551-checker-shifter-operand-expected-stdout",
+    out: ["art-run-test-551-checker-shifter-operand-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/551-checker-shifter-operand/expected.txt b/test/551-checker-shifter-operand/expected-stdout.txt
index e69de29bb2..e69de29bb2 100644
--- a/test/551-checker-shifter-operand/expected.txt
+++ b/test/551-checker-shifter-operand/expected-stdout.txt
diff --git a/test/551-implicit-null-checks/Android.bp b/test/551-implicit-null-checks/Android.bp
index 3eac7844a3..48e3ffebfe 100644
--- a/test/551-implicit-null-checks/Android.bp
+++ b/test/551-implicit-null-checks/Android.bp
@@ -8,13 +8,13 @@ java_test {
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-551-implicit-null-checks-expected"],
+    data: [":art-run-test-551-implicit-null-checks-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-551-implicit-null-checks-expected",
-    out: ["art-run-test-551-implicit-null-checks-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-551-implicit-null-checks-expected-stdout",
+    out: ["art-run-test-551-implicit-null-checks-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/551-implicit-null-checks/expected.txt b/test/551-implicit-null-checks/expected-stdout.txt
index 49b3771e4e..49b3771e4e 100644
--- a/test/551-implicit-null-checks/expected.txt
+++ b/test/551-implicit-null-checks/expected-stdout.txt
diff --git a/test/551-invoke-super/expected.txt b/test/551-invoke-super/expected-stdout.txt
index e69de29bb2..e69de29bb2 100644
--- a/test/551-invoke-super/expected.txt
+++ b/test/551-invoke-super/expected-stdout.txt
diff --git a/test/552-checker-primitive-typeprop/expected.txt b/test/552-checker-primitive-typeprop/expected-stdout.txt
index e69de29bb2..e69de29bb2 100644
--- a/test/552-checker-primitive-typeprop/expected.txt
+++ b/test/552-checker-primitive-typeprop/expected-stdout.txt
diff --git a/test/552-checker-sharpening/Android.bp b/test/552-checker-sharpening/Android.bp
index d02a611ade..66658ec7e0 100644
--- a/test/552-checker-sharpening/Android.bp
+++ b/test/552-checker-sharpening/Android.bp
@@ -8,7 +8,7 @@ java_test {
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-552-checker-sharpening-expected"],
+    data: [":art-run-test-552-checker-sharpening-expected-stdout"],
     // Include the Java source files in the test's artifacts, to make Checker assertions
     // available to the TradeFed test runner.
     include_srcs: true,
@@ -16,8 +16,8 @@ java_test {
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-552-checker-sharpening-expected",
-    out: ["art-run-test-552-checker-sharpening-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-552-checker-sharpening-expected-stdout",
+    out: ["art-run-test-552-checker-sharpening-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/552-checker-sharpening/expected.txt b/test/552-checker-sharpening/expected-stdout.txt
index e69de29bb2..e69de29bb2 100644
--- a/test/552-checker-sharpening/expected.txt
+++ b/test/552-checker-sharpening/expected-stdout.txt
diff --git a/test/552-checker-x86-avx2-bit-manipulation/Android.bp b/test/552-checker-x86-avx2-bit-manipulation/Android.bp
index a7261a2a9b..dc7f092c90 100644
--- a/test/552-checker-x86-avx2-bit-manipulation/Android.bp
+++ b/test/552-checker-x86-avx2-bit-manipulation/Android.bp
@@ -8,7 +8,7 @@ java_test {
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-552-checker-x86-avx2-bit-manipulation-expected"],
+    data: [":art-run-test-552-checker-x86-avx2-bit-manipulation-expected-stdout"],
     // Include the Java source files in the test's artifacts, to make Checker assertions
     // available to the TradeFed test runner.
     include_srcs: true,
@@ -16,8 +16,8 @@ java_test {
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-552-checker-x86-avx2-bit-manipulation-expected",
-    out: ["art-run-test-552-checker-x86-avx2-bit-manipulation-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-552-checker-x86-avx2-bit-manipulation-expected-stdout",
+    out: ["art-run-test-552-checker-x86-avx2-bit-manipulation-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/552-checker-x86-avx2-bit-manipulation/expected.txt b/test/552-checker-x86-avx2-bit-manipulation/expected-stdout.txt
index e69de29bb2..e69de29bb2 100644
--- a/test/552-checker-x86-avx2-bit-manipulation/expected.txt
+++ b/test/552-checker-x86-avx2-bit-manipulation/expected-stdout.txt
diff --git a/test/552-invoke-non-existent-super/expected.txt b/test/552-invoke-non-existent-super/expected-stdout.txt
index e69de29bb2..e69de29bb2 100644
--- a/test/552-invoke-non-existent-super/expected.txt
+++ b/test/552-invoke-non-existent-super/expected-stdout.txt
diff --git a/test/553-invoke-super/expected.txt b/test/553-invoke-super/expected-stdout.txt
index e69de29bb2..e69de29bb2 100644
--- a/test/553-invoke-super/expected.txt
+++ b/test/553-invoke-super/expected-stdout.txt
diff --git a/test/554-checker-rtp-checkcast/Android.bp b/test/554-checker-rtp-checkcast/Android.bp
index 6dc0a183d2..49038fb5ec 100644
--- a/test/554-checker-rtp-checkcast/Android.bp
+++ b/test/554-checker-rtp-checkcast/Android.bp
@@ -8,7 +8,7 @@ java_test {
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-554-checker-rtp-checkcast-expected"],
+    data: [":art-run-test-554-checker-rtp-checkcast-expected-stdout"],
     // Include the Java source files in the test's artifacts, to make Checker assertions
     // available to the TradeFed test runner.
     include_srcs: true,
@@ -16,8 +16,8 @@ java_test {
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-554-checker-rtp-checkcast-expected",
-    out: ["art-run-test-554-checker-rtp-checkcast-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-554-checker-rtp-checkcast-expected-stdout",
+    out: ["art-run-test-554-checker-rtp-checkcast-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/554-checker-rtp-checkcast/expected.txt b/test/554-checker-rtp-checkcast/expected-stdout.txt
index e69de29bb2..e69de29bb2 100644
--- a/test/554-checker-rtp-checkcast/expected.txt
+++ b/test/554-checker-rtp-checkcast/expected-stdout.txt
diff --git a/test/555-UnsafeGetLong-regression/Android.bp b/test/555-UnsafeGetLong-regression/Android.bp
index 83c5ee6c4b..89072af4e9 100644
--- a/test/555-UnsafeGetLong-regression/Android.bp
+++ b/test/555-UnsafeGetLong-regression/Android.bp
@@ -8,13 +8,13 @@ java_test {
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-555-UnsafeGetLong-regression-expected"],
+    data: [":art-run-test-555-UnsafeGetLong-regression-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-555-UnsafeGetLong-regression-expected",
-    out: ["art-run-test-555-UnsafeGetLong-regression-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-555-UnsafeGetLong-regression-expected-stdout",
+    out: ["art-run-test-555-UnsafeGetLong-regression-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/555-UnsafeGetLong-regression/expected.txt b/test/555-UnsafeGetLong-regression/expected-stdout.txt
index 6a5618ebc6..6a5618ebc6 100644
--- a/test/555-UnsafeGetLong-regression/expected.txt
+++ b/test/555-UnsafeGetLong-regression/expected-stdout.txt
diff --git a/test/556-invoke-super/expected.txt b/test/556-invoke-super/expected-stdout.txt
index e69de29bb2..e69de29bb2 100644
--- a/test/556-invoke-super/expected.txt
+++ b/test/556-invoke-super/expected-stdout.txt
diff --git a/test/557-checker-instruct-simplifier-ror/Android.bp b/test/557-checker-instruct-simplifier-ror/Android.bp
index 2a38fd001a..24b3747913 100644
--- a/test/557-checker-instruct-simplifier-ror/Android.bp
+++ b/test/557-checker-instruct-simplifier-ror/Android.bp
@@ -8,7 +8,7 @@ java_test {
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-557-checker-instruct-simplifier-ror-expected"],
+    data: [":art-run-test-557-checker-instruct-simplifier-ror-expected-stdout"],
     // Include the Java source files in the test's artifacts, to make Checker assertions
     // available to the TradeFed test runner.
     include_srcs: true,
@@ -16,8 +16,8 @@ java_test {
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-557-checker-instruct-simplifier-ror-expected",
-    out: ["art-run-test-557-checker-instruct-simplifier-ror-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-557-checker-instruct-simplifier-ror-expected-stdout",
+    out: ["art-run-test-557-checker-instruct-simplifier-ror-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/557-checker-instruct-simplifier-ror/expected.txt b/test/557-checker-instruct-simplifier-ror/expected-stdout.txt
index e69de29bb2..e69de29bb2 100644
--- a/test/557-checker-instruct-simplifier-ror/expected.txt
+++ b/test/557-checker-instruct-simplifier-ror/expected-stdout.txt
diff --git a/test/557-checker-ref-equivalent/expected.txt b/test/557-checker-ref-equivalent/expected-stdout.txt
index e69de29bb2..e69de29bb2 100644
--- a/test/557-checker-ref-equivalent/expected.txt
+++ b/test/557-checker-ref-equivalent/expected-stdout.txt
diff --git a/test/558-switch/Android.bp b/test/558-switch/Android.bp
index 78f5fe69b2..2bcacb06d0 100644
--- a/test/558-switch/Android.bp
+++ b/test/558-switch/Android.bp
@@ -8,13 +8,13 @@ java_test {
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-558-switch-expected"],
+    data: [":art-run-test-558-switch-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-558-switch-expected",
-    out: ["art-run-test-558-switch-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-558-switch-expected-stdout",
+    out: ["art-run-test-558-switch-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/558-switch/expected.txt b/test/558-switch/expected-stdout.txt
index e69de29bb2..e69de29bb2 100644
--- a/test/558-switch/expected.txt
+++ b/test/558-switch/expected-stdout.txt
diff --git a/test/559-bce-ssa/Android.bp b/test/559-bce-ssa/Android.bp
index f806827349..3921fbffa1 100644
--- a/test/559-bce-ssa/Android.bp
+++ b/test/559-bce-ssa/Android.bp
@@ -8,13 +8,13 @@ java_test {
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-559-bce-ssa-expected"],
+    data: [":art-run-test-559-bce-ssa-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-559-bce-ssa-expected",
-    out: ["art-run-test-559-bce-ssa-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-559-bce-ssa-expected-stdout",
+    out: ["art-run-test-559-bce-ssa-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/559-bce-ssa/expected.txt b/test/559-bce-ssa/expected-stdout.txt
index e69de29bb2..e69de29bb2 100644
--- a/test/559-bce-ssa/expected.txt
+++ b/test/559-bce-ssa/expected-stdout.txt
diff --git a/test/559-checker-irreducible-loop/expected.txt b/test/559-checker-irreducible-loop/expected-stdout.txt
index b64be7a6ad..b64be7a6ad 100644
--- a/test/559-checker-irreducible-loop/expected.txt
+++ b/test/559-checker-irreducible-loop/expected-stdout.txt
diff --git a/test/559-checker-rtp-ifnotnull/Android.bp b/test/559-checker-rtp-ifnotnull/Android.bp
index 3ba9d3bca7..7a6116939d 100644
--- a/test/559-checker-rtp-ifnotnull/Android.bp
+++ b/test/559-checker-rtp-ifnotnull/Android.bp
@@ -8,7 +8,7 @@ java_test {
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-559-checker-rtp-ifnotnull-expected"],
+    data: [":art-run-test-559-checker-rtp-ifnotnull-expected-stdout"],
     // Include the Java source files in the test's artifacts, to make Checker assertions
     // available to the TradeFed test runner.
     include_srcs: true,
@@ -16,8 +16,8 @@ java_test {
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-559-checker-rtp-ifnotnull-expected",
-    out: ["art-run-test-559-checker-rtp-ifnotnull-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-559-checker-rtp-ifnotnull-expected-stdout",
+    out: ["art-run-test-559-checker-rtp-ifnotnull-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/559-checker-rtp-ifnotnull/expected.txt b/test/559-checker-rtp-ifnotnull/expected-stdout.txt
index e69de29bb2..e69de29bb2 100644
--- a/test/559-checker-rtp-ifnotnull/expected.txt
+++ b/test/559-checker-rtp-ifnotnull/expected-stdout.txt
diff --git a/test/560-packed-switch/Android.bp b/test/560-packed-switch/Android.bp
index 1a14037c62..125535e414 100644
--- a/test/560-packed-switch/Android.bp
+++ b/test/560-packed-switch/Android.bp
@@ -8,13 +8,13 @@ java_test {
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-560-packed-switch-expected"],
+    data: [":art-run-test-560-packed-switch-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-560-packed-switch-expected",
-    out: ["art-run-test-560-packed-switch-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-560-packed-switch-expected-stdout",
+    out: ["art-run-test-560-packed-switch-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/560-packed-switch/expected.txt b/test/560-packed-switch/expected-stdout.txt
index e69de29bb2..e69de29bb2 100644
--- a/test/560-packed-switch/expected.txt
+++ b/test/560-packed-switch/expected-stdout.txt
diff --git a/test/561-divrem/Android.bp b/test/561-divrem/Android.bp
index d168c7173a..955580765d 100644
--- a/test/561-divrem/Android.bp
+++ b/test/561-divrem/Android.bp
@@ -8,13 +8,13 @@ java_test {
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-561-divrem-expected"],
+    data: [":art-run-test-561-divrem-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-561-divrem-expected",
-    out: ["art-run-test-561-divrem-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-561-divrem-expected-stdout",
+    out: ["art-run-test-561-divrem-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/561-divrem/expected.txt b/test/561-divrem/expected-stdout.txt
index e69de29bb2..e69de29bb2 100644
--- a/test/561-divrem/expected.txt
+++ b/test/561-divrem/expected-stdout.txt
diff --git a/test/561-shared-slowpaths/Android.bp b/test/561-shared-slowpaths/Android.bp
index be070ab516..b0029cdd6c 100644
--- a/test/561-shared-slowpaths/Android.bp
+++ b/test/561-shared-slowpaths/Android.bp
@@ -8,13 +8,13 @@ java_test {
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-561-shared-slowpaths-expected"],
+    data: [":art-run-test-561-shared-slowpaths-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-561-shared-slowpaths-expected",
-    out: ["art-run-test-561-shared-slowpaths-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-561-shared-slowpaths-expected-stdout",
+    out: ["art-run-test-561-shared-slowpaths-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/561-shared-slowpaths/expected.txt b/test/561-shared-slowpaths/expected-stdout.txt
index b0aad4deb5..b0aad4deb5 100644
--- a/test/561-shared-slowpaths/expected.txt
+++ b/test/561-shared-slowpaths/expected-stdout.txt
diff --git a/test/562-bce-preheader/Android.bp b/test/562-bce-preheader/Android.bp
index 13c0f368bd..dd129abf2c 100644
--- a/test/562-bce-preheader/Android.bp
+++ b/test/562-bce-preheader/Android.bp
@@ -8,13 +8,13 @@ java_test {
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-562-bce-preheader-expected"],
+    data: [":art-run-test-562-bce-preheader-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-562-bce-preheader-expected",
-    out: ["art-run-test-562-bce-preheader-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-562-bce-preheader-expected-stdout",
+    out: ["art-run-test-562-bce-preheader-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/562-bce-preheader/expected.txt b/test/562-bce-preheader/expected-stdout.txt
index b0aad4deb5..b0aad4deb5 100644
--- a/test/562-bce-preheader/expected.txt
+++ b/test/562-bce-preheader/expected-stdout.txt
diff --git a/test/562-checker-no-intermediate/Android.bp b/test/562-checker-no-intermediate/Android.bp
index b0c2e3c401..bf68dcb551 100644
--- a/test/562-checker-no-intermediate/Android.bp
+++ b/test/562-checker-no-intermediate/Android.bp
@@ -8,7 +8,7 @@ java_test {
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-562-checker-no-intermediate-expected"],
+    data: [":art-run-test-562-checker-no-intermediate-expected-stdout"],
     // Include the Java source files in the test's artifacts, to make Checker assertions
     // available to the TradeFed test runner.
     include_srcs: true,
@@ -16,8 +16,8 @@ java_test {
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-562-checker-no-intermediate-expected",
-    out: ["art-run-test-562-checker-no-intermediate-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-562-checker-no-intermediate-expected-stdout",
+    out: ["art-run-test-562-checker-no-intermediate-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/562-checker-no-intermediate/expected.txt b/test/562-checker-no-intermediate/expected-stdout.txt
index e69de29bb2..e69de29bb2 100644
--- a/test/562-checker-no-intermediate/expected.txt
+++ b/test/562-checker-no-intermediate/expected-stdout.txt
diff --git a/test/563-checker-fakestring/expected.txt b/test/563-checker-fakestring/expected-stdout.txt
index 6a5618ebc6..6a5618ebc6 100644
--- a/test/563-checker-fakestring/expected.txt
+++ b/test/563-checker-fakestring/expected-stdout.txt
diff --git a/test/563-checker-invoke-super/Android.bp b/test/563-checker-invoke-super/Android.bp
index 2963269091..ff38836b57 100644
--- a/test/563-checker-invoke-super/Android.bp
+++ b/test/563-checker-invoke-super/Android.bp
@@ -8,7 +8,7 @@ java_test {
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-563-checker-invoke-super-expected"],
+    data: [":art-run-test-563-checker-invoke-super-expected-stdout"],
     // Include the Java source files in the test's artifacts, to make Checker assertions
     // available to the TradeFed test runner.
     include_srcs: true,
@@ -16,8 +16,8 @@ java_test {
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-563-checker-invoke-super-expected",
-    out: ["art-run-test-563-checker-invoke-super-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-563-checker-invoke-super-expected-stdout",
+    out: ["art-run-test-563-checker-invoke-super-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/563-checker-invoke-super/expected.txt b/test/563-checker-invoke-super/expected-stdout.txt
index e69de29bb2..e69de29bb2 100644
--- a/test/563-checker-invoke-super/expected.txt
+++ b/test/563-checker-invoke-super/expected-stdout.txt
diff --git a/test/564-checker-bitcount/Android.bp b/test/564-checker-bitcount/Android.bp
index afd0915601..0dad882f32 100644
--- a/test/564-checker-bitcount/Android.bp
+++ b/test/564-checker-bitcount/Android.bp
@@ -8,7 +8,7 @@ java_test {
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-564-checker-bitcount-expected"],
+    data: [":art-run-test-564-checker-bitcount-expected-stdout"],
     // Include the Java source files in the test's artifacts, to make Checker assertions
     // available to the TradeFed test runner.
     include_srcs: true,
@@ -16,8 +16,8 @@ java_test {
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-564-checker-bitcount-expected",
-    out: ["art-run-test-564-checker-bitcount-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-564-checker-bitcount-expected-stdout",
+    out: ["art-run-test-564-checker-bitcount-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/564-checker-bitcount/expected.txt b/test/564-checker-bitcount/expected-stdout.txt
index b0aad4deb5..b0aad4deb5 100644
--- a/test/564-checker-bitcount/expected.txt
+++ b/test/564-checker-bitcount/expected-stdout.txt
diff --git a/test/564-checker-inline-loop/Android.bp b/test/564-checker-inline-loop/Android.bp
index cd5cac14c9..1b0a377ecc 100644
--- a/test/564-checker-inline-loop/Android.bp
+++ b/test/564-checker-inline-loop/Android.bp
@@ -8,7 +8,7 @@ java_test {
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-564-checker-inline-loop-expected"],
+    data: [":art-run-test-564-checker-inline-loop-expected-stdout"],
     // Include the Java source files in the test's artifacts, to make Checker assertions
     // available to the TradeFed test runner.
     include_srcs: true,
@@ -16,8 +16,8 @@ java_test {
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-564-checker-inline-loop-expected",
-    out: ["art-run-test-564-checker-inline-loop-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-564-checker-inline-loop-expected-stdout",
+    out: ["art-run-test-564-checker-inline-loop-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/564-checker-inline-loop/expected.txt b/test/564-checker-inline-loop/expected-stdout.txt
index e69de29bb2..e69de29bb2 100644
--- a/test/564-checker-inline-loop/expected.txt
+++ b/test/564-checker-inline-loop/expected-stdout.txt
diff --git a/test/564-checker-irreducible-loop/expected.txt b/test/564-checker-irreducible-loop/expected-stdout.txt
index d81cc0710e..d81cc0710e 100644
--- a/test/564-checker-irreducible-loop/expected.txt
+++ b/test/564-checker-irreducible-loop/expected-stdout.txt
diff --git a/test/564-checker-negbitwise/Android.bp b/test/564-checker-negbitwise/Android.bp
index 872e5e9144..55749eebd5 100644
--- a/test/564-checker-negbitwise/Android.bp
+++ b/test/564-checker-negbitwise/Android.bp
@@ -8,7 +8,7 @@ java_test {
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-564-checker-negbitwise-expected"],
+    data: [":art-run-test-564-checker-negbitwise-expected-stdout"],
     // Include the Java source files in the test's artifacts, to make Checker assertions
     // available to the TradeFed test runner.
     include_srcs: true,
@@ -16,8 +16,8 @@ java_test {
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-564-checker-negbitwise-expected",
-    out: ["art-run-test-564-checker-negbitwise-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-564-checker-negbitwise-expected-stdout",
+    out: ["art-run-test-564-checker-negbitwise-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/564-checker-negbitwise/expected.txt b/test/564-checker-negbitwise/expected-stdout.txt
index e69de29bb2..e69de29bb2 100644
--- a/test/564-checker-negbitwise/expected.txt
+++ b/test/564-checker-negbitwise/expected-stdout.txt
diff --git a/test/565-checker-condition-liveness/Android.bp b/test/565-checker-condition-liveness/Android.bp
index 4cd4aecede..1d1c0ee0fe 100644
--- a/test/565-checker-condition-liveness/Android.bp
+++ b/test/565-checker-condition-liveness/Android.bp
@@ -8,7 +8,7 @@ java_test {
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-565-checker-condition-liveness-expected"],
+    data: [":art-run-test-565-checker-condition-liveness-expected-stdout"],
     // Include the Java source files in the test's artifacts, to make Checker assertions
     // available to the TradeFed test runner.
     include_srcs: true,
@@ -16,8 +16,8 @@ java_test {
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-565-checker-condition-liveness-expected",
-    out: ["art-run-test-565-checker-condition-liveness-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-565-checker-condition-liveness-expected-stdout",
+    out: ["art-run-test-565-checker-condition-liveness-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/565-checker-condition-liveness/expected.txt b/test/565-checker-condition-liveness/expected-stdout.txt
index e69de29bb2..e69de29bb2 100644
--- a/test/565-checker-condition-liveness/expected.txt
+++ b/test/565-checker-condition-liveness/expected-stdout.txt
diff --git a/test/565-checker-doublenegbitwise/expected.txt b/test/565-checker-doublenegbitwise/expected-stdout.txt
index e69de29bb2..e69de29bb2 100644
--- a/test/565-checker-doublenegbitwise/expected.txt
+++ b/test/565-checker-doublenegbitwise/expected-stdout.txt
diff --git a/test/565-checker-irreducible-loop/expected.txt b/test/565-checker-irreducible-loop/expected-stdout.txt
index 6ed281c757..6ed281c757 100644
--- a/test/565-checker-irreducible-loop/expected.txt
+++ b/test/565-checker-irreducible-loop/expected-stdout.txt
diff --git a/test/566-checker-codegen-select/Android.bp b/test/566-checker-codegen-select/Android.bp
index b17411763e..1bd641ed69 100644
--- a/test/566-checker-codegen-select/Android.bp
+++ b/test/566-checker-codegen-select/Android.bp
@@ -8,7 +8,7 @@ java_test {
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-566-checker-codegen-select-expected"],
+    data: [":art-run-test-566-checker-codegen-select-expected-stdout"],
     // Include the Java source files in the test's artifacts, to make Checker assertions
     // available to the TradeFed test runner.
     include_srcs: true,
@@ -16,8 +16,8 @@ java_test {
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-566-checker-codegen-select-expected",
-    out: ["art-run-test-566-checker-codegen-select-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-566-checker-codegen-select-expected-stdout",
+    out: ["art-run-test-566-checker-codegen-select-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/566-checker-codegen-select/expected.txt b/test/566-checker-codegen-select/expected-stdout.txt
index e69de29bb2..e69de29bb2 100644
--- a/test/566-checker-codegen-select/expected.txt
+++ b/test/566-checker-codegen-select/expected-stdout.txt
diff --git a/test/566-polymorphic-inlining/Android.bp b/test/566-polymorphic-inlining/Android.bp
index 20f99160be..0c118af93c 100644
--- a/test/566-polymorphic-inlining/Android.bp
+++ b/test/566-polymorphic-inlining/Android.bp
@@ -8,13 +8,13 @@ java_test {
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-566-polymorphic-inlining-expected"],
+    data: [":art-run-test-566-polymorphic-inlining-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-566-polymorphic-inlining-expected",
-    out: ["art-run-test-566-polymorphic-inlining-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-566-polymorphic-inlining-expected-stdout",
+    out: ["art-run-test-566-polymorphic-inlining-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/566-polymorphic-inlining/expected.txt b/test/566-polymorphic-inlining/expected-stdout.txt
index 6a5618ebc6..6a5618ebc6 100644
--- a/test/566-polymorphic-inlining/expected.txt
+++ b/test/566-polymorphic-inlining/expected-stdout.txt
diff --git a/test/567-checker-builder-intrinsics/Android.bp b/test/567-checker-builder-intrinsics/Android.bp
index c3cbf27ba6..7a2c01d484 100644
--- a/test/567-checker-builder-intrinsics/Android.bp
+++ b/test/567-checker-builder-intrinsics/Android.bp
@@ -8,7 +8,7 @@ java_test {
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-567-checker-builder-intrinsics-expected"],
+    data: [":art-run-test-567-checker-builder-intrinsics-expected-stdout"],
     // Include the Java source files in the test's artifacts, to make Checker assertions
     // available to the TradeFed test runner.
     include_srcs: true,
@@ -16,8 +16,8 @@ java_test {
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-567-checker-builder-intrinsics-expected",
-    out: ["art-run-test-567-checker-builder-intrinsics-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-567-checker-builder-intrinsics-expected-stdout",
+    out: ["art-run-test-567-checker-builder-intrinsics-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/567-checker-builder-intrinsics/expected.txt b/test/567-checker-builder-intrinsics/expected-stdout.txt
index 9554e0d95c..9554e0d95c 100644
--- a/test/567-checker-builder-intrinsics/expected.txt
+++ b/test/567-checker-builder-intrinsics/expected-stdout.txt
diff --git a/test/568-checker-onebit/Android.bp b/test/568-checker-onebit/Android.bp
index be73bc118c..87b95a76ee 100644
--- a/test/568-checker-onebit/Android.bp
+++ b/test/568-checker-onebit/Android.bp
@@ -8,7 +8,7 @@ java_test {
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-568-checker-onebit-expected"],
+    data: [":art-run-test-568-checker-onebit-expected-stdout"],
     // Include the Java source files in the test's artifacts, to make Checker assertions
     // available to the TradeFed test runner.
     include_srcs: true,
@@ -16,8 +16,8 @@ java_test {
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-568-checker-onebit-expected",
-    out: ["art-run-test-568-checker-onebit-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-568-checker-onebit-expected-stdout",
+    out: ["art-run-test-568-checker-onebit-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/568-checker-onebit/expected.txt b/test/568-checker-onebit/expected-stdout.txt
index b0aad4deb5..b0aad4deb5 100644
--- a/test/568-checker-onebit/expected.txt
+++ b/test/568-checker-onebit/expected-stdout.txt
diff --git a/test/569-checker-pattern-replacement/expected.txt b/test/569-checker-pattern-replacement/expected-stdout.txt
index e69de29bb2..e69de29bb2 100644
--- a/test/569-checker-pattern-replacement/expected.txt
+++ b/test/569-checker-pattern-replacement/expected-stdout.txt
diff --git a/test/570-checker-osr-locals/expected.txt b/test/570-checker-osr-locals/expected-stdout.txt
index 6a5618ebc6..6a5618ebc6 100644
--- a/test/570-checker-osr-locals/expected.txt
+++ b/test/570-checker-osr-locals/expected-stdout.txt
diff --git a/test/570-checker-osr/expected.txt b/test/570-checker-osr/expected-stdout.txt
index 65447be9c3..65447be9c3 100644
--- a/test/570-checker-osr/expected.txt
+++ b/test/570-checker-osr/expected-stdout.txt
diff --git a/test/570-checker-select/Android.bp b/test/570-checker-select/Android.bp
index 4b9a58ee14..0c1bbf9dcc 100644
--- a/test/570-checker-select/Android.bp
+++ b/test/570-checker-select/Android.bp
@@ -8,7 +8,7 @@ java_test {
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-570-checker-select-expected"],
+    data: [":art-run-test-570-checker-select-expected-stdout"],
     // Include the Java source files in the test's artifacts, to make Checker assertions
     // available to the TradeFed test runner.
     include_srcs: true,
@@ -16,8 +16,8 @@ java_test {
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-570-checker-select-expected",
-    out: ["art-run-test-570-checker-select-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-570-checker-select-expected-stdout",
+    out: ["art-run-test-570-checker-select-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/570-checker-select/expected.txt b/test/570-checker-select/expected-stdout.txt
index e69de29bb2..e69de29bb2 100644
--- a/test/570-checker-select/expected.txt
+++ b/test/570-checker-select/expected-stdout.txt
diff --git a/test/571-irreducible-loop/expected.txt b/test/571-irreducible-loop/expected-stdout.txt
index 3a71184143..3a71184143 100644
--- a/test/571-irreducible-loop/expected.txt
+++ b/test/571-irreducible-loop/expected-stdout.txt
diff --git a/test/572-checker-array-get-regression/Android.bp b/test/572-checker-array-get-regression/Android.bp
index 68d561e919..e6564d53ef 100644
--- a/test/572-checker-array-get-regression/Android.bp
+++ b/test/572-checker-array-get-regression/Android.bp
@@ -8,7 +8,7 @@ java_test {
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-572-checker-array-get-regression-expected"],
+    data: [":art-run-test-572-checker-array-get-regression-expected-stdout"],
     // Include the Java source files in the test's artifacts, to make Checker assertions
     // available to the TradeFed test runner.
     include_srcs: true,
@@ -16,8 +16,8 @@ java_test {
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-572-checker-array-get-regression-expected",
-    out: ["art-run-test-572-checker-array-get-regression-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-572-checker-array-get-regression-expected-stdout",
+    out: ["art-run-test-572-checker-array-get-regression-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/572-checker-array-get-regression/expected.txt b/test/572-checker-array-get-regression/expected-stdout.txt
index f7d1ad4743..f7d1ad4743 100644
--- a/test/572-checker-array-get-regression/expected.txt
+++ b/test/572-checker-array-get-regression/expected-stdout.txt
diff --git a/test/573-checker-checkcast-regression/Android.bp b/test/573-checker-checkcast-regression/Android.bp
index 35d41aae3e..61ea46e207 100644
--- a/test/573-checker-checkcast-regression/Android.bp
+++ b/test/573-checker-checkcast-regression/Android.bp
@@ -8,7 +8,7 @@ java_test {
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-573-checker-checkcast-regression-expected"],
+    data: [":art-run-test-573-checker-checkcast-regression-expected-stdout"],
     // Include the Java source files in the test's artifacts, to make Checker assertions
     // available to the TradeFed test runner.
     include_srcs: true,
@@ -16,8 +16,8 @@ java_test {
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-573-checker-checkcast-regression-expected",
-    out: ["art-run-test-573-checker-checkcast-regression-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-573-checker-checkcast-regression-expected-stdout",
+    out: ["art-run-test-573-checker-checkcast-regression-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/573-checker-checkcast-regression/expected.txt b/test/573-checker-checkcast-regression/expected-stdout.txt
index b8626c4cff..b8626c4cff 100644
--- a/test/573-checker-checkcast-regression/expected.txt
+++ b/test/573-checker-checkcast-regression/expected-stdout.txt
diff --git a/test/574-irreducible-and-constant-area/expected.txt b/test/574-irreducible-and-constant-area/expected-stdout.txt
index e69de29bb2..e69de29bb2 100644
--- a/test/574-irreducible-and-constant-area/expected.txt
+++ b/test/574-irreducible-and-constant-area/expected-stdout.txt
diff --git a/test/575-checker-string-init-alias/expected.txt b/test/575-checker-string-init-alias/expected-stdout.txt
index 6a5618ebc6..6a5618ebc6 100644
--- a/test/575-checker-string-init-alias/expected.txt
+++ b/test/575-checker-string-init-alias/expected-stdout.txt
diff --git a/test/576-polymorphic-inlining/Android.bp b/test/576-polymorphic-inlining/Android.bp
index ec925c5781..cfeff29f62 100644
--- a/test/576-polymorphic-inlining/Android.bp
+++ b/test/576-polymorphic-inlining/Android.bp
@@ -8,13 +8,13 @@ java_test {
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-576-polymorphic-inlining-expected"],
+    data: [":art-run-test-576-polymorphic-inlining-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-576-polymorphic-inlining-expected",
-    out: ["art-run-test-576-polymorphic-inlining-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-576-polymorphic-inlining-expected-stdout",
+    out: ["art-run-test-576-polymorphic-inlining-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/576-polymorphic-inlining/expected.txt b/test/576-polymorphic-inlining/expected-stdout.txt
index e69de29bb2..e69de29bb2 100644
--- a/test/576-polymorphic-inlining/expected.txt
+++ b/test/576-polymorphic-inlining/expected-stdout.txt
diff --git a/test/577-checker-fp2int/Android.bp b/test/577-checker-fp2int/Android.bp
index 09c9d8098f..a9f9acb201 100644
--- a/test/577-checker-fp2int/Android.bp
+++ b/test/577-checker-fp2int/Android.bp
@@ -8,7 +8,7 @@ java_test {
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-577-checker-fp2int-expected"],
+    data: [":art-run-test-577-checker-fp2int-expected-stdout"],
     // Include the Java source files in the test's artifacts, to make Checker assertions
     // available to the TradeFed test runner.
     include_srcs: true,
@@ -16,8 +16,8 @@ java_test {
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-577-checker-fp2int-expected",
-    out: ["art-run-test-577-checker-fp2int-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-577-checker-fp2int-expected-stdout",
+    out: ["art-run-test-577-checker-fp2int-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/577-checker-fp2int/expected.txt b/test/577-checker-fp2int/expected-stdout.txt
index b0aad4deb5..b0aad4deb5 100644
--- a/test/577-checker-fp2int/expected.txt
+++ b/test/577-checker-fp2int/expected-stdout.txt
diff --git a/test/578-bce-visit/Android.bp b/test/578-bce-visit/Android.bp
index 59034011d3..bcb81c318f 100644
--- a/test/578-bce-visit/Android.bp
+++ b/test/578-bce-visit/Android.bp
@@ -8,13 +8,13 @@ java_test {
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-578-bce-visit-expected"],
+    data: [":art-run-test-578-bce-visit-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-578-bce-visit-expected",
-    out: ["art-run-test-578-bce-visit-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-578-bce-visit-expected-stdout",
+    out: ["art-run-test-578-bce-visit-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/578-bce-visit/expected.txt b/test/578-bce-visit/expected-stdout.txt
index 28fca2cc12..28fca2cc12 100644
--- a/test/578-bce-visit/expected.txt
+++ b/test/578-bce-visit/expected-stdout.txt
diff --git a/test/578-polymorphic-inlining/Android.bp b/test/578-polymorphic-inlining/Android.bp
index 8ab7ac0e69..b8bed4cd10 100644
--- a/test/578-polymorphic-inlining/Android.bp
+++ b/test/578-polymorphic-inlining/Android.bp
@@ -8,13 +8,13 @@ java_test {
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-578-polymorphic-inlining-expected"],
+    data: [":art-run-test-578-polymorphic-inlining-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-578-polymorphic-inlining-expected",
-    out: ["art-run-test-578-polymorphic-inlining-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-578-polymorphic-inlining-expected-stdout",
+    out: ["art-run-test-578-polymorphic-inlining-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/578-polymorphic-inlining/expected.txt b/test/578-polymorphic-inlining/expected-stdout.txt
index e69de29bb2..e69de29bb2 100644
--- a/test/578-polymorphic-inlining/expected.txt
+++ b/test/578-polymorphic-inlining/expected-stdout.txt
diff --git a/test/579-inline-infinite/Android.bp b/test/579-inline-infinite/Android.bp
index 78aa062b4f..f31f06ef65 100644
--- a/test/579-inline-infinite/Android.bp
+++ b/test/579-inline-infinite/Android.bp
@@ -8,13 +8,13 @@ java_test {
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-579-inline-infinite-expected"],
+    data: [":art-run-test-579-inline-infinite-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-579-inline-infinite-expected",
-    out: ["art-run-test-579-inline-infinite-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-579-inline-infinite-expected-stdout",
+    out: ["art-run-test-579-inline-infinite-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/579-inline-infinite/expected.txt b/test/579-inline-infinite/expected-stdout.txt
index e69de29bb2..e69de29bb2 100644
--- a/test/579-inline-infinite/expected.txt
+++ b/test/579-inline-infinite/expected-stdout.txt
diff --git a/test/580-checker-round/Android.bp b/test/580-checker-round/Android.bp
index a81edd64c6..55c77cc28a 100644
--- a/test/580-checker-round/Android.bp
+++ b/test/580-checker-round/Android.bp
@@ -8,7 +8,7 @@ java_test {
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-580-checker-round-expected"],
+    data: [":art-run-test-580-checker-round-expected-stdout"],
     // Include the Java source files in the test's artifacts, to make Checker assertions
     // available to the TradeFed test runner.
     include_srcs: true,
@@ -16,8 +16,8 @@ java_test {
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-580-checker-round-expected",
-    out: ["art-run-test-580-checker-round-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-580-checker-round-expected-stdout",
+    out: ["art-run-test-580-checker-round-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/580-checker-round/expected.txt b/test/580-checker-round/expected-stdout.txt
index b0aad4deb5..b0aad4deb5 100644
--- a/test/580-checker-round/expected.txt
+++ b/test/580-checker-round/expected-stdout.txt
diff --git a/test/580-checker-string-fact-intrinsics/expected.txt b/test/580-checker-string-fact-intrinsics/expected-stdout.txt
index 86e041dad6..86e041dad6 100644
--- a/test/580-checker-string-fact-intrinsics/expected.txt
+++ b/test/580-checker-string-fact-intrinsics/expected-stdout.txt
diff --git a/test/580-crc32/Android.bp b/test/580-crc32/Android.bp
index dfef91d14d..07dfc9622f 100644
--- a/test/580-crc32/Android.bp
+++ b/test/580-crc32/Android.bp
@@ -8,13 +8,13 @@ java_test {
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-580-crc32-expected"],
+    data: [":art-run-test-580-crc32-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-580-crc32-expected",
-    out: ["art-run-test-580-crc32-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-580-crc32-expected-stdout",
+    out: ["art-run-test-580-crc32-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/580-crc32/expected.txt b/test/580-crc32/expected-stdout.txt
index e69de29bb2..e69de29bb2 100644
--- a/test/580-crc32/expected.txt
+++ b/test/580-crc32/expected-stdout.txt
diff --git a/test/580-fp16/expected.txt b/test/580-fp16/expected-stdout.txt
index e69de29bb2..e69de29bb2 100644
--- a/test/580-fp16/expected.txt
+++ b/test/580-fp16/expected-stdout.txt
diff --git a/test/581-rtp/Android.bp b/test/581-rtp/Android.bp
index 51f830a6b3..7d321cdd12 100644
--- a/test/581-rtp/Android.bp
+++ b/test/581-rtp/Android.bp
@@ -8,13 +8,13 @@ java_test {
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-581-rtp-expected"],
+    data: [":art-run-test-581-rtp-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-581-rtp-expected",
-    out: ["art-run-test-581-rtp-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-581-rtp-expected-stdout",
+    out: ["art-run-test-581-rtp-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/581-rtp/expected.txt b/test/581-rtp/expected-stdout.txt
index e69de29bb2..e69de29bb2 100644
--- a/test/581-rtp/expected.txt
+++ b/test/581-rtp/expected-stdout.txt
diff --git a/test/582-checker-bce-length/Android.bp b/test/582-checker-bce-length/Android.bp
index ea8275ae84..016a51a0e7 100644
--- a/test/582-checker-bce-length/Android.bp
+++ b/test/582-checker-bce-length/Android.bp
@@ -8,7 +8,7 @@ java_test {
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-582-checker-bce-length-expected"],
+    data: [":art-run-test-582-checker-bce-length-expected-stdout"],
     // Include the Java source files in the test's artifacts, to make Checker assertions
     // available to the TradeFed test runner.
     include_srcs: true,
@@ -16,8 +16,8 @@ java_test {
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-582-checker-bce-length-expected",
-    out: ["art-run-test-582-checker-bce-length-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-582-checker-bce-length-expected-stdout",
+    out: ["art-run-test-582-checker-bce-length-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/582-checker-bce-length/expected.txt b/test/582-checker-bce-length/expected-stdout.txt
index b0aad4deb5..b0aad4deb5 100644
--- a/test/582-checker-bce-length/expected.txt
+++ b/test/582-checker-bce-length/expected-stdout.txt
diff --git a/test/583-checker-zero/Android.bp b/test/583-checker-zero/Android.bp
index d599c21c55..0792faf8e7 100644
--- a/test/583-checker-zero/Android.bp
+++ b/test/583-checker-zero/Android.bp
@@ -8,7 +8,7 @@ java_test {
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-583-checker-zero-expected"],
+    data: [":art-run-test-583-checker-zero-expected-stdout"],
     // Include the Java source files in the test's artifacts, to make Checker assertions
     // available to the TradeFed test runner.
     include_srcs: true,
@@ -16,8 +16,8 @@ java_test {
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-583-checker-zero-expected",
-    out: ["art-run-test-583-checker-zero-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-583-checker-zero-expected-stdout",
+    out: ["art-run-test-583-checker-zero-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/583-checker-zero/expected.txt b/test/583-checker-zero/expected-stdout.txt
index e69de29bb2..e69de29bb2 100644
--- a/test/583-checker-zero/expected.txt
+++ b/test/583-checker-zero/expected-stdout.txt
diff --git a/test/584-checker-div-bool/Android.bp b/test/584-checker-div-bool/Android.bp
index 381ab01ba0..96d64f3ab2 100644
--- a/test/584-checker-div-bool/Android.bp
+++ b/test/584-checker-div-bool/Android.bp
@@ -8,7 +8,7 @@ java_test {
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-584-checker-div-bool-expected"],
+    data: [":art-run-test-584-checker-div-bool-expected-stdout"],
     // Include the Java source files in the test's artifacts, to make Checker assertions
     // available to the TradeFed test runner.
     include_srcs: true,
@@ -16,8 +16,8 @@ java_test {
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-584-checker-div-bool-expected",
-    out: ["art-run-test-584-checker-div-bool-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-584-checker-div-bool-expected-stdout",
+    out: ["art-run-test-584-checker-div-bool-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/584-checker-div-bool/expected.txt b/test/584-checker-div-bool/expected-stdout.txt
index e69de29bb2..e69de29bb2 100644
--- a/test/584-checker-div-bool/expected.txt
+++ b/test/584-checker-div-bool/expected-stdout.txt
diff --git a/test/585-inline-unresolved/expected.txt b/test/585-inline-unresolved/expected-stdout.txt
index e69de29bb2..e69de29bb2 100644
--- a/test/585-inline-unresolved/expected.txt
+++ b/test/585-inline-unresolved/expected-stdout.txt
diff --git a/test/586-checker-null-array-get/expected.txt b/test/586-checker-null-array-get/expected-stdout.txt
index e69de29bb2..e69de29bb2 100644
--- a/test/586-checker-null-array-get/expected.txt
+++ b/test/586-checker-null-array-get/expected-stdout.txt
diff --git a/test/587-inline-class-error/expected.txt b/test/587-inline-class-error/expected-stdout.txt
index e69de29bb2..e69de29bb2 100644
--- a/test/587-inline-class-error/expected.txt
+++ b/test/587-inline-class-error/expected-stdout.txt
diff --git a/test/588-checker-irreducib-lifetime-hole/expected.txt b/test/588-checker-irreducib-lifetime-hole/expected-stdout.txt
index aab200982b..aab200982b 100644
--- a/test/588-checker-irreducib-lifetime-hole/expected.txt
+++ b/test/588-checker-irreducib-lifetime-hole/expected-stdout.txt
diff --git a/test/589-super-imt/Android.bp b/test/589-super-imt/Android.bp
index a2235e904f..1bb6538296 100644
--- a/test/589-super-imt/Android.bp
+++ b/test/589-super-imt/Android.bp
@@ -8,13 +8,13 @@ java_test {
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-589-super-imt-expected"],
+    data: [":art-run-test-589-super-imt-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-589-super-imt-expected",
-    out: ["art-run-test-589-super-imt-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-589-super-imt-expected-stdout",
+    out: ["art-run-test-589-super-imt-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/589-super-imt/expected.txt b/test/589-super-imt/expected-stdout.txt
index e69de29bb2..e69de29bb2 100644
--- a/test/589-super-imt/expected.txt
+++ b/test/589-super-imt/expected-stdout.txt
diff --git a/test/590-checker-arr-set-null-regression/Android.bp b/test/590-checker-arr-set-null-regression/Android.bp
index 0b33cdc05a..578e8a83fd 100644
--- a/test/590-checker-arr-set-null-regression/Android.bp
+++ b/test/590-checker-arr-set-null-regression/Android.bp
@@ -8,7 +8,7 @@ java_test {
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-590-checker-arr-set-null-regression-expected"],
+    data: [":art-run-test-590-checker-arr-set-null-regression-expected-stdout"],
     // Include the Java source files in the test's artifacts, to make Checker assertions
     // available to the TradeFed test runner.
     include_srcs: true,
@@ -16,8 +16,8 @@ java_test {
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-590-checker-arr-set-null-regression-expected",
-    out: ["art-run-test-590-checker-arr-set-null-regression-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-590-checker-arr-set-null-regression-expected-stdout",
+    out: ["art-run-test-590-checker-arr-set-null-regression-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/590-checker-arr-set-null-regression/expected.txt b/test/590-checker-arr-set-null-regression/expected-stdout.txt
index b0aad4deb5..b0aad4deb5 100644
--- a/test/590-checker-arr-set-null-regression/expected.txt
+++ b/test/590-checker-arr-set-null-regression/expected-stdout.txt
diff --git a/test/590-infinite-loop-with-nop/expected.txt b/test/590-infinite-loop-with-nop/expected-stdout.txt
index e69de29bb2..e69de29bb2 100644
--- a/test/590-infinite-loop-with-nop/expected.txt
+++ b/test/590-infinite-loop-with-nop/expected-stdout.txt
diff --git a/test/591-checker-regression-dead-loop/Android.bp b/test/591-checker-regression-dead-loop/Android.bp
index 979d099ba4..8aa61492d5 100644
--- a/test/591-checker-regression-dead-loop/Android.bp
+++ b/test/591-checker-regression-dead-loop/Android.bp
@@ -8,7 +8,7 @@ java_test {
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-591-checker-regression-dead-loop-expected"],
+    data: [":art-run-test-591-checker-regression-dead-loop-expected-stdout"],
     // Include the Java source files in the test's artifacts, to make Checker assertions
     // available to the TradeFed test runner.
     include_srcs: true,
@@ -16,8 +16,8 @@ java_test {
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-591-checker-regression-dead-loop-expected",
-    out: ["art-run-test-591-checker-regression-dead-loop-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-591-checker-regression-dead-loop-expected-stdout",
+    out: ["art-run-test-591-checker-regression-dead-loop-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/591-checker-regression-dead-loop/expected.txt b/test/591-checker-regression-dead-loop/expected-stdout.txt
index e69de29bb2..e69de29bb2 100644
--- a/test/591-checker-regression-dead-loop/expected.txt
+++ b/test/591-checker-regression-dead-loop/expected-stdout.txt
diff --git a/test/591-new-instance-string/expected.txt b/test/591-new-instance-string/expected-stdout.txt
index b0aad4deb5..b0aad4deb5 100644
--- a/test/591-new-instance-string/expected.txt
+++ b/test/591-new-instance-string/expected-stdout.txt
diff --git a/test/592-checker-regression-bool-input/expected.txt b/test/592-checker-regression-bool-input/expected-stdout.txt
index e69de29bb2..e69de29bb2 100644
--- a/test/592-checker-regression-bool-input/expected.txt
+++ b/test/592-checker-regression-bool-input/expected-stdout.txt
diff --git a/test/593-checker-boolean-2-integral-conv/expected.txt b/test/593-checker-boolean-2-integral-conv/expected-stdout.txt
index b0aad4deb5..b0aad4deb5 100644
--- a/test/593-checker-boolean-2-integral-conv/expected.txt
+++ b/test/593-checker-boolean-2-integral-conv/expected-stdout.txt
diff --git a/test/593-checker-long-2-float-regression/Android.bp b/test/593-checker-long-2-float-regression/Android.bp
index 8d2b591492..a6eaaac818 100644
--- a/test/593-checker-long-2-float-regression/Android.bp
+++ b/test/593-checker-long-2-float-regression/Android.bp
@@ -8,7 +8,7 @@ java_test {
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-593-checker-long-2-float-regression-expected"],
+    data: [":art-run-test-593-checker-long-2-float-regression-expected-stdout"],
     // Include the Java source files in the test's artifacts, to make Checker assertions
     // available to the TradeFed test runner.
     include_srcs: true,
@@ -16,8 +16,8 @@ java_test {
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-593-checker-long-2-float-regression-expected",
-    out: ["art-run-test-593-checker-long-2-float-regression-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-593-checker-long-2-float-regression-expected-stdout",
+    out: ["art-run-test-593-checker-long-2-float-regression-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/593-checker-long-2-float-regression/expected.txt b/test/593-checker-long-2-float-regression/expected-stdout.txt
index e69de29bb2..e69de29bb2 100644
--- a/test/593-checker-long-2-float-regression/expected.txt
+++ b/test/593-checker-long-2-float-regression/expected-stdout.txt
diff --git a/test/593-checker-shift-and-simplifier/expected.txt b/test/593-checker-shift-and-simplifier/expected-stdout.txt
index f8d85db6ac..f8d85db6ac 100644
--- a/test/593-checker-shift-and-simplifier/expected.txt
+++ b/test/593-checker-shift-and-simplifier/expected-stdout.txt
diff --git a/test/594-checker-array-alias/Android.bp b/test/594-checker-array-alias/Android.bp
index b2c342789d..b3a2bcf1d4 100644
--- a/test/594-checker-array-alias/Android.bp
+++ b/test/594-checker-array-alias/Android.bp
@@ -8,7 +8,7 @@ java_test {
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-594-checker-array-alias-expected"],
+    data: [":art-run-test-594-checker-array-alias-expected-stdout"],
     // Include the Java source files in the test's artifacts, to make Checker assertions
     // available to the TradeFed test runner.
     include_srcs: true,
@@ -16,8 +16,8 @@ java_test {
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-594-checker-array-alias-expected",
-    out: ["art-run-test-594-checker-array-alias-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-594-checker-array-alias-expected-stdout",
+    out: ["art-run-test-594-checker-array-alias-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/594-checker-array-alias/expected.txt b/test/594-checker-array-alias/expected-stdout.txt
index b0aad4deb5..b0aad4deb5 100644
--- a/test/594-checker-array-alias/expected.txt
+++ b/test/594-checker-array-alias/expected-stdout.txt
diff --git a/test/594-checker-irreducible-linorder/expected.txt b/test/594-checker-irreducible-linorder/expected-stdout.txt
index e69de29bb2..e69de29bb2 100644
--- a/test/594-checker-irreducible-linorder/expected.txt
+++ b/test/594-checker-irreducible-linorder/expected-stdout.txt
diff --git a/test/594-invoke-super/expected.txt b/test/594-invoke-super/expected-stdout.txt
index de26026c99..de26026c99 100644
--- a/test/594-invoke-super/expected.txt
+++ b/test/594-invoke-super/expected-stdout.txt
diff --git a/test/594-load-string-regression/Android.bp b/test/594-load-string-regression/Android.bp
index 674a81678f..e70bad9dc1 100644
--- a/test/594-load-string-regression/Android.bp
+++ b/test/594-load-string-regression/Android.bp
@@ -8,13 +8,13 @@ java_test {
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-594-load-string-regression-expected"],
+    data: [":art-run-test-594-load-string-regression-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-594-load-string-regression-expected",
-    out: ["art-run-test-594-load-string-regression-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-594-load-string-regression-expected-stdout",
+    out: ["art-run-test-594-load-string-regression-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/594-load-string-regression/expected.txt b/test/594-load-string-regression/expected-stdout.txt
index 365b0e168f..365b0e168f 100644
--- a/test/594-load-string-regression/expected.txt
+++ b/test/594-load-string-regression/expected-stdout.txt
diff --git a/test/595-error-class/expected.txt b/test/595-error-class/expected-stdout.txt
index b0aad4deb5..b0aad4deb5 100644
--- a/test/595-error-class/expected.txt
+++ b/test/595-error-class/expected-stdout.txt
diff --git a/test/595-profile-saving/Android.bp b/test/595-profile-saving/Android.bp
index f8f233b492..f0144f3447 100644
--- a/test/595-profile-saving/Android.bp
+++ b/test/595-profile-saving/Android.bp
@@ -8,13 +8,13 @@ java_test {
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-595-profile-saving-expected"],
+    data: [":art-run-test-595-profile-saving-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-595-profile-saving-expected",
-    out: ["art-run-test-595-profile-saving-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-595-profile-saving-expected-stdout",
+    out: ["art-run-test-595-profile-saving-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/595-profile-saving/expected.txt b/test/595-profile-saving/expected-stdout.txt
index 9e28e07261..9e28e07261 100644
--- a/test/595-profile-saving/expected.txt
+++ b/test/595-profile-saving/expected-stdout.txt
diff --git a/test/596-app-images/expected.txt b/test/596-app-images/expected-stdout.txt
index ff3be57faf..ff3be57faf 100644
--- a/test/596-app-images/expected.txt
+++ b/test/596-app-images/expected-stdout.txt
diff --git a/test/596-checker-dead-phi/expected.txt b/test/596-checker-dead-phi/expected-stdout.txt
index d81cc0710e..d81cc0710e 100644
--- a/test/596-checker-dead-phi/expected.txt
+++ b/test/596-checker-dead-phi/expected-stdout.txt
diff --git a/test/596-monitor-inflation/expected.txt b/test/596-monitor-inflation/expected-stdout.txt
index 2add6966a0..2add6966a0 100644
--- a/test/596-monitor-inflation/expected.txt
+++ b/test/596-monitor-inflation/expected-stdout.txt
diff --git a/test/597-app-images-same-classloader/expected.txt b/test/597-app-images-same-classloader/expected-stdout.txt
index ff3be57faf..ff3be57faf 100644
--- a/test/597-app-images-same-classloader/expected.txt
+++ b/test/597-app-images-same-classloader/expected-stdout.txt
diff --git a/test/597-deopt-busy-loop/Android.bp b/test/597-deopt-busy-loop/Android.bp
index 9768f123ee..c8d5d34db3 100644
--- a/test/597-deopt-busy-loop/Android.bp
+++ b/test/597-deopt-busy-loop/Android.bp
@@ -8,13 +8,13 @@ java_test {
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-597-deopt-busy-loop-expected"],
+    data: [":art-run-test-597-deopt-busy-loop-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-597-deopt-busy-loop-expected",
-    out: ["art-run-test-597-deopt-busy-loop-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-597-deopt-busy-loop-expected-stdout",
+    out: ["art-run-test-597-deopt-busy-loop-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/597-deopt-busy-loop/expected.txt b/test/597-deopt-busy-loop/expected-stdout.txt
index c8ab17da91..c8ab17da91 100644
--- a/test/597-deopt-busy-loop/expected.txt
+++ b/test/597-deopt-busy-loop/expected-stdout.txt
diff --git a/test/597-deopt-invoke-stub/Android.bp b/test/597-deopt-invoke-stub/Android.bp
index 02efbe17a2..4c1ed1f682 100644
--- a/test/597-deopt-invoke-stub/Android.bp
+++ b/test/597-deopt-invoke-stub/Android.bp
@@ -8,13 +8,13 @@ java_test {
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-597-deopt-invoke-stub-expected"],
+    data: [":art-run-test-597-deopt-invoke-stub-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-597-deopt-invoke-stub-expected",
-    out: ["art-run-test-597-deopt-invoke-stub-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-597-deopt-invoke-stub-expected-stdout",
+    out: ["art-run-test-597-deopt-invoke-stub-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/597-deopt-invoke-stub/expected.txt b/test/597-deopt-invoke-stub/expected-stdout.txt
index f993efcdad..f993efcdad 100644
--- a/test/597-deopt-invoke-stub/expected.txt
+++ b/test/597-deopt-invoke-stub/expected-stdout.txt
diff --git a/test/597-deopt-new-string/Android.bp b/test/597-deopt-new-string/Android.bp
index 0b83630df7..63eedbc442 100644
--- a/test/597-deopt-new-string/Android.bp
+++ b/test/597-deopt-new-string/Android.bp
@@ -8,13 +8,13 @@ java_test {
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-597-deopt-new-string-expected"],
+    data: [":art-run-test-597-deopt-new-string-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-597-deopt-new-string-expected",
-    out: ["art-run-test-597-deopt-new-string-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-597-deopt-new-string-expected-stdout",
+    out: ["art-run-test-597-deopt-new-string-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/597-deopt-new-string/expected.txt b/test/597-deopt-new-string/expected-stdout.txt
index f993efcdad..f993efcdad 100644
--- a/test/597-deopt-new-string/expected.txt
+++ b/test/597-deopt-new-string/expected-stdout.txt
diff --git a/test/598-checker-irreducible-dominance/expected.txt b/test/598-checker-irreducible-dominance/expected-stdout.txt
index e69de29bb2..e69de29bb2 100644
--- a/test/598-checker-irreducible-dominance/expected.txt
+++ b/test/598-checker-irreducible-dominance/expected-stdout.txt
diff --git a/test/599-checker-irreducible-loop/expected.txt b/test/599-checker-irreducible-loop/expected-stdout.txt
index 573541ac97..573541ac97 100644
--- a/test/599-checker-irreducible-loop/expected.txt
+++ b/test/599-checker-irreducible-loop/expected-stdout.txt
diff --git a/test/600-verifier-fails/expected.txt b/test/600-verifier-fails/expected-stdout.txt
index 974b995a6d..974b995a6d 100644
--- a/test/600-verifier-fails/expected.txt
+++ b/test/600-verifier-fails/expected-stdout.txt
diff --git a/test/601-method-access/expected.txt b/test/601-method-access/expected-stdout.txt
index 90fbab87af..90fbab87af 100644
--- a/test/601-method-access/expected.txt
+++ b/test/601-method-access/expected-stdout.txt
diff --git a/test/602-deoptimizeable/Android.bp b/test/602-deoptimizeable/Android.bp
index 322caee5a0..95f0af33b8 100644
--- a/test/602-deoptimizeable/Android.bp
+++ b/test/602-deoptimizeable/Android.bp
@@ -8,13 +8,13 @@ java_test {
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-602-deoptimizeable-expected"],
+    data: [":art-run-test-602-deoptimizeable-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-602-deoptimizeable-expected",
-    out: ["art-run-test-602-deoptimizeable-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-602-deoptimizeable-expected-stdout",
+    out: ["art-run-test-602-deoptimizeable-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/602-deoptimizeable/expected.txt b/test/602-deoptimizeable/expected-stdout.txt
index f993efcdad..f993efcdad 100644
--- a/test/602-deoptimizeable/expected.txt
+++ b/test/602-deoptimizeable/expected-stdout.txt
diff --git a/test/603-checker-instanceof/Android.bp b/test/603-checker-instanceof/Android.bp
index cdab711f5a..41854243b4 100644
--- a/test/603-checker-instanceof/Android.bp
+++ b/test/603-checker-instanceof/Android.bp
@@ -8,7 +8,7 @@ java_test {
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-603-checker-instanceof-expected"],
+    data: [":art-run-test-603-checker-instanceof-expected-stdout"],
     // Include the Java source files in the test's artifacts, to make Checker assertions
     // available to the TradeFed test runner.
     include_srcs: true,
@@ -16,8 +16,8 @@ java_test {
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-603-checker-instanceof-expected",
-    out: ["art-run-test-603-checker-instanceof-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-603-checker-instanceof-expected-stdout",
+    out: ["art-run-test-603-checker-instanceof-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/603-checker-instanceof/expected.txt b/test/603-checker-instanceof/expected-stdout.txt
index e69de29bb2..e69de29bb2 100644
--- a/test/603-checker-instanceof/expected.txt
+++ b/test/603-checker-instanceof/expected-stdout.txt
diff --git a/test/604-hot-static-interface/Android.bp b/test/604-hot-static-interface/Android.bp
index 2eac8a67ba..59c36230bc 100644
--- a/test/604-hot-static-interface/Android.bp
+++ b/test/604-hot-static-interface/Android.bp
@@ -8,13 +8,13 @@ java_test {
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-604-hot-static-interface-expected"],
+    data: [":art-run-test-604-hot-static-interface-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-604-hot-static-interface-expected",
-    out: ["art-run-test-604-hot-static-interface-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-604-hot-static-interface-expected-stdout",
+    out: ["art-run-test-604-hot-static-interface-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/604-hot-static-interface/expected.txt b/test/604-hot-static-interface/expected-stdout.txt
index 6a5618ebc6..6a5618ebc6 100644
--- a/test/604-hot-static-interface/expected.txt
+++ b/test/604-hot-static-interface/expected-stdout.txt
diff --git a/test/605-new-string-from-bytes/Android.bp b/test/605-new-string-from-bytes/Android.bp
index bb3fb80d05..3524a8bb78 100644
--- a/test/605-new-string-from-bytes/Android.bp
+++ b/test/605-new-string-from-bytes/Android.bp
@@ -8,13 +8,13 @@ java_test {
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-605-new-string-from-bytes-expected"],
+    data: [":art-run-test-605-new-string-from-bytes-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-605-new-string-from-bytes-expected",
-    out: ["art-run-test-605-new-string-from-bytes-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-605-new-string-from-bytes-expected-stdout",
+    out: ["art-run-test-605-new-string-from-bytes-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/605-new-string-from-bytes/expected.txt b/test/605-new-string-from-bytes/expected-stdout.txt
index e69de29bb2..e69de29bb2 100644
--- a/test/605-new-string-from-bytes/expected.txt
+++ b/test/605-new-string-from-bytes/expected-stdout.txt
diff --git a/test/606-erroneous-class/expected.txt b/test/606-erroneous-class/expected-stdout.txt
index e69de29bb2..e69de29bb2 100644
--- a/test/606-erroneous-class/expected.txt
+++ b/test/606-erroneous-class/expected-stdout.txt
diff --git a/test/607-daemon-stress/Android.bp b/test/607-daemon-stress/Android.bp
index 4b60c9a836..2f539dba89 100644
--- a/test/607-daemon-stress/Android.bp
+++ b/test/607-daemon-stress/Android.bp
@@ -8,13 +8,13 @@ java_test {
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-607-daemon-stress-expected"],
+    data: [":art-run-test-607-daemon-stress-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-607-daemon-stress-expected",
-    out: ["art-run-test-607-daemon-stress-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-607-daemon-stress-expected-stdout",
+    out: ["art-run-test-607-daemon-stress-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/607-daemon-stress/expected.txt b/test/607-daemon-stress/expected-stdout.txt
index e69de29bb2..e69de29bb2 100644
--- a/test/607-daemon-stress/expected.txt
+++ b/test/607-daemon-stress/expected-stdout.txt
diff --git a/test/608-checker-unresolved-lse/expected.txt b/test/608-checker-unresolved-lse/expected-stdout.txt
index e69de29bb2..e69de29bb2 100644
--- a/test/608-checker-unresolved-lse/expected.txt
+++ b/test/608-checker-unresolved-lse/expected-stdout.txt
diff --git a/test/609-checker-inline-interface/Android.bp b/test/609-checker-inline-interface/Android.bp
index 192888456c..b2ad70c332 100644
--- a/test/609-checker-inline-interface/Android.bp
+++ b/test/609-checker-inline-interface/Android.bp
@@ -8,7 +8,7 @@ java_test {
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-609-checker-inline-interface-expected"],
+    data: [":art-run-test-609-checker-inline-interface-expected-stdout"],
     // Include the Java source files in the test's artifacts, to make Checker assertions
     // available to the TradeFed test runner.
     include_srcs: true,
@@ -16,8 +16,8 @@ java_test {
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-609-checker-inline-interface-expected",
-    out: ["art-run-test-609-checker-inline-interface-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-609-checker-inline-interface-expected-stdout",
+    out: ["art-run-test-609-checker-inline-interface-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/609-checker-inline-interface/expected.txt b/test/609-checker-inline-interface/expected-stdout.txt
index e69de29bb2..e69de29bb2 100644
--- a/test/609-checker-inline-interface/expected.txt
+++ b/test/609-checker-inline-interface/expected-stdout.txt
diff --git a/test/609-checker-x86-bounds-check/Android.bp b/test/609-checker-x86-bounds-check/Android.bp
index 3d3b412e7f..eab2ab6a95 100644
--- a/test/609-checker-x86-bounds-check/Android.bp
+++ b/test/609-checker-x86-bounds-check/Android.bp
@@ -8,7 +8,7 @@ java_test {
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-609-checker-x86-bounds-check-expected"],
+    data: [":art-run-test-609-checker-x86-bounds-check-expected-stdout"],
     // Include the Java source files in the test's artifacts, to make Checker assertions
     // available to the TradeFed test runner.
     include_srcs: true,
@@ -16,8 +16,8 @@ java_test {
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-609-checker-x86-bounds-check-expected",
-    out: ["art-run-test-609-checker-x86-bounds-check-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-609-checker-x86-bounds-check-expected-stdout",
+    out: ["art-run-test-609-checker-x86-bounds-check-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/609-checker-x86-bounds-check/expected.txt b/test/609-checker-x86-bounds-check/expected-stdout.txt
index b0aad4deb5..b0aad4deb5 100644
--- a/test/609-checker-x86-bounds-check/expected.txt
+++ b/test/609-checker-x86-bounds-check/expected-stdout.txt
diff --git a/test/610-arraycopy/Android.bp b/test/610-arraycopy/Android.bp
index 1415061435..d775c13cf6 100644
--- a/test/610-arraycopy/Android.bp
+++ b/test/610-arraycopy/Android.bp
@@ -8,13 +8,13 @@ java_test {
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-610-arraycopy-expected"],
+    data: [":art-run-test-610-arraycopy-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-610-arraycopy-expected",
-    out: ["art-run-test-610-arraycopy-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-610-arraycopy-expected-stdout",
+    out: ["art-run-test-610-arraycopy-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/610-arraycopy/expected.txt b/test/610-arraycopy/expected-stdout.txt
index e69de29bb2..e69de29bb2 100644
--- a/test/610-arraycopy/expected.txt
+++ b/test/610-arraycopy/expected-stdout.txt
diff --git a/test/611-checker-simplify-if/Android.bp b/test/611-checker-simplify-if/Android.bp
index af75af6d71..be60c4b260 100644
--- a/test/611-checker-simplify-if/Android.bp
+++ b/test/611-checker-simplify-if/Android.bp
@@ -8,7 +8,7 @@ java_test {
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-611-checker-simplify-if-expected"],
+    data: [":art-run-test-611-checker-simplify-if-expected-stdout"],
     // Include the Java source files in the test's artifacts, to make Checker assertions
     // available to the TradeFed test runner.
     include_srcs: true,
@@ -16,8 +16,8 @@ java_test {
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-611-checker-simplify-if-expected",
-    out: ["art-run-test-611-checker-simplify-if-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-611-checker-simplify-if-expected-stdout",
+    out: ["art-run-test-611-checker-simplify-if-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/611-checker-simplify-if/expected.txt b/test/611-checker-simplify-if/expected-stdout.txt
index 3083c4c528..3083c4c528 100644
--- a/test/611-checker-simplify-if/expected.txt
+++ b/test/611-checker-simplify-if/expected-stdout.txt
diff --git a/test/612-jit-dex-cache/expected.txt b/test/612-jit-dex-cache/expected-stdout.txt
index 6a5618ebc6..6a5618ebc6 100644
--- a/test/612-jit-dex-cache/expected.txt
+++ b/test/612-jit-dex-cache/expected-stdout.txt
diff --git a/test/613-inlining-dex-cache/expected.txt b/test/613-inlining-dex-cache/expected-stdout.txt
index 6a5618ebc6..6a5618ebc6 100644
--- a/test/613-inlining-dex-cache/expected.txt
+++ b/test/613-inlining-dex-cache/expected-stdout.txt
diff --git a/test/614-checker-dump-constant-location/Android.bp b/test/614-checker-dump-constant-location/Android.bp
index aa1a6fec60..dca6dc91b1 100644
--- a/test/614-checker-dump-constant-location/Android.bp
+++ b/test/614-checker-dump-constant-location/Android.bp
@@ -8,7 +8,7 @@ java_test {
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-614-checker-dump-constant-location-expected"],
+    data: [":art-run-test-614-checker-dump-constant-location-expected-stdout"],
     // Include the Java source files in the test's artifacts, to make Checker assertions
     // available to the TradeFed test runner.
     include_srcs: true,
@@ -16,8 +16,8 @@ java_test {
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-614-checker-dump-constant-location-expected",
-    out: ["art-run-test-614-checker-dump-constant-location-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-614-checker-dump-constant-location-expected-stdout",
+    out: ["art-run-test-614-checker-dump-constant-location-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/614-checker-dump-constant-location/expected.txt b/test/614-checker-dump-constant-location/expected-stdout.txt
index e69de29bb2..e69de29bb2 100644
--- a/test/614-checker-dump-constant-location/expected.txt
+++ b/test/614-checker-dump-constant-location/expected-stdout.txt
diff --git a/test/615-checker-arm64-store-zero/Android.bp b/test/615-checker-arm64-store-zero/Android.bp
index 88cff5f49f..6c1687eaa8 100644
--- a/test/615-checker-arm64-store-zero/Android.bp
+++ b/test/615-checker-arm64-store-zero/Android.bp
@@ -8,7 +8,7 @@ java_test {
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-615-checker-arm64-store-zero-expected"],
+    data: [":art-run-test-615-checker-arm64-store-zero-expected-stdout"],
     // Include the Java source files in the test's artifacts, to make Checker assertions
     // available to the TradeFed test runner.
     include_srcs: true,
@@ -16,8 +16,8 @@ java_test {
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-615-checker-arm64-store-zero-expected",
-    out: ["art-run-test-615-checker-arm64-store-zero-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-615-checker-arm64-store-zero-expected-stdout",
+    out: ["art-run-test-615-checker-arm64-store-zero-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/615-checker-arm64-store-zero/expected.txt b/test/615-checker-arm64-store-zero/expected-stdout.txt
index e69de29bb2..e69de29bb2 100644
--- a/test/615-checker-arm64-store-zero/expected.txt
+++ b/test/615-checker-arm64-store-zero/expected-stdout.txt
diff --git a/test/616-cha-abstract/Android.bp b/test/616-cha-abstract/Android.bp
index dece12fb03..856561ef98 100644
--- a/test/616-cha-abstract/Android.bp
+++ b/test/616-cha-abstract/Android.bp
@@ -8,13 +8,13 @@ java_test {
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-616-cha-abstract-expected"],
+    data: [":art-run-test-616-cha-abstract-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-616-cha-abstract-expected",
-    out: ["art-run-test-616-cha-abstract-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-616-cha-abstract-expected-stdout",
+    out: ["art-run-test-616-cha-abstract-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/616-cha-abstract/expected.txt b/test/616-cha-abstract/expected-stdout.txt
index 6a5618ebc6..6a5618ebc6 100644
--- a/test/616-cha-abstract/expected.txt
+++ b/test/616-cha-abstract/expected-stdout.txt
diff --git a/test/616-cha-interface-default/expected.txt b/test/616-cha-interface-default/expected-stdout.txt
index 6a5618ebc6..6a5618ebc6 100644
--- a/test/616-cha-interface-default/expected.txt
+++ b/test/616-cha-interface-default/expected-stdout.txt
diff --git a/test/616-cha-interface/Android.bp b/test/616-cha-interface/Android.bp
index 7b25f024a6..404594bf6a 100644
--- a/test/616-cha-interface/Android.bp
+++ b/test/616-cha-interface/Android.bp
@@ -8,13 +8,13 @@ java_test {
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-616-cha-interface-expected"],
+    data: [":art-run-test-616-cha-interface-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-616-cha-interface-expected",
-    out: ["art-run-test-616-cha-interface-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-616-cha-interface-expected-stdout",
+    out: ["art-run-test-616-cha-interface-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/616-cha-interface/expected.txt b/test/616-cha-interface/expected-stdout.txt
index 6a5618ebc6..6a5618ebc6 100644
--- a/test/616-cha-interface/expected.txt
+++ b/test/616-cha-interface/expected-stdout.txt
diff --git a/test/616-cha-miranda/Android.bp b/test/616-cha-miranda/Android.bp
index 04554bb137..81d4ba9a6a 100644
--- a/test/616-cha-miranda/Android.bp
+++ b/test/616-cha-miranda/Android.bp
@@ -8,13 +8,13 @@ java_test {
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-616-cha-miranda-expected"],
+    data: [":art-run-test-616-cha-miranda-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-616-cha-miranda-expected",
-    out: ["art-run-test-616-cha-miranda-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-616-cha-miranda-expected-stdout",
+    out: ["art-run-test-616-cha-miranda-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/616-cha-miranda/expected.txt b/test/616-cha-miranda/expected-stdout.txt
index 6a5618ebc6..6a5618ebc6 100644
--- a/test/616-cha-miranda/expected.txt
+++ b/test/616-cha-miranda/expected-stdout.txt
diff --git a/test/616-cha-native/Android.bp b/test/616-cha-native/Android.bp
index 635f2bb250..d9032711e5 100644
--- a/test/616-cha-native/Android.bp
+++ b/test/616-cha-native/Android.bp
@@ -8,13 +8,13 @@ java_test {
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-616-cha-native-expected"],
+    data: [":art-run-test-616-cha-native-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-616-cha-native-expected",
-    out: ["art-run-test-616-cha-native-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-616-cha-native-expected-stdout",
+    out: ["art-run-test-616-cha-native-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/616-cha-native/expected.txt b/test/616-cha-native/expected-stdout.txt
index 6a5618ebc6..6a5618ebc6 100644
--- a/test/616-cha-native/expected.txt
+++ b/test/616-cha-native/expected-stdout.txt
diff --git a/test/616-cha-proxy-method-inline/expected.txt b/test/616-cha-proxy-method-inline/expected-stdout.txt
index 6a5618ebc6..6a5618ebc6 100644
--- a/test/616-cha-proxy-method-inline/expected.txt
+++ b/test/616-cha-proxy-method-inline/expected-stdout.txt
diff --git a/test/616-cha-regression-proxy-method/Android.bp b/test/616-cha-regression-proxy-method/Android.bp
index 2cf8807d7a..fe579507d6 100644
--- a/test/616-cha-regression-proxy-method/Android.bp
+++ b/test/616-cha-regression-proxy-method/Android.bp
@@ -8,13 +8,13 @@ java_test {
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-616-cha-regression-proxy-method-expected"],
+    data: [":art-run-test-616-cha-regression-proxy-method-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-616-cha-regression-proxy-method-expected",
-    out: ["art-run-test-616-cha-regression-proxy-method-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-616-cha-regression-proxy-method-expected-stdout",
+    out: ["art-run-test-616-cha-regression-proxy-method-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/616-cha-regression-proxy-method/expected.txt b/test/616-cha-regression-proxy-method/expected-stdout.txt
index 6a5618ebc6..6a5618ebc6 100644
--- a/test/616-cha-regression-proxy-method/expected.txt
+++ b/test/616-cha-regression-proxy-method/expected-stdout.txt
diff --git a/test/616-cha-unloading/expected.txt b/test/616-cha-unloading/expected-stdout.txt
index 77a1486479..77a1486479 100644
--- a/test/616-cha-unloading/expected.txt
+++ b/test/616-cha-unloading/expected-stdout.txt
diff --git a/test/616-cha/Android.bp b/test/616-cha/Android.bp
index 110135b594..59b04aeda1 100644
--- a/test/616-cha/Android.bp
+++ b/test/616-cha/Android.bp
@@ -8,13 +8,13 @@ java_test {
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-616-cha-expected"],
+    data: [":art-run-test-616-cha-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-616-cha-expected",
-    out: ["art-run-test-616-cha-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-616-cha-expected-stdout",
+    out: ["art-run-test-616-cha-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/616-cha/expected.txt b/test/616-cha/expected-stdout.txt
index 6a5618ebc6..6a5618ebc6 100644
--- a/test/616-cha/expected.txt
+++ b/test/616-cha/expected-stdout.txt
diff --git a/test/617-clinit-oome/Android.bp b/test/617-clinit-oome/Android.bp
index d60a39ca2f..a7432e4077 100644
--- a/test/617-clinit-oome/Android.bp
+++ b/test/617-clinit-oome/Android.bp
@@ -8,13 +8,13 @@ java_test {
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-617-clinit-oome-expected"],
+    data: [":art-run-test-617-clinit-oome-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-617-clinit-oome-expected",
-    out: ["art-run-test-617-clinit-oome-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-617-clinit-oome-expected-stdout",
+    out: ["art-run-test-617-clinit-oome-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/617-clinit-oome/expected.txt b/test/617-clinit-oome/expected-stdout.txt
index c1d33ff9e6..c1d33ff9e6 100644
--- a/test/617-clinit-oome/expected.txt
+++ b/test/617-clinit-oome/expected-stdout.txt
diff --git a/test/618-checker-induction/Android.bp b/test/618-checker-induction/Android.bp
index e126d37fbb..6eeebe2bdf 100644
--- a/test/618-checker-induction/Android.bp
+++ b/test/618-checker-induction/Android.bp
@@ -8,7 +8,7 @@ java_test {
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-618-checker-induction-expected"],
+    data: [":art-run-test-618-checker-induction-expected-stdout"],
     // Include the Java source files in the test's artifacts, to make Checker assertions
     // available to the TradeFed test runner.
     include_srcs: true,
@@ -16,8 +16,8 @@ java_test {
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-618-checker-induction-expected",
-    out: ["art-run-test-618-checker-induction-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-618-checker-induction-expected-stdout",
+    out: ["art-run-test-618-checker-induction-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/618-checker-induction/expected.txt b/test/618-checker-induction/expected-stdout.txt
index b0aad4deb5..b0aad4deb5 100644
--- a/test/618-checker-induction/expected.txt
+++ b/test/618-checker-induction/expected-stdout.txt
diff --git a/test/619-checker-current-method/Android.bp b/test/619-checker-current-method/Android.bp
index 40108a2515..8411e6b9c8 100644
--- a/test/619-checker-current-method/Android.bp
+++ b/test/619-checker-current-method/Android.bp
@@ -8,7 +8,7 @@ java_test {
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-619-checker-current-method-expected"],
+    data: [":art-run-test-619-checker-current-method-expected-stdout"],
     // Include the Java source files in the test's artifacts, to make Checker assertions
     // available to the TradeFed test runner.
     include_srcs: true,
@@ -16,8 +16,8 @@ java_test {
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-619-checker-current-method-expected",
-    out: ["art-run-test-619-checker-current-method-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-619-checker-current-method-expected-stdout",
+    out: ["art-run-test-619-checker-current-method-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/619-checker-current-method/expected.txt b/test/619-checker-current-method/expected-stdout.txt
index e69de29bb2..e69de29bb2 100644
--- a/test/619-checker-current-method/expected.txt
+++ b/test/619-checker-current-method/expected-stdout.txt
diff --git a/test/620-checker-bce-intrinsics/Android.bp b/test/620-checker-bce-intrinsics/Android.bp
index 012ac7f11f..af2cd0cc88 100644
--- a/test/620-checker-bce-intrinsics/Android.bp
+++ b/test/620-checker-bce-intrinsics/Android.bp
@@ -8,7 +8,7 @@ java_test {
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-620-checker-bce-intrinsics-expected"],
+    data: [":art-run-test-620-checker-bce-intrinsics-expected-stdout"],
     // Include the Java source files in the test's artifacts, to make Checker assertions
     // available to the TradeFed test runner.
     include_srcs: true,
@@ -16,8 +16,8 @@ java_test {
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-620-checker-bce-intrinsics-expected",
-    out: ["art-run-test-620-checker-bce-intrinsics-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-620-checker-bce-intrinsics-expected-stdout",
+    out: ["art-run-test-620-checker-bce-intrinsics-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/620-checker-bce-intrinsics/expected.txt b/test/620-checker-bce-intrinsics/expected-stdout.txt
index b0aad4deb5..b0aad4deb5 100644
--- a/test/620-checker-bce-intrinsics/expected.txt
+++ b/test/620-checker-bce-intrinsics/expected-stdout.txt
diff --git a/test/622-checker-bce-regressions/Android.bp b/test/622-checker-bce-regressions/Android.bp
index 8a9823fedd..3df33acb78 100644
--- a/test/622-checker-bce-regressions/Android.bp
+++ b/test/622-checker-bce-regressions/Android.bp
@@ -8,7 +8,7 @@ java_test {
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-622-checker-bce-regressions-expected"],
+    data: [":art-run-test-622-checker-bce-regressions-expected-stdout"],
     // Include the Java source files in the test's artifacts, to make Checker assertions
     // available to the TradeFed test runner.
     include_srcs: true,
@@ -16,8 +16,8 @@ java_test {
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-622-checker-bce-regressions-expected",
-    out: ["art-run-test-622-checker-bce-regressions-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-622-checker-bce-regressions-expected-stdout",
+    out: ["art-run-test-622-checker-bce-regressions-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/622-checker-bce-regressions/expected.txt b/test/622-checker-bce-regressions/expected-stdout.txt
index b0aad4deb5..b0aad4deb5 100644
--- a/test/622-checker-bce-regressions/expected.txt
+++ b/test/622-checker-bce-regressions/expected-stdout.txt
diff --git a/test/622-simplifyifs-exception-edges/expected.txt b/test/622-simplifyifs-exception-edges/expected-stdout.txt
index e69de29bb2..e69de29bb2 100644
--- a/test/622-simplifyifs-exception-edges/expected.txt
+++ b/test/622-simplifyifs-exception-edges/expected-stdout.txt
diff --git a/test/623-checker-loop-regressions/Android.bp b/test/623-checker-loop-regressions/Android.bp
index 7098e13b76..8bad36d042 100644
--- a/test/623-checker-loop-regressions/Android.bp
+++ b/test/623-checker-loop-regressions/Android.bp
@@ -8,7 +8,7 @@ java_test {
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-623-checker-loop-regressions-expected"],
+    data: [":art-run-test-623-checker-loop-regressions-expected-stdout"],
     // Include the Java source files in the test's artifacts, to make Checker assertions
     // available to the TradeFed test runner.
     include_srcs: true,
@@ -16,8 +16,8 @@ java_test {
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-623-checker-loop-regressions-expected",
-    out: ["art-run-test-623-checker-loop-regressions-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-623-checker-loop-regressions-expected-stdout",
+    out: ["art-run-test-623-checker-loop-regressions-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/623-checker-loop-regressions/expected.txt b/test/623-checker-loop-regressions/expected-stdout.txt
index 805857dc65..805857dc65 100644
--- a/test/623-checker-loop-regressions/expected.txt
+++ b/test/623-checker-loop-regressions/expected-stdout.txt
diff --git a/test/624-checker-stringops/expected.txt b/test/624-checker-stringops/expected-stdout.txt
index b0aad4deb5..b0aad4deb5 100644
--- a/test/624-checker-stringops/expected.txt
+++ b/test/624-checker-stringops/expected-stdout.txt
diff --git a/test/625-checker-licm-regressions/Android.bp b/test/625-checker-licm-regressions/Android.bp
index ea71b3e3e6..2e95b5edcb 100644
--- a/test/625-checker-licm-regressions/Android.bp
+++ b/test/625-checker-licm-regressions/Android.bp
@@ -8,7 +8,7 @@ java_test {
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-625-checker-licm-regressions-expected"],
+    data: [":art-run-test-625-checker-licm-regressions-expected-stdout"],
     // Include the Java source files in the test's artifacts, to make Checker assertions
     // available to the TradeFed test runner.
     include_srcs: true,
@@ -16,8 +16,8 @@ java_test {
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-625-checker-licm-regressions-expected",
-    out: ["art-run-test-625-checker-licm-regressions-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-625-checker-licm-regressions-expected-stdout",
+    out: ["art-run-test-625-checker-licm-regressions-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/625-checker-licm-regressions/expected.txt b/test/625-checker-licm-regressions/expected-stdout.txt
index b0aad4deb5..b0aad4deb5 100644
--- a/test/625-checker-licm-regressions/expected.txt
+++ b/test/625-checker-licm-regressions/expected-stdout.txt
diff --git a/test/626-checker-arm64-scratch-register/expected.txt b/test/626-checker-arm64-scratch-register/expected-stdout.txt
index b0aad4deb5..b0aad4deb5 100644
--- a/test/626-checker-arm64-scratch-register/expected.txt
+++ b/test/626-checker-arm64-scratch-register/expected-stdout.txt
diff --git a/test/626-const-class-linking/expected.txt b/test/626-const-class-linking/expected-stdout.txt
index de1b8152ee..de1b8152ee 100644
--- a/test/626-const-class-linking/expected.txt
+++ b/test/626-const-class-linking/expected-stdout.txt
diff --git a/test/626-const-class-linking/src/Main.java b/test/626-const-class-linking/src/Main.java
index 1bc94a7c7d..1541ab35d8 100644
--- a/test/626-const-class-linking/src/Main.java
+++ b/test/626-const-class-linking/src/Main.java
@@ -28,7 +28,7 @@ public class Main {
             System.loadLibrary(args[0]);
         } catch (ClassNotFoundException e) {
             usingRI = true;
-            // Add expected JNI_OnLoad log line to match expected.txt.
+            // Add expected JNI_OnLoad log line to match expected-stdout.txt.
             System.out.println("JNI_OnLoad called");
         }
 
@@ -107,7 +107,7 @@ public class Main {
         } catch (InvocationTargetException ite) {
             String message = ite.getCause().getMessage();
             if (usingRI && "Test".equals(message)) {
-              // Replace RI message with dalvik message to match expected.txt.
+              // Replace RI message with dalvik message to match expected-stdout.txt.
               message = "Initiating class loader of type " +
                   misbehaving_loader.getClass().getName() +
                   " returned class Helper2 instead of Test.";
diff --git a/test/626-set-resolved-string/Android.bp b/test/626-set-resolved-string/Android.bp
index a367111c29..b8fa91ee23 100644
--- a/test/626-set-resolved-string/Android.bp
+++ b/test/626-set-resolved-string/Android.bp
@@ -8,13 +8,13 @@ java_test {
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-626-set-resolved-string-expected"],
+    data: [":art-run-test-626-set-resolved-string-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-626-set-resolved-string-expected",
-    out: ["art-run-test-626-set-resolved-string-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-626-set-resolved-string-expected-stdout",
+    out: ["art-run-test-626-set-resolved-string-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/626-set-resolved-string/expected.txt b/test/626-set-resolved-string/expected-stdout.txt
index f4983b5870..f4983b5870 100644
--- a/test/626-set-resolved-string/expected.txt
+++ b/test/626-set-resolved-string/expected-stdout.txt
diff --git a/test/627-checker-unroll/Android.bp b/test/627-checker-unroll/Android.bp
index c583cb4e5f..3b93f94a2c 100644
--- a/test/627-checker-unroll/Android.bp
+++ b/test/627-checker-unroll/Android.bp
@@ -8,7 +8,7 @@ java_test {
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-627-checker-unroll-expected"],
+    data: [":art-run-test-627-checker-unroll-expected-stdout"],
     // Include the Java source files in the test's artifacts, to make Checker assertions
     // available to the TradeFed test runner.
     include_srcs: true,
@@ -16,8 +16,8 @@ java_test {
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-627-checker-unroll-expected",
-    out: ["art-run-test-627-checker-unroll-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-627-checker-unroll-expected-stdout",
+    out: ["art-run-test-627-checker-unroll-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/627-checker-unroll/expected.txt b/test/627-checker-unroll/expected-stdout.txt
index b0aad4deb5..b0aad4deb5 100644
--- a/test/627-checker-unroll/expected.txt
+++ b/test/627-checker-unroll/expected-stdout.txt
diff --git a/test/628-vdex/Android.bp b/test/628-vdex/Android.bp
index 8a0dc060bb..0433761e34 100644
--- a/test/628-vdex/Android.bp
+++ b/test/628-vdex/Android.bp
@@ -8,13 +8,13 @@ java_test {
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-628-vdex-expected"],
+    data: [":art-run-test-628-vdex-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-628-vdex-expected",
-    out: ["art-run-test-628-vdex-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-628-vdex-expected-stdout",
+    out: ["art-run-test-628-vdex-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/628-vdex/expected.txt b/test/628-vdex/expected-stdout.txt
index d0f61f692c..d0f61f692c 100644
--- a/test/628-vdex/expected.txt
+++ b/test/628-vdex/expected-stdout.txt
diff --git a/test/629-vdex-speed/Android.bp b/test/629-vdex-speed/Android.bp
index aa1bb0887e..286fbd5acf 100644
--- a/test/629-vdex-speed/Android.bp
+++ b/test/629-vdex-speed/Android.bp
@@ -8,13 +8,13 @@ java_test {
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-629-vdex-speed-expected"],
+    data: [":art-run-test-629-vdex-speed-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-629-vdex-speed-expected",
-    out: ["art-run-test-629-vdex-speed-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-629-vdex-speed-expected-stdout",
+    out: ["art-run-test-629-vdex-speed-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/629-vdex-speed/expected.txt b/test/629-vdex-speed/expected-stdout.txt
index 6a5618ebc6..6a5618ebc6 100644
--- a/test/629-vdex-speed/expected.txt
+++ b/test/629-vdex-speed/expected-stdout.txt
diff --git a/test/630-safecast-array/expected.txt b/test/630-safecast-array/expected-stdout.txt
index e69de29bb2..e69de29bb2 100644
--- a/test/630-safecast-array/expected.txt
+++ b/test/630-safecast-array/expected-stdout.txt
diff --git a/test/631-checker-get-class/Android.bp b/test/631-checker-get-class/Android.bp
index 72263363ec..b19146dbae 100644
--- a/test/631-checker-get-class/Android.bp
+++ b/test/631-checker-get-class/Android.bp
@@ -8,7 +8,7 @@ java_test {
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-631-checker-get-class-expected"],
+    data: [":art-run-test-631-checker-get-class-expected-stdout"],
     // Include the Java source files in the test's artifacts, to make Checker assertions
     // available to the TradeFed test runner.
     include_srcs: true,
@@ -16,8 +16,8 @@ java_test {
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-631-checker-get-class-expected",
-    out: ["art-run-test-631-checker-get-class-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-631-checker-get-class-expected-stdout",
+    out: ["art-run-test-631-checker-get-class-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/631-checker-get-class/expected.txt b/test/631-checker-get-class/expected-stdout.txt
index e69de29bb2..e69de29bb2 100644
--- a/test/631-checker-get-class/expected.txt
+++ b/test/631-checker-get-class/expected-stdout.txt
diff --git a/test/632-checker-char-at-bounds/Android.bp b/test/632-checker-char-at-bounds/Android.bp
index 96831f2024..c75e9d2673 100644
--- a/test/632-checker-char-at-bounds/Android.bp
+++ b/test/632-checker-char-at-bounds/Android.bp
@@ -8,7 +8,7 @@ java_test {
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-632-checker-char-at-bounds-expected"],
+    data: [":art-run-test-632-checker-char-at-bounds-expected-stdout"],
     // Include the Java source files in the test's artifacts, to make Checker assertions
     // available to the TradeFed test runner.
     include_srcs: true,
@@ -16,8 +16,8 @@ java_test {
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-632-checker-char-at-bounds-expected",
-    out: ["art-run-test-632-checker-char-at-bounds-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-632-checker-char-at-bounds-expected-stdout",
+    out: ["art-run-test-632-checker-char-at-bounds-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/632-checker-char-at-bounds/expected.txt b/test/632-checker-char-at-bounds/expected-stdout.txt
index e69de29bb2..e69de29bb2 100644
--- a/test/632-checker-char-at-bounds/expected.txt
+++ b/test/632-checker-char-at-bounds/expected-stdout.txt
diff --git a/test/633-checker-rtp-getclass/expected.txt b/test/633-checker-rtp-getclass/expected-stdout.txt
index a178d0414b..a178d0414b 100644
--- a/test/633-checker-rtp-getclass/expected.txt
+++ b/test/633-checker-rtp-getclass/expected-stdout.txt
diff --git a/test/634-vdex-duplicate/expected.txt b/test/634-vdex-duplicate/expected-stdout.txt
index 557db03de9..557db03de9 100644
--- a/test/634-vdex-duplicate/expected.txt
+++ b/test/634-vdex-duplicate/expected-stdout.txt
diff --git a/test/635-checker-arm64-volatile-load-cc/Android.bp b/test/635-checker-arm64-volatile-load-cc/Android.bp
index c193565603..c29ca2a897 100644
--- a/test/635-checker-arm64-volatile-load-cc/Android.bp
+++ b/test/635-checker-arm64-volatile-load-cc/Android.bp
@@ -8,7 +8,7 @@ java_test {
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-635-checker-arm64-volatile-load-cc-expected"],
+    data: [":art-run-test-635-checker-arm64-volatile-load-cc-expected-stdout"],
     // Include the Java source files in the test's artifacts, to make Checker assertions
     // available to the TradeFed test runner.
     include_srcs: true,
@@ -16,8 +16,8 @@ java_test {
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-635-checker-arm64-volatile-load-cc-expected",
-    out: ["art-run-test-635-checker-arm64-volatile-load-cc-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-635-checker-arm64-volatile-load-cc-expected-stdout",
+    out: ["art-run-test-635-checker-arm64-volatile-load-cc-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/635-checker-arm64-volatile-load-cc/expected.txt b/test/635-checker-arm64-volatile-load-cc/expected-stdout.txt
index b0aad4deb5..b0aad4deb5 100644
--- a/test/635-checker-arm64-volatile-load-cc/expected.txt
+++ b/test/635-checker-arm64-volatile-load-cc/expected-stdout.txt
diff --git a/test/636-arm64-veneer-pool/Android.bp b/test/636-arm64-veneer-pool/Android.bp
index 10d44e391e..56ecb9e2f7 100644
--- a/test/636-arm64-veneer-pool/Android.bp
+++ b/test/636-arm64-veneer-pool/Android.bp
@@ -8,13 +8,13 @@ java_test {
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-636-arm64-veneer-pool-expected"],
+    data: [":art-run-test-636-arm64-veneer-pool-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-636-arm64-veneer-pool-expected",
-    out: ["art-run-test-636-arm64-veneer-pool-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-636-arm64-veneer-pool-expected-stdout",
+    out: ["art-run-test-636-arm64-veneer-pool-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/636-arm64-veneer-pool/expected.txt b/test/636-arm64-veneer-pool/expected-stdout.txt
index b0aad4deb5..b0aad4deb5 100644
--- a/test/636-arm64-veneer-pool/expected.txt
+++ b/test/636-arm64-veneer-pool/expected-stdout.txt
diff --git a/test/636-wrong-static-access/expected.txt b/test/636-wrong-static-access/expected-stdout.txt
index 6a5618ebc6..6a5618ebc6 100644
--- a/test/636-wrong-static-access/expected.txt
+++ b/test/636-wrong-static-access/expected-stdout.txt
diff --git a/test/637-checker-throw-inline/Android.bp b/test/637-checker-throw-inline/Android.bp
index 3a71451cc1..d05746a85b 100644
--- a/test/637-checker-throw-inline/Android.bp
+++ b/test/637-checker-throw-inline/Android.bp
@@ -8,7 +8,7 @@ java_test {
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-637-checker-throw-inline-expected"],
+    data: [":art-run-test-637-checker-throw-inline-expected-stdout"],
     // Include the Java source files in the test's artifacts, to make Checker assertions
     // available to the TradeFed test runner.
     include_srcs: true,
@@ -16,8 +16,8 @@ java_test {
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-637-checker-throw-inline-expected",
-    out: ["art-run-test-637-checker-throw-inline-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-637-checker-throw-inline-expected-stdout",
+    out: ["art-run-test-637-checker-throw-inline-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/637-checker-throw-inline/expected.txt b/test/637-checker-throw-inline/expected-stdout.txt
index e69de29bb2..e69de29bb2 100644
--- a/test/637-checker-throw-inline/expected.txt
+++ b/test/637-checker-throw-inline/expected-stdout.txt
diff --git a/test/638-checker-inline-cache-intrinsic/Android.bp b/test/638-checker-inline-cache-intrinsic/Android.bp
index a1a812d1cb..6b7f1f21ae 100644
--- a/test/638-checker-inline-cache-intrinsic/Android.bp
+++ b/test/638-checker-inline-cache-intrinsic/Android.bp
@@ -8,7 +8,7 @@ java_test {
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-638-checker-inline-cache-intrinsic-expected"],
+    data: [":art-run-test-638-checker-inline-cache-intrinsic-expected-stdout"],
     // Include the Java source files in the test's artifacts, to make Checker assertions
     // available to the TradeFed test runner.
     include_srcs: true,
@@ -16,8 +16,8 @@ java_test {
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-638-checker-inline-cache-intrinsic-expected",
-    out: ["art-run-test-638-checker-inline-cache-intrinsic-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-638-checker-inline-cache-intrinsic-expected-stdout",
+    out: ["art-run-test-638-checker-inline-cache-intrinsic-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/638-checker-inline-cache-intrinsic/expected.txt b/test/638-checker-inline-cache-intrinsic/expected-stdout.txt
index 6a5618ebc6..6a5618ebc6 100644
--- a/test/638-checker-inline-cache-intrinsic/expected.txt
+++ b/test/638-checker-inline-cache-intrinsic/expected-stdout.txt
diff --git a/test/638-checker-inline-caches/expected.txt b/test/638-checker-inline-caches/expected-stdout.txt
index e69de29bb2..e69de29bb2 100644
--- a/test/638-checker-inline-caches/expected.txt
+++ b/test/638-checker-inline-caches/expected-stdout.txt
diff --git a/test/638-no-line-number/expected.txt b/test/638-no-line-number/expected-stdout.txt
index 3b6ff96101..3b6ff96101 100644
--- a/test/638-no-line-number/expected.txt
+++ b/test/638-no-line-number/expected-stdout.txt
diff --git a/test/639-checker-code-sinking/Android.bp b/test/639-checker-code-sinking/Android.bp
index 2e35f9d804..c7b7009333 100644
--- a/test/639-checker-code-sinking/Android.bp
+++ b/test/639-checker-code-sinking/Android.bp
@@ -8,7 +8,7 @@ java_test {
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-639-checker-code-sinking-expected"],
+    data: [":art-run-test-639-checker-code-sinking-expected-stdout"],
     // Include the Java source files in the test's artifacts, to make Checker assertions
     // available to the TradeFed test runner.
     include_srcs: true,
@@ -16,8 +16,8 @@ java_test {
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-639-checker-code-sinking-expected",
-    out: ["art-run-test-639-checker-code-sinking-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-639-checker-code-sinking-expected-stdout",
+    out: ["art-run-test-639-checker-code-sinking-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/639-checker-code-sinking/expected.txt b/test/639-checker-code-sinking/expected-stdout.txt
index 5d4833aca8..5d4833aca8 100644
--- a/test/639-checker-code-sinking/expected.txt
+++ b/test/639-checker-code-sinking/expected-stdout.txt
diff --git a/test/640-checker-boolean-simd/Android.bp b/test/640-checker-boolean-simd/Android.bp
index cf2d2f0e9b..18616cf665 100644
--- a/test/640-checker-boolean-simd/Android.bp
+++ b/test/640-checker-boolean-simd/Android.bp
@@ -8,7 +8,7 @@ java_test {
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-640-checker-boolean-simd-expected"],
+    data: [":art-run-test-640-checker-boolean-simd-expected-stdout"],
     // Include the Java source files in the test's artifacts, to make Checker assertions
     // available to the TradeFed test runner.
     include_srcs: true,
@@ -16,8 +16,8 @@ java_test {
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-640-checker-boolean-simd-expected",
-    out: ["art-run-test-640-checker-boolean-simd-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-640-checker-boolean-simd-expected-stdout",
+    out: ["art-run-test-640-checker-boolean-simd-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/640-checker-boolean-simd/expected.txt b/test/640-checker-boolean-simd/expected-stdout.txt
index b0aad4deb5..b0aad4deb5 100644
--- a/test/640-checker-boolean-simd/expected.txt
+++ b/test/640-checker-boolean-simd/expected-stdout.txt
diff --git a/test/640-checker-integer-valueof/Android.bp b/test/640-checker-integer-valueof/Android.bp
index 97a15ac5b0..63bcaf539b 100644
--- a/test/640-checker-integer-valueof/Android.bp
+++ b/test/640-checker-integer-valueof/Android.bp
@@ -8,7 +8,7 @@ java_test {
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-640-checker-integer-valueof-expected"],
+    data: [":art-run-test-640-checker-integer-valueof-expected-stdout"],
     // Include the Java source files in the test's artifacts, to make Checker assertions
     // available to the TradeFed test runner.
     include_srcs: true,
@@ -16,8 +16,8 @@ java_test {
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-640-checker-integer-valueof-expected",
-    out: ["art-run-test-640-checker-integer-valueof-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-640-checker-integer-valueof-expected-stdout",
+    out: ["art-run-test-640-checker-integer-valueof-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/640-checker-integer-valueof/expected.txt b/test/640-checker-integer-valueof/expected-stdout.txt
index e69de29bb2..e69de29bb2 100644
--- a/test/640-checker-integer-valueof/expected.txt
+++ b/test/640-checker-integer-valueof/expected-stdout.txt
diff --git a/test/640-checker-simd/Android.bp b/test/640-checker-simd/Android.bp
index ae82368eeb..e7cec560e1 100644
--- a/test/640-checker-simd/Android.bp
+++ b/test/640-checker-simd/Android.bp
@@ -8,7 +8,7 @@ java_test {
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-640-checker-simd-expected"],
+    data: [":art-run-test-640-checker-simd-expected-stdout"],
     // Include the Java source files in the test's artifacts, to make Checker assertions
     // available to the TradeFed test runner.
     include_srcs: true,
@@ -16,8 +16,8 @@ java_test {
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-640-checker-simd-expected",
-    out: ["art-run-test-640-checker-simd-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-640-checker-simd-expected-stdout",
+    out: ["art-run-test-640-checker-simd-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/640-checker-simd/expected.txt b/test/640-checker-simd/expected-stdout.txt
index b7a4fcca9a..b7a4fcca9a 100644
--- a/test/640-checker-simd/expected.txt
+++ b/test/640-checker-simd/expected-stdout.txt
diff --git a/test/641-checker-arraycopy/Android.bp b/test/641-checker-arraycopy/Android.bp
index 600fbcf4a9..b643053b0f 100644
--- a/test/641-checker-arraycopy/Android.bp
+++ b/test/641-checker-arraycopy/Android.bp
@@ -8,7 +8,7 @@ java_test {
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-641-checker-arraycopy-expected"],
+    data: [":art-run-test-641-checker-arraycopy-expected-stdout"],
     // Include the Java source files in the test's artifacts, to make Checker assertions
     // available to the TradeFed test runner.
     include_srcs: true,
@@ -16,8 +16,8 @@ java_test {
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-641-checker-arraycopy-expected",
-    out: ["art-run-test-641-checker-arraycopy-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-641-checker-arraycopy-expected-stdout",
+    out: ["art-run-test-641-checker-arraycopy-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/641-checker-arraycopy/expected.txt b/test/641-checker-arraycopy/expected-stdout.txt
index e69de29bb2..e69de29bb2 100644
--- a/test/641-checker-arraycopy/expected.txt
+++ b/test/641-checker-arraycopy/expected-stdout.txt
diff --git a/test/641-irreducible-inline/expected.txt b/test/641-irreducible-inline/expected-stdout.txt
index d81cc0710e..d81cc0710e 100644
--- a/test/641-irreducible-inline/expected.txt
+++ b/test/641-irreducible-inline/expected-stdout.txt
diff --git a/test/641-iterations/Android.bp b/test/641-iterations/Android.bp
index 1de9a8fa51..40a20f6a34 100644
--- a/test/641-iterations/Android.bp
+++ b/test/641-iterations/Android.bp
@@ -8,13 +8,13 @@ java_test {
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-641-iterations-expected"],
+    data: [":art-run-test-641-iterations-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-641-iterations-expected",
-    out: ["art-run-test-641-iterations-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-641-iterations-expected-stdout",
+    out: ["art-run-test-641-iterations-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/641-iterations/expected.txt b/test/641-iterations/expected-stdout.txt
index b0aad4deb5..b0aad4deb5 100644
--- a/test/641-iterations/expected.txt
+++ b/test/641-iterations/expected-stdout.txt
diff --git a/test/642-fp-callees/Android.bp b/test/642-fp-callees/Android.bp
index 1af21cac3a..2ec92f0172 100644
--- a/test/642-fp-callees/Android.bp
+++ b/test/642-fp-callees/Android.bp
@@ -8,13 +8,13 @@ java_test {
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-642-fp-callees-expected"],
+    data: [":art-run-test-642-fp-callees-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-642-fp-callees-expected",
-    out: ["art-run-test-642-fp-callees-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-642-fp-callees-expected-stdout",
+    out: ["art-run-test-642-fp-callees-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/642-fp-callees/expected.txt b/test/642-fp-callees/expected-stdout.txt
index 77a1486479..77a1486479 100644
--- a/test/642-fp-callees/expected.txt
+++ b/test/642-fp-callees/expected-stdout.txt
diff --git a/test/643-checker-bogus-ic/Android.bp b/test/643-checker-bogus-ic/Android.bp
index 17656f0889..612a003708 100644
--- a/test/643-checker-bogus-ic/Android.bp
+++ b/test/643-checker-bogus-ic/Android.bp
@@ -8,7 +8,7 @@ java_test {
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-643-checker-bogus-ic-expected"],
+    data: [":art-run-test-643-checker-bogus-ic-expected-stdout"],
     // Include the Java source files in the test's artifacts, to make Checker assertions
     // available to the TradeFed test runner.
     include_srcs: true,
@@ -16,8 +16,8 @@ java_test {
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-643-checker-bogus-ic-expected",
-    out: ["art-run-test-643-checker-bogus-ic-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-643-checker-bogus-ic-expected-stdout",
+    out: ["art-run-test-643-checker-bogus-ic-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/643-checker-bogus-ic/expected.txt b/test/643-checker-bogus-ic/expected-stdout.txt
index e69de29bb2..e69de29bb2 100644
--- a/test/643-checker-bogus-ic/expected.txt
+++ b/test/643-checker-bogus-ic/expected-stdout.txt
diff --git a/test/645-checker-abs-simd/Android.bp b/test/645-checker-abs-simd/Android.bp
index 1cfb950748..624d1fb1d2 100644
--- a/test/645-checker-abs-simd/Android.bp
+++ b/test/645-checker-abs-simd/Android.bp
@@ -8,7 +8,7 @@ java_test {
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-645-checker-abs-simd-expected"],
+    data: [":art-run-test-645-checker-abs-simd-expected-stdout"],
     // Include the Java source files in the test's artifacts, to make Checker assertions
     // available to the TradeFed test runner.
     include_srcs: true,
@@ -16,8 +16,8 @@ java_test {
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-645-checker-abs-simd-expected",
-    out: ["art-run-test-645-checker-abs-simd-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-645-checker-abs-simd-expected-stdout",
+    out: ["art-run-test-645-checker-abs-simd-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/645-checker-abs-simd/expected.txt b/test/645-checker-abs-simd/expected-stdout.txt
index b0aad4deb5..b0aad4deb5 100644
--- a/test/645-checker-abs-simd/expected.txt
+++ b/test/645-checker-abs-simd/expected-stdout.txt
diff --git a/test/646-checker-arraycopy-large-cst-pos/Android.bp b/test/646-checker-arraycopy-large-cst-pos/Android.bp
index ea7481b8c6..93a1c0792d 100644
--- a/test/646-checker-arraycopy-large-cst-pos/Android.bp
+++ b/test/646-checker-arraycopy-large-cst-pos/Android.bp
@@ -8,7 +8,7 @@ java_test {
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-646-checker-arraycopy-large-cst-pos-expected"],
+    data: [":art-run-test-646-checker-arraycopy-large-cst-pos-expected-stdout"],
     // Include the Java source files in the test's artifacts, to make Checker assertions
     // available to the TradeFed test runner.
     include_srcs: true,
@@ -16,8 +16,8 @@ java_test {
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-646-checker-arraycopy-large-cst-pos-expected",
-    out: ["art-run-test-646-checker-arraycopy-large-cst-pos-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-646-checker-arraycopy-large-cst-pos-expected-stdout",
+    out: ["art-run-test-646-checker-arraycopy-large-cst-pos-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/646-checker-arraycopy-large-cst-pos/expected.txt b/test/646-checker-arraycopy-large-cst-pos/expected-stdout.txt
index b0aad4deb5..b0aad4deb5 100644
--- a/test/646-checker-arraycopy-large-cst-pos/expected.txt
+++ b/test/646-checker-arraycopy-large-cst-pos/expected-stdout.txt
diff --git a/test/646-checker-long-const-to-int/Android.bp b/test/646-checker-long-const-to-int/Android.bp
index 6ba7740cbb..7d8af91a58 100644
--- a/test/646-checker-long-const-to-int/Android.bp
+++ b/test/646-checker-long-const-to-int/Android.bp
@@ -8,7 +8,7 @@ java_test {
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-646-checker-long-const-to-int-expected"],
+    data: [":art-run-test-646-checker-long-const-to-int-expected-stdout"],
     // Include the Java source files in the test's artifacts, to make Checker assertions
     // available to the TradeFed test runner.
     include_srcs: true,
@@ -16,8 +16,8 @@ java_test {
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-646-checker-long-const-to-int-expected",
-    out: ["art-run-test-646-checker-long-const-to-int-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-646-checker-long-const-to-int-expected-stdout",
+    out: ["art-run-test-646-checker-long-const-to-int-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/646-checker-long-const-to-int/expected.txt b/test/646-checker-long-const-to-int/expected-stdout.txt
index 9abd696f97..9abd696f97 100644
--- a/test/646-checker-long-const-to-int/expected.txt
+++ b/test/646-checker-long-const-to-int/expected-stdout.txt
diff --git a/test/646-checker-simd-hadd/Android.bp b/test/646-checker-simd-hadd/Android.bp
index 1fc42988d6..7927752855 100644
--- a/test/646-checker-simd-hadd/Android.bp
+++ b/test/646-checker-simd-hadd/Android.bp
@@ -8,7 +8,7 @@ java_test {
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-646-checker-simd-hadd-expected"],
+    data: [":art-run-test-646-checker-simd-hadd-expected-stdout"],
     // Include the Java source files in the test's artifacts, to make Checker assertions
     // available to the TradeFed test runner.
     include_srcs: true,
@@ -16,8 +16,8 @@ java_test {
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-646-checker-simd-hadd-expected",
-    out: ["art-run-test-646-checker-simd-hadd-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-646-checker-simd-hadd-expected-stdout",
+    out: ["art-run-test-646-checker-simd-hadd-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/646-checker-simd-hadd/expected.txt b/test/646-checker-simd-hadd/expected-stdout.txt
index e2b68e7895..e2b68e7895 100644
--- a/test/646-checker-simd-hadd/expected.txt
+++ b/test/646-checker-simd-hadd/expected-stdout.txt
diff --git a/test/647-jni-get-field-id/Android.bp b/test/647-jni-get-field-id/Android.bp
index 482aa3966f..a63ac8c826 100644
--- a/test/647-jni-get-field-id/Android.bp
+++ b/test/647-jni-get-field-id/Android.bp
@@ -8,13 +8,13 @@ java_test {
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-647-jni-get-field-id-expected"],
+    data: [":art-run-test-647-jni-get-field-id-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-647-jni-get-field-id-expected",
-    out: ["art-run-test-647-jni-get-field-id-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-647-jni-get-field-id-expected-stdout",
+    out: ["art-run-test-647-jni-get-field-id-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/647-jni-get-field-id/expected.txt b/test/647-jni-get-field-id/expected-stdout.txt
index 5fdc1ccce0..5fdc1ccce0 100644
--- a/test/647-jni-get-field-id/expected.txt
+++ b/test/647-jni-get-field-id/expected-stdout.txt
diff --git a/test/647-sinking-catch/expected.txt b/test/647-sinking-catch/expected-stdout.txt
index b2cde1851f..b2cde1851f 100644
--- a/test/647-sinking-catch/expected.txt
+++ b/test/647-sinking-catch/expected-stdout.txt
diff --git a/test/648-inline-caches-unresolved/expected.txt b/test/648-inline-caches-unresolved/expected-stdout.txt
index 4e6a4384c5..4e6a4384c5 100644
--- a/test/648-inline-caches-unresolved/expected.txt
+++ b/test/648-inline-caches-unresolved/expected-stdout.txt
diff --git a/test/648-many-direct-methods/expected.txt b/test/648-many-direct-methods/expected-stdout.txt
index b0aad4deb5..b0aad4deb5 100644
--- a/test/648-many-direct-methods/expected.txt
+++ b/test/648-many-direct-methods/expected-stdout.txt
diff --git a/test/649-vdex-duplicate-method/expected.txt b/test/649-vdex-duplicate-method/expected-stdout.txt
index 573541ac97..573541ac97 100644
--- a/test/649-vdex-duplicate-method/expected.txt
+++ b/test/649-vdex-duplicate-method/expected-stdout.txt
diff --git a/test/650-checker-inline-access-thunks/Android.bp b/test/650-checker-inline-access-thunks/Android.bp
index 3e356351ff..a08824ebd1 100644
--- a/test/650-checker-inline-access-thunks/Android.bp
+++ b/test/650-checker-inline-access-thunks/Android.bp
@@ -8,7 +8,7 @@ java_test {
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-650-checker-inline-access-thunks-expected"],
+    data: [":art-run-test-650-checker-inline-access-thunks-expected-stdout"],
     // Include the Java source files in the test's artifacts, to make Checker assertions
     // available to the TradeFed test runner.
     include_srcs: true,
@@ -16,8 +16,8 @@ java_test {
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-650-checker-inline-access-thunks-expected",
-    out: ["art-run-test-650-checker-inline-access-thunks-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-650-checker-inline-access-thunks-expected-stdout",
+    out: ["art-run-test-650-checker-inline-access-thunks-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/650-checker-inline-access-thunks/expected.txt b/test/650-checker-inline-access-thunks/expected-stdout.txt
index d81cc0710e..d81cc0710e 100644
--- a/test/650-checker-inline-access-thunks/expected.txt
+++ b/test/650-checker-inline-access-thunks/expected-stdout.txt
diff --git a/test/652-deopt-intrinsic/Android.bp b/test/652-deopt-intrinsic/Android.bp
index 30e891a676..65d3af7906 100644
--- a/test/652-deopt-intrinsic/Android.bp
+++ b/test/652-deopt-intrinsic/Android.bp
@@ -8,13 +8,13 @@ java_test {
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-652-deopt-intrinsic-expected"],
+    data: [":art-run-test-652-deopt-intrinsic-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-652-deopt-intrinsic-expected",
-    out: ["art-run-test-652-deopt-intrinsic-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-652-deopt-intrinsic-expected-stdout",
+    out: ["art-run-test-652-deopt-intrinsic-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/652-deopt-intrinsic/expected.txt b/test/652-deopt-intrinsic/expected-stdout.txt
index 6a5618ebc6..6a5618ebc6 100644
--- a/test/652-deopt-intrinsic/expected.txt
+++ b/test/652-deopt-intrinsic/expected-stdout.txt
diff --git a/test/654-checker-periodic/Android.bp b/test/654-checker-periodic/Android.bp
index 6ab0be0ca3..6381ddc83d 100644
--- a/test/654-checker-periodic/Android.bp
+++ b/test/654-checker-periodic/Android.bp
@@ -8,7 +8,7 @@ java_test {
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-654-checker-periodic-expected"],
+    data: [":art-run-test-654-checker-periodic-expected-stdout"],
     // Include the Java source files in the test's artifacts, to make Checker assertions
     // available to the TradeFed test runner.
     include_srcs: true,
@@ -16,8 +16,8 @@ java_test {
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-654-checker-periodic-expected",
-    out: ["art-run-test-654-checker-periodic-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-654-checker-periodic-expected-stdout",
+    out: ["art-run-test-654-checker-periodic-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/654-checker-periodic/expected.txt b/test/654-checker-periodic/expected-stdout.txt
index b0aad4deb5..b0aad4deb5 100644
--- a/test/654-checker-periodic/expected.txt
+++ b/test/654-checker-periodic/expected-stdout.txt
diff --git a/test/655-checker-simd-arm-opt/Android.bp b/test/655-checker-simd-arm-opt/Android.bp
index e6b3aa83b2..8cd851aca9 100644
--- a/test/655-checker-simd-arm-opt/Android.bp
+++ b/test/655-checker-simd-arm-opt/Android.bp
@@ -8,7 +8,7 @@ java_test {
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-655-checker-simd-arm-opt-expected"],
+    data: [":art-run-test-655-checker-simd-arm-opt-expected-stdout"],
     // Include the Java source files in the test's artifacts, to make Checker assertions
     // available to the TradeFed test runner.
     include_srcs: true,
@@ -16,8 +16,8 @@ java_test {
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-655-checker-simd-arm-opt-expected",
-    out: ["art-run-test-655-checker-simd-arm-opt-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-655-checker-simd-arm-opt-expected-stdout",
+    out: ["art-run-test-655-checker-simd-arm-opt-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/655-checker-simd-arm-opt/expected.txt b/test/655-checker-simd-arm-opt/expected-stdout.txt
index b0aad4deb5..b0aad4deb5 100644
--- a/test/655-checker-simd-arm-opt/expected.txt
+++ b/test/655-checker-simd-arm-opt/expected-stdout.txt
diff --git a/test/655-jit-clinit/Android.bp b/test/655-jit-clinit/Android.bp
index 8dbc7e8c3b..a9be307436 100644
--- a/test/655-jit-clinit/Android.bp
+++ b/test/655-jit-clinit/Android.bp
@@ -8,13 +8,13 @@ java_test {
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-655-jit-clinit-expected"],
+    data: [":art-run-test-655-jit-clinit-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-655-jit-clinit-expected",
-    out: ["art-run-test-655-jit-clinit-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-655-jit-clinit-expected-stdout",
+    out: ["art-run-test-655-jit-clinit-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/655-jit-clinit/expected.txt b/test/655-jit-clinit/expected-stdout.txt
index 6a5618ebc6..6a5618ebc6 100644
--- a/test/655-jit-clinit/expected.txt
+++ b/test/655-jit-clinit/expected-stdout.txt
diff --git a/test/656-annotation-lookup-generic-jni/expected.txt b/test/656-annotation-lookup-generic-jni/expected-stdout.txt
index 4519c7e442..4519c7e442 100644
--- a/test/656-annotation-lookup-generic-jni/expected.txt
+++ b/test/656-annotation-lookup-generic-jni/expected-stdout.txt
diff --git a/test/656-checker-simd-opt/Android.bp b/test/656-checker-simd-opt/Android.bp
index 7429759d74..098dac4869 100644
--- a/test/656-checker-simd-opt/Android.bp
+++ b/test/656-checker-simd-opt/Android.bp
@@ -8,7 +8,7 @@ java_test {
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-656-checker-simd-opt-expected"],
+    data: [":art-run-test-656-checker-simd-opt-expected-stdout"],
     // Include the Java source files in the test's artifacts, to make Checker assertions
     // available to the TradeFed test runner.
     include_srcs: true,
@@ -16,8 +16,8 @@ java_test {
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-656-checker-simd-opt-expected",
-    out: ["art-run-test-656-checker-simd-opt-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-656-checker-simd-opt-expected-stdout",
+    out: ["art-run-test-656-checker-simd-opt-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/656-checker-simd-opt/expected.txt b/test/656-checker-simd-opt/expected-stdout.txt
index b0aad4deb5..b0aad4deb5 100644
--- a/test/656-checker-simd-opt/expected.txt
+++ b/test/656-checker-simd-opt/expected-stdout.txt
diff --git a/test/656-loop-deopt/Android.bp b/test/656-loop-deopt/Android.bp
index a5dc8167ec..b4c45b8f01 100644
--- a/test/656-loop-deopt/Android.bp
+++ b/test/656-loop-deopt/Android.bp
@@ -8,13 +8,13 @@ java_test {
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-656-loop-deopt-expected"],
+    data: [":art-run-test-656-loop-deopt-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-656-loop-deopt-expected",
-    out: ["art-run-test-656-loop-deopt-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-656-loop-deopt-expected-stdout",
+    out: ["art-run-test-656-loop-deopt-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/656-loop-deopt/expected.txt b/test/656-loop-deopt/expected-stdout.txt
index 6a5618ebc6..6a5618ebc6 100644
--- a/test/656-loop-deopt/expected.txt
+++ b/test/656-loop-deopt/expected-stdout.txt
diff --git a/test/657-branches/Android.bp b/test/657-branches/Android.bp
index e384db8b32..889063d189 100644
--- a/test/657-branches/Android.bp
+++ b/test/657-branches/Android.bp
@@ -8,13 +8,13 @@ java_test {
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-657-branches-expected"],
+    data: [":art-run-test-657-branches-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-657-branches-expected",
-    out: ["art-run-test-657-branches-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-657-branches-expected-stdout",
+    out: ["art-run-test-657-branches-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/657-branches/expected.txt b/test/657-branches/expected-stdout.txt
index d9fd864709..d9fd864709 100644
--- a/test/657-branches/expected.txt
+++ b/test/657-branches/expected-stdout.txt
diff --git a/test/658-fp-read-barrier/Android.bp b/test/658-fp-read-barrier/Android.bp
index e93878fefb..9372125914 100644
--- a/test/658-fp-read-barrier/Android.bp
+++ b/test/658-fp-read-barrier/Android.bp
@@ -8,13 +8,13 @@ java_test {
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-658-fp-read-barrier-expected"],
+    data: [":art-run-test-658-fp-read-barrier-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-658-fp-read-barrier-expected",
-    out: ["art-run-test-658-fp-read-barrier-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-658-fp-read-barrier-expected-stdout",
+    out: ["art-run-test-658-fp-read-barrier-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/658-fp-read-barrier/expected.txt b/test/658-fp-read-barrier/expected-stdout.txt
index e69de29bb2..e69de29bb2 100644
--- a/test/658-fp-read-barrier/expected.txt
+++ b/test/658-fp-read-barrier/expected-stdout.txt
diff --git a/test/659-unpadded-array/expected.txt b/test/659-unpadded-array/expected-stdout.txt
index e69de29bb2..e69de29bb2 100644
--- a/test/659-unpadded-array/expected.txt
+++ b/test/659-unpadded-array/expected-stdout.txt
diff --git a/test/660-checker-sad/Android.bp b/test/660-checker-sad/Android.bp
index 4045182855..bcaa1c0fdf 100644
--- a/test/660-checker-sad/Android.bp
+++ b/test/660-checker-sad/Android.bp
@@ -8,7 +8,7 @@ java_test {
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-660-checker-sad-expected"],
+    data: [":art-run-test-660-checker-sad-expected-stdout"],
     // Include the Java source files in the test's artifacts, to make Checker assertions
     // available to the TradeFed test runner.
     include_srcs: true,
@@ -16,8 +16,8 @@ java_test {
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-660-checker-sad-expected",
-    out: ["art-run-test-660-checker-sad-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-660-checker-sad-expected-stdout",
+    out: ["art-run-test-660-checker-sad-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/660-checker-sad/expected.txt b/test/660-checker-sad/expected-stdout.txt
index b73875c8a4..b73875c8a4 100644
--- a/test/660-checker-sad/expected.txt
+++ b/test/660-checker-sad/expected-stdout.txt
diff --git a/test/660-checker-simd-sad/Android.bp b/test/660-checker-simd-sad/Android.bp
index 9b15b52b83..cf99f97ece 100644
--- a/test/660-checker-simd-sad/Android.bp
+++ b/test/660-checker-simd-sad/Android.bp
@@ -8,7 +8,7 @@ java_test {
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-660-checker-simd-sad-expected"],
+    data: [":art-run-test-660-checker-simd-sad-expected-stdout"],
     // Include the Java source files in the test's artifacts, to make Checker assertions
     // available to the TradeFed test runner.
     include_srcs: true,
@@ -16,8 +16,8 @@ java_test {
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-660-checker-simd-sad-expected",
-    out: ["art-run-test-660-checker-simd-sad-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-660-checker-simd-sad-expected-stdout",
+    out: ["art-run-test-660-checker-simd-sad-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/660-checker-simd-sad/expected.txt b/test/660-checker-simd-sad/expected-stdout.txt
index 4685416d05..4685416d05 100644
--- a/test/660-checker-simd-sad/expected.txt
+++ b/test/660-checker-simd-sad/expected-stdout.txt
diff --git a/test/660-clinit/Android.bp b/test/660-clinit/Android.bp
index 2e325962fa..a6f9bd9498 100644
--- a/test/660-clinit/Android.bp
+++ b/test/660-clinit/Android.bp
@@ -8,13 +8,13 @@ java_test {
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-660-clinit-expected"],
+    data: [":art-run-test-660-clinit-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-660-clinit-expected",
-    out: ["art-run-test-660-clinit-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-660-clinit-expected-stdout",
+    out: ["art-run-test-660-clinit-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/660-clinit/expected.txt b/test/660-clinit/expected-stdout.txt
index ee1b47929e..ee1b47929e 100644
--- a/test/660-clinit/expected.txt
+++ b/test/660-clinit/expected-stdout.txt
diff --git a/test/660-store-8-16/expected.txt b/test/660-store-8-16/expected-stdout.txt
index e69de29bb2..e69de29bb2 100644
--- a/test/660-store-8-16/expected.txt
+++ b/test/660-store-8-16/expected-stdout.txt
diff --git a/test/661-checker-simd-reduc/Android.bp b/test/661-checker-simd-reduc/Android.bp
index 7be8f9e172..ce4da4ec71 100644
--- a/test/661-checker-simd-reduc/Android.bp
+++ b/test/661-checker-simd-reduc/Android.bp
@@ -8,7 +8,7 @@ java_test {
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-661-checker-simd-reduc-expected"],
+    data: [":art-run-test-661-checker-simd-reduc-expected-stdout"],
     // Include the Java source files in the test's artifacts, to make Checker assertions
     // available to the TradeFed test runner.
     include_srcs: true,
@@ -16,8 +16,8 @@ java_test {
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-661-checker-simd-reduc-expected",
-    out: ["art-run-test-661-checker-simd-reduc-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-661-checker-simd-reduc-expected-stdout",
+    out: ["art-run-test-661-checker-simd-reduc-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/661-checker-simd-reduc/expected.txt b/test/661-checker-simd-reduc/expected-stdout.txt
index b0aad4deb5..b0aad4deb5 100644
--- a/test/661-checker-simd-reduc/expected.txt
+++ b/test/661-checker-simd-reduc/expected-stdout.txt
diff --git a/test/661-classloader-allocator/expected.txt b/test/661-classloader-allocator/expected-stdout.txt
index 6a5618ebc6..6a5618ebc6 100644
--- a/test/661-classloader-allocator/expected.txt
+++ b/test/661-classloader-allocator/expected-stdout.txt
diff --git a/test/661-oat-writer-layout/Android.bp b/test/661-oat-writer-layout/Android.bp
index fecfd37172..44f18f6e9a 100644
--- a/test/661-oat-writer-layout/Android.bp
+++ b/test/661-oat-writer-layout/Android.bp
@@ -8,13 +8,13 @@ java_test {
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-661-oat-writer-layout-expected"],
+    data: [":art-run-test-661-oat-writer-layout-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-661-oat-writer-layout-expected",
-    out: ["art-run-test-661-oat-writer-layout-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-661-oat-writer-layout-expected-stdout",
+    out: ["art-run-test-661-oat-writer-layout-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/661-oat-writer-layout/expected.txt b/test/661-oat-writer-layout/expected-stdout.txt
index b7ad70a985..b7ad70a985 100644
--- a/test/661-oat-writer-layout/expected.txt
+++ b/test/661-oat-writer-layout/expected-stdout.txt
diff --git a/test/662-regression-alias/Android.bp b/test/662-regression-alias/Android.bp
index a2ce3a24c2..b24ed72b3f 100644
--- a/test/662-regression-alias/Android.bp
+++ b/test/662-regression-alias/Android.bp
@@ -8,13 +8,13 @@ java_test {
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-662-regression-alias-expected"],
+    data: [":art-run-test-662-regression-alias-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-662-regression-alias-expected",
-    out: ["art-run-test-662-regression-alias-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-662-regression-alias-expected-stdout",
+    out: ["art-run-test-662-regression-alias-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/662-regression-alias/expected.txt b/test/662-regression-alias/expected-stdout.txt
index 7250211df8..7250211df8 100644
--- a/test/662-regression-alias/expected.txt
+++ b/test/662-regression-alias/expected-stdout.txt
diff --git a/test/663-checker-select-generator/expected.txt b/test/663-checker-select-generator/expected-stdout.txt
index e69de29bb2..e69de29bb2 100644
--- a/test/663-checker-select-generator/expected.txt
+++ b/test/663-checker-select-generator/expected-stdout.txt
diff --git a/test/663-odd-dex-size/expected.txt b/test/663-odd-dex-size/expected-stdout.txt
index 3da1ec26e9..3da1ec26e9 100644
--- a/test/663-odd-dex-size/expected.txt
+++ b/test/663-odd-dex-size/expected-stdout.txt
diff --git a/test/663-odd-dex-size2/expected.txt b/test/663-odd-dex-size2/expected-stdout.txt
index 3da1ec26e9..3da1ec26e9 100644
--- a/test/663-odd-dex-size2/expected.txt
+++ b/test/663-odd-dex-size2/expected-stdout.txt
diff --git a/test/663-odd-dex-size3/expected.txt b/test/663-odd-dex-size3/expected-stdout.txt
index 3da1ec26e9..3da1ec26e9 100644
--- a/test/663-odd-dex-size3/expected.txt
+++ b/test/663-odd-dex-size3/expected-stdout.txt
diff --git a/test/663-odd-dex-size4/expected.txt b/test/663-odd-dex-size4/expected-stdout.txt
index 3da1ec26e9..3da1ec26e9 100644
--- a/test/663-odd-dex-size4/expected.txt
+++ b/test/663-odd-dex-size4/expected-stdout.txt
diff --git a/test/664-aget-verifier/Android.bp b/test/664-aget-verifier/Android.bp
index a4ae4ea221..011fdc82a9 100644
--- a/test/664-aget-verifier/Android.bp
+++ b/test/664-aget-verifier/Android.bp
@@ -8,13 +8,13 @@ java_test {
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-664-aget-verifier-expected"],
+    data: [":art-run-test-664-aget-verifier-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-664-aget-verifier-expected",
-    out: ["art-run-test-664-aget-verifier-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-664-aget-verifier-expected-stdout",
+    out: ["art-run-test-664-aget-verifier-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/664-aget-verifier/expected.txt b/test/664-aget-verifier/expected-stdout.txt
index 50e2e94985..50e2e94985 100644
--- a/test/664-aget-verifier/expected.txt
+++ b/test/664-aget-verifier/expected-stdout.txt
diff --git a/test/665-checker-simd-zero/Android.bp b/test/665-checker-simd-zero/Android.bp
index 99d8a4c5d8..45bae134e4 100644
--- a/test/665-checker-simd-zero/Android.bp
+++ b/test/665-checker-simd-zero/Android.bp
@@ -8,7 +8,7 @@ java_test {
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-665-checker-simd-zero-expected"],
+    data: [":art-run-test-665-checker-simd-zero-expected-stdout"],
     // Include the Java source files in the test's artifacts, to make Checker assertions
     // available to the TradeFed test runner.
     include_srcs: true,
@@ -16,8 +16,8 @@ java_test {
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-665-checker-simd-zero-expected",
-    out: ["art-run-test-665-checker-simd-zero-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-665-checker-simd-zero-expected-stdout",
+    out: ["art-run-test-665-checker-simd-zero-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/665-checker-simd-zero/expected.txt b/test/665-checker-simd-zero/expected-stdout.txt
index b0aad4deb5..b0aad4deb5 100644
--- a/test/665-checker-simd-zero/expected.txt
+++ b/test/665-checker-simd-zero/expected-stdout.txt
diff --git a/test/666-dex-cache-itf/Android.bp b/test/666-dex-cache-itf/Android.bp
index da3105face..4544b95352 100644
--- a/test/666-dex-cache-itf/Android.bp
+++ b/test/666-dex-cache-itf/Android.bp
@@ -8,13 +8,13 @@ java_test {
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-666-dex-cache-itf-expected"],
+    data: [":art-run-test-666-dex-cache-itf-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-666-dex-cache-itf-expected",
-    out: ["art-run-test-666-dex-cache-itf-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-666-dex-cache-itf-expected-stdout",
+    out: ["art-run-test-666-dex-cache-itf-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/666-dex-cache-itf/expected.txt b/test/666-dex-cache-itf/expected-stdout.txt
index e69de29bb2..e69de29bb2 100644
--- a/test/666-dex-cache-itf/expected.txt
+++ b/test/666-dex-cache-itf/expected-stdout.txt
diff --git a/test/667-checker-simd-alignment/Android.bp b/test/667-checker-simd-alignment/Android.bp
index 195cb99ccc..d5c6586d25 100644
--- a/test/667-checker-simd-alignment/Android.bp
+++ b/test/667-checker-simd-alignment/Android.bp
@@ -8,7 +8,7 @@ java_test {
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-667-checker-simd-alignment-expected"],
+    data: [":art-run-test-667-checker-simd-alignment-expected-stdout"],
     // Include the Java source files in the test's artifacts, to make Checker assertions
     // available to the TradeFed test runner.
     include_srcs: true,
@@ -16,8 +16,8 @@ java_test {
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-667-checker-simd-alignment-expected",
-    out: ["art-run-test-667-checker-simd-alignment-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-667-checker-simd-alignment-expected-stdout",
+    out: ["art-run-test-667-checker-simd-alignment-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/667-checker-simd-alignment/expected.txt b/test/667-checker-simd-alignment/expected-stdout.txt
index b0aad4deb5..b0aad4deb5 100644
--- a/test/667-checker-simd-alignment/expected.txt
+++ b/test/667-checker-simd-alignment/expected-stdout.txt
diff --git a/test/667-jit-jni-stub/Android.bp b/test/667-jit-jni-stub/Android.bp
index c8edf82190..fe7ff5d0cd 100644
--- a/test/667-jit-jni-stub/Android.bp
+++ b/test/667-jit-jni-stub/Android.bp
@@ -8,13 +8,13 @@ java_test {
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-667-jit-jni-stub-expected"],
+    data: [":art-run-test-667-jit-jni-stub-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-667-jit-jni-stub-expected",
-    out: ["art-run-test-667-jit-jni-stub-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-667-jit-jni-stub-expected-stdout",
+    out: ["art-run-test-667-jit-jni-stub-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/667-jit-jni-stub/expected.txt b/test/667-jit-jni-stub/expected-stdout.txt
index 6a5618ebc6..6a5618ebc6 100644
--- a/test/667-jit-jni-stub/expected.txt
+++ b/test/667-jit-jni-stub/expected-stdout.txt
diff --git a/test/667-out-of-bounds/Android.bp b/test/667-out-of-bounds/Android.bp
index b163fd97e0..0c124c1e80 100644
--- a/test/667-out-of-bounds/Android.bp
+++ b/test/667-out-of-bounds/Android.bp
@@ -8,13 +8,13 @@ java_test {
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-667-out-of-bounds-expected"],
+    data: [":art-run-test-667-out-of-bounds-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-667-out-of-bounds-expected",
-    out: ["art-run-test-667-out-of-bounds-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-667-out-of-bounds-expected-stdout",
+    out: ["art-run-test-667-out-of-bounds-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/667-out-of-bounds/expected.txt b/test/667-out-of-bounds/expected-stdout.txt
index e114c50371..e114c50371 100644
--- a/test/667-out-of-bounds/expected.txt
+++ b/test/667-out-of-bounds/expected-stdout.txt
diff --git a/test/668-aiobe/expected.txt b/test/668-aiobe/expected-stdout.txt
index e69de29bb2..e69de29bb2 100644
--- a/test/668-aiobe/expected.txt
+++ b/test/668-aiobe/expected-stdout.txt
diff --git a/test/669-checker-break/Android.bp b/test/669-checker-break/Android.bp
index e6ac50c642..57bfac86b7 100644
--- a/test/669-checker-break/Android.bp
+++ b/test/669-checker-break/Android.bp
@@ -8,7 +8,7 @@ java_test {
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-669-checker-break-expected"],
+    data: [":art-run-test-669-checker-break-expected-stdout"],
     // Include the Java source files in the test's artifacts, to make Checker assertions
     // available to the TradeFed test runner.
     include_srcs: true,
@@ -16,8 +16,8 @@ java_test {
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-669-checker-break-expected",
-    out: ["art-run-test-669-checker-break-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-669-checker-break-expected-stdout",
+    out: ["art-run-test-669-checker-break-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/669-checker-break/expected.txt b/test/669-checker-break/expected-stdout.txt
index b0aad4deb5..b0aad4deb5 100644
--- a/test/669-checker-break/expected.txt
+++ b/test/669-checker-break/expected-stdout.txt
diff --git a/test/670-bitstring-type-check/expected.txt b/test/670-bitstring-type-check/expected-stdout.txt
index e69de29bb2..e69de29bb2 100644
--- a/test/670-bitstring-type-check/expected.txt
+++ b/test/670-bitstring-type-check/expected-stdout.txt
diff --git a/test/671-npe-field-opts/Android.bp b/test/671-npe-field-opts/Android.bp
index ca0545f0da..7362f4af96 100644
--- a/test/671-npe-field-opts/Android.bp
+++ b/test/671-npe-field-opts/Android.bp
@@ -8,13 +8,13 @@ java_test {
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-671-npe-field-opts-expected"],
+    data: [":art-run-test-671-npe-field-opts-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-671-npe-field-opts-expected",
-    out: ["art-run-test-671-npe-field-opts-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-671-npe-field-opts-expected-stdout",
+    out: ["art-run-test-671-npe-field-opts-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/671-npe-field-opts/expected.txt b/test/671-npe-field-opts/expected-stdout.txt
index e69de29bb2..e69de29bb2 100644
--- a/test/671-npe-field-opts/expected.txt
+++ b/test/671-npe-field-opts/expected-stdout.txt
diff --git a/test/672-checker-throw-method/Android.bp b/test/672-checker-throw-method/Android.bp
index 64b16ccf23..1381d4c8c5 100644
--- a/test/672-checker-throw-method/Android.bp
+++ b/test/672-checker-throw-method/Android.bp
@@ -8,7 +8,7 @@ java_test {
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-672-checker-throw-method-expected"],
+    data: [":art-run-test-672-checker-throw-method-expected-stdout"],
     // Include the Java source files in the test's artifacts, to make Checker assertions
     // available to the TradeFed test runner.
     include_srcs: true,
@@ -16,8 +16,8 @@ java_test {
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-672-checker-throw-method-expected",
-    out: ["art-run-test-672-checker-throw-method-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-672-checker-throw-method-expected-stdout",
+    out: ["art-run-test-672-checker-throw-method-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/672-checker-throw-method/expected.txt b/test/672-checker-throw-method/expected-stdout.txt
index b0aad4deb5..b0aad4deb5 100644
--- a/test/672-checker-throw-method/expected.txt
+++ b/test/672-checker-throw-method/expected-stdout.txt
diff --git a/test/673-checker-throw-vmethod/Android.bp b/test/673-checker-throw-vmethod/Android.bp
index 681f0a022c..66e78e0d85 100644
--- a/test/673-checker-throw-vmethod/Android.bp
+++ b/test/673-checker-throw-vmethod/Android.bp
@@ -8,7 +8,7 @@ java_test {
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-673-checker-throw-vmethod-expected"],
+    data: [":art-run-test-673-checker-throw-vmethod-expected-stdout"],
     // Include the Java source files in the test's artifacts, to make Checker assertions
     // available to the TradeFed test runner.
     include_srcs: true,
@@ -16,8 +16,8 @@ java_test {
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-673-checker-throw-vmethod-expected",
-    out: ["art-run-test-673-checker-throw-vmethod-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-673-checker-throw-vmethod-expected-stdout",
+    out: ["art-run-test-673-checker-throw-vmethod-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/673-checker-throw-vmethod/expected.txt b/test/673-checker-throw-vmethod/expected-stdout.txt
index b0aad4deb5..b0aad4deb5 100644
--- a/test/673-checker-throw-vmethod/expected.txt
+++ b/test/673-checker-throw-vmethod/expected-stdout.txt
diff --git a/test/674-HelloWorld-Dm/Android.bp b/test/674-HelloWorld-Dm/Android.bp
index 2ff2a0be0a..57d6fdfdd7 100644
--- a/test/674-HelloWorld-Dm/Android.bp
+++ b/test/674-HelloWorld-Dm/Android.bp
@@ -8,13 +8,13 @@ java_test {
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-674-HelloWorld-Dm-expected"],
+    data: [":art-run-test-674-HelloWorld-Dm-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-674-HelloWorld-Dm-expected",
-    out: ["art-run-test-674-HelloWorld-Dm-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-674-HelloWorld-Dm-expected-stdout",
+    out: ["art-run-test-674-HelloWorld-Dm-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/674-HelloWorld-Dm/expected.txt b/test/674-HelloWorld-Dm/expected-stdout.txt
index af5626b4a1..af5626b4a1 100644
--- a/test/674-HelloWorld-Dm/expected.txt
+++ b/test/674-HelloWorld-Dm/expected-stdout.txt
diff --git a/test/674-hiddenapi/expected.txt b/test/674-hiddenapi/expected-stdout.txt
index e69de29bb2..e69de29bb2 100644
--- a/test/674-hiddenapi/expected.txt
+++ b/test/674-hiddenapi/expected-stdout.txt
diff --git a/test/674-hotness-compiled/Android.bp b/test/674-hotness-compiled/Android.bp
index ca4f37220d..430ade14d7 100644
--- a/test/674-hotness-compiled/Android.bp
+++ b/test/674-hotness-compiled/Android.bp
@@ -8,13 +8,13 @@ java_test {
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-674-hotness-compiled-expected"],
+    data: [":art-run-test-674-hotness-compiled-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-674-hotness-compiled-expected",
-    out: ["art-run-test-674-hotness-compiled-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-674-hotness-compiled-expected-stdout",
+    out: ["art-run-test-674-hotness-compiled-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/674-hotness-compiled/expected.txt b/test/674-hotness-compiled/expected-stdout.txt
index 6a5618ebc6..6a5618ebc6 100644
--- a/test/674-hotness-compiled/expected.txt
+++ b/test/674-hotness-compiled/expected-stdout.txt
diff --git a/test/674-vdex-uncompress/expected.txt b/test/674-vdex-uncompress/expected-stdout.txt
index d0f61f692c..d0f61f692c 100644
--- a/test/674-vdex-uncompress/expected.txt
+++ b/test/674-vdex-uncompress/expected-stdout.txt
diff --git a/test/675-checker-unverified-method/expected.txt b/test/675-checker-unverified-method/expected-stdout.txt
index b0aad4deb5..b0aad4deb5 100644
--- a/test/675-checker-unverified-method/expected.txt
+++ b/test/675-checker-unverified-method/expected-stdout.txt
diff --git a/test/676-proxy-jit-at-first-use/Android.bp b/test/676-proxy-jit-at-first-use/Android.bp
index 7ecdd2a1fd..62989696f5 100644
--- a/test/676-proxy-jit-at-first-use/Android.bp
+++ b/test/676-proxy-jit-at-first-use/Android.bp
@@ -8,13 +8,13 @@ java_test {
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-676-proxy-jit-at-first-use-expected"],
+    data: [":art-run-test-676-proxy-jit-at-first-use-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-676-proxy-jit-at-first-use-expected",
-    out: ["art-run-test-676-proxy-jit-at-first-use-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-676-proxy-jit-at-first-use-expected-stdout",
+    out: ["art-run-test-676-proxy-jit-at-first-use-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/676-proxy-jit-at-first-use/expected.txt b/test/676-proxy-jit-at-first-use/expected-stdout.txt
index 6915b2f261..6915b2f261 100644
--- a/test/676-proxy-jit-at-first-use/expected.txt
+++ b/test/676-proxy-jit-at-first-use/expected-stdout.txt
diff --git a/test/676-resolve-field-type/expected.txt b/test/676-resolve-field-type/expected-stdout.txt
index a965a70ed4..a965a70ed4 100644
--- a/test/676-resolve-field-type/expected.txt
+++ b/test/676-resolve-field-type/expected-stdout.txt
diff --git a/test/677-fsi/expected.txt b/test/677-fsi/expected-stdout.txt
index 2b073430b6..2b073430b6 100644
--- a/test/677-fsi/expected.txt
+++ b/test/677-fsi/expected-stdout.txt
diff --git a/test/677-fsi2/Android.bp b/test/677-fsi2/Android.bp
index 59c899aac2..f49b233867 100644
--- a/test/677-fsi2/Android.bp
+++ b/test/677-fsi2/Android.bp
@@ -8,13 +8,13 @@ java_test {
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-677-fsi2-expected"],
+    data: [":art-run-test-677-fsi2-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-677-fsi2-expected",
-    out: ["art-run-test-677-fsi2-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-677-fsi2-expected-stdout",
+    out: ["art-run-test-677-fsi2-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/677-fsi2/expected.txt b/test/677-fsi2/expected-stdout.txt
index 557db03de9..557db03de9 100644
--- a/test/677-fsi2/expected.txt
+++ b/test/677-fsi2/expected-stdout.txt
diff --git a/test/678-quickening/expected.txt b/test/678-quickening/expected-stdout.txt
index a965a70ed4..a965a70ed4 100644
--- a/test/678-quickening/expected.txt
+++ b/test/678-quickening/expected-stdout.txt
diff --git a/test/679-locks/Android.bp b/test/679-locks/Android.bp
index 73d7b8e80a..6fa48254bf 100644
--- a/test/679-locks/Android.bp
+++ b/test/679-locks/Android.bp
@@ -8,13 +8,13 @@ java_test {
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-679-locks-expected"],
+    data: [":art-run-test-679-locks-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-679-locks-expected",
-    out: ["art-run-test-679-locks-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-679-locks-expected-stdout",
+    out: ["art-run-test-679-locks-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/679-locks/expected.txt b/test/679-locks/expected-stdout.txt
index 85a20bea2f..85a20bea2f 100644
--- a/test/679-locks/expected.txt
+++ b/test/679-locks/expected-stdout.txt
diff --git a/test/680-checker-deopt-dex-pc-0/Android.bp b/test/680-checker-deopt-dex-pc-0/Android.bp
index 28c7a980bb..eb06043121 100644
--- a/test/680-checker-deopt-dex-pc-0/Android.bp
+++ b/test/680-checker-deopt-dex-pc-0/Android.bp
@@ -8,7 +8,7 @@ java_test {
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-680-checker-deopt-dex-pc-0-expected"],
+    data: [":art-run-test-680-checker-deopt-dex-pc-0-expected-stdout"],
     // Include the Java source files in the test's artifacts, to make Checker assertions
     // available to the TradeFed test runner.
     include_srcs: true,
@@ -16,8 +16,8 @@ java_test {
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-680-checker-deopt-dex-pc-0-expected",
-    out: ["art-run-test-680-checker-deopt-dex-pc-0-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-680-checker-deopt-dex-pc-0-expected-stdout",
+    out: ["art-run-test-680-checker-deopt-dex-pc-0-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/680-checker-deopt-dex-pc-0/expected.txt b/test/680-checker-deopt-dex-pc-0/expected-stdout.txt
index 805857dc65..805857dc65 100644
--- a/test/680-checker-deopt-dex-pc-0/expected.txt
+++ b/test/680-checker-deopt-dex-pc-0/expected-stdout.txt
diff --git a/test/680-sink-regression/Android.bp b/test/680-sink-regression/Android.bp
index 0b2634d188..5d14b64d5e 100644
--- a/test/680-sink-regression/Android.bp
+++ b/test/680-sink-regression/Android.bp
@@ -8,13 +8,13 @@ java_test {
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-680-sink-regression-expected"],
+    data: [":art-run-test-680-sink-regression-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-680-sink-regression-expected",
-    out: ["art-run-test-680-sink-regression-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-680-sink-regression-expected-stdout",
+    out: ["art-run-test-680-sink-regression-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/680-sink-regression/expected.txt b/test/680-sink-regression/expected-stdout.txt
index b0aad4deb5..b0aad4deb5 100644
--- a/test/680-sink-regression/expected.txt
+++ b/test/680-sink-regression/expected-stdout.txt
diff --git a/test/682-double-catch-phi/expected.txt b/test/682-double-catch-phi/expected-stdout.txt
index b0aad4deb5..b0aad4deb5 100644
--- a/test/682-double-catch-phi/expected.txt
+++ b/test/682-double-catch-phi/expected-stdout.txt
diff --git a/test/683-clinit-inline-static-invoke/expected.txt b/test/683-clinit-inline-static-invoke/expected-stdout.txt
index e69de29bb2..e69de29bb2 100644
--- a/test/683-clinit-inline-static-invoke/expected.txt
+++ b/test/683-clinit-inline-static-invoke/expected-stdout.txt
diff --git a/test/684-checker-simd-dotprod/Android.bp b/test/684-checker-simd-dotprod/Android.bp
index 886c08c11e..23c98f8a71 100644
--- a/test/684-checker-simd-dotprod/Android.bp
+++ b/test/684-checker-simd-dotprod/Android.bp
@@ -8,7 +8,7 @@ java_test {
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-684-checker-simd-dotprod-expected"],
+    data: [":art-run-test-684-checker-simd-dotprod-expected-stdout"],
     // Include the Java source files in the test's artifacts, to make Checker assertions
     // available to the TradeFed test runner.
     include_srcs: true,
@@ -16,8 +16,8 @@ java_test {
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-684-checker-simd-dotprod-expected",
-    out: ["art-run-test-684-checker-simd-dotprod-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-684-checker-simd-dotprod-expected-stdout",
+    out: ["art-run-test-684-checker-simd-dotprod-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/684-checker-simd-dotprod/expected.txt b/test/684-checker-simd-dotprod/expected-stdout.txt
index b0aad4deb5..b0aad4deb5 100644
--- a/test/684-checker-simd-dotprod/expected.txt
+++ b/test/684-checker-simd-dotprod/expected-stdout.txt
diff --git a/test/684-select-condition/Android.bp b/test/684-select-condition/Android.bp
index bb0e490355..acc48db80b 100644
--- a/test/684-select-condition/Android.bp
+++ b/test/684-select-condition/Android.bp
@@ -8,13 +8,13 @@ java_test {
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-684-select-condition-expected"],
+    data: [":art-run-test-684-select-condition-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-684-select-condition-expected",
-    out: ["art-run-test-684-select-condition-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-684-select-condition-expected-stdout",
+    out: ["art-run-test-684-select-condition-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/684-select-condition/expected.txt b/test/684-select-condition/expected-stdout.txt
index e69de29bb2..e69de29bb2 100644
--- a/test/684-select-condition/expected.txt
+++ b/test/684-select-condition/expected-stdout.txt
diff --git a/test/685-deoptimizeable/Android.bp b/test/685-deoptimizeable/Android.bp
index 04a8305efe..83059c3c77 100644
--- a/test/685-deoptimizeable/Android.bp
+++ b/test/685-deoptimizeable/Android.bp
@@ -8,13 +8,13 @@ java_test {
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-685-deoptimizeable-expected"],
+    data: [":art-run-test-685-deoptimizeable-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-685-deoptimizeable-expected",
-    out: ["art-run-test-685-deoptimizeable-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-685-deoptimizeable-expected-stdout",
+    out: ["art-run-test-685-deoptimizeable-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/685-deoptimizeable/expected.txt b/test/685-deoptimizeable/expected-stdout.txt
index f993efcdad..f993efcdad 100644
--- a/test/685-deoptimizeable/expected.txt
+++ b/test/685-deoptimizeable/expected-stdout.txt
diff --git a/test/685-shifts/expected.txt b/test/685-shifts/expected-stdout.txt
index e69de29bb2..e69de29bb2 100644
--- a/test/685-shifts/expected.txt
+++ b/test/685-shifts/expected-stdout.txt
diff --git a/test/686-get-this/expected.txt b/test/686-get-this/expected-stdout.txt
index 6a5618ebc6..6a5618ebc6 100644
--- a/test/686-get-this/expected.txt
+++ b/test/686-get-this/expected-stdout.txt
diff --git a/test/687-deopt/Android.bp b/test/687-deopt/Android.bp
index e75c905db1..e9c75af1a2 100644
--- a/test/687-deopt/Android.bp
+++ b/test/687-deopt/Android.bp
@@ -8,13 +8,13 @@ java_test {
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-687-deopt-expected"],
+    data: [":art-run-test-687-deopt-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-687-deopt-expected",
-    out: ["art-run-test-687-deopt-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-687-deopt-expected-stdout",
+    out: ["art-run-test-687-deopt-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/687-deopt/expected.txt b/test/687-deopt/expected-stdout.txt
index 6a5618ebc6..6a5618ebc6 100644
--- a/test/687-deopt/expected.txt
+++ b/test/687-deopt/expected-stdout.txt
diff --git a/test/688-shared-library/expected.txt b/test/688-shared-library/expected-stdout.txt
index e69de29bb2..e69de29bb2 100644
--- a/test/688-shared-library/expected.txt
+++ b/test/688-shared-library/expected-stdout.txt
diff --git a/test/689-multi-catch/Android.bp b/test/689-multi-catch/Android.bp
index c383b95623..be3e8c07dd 100644
--- a/test/689-multi-catch/Android.bp
+++ b/test/689-multi-catch/Android.bp
@@ -8,13 +8,13 @@ java_test {
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-689-multi-catch-expected"],
+    data: [":art-run-test-689-multi-catch-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-689-multi-catch-expected",
-    out: ["art-run-test-689-multi-catch-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-689-multi-catch-expected-stdout",
+    out: ["art-run-test-689-multi-catch-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/689-multi-catch/expected.txt b/test/689-multi-catch/expected-stdout.txt
index e69de29bb2..e69de29bb2 100644
--- a/test/689-multi-catch/expected.txt
+++ b/test/689-multi-catch/expected-stdout.txt
diff --git a/test/689-zygote-jit-deopt/Android.bp b/test/689-zygote-jit-deopt/Android.bp
index f76621eb1e..a1a36eb0fb 100644
--- a/test/689-zygote-jit-deopt/Android.bp
+++ b/test/689-zygote-jit-deopt/Android.bp
@@ -8,13 +8,13 @@ java_test {
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-689-zygote-jit-deopt-expected"],
+    data: [":art-run-test-689-zygote-jit-deopt-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-689-zygote-jit-deopt-expected",
-    out: ["art-run-test-689-zygote-jit-deopt-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-689-zygote-jit-deopt-expected-stdout",
+    out: ["art-run-test-689-zygote-jit-deopt-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/689-zygote-jit-deopt/expected.txt b/test/689-zygote-jit-deopt/expected-stdout.txt
index 6a5618ebc6..6a5618ebc6 100644
--- a/test/689-zygote-jit-deopt/expected.txt
+++ b/test/689-zygote-jit-deopt/expected-stdout.txt
diff --git a/test/690-hiddenapi-same-name-methods/expected.txt b/test/690-hiddenapi-same-name-methods/expected-stdout.txt
index 6a5618ebc6..6a5618ebc6 100644
--- a/test/690-hiddenapi-same-name-methods/expected.txt
+++ b/test/690-hiddenapi-same-name-methods/expected-stdout.txt
diff --git a/test/691-hiddenapi-proxy/expected.txt b/test/691-hiddenapi-proxy/expected-stdout.txt
index dec0d14281..dec0d14281 100644
--- a/test/691-hiddenapi-proxy/expected.txt
+++ b/test/691-hiddenapi-proxy/expected-stdout.txt
diff --git a/test/692-vdex-inmem-loader/expected.txt b/test/692-vdex-inmem-loader/expected-stdout.txt
index 889d7d1da3..889d7d1da3 100644
--- a/test/692-vdex-inmem-loader/expected.txt
+++ b/test/692-vdex-inmem-loader/expected-stdout.txt
diff --git a/test/693-vdex-inmem-loader-evict/Android.bp b/test/693-vdex-inmem-loader-evict/Android.bp
index 97d8776af4..00565d2601 100644
--- a/test/693-vdex-inmem-loader-evict/Android.bp
+++ b/test/693-vdex-inmem-loader-evict/Android.bp
@@ -8,13 +8,13 @@ java_test {
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-693-vdex-inmem-loader-evict-expected"],
+    data: [":art-run-test-693-vdex-inmem-loader-evict-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-693-vdex-inmem-loader-evict-expected",
-    out: ["art-run-test-693-vdex-inmem-loader-evict-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-693-vdex-inmem-loader-evict-expected-stdout",
+    out: ["art-run-test-693-vdex-inmem-loader-evict-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/693-vdex-inmem-loader-evict/expected.txt b/test/693-vdex-inmem-loader-evict/expected-stdout.txt
index 6a5618ebc6..6a5618ebc6 100644
--- a/test/693-vdex-inmem-loader-evict/expected.txt
+++ b/test/693-vdex-inmem-loader-evict/expected-stdout.txt
diff --git a/test/694-clinit-jit/Android.bp b/test/694-clinit-jit/Android.bp
index d118ffe89d..287e96cce3 100644
--- a/test/694-clinit-jit/Android.bp
+++ b/test/694-clinit-jit/Android.bp
@@ -8,13 +8,13 @@ java_test {
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-694-clinit-jit-expected"],
+    data: [":art-run-test-694-clinit-jit-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-694-clinit-jit-expected",
-    out: ["art-run-test-694-clinit-jit-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-694-clinit-jit-expected-stdout",
+    out: ["art-run-test-694-clinit-jit-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/694-clinit-jit/expected.txt b/test/694-clinit-jit/expected-stdout.txt
index d81cc0710e..d81cc0710e 100644
--- a/test/694-clinit-jit/expected.txt
+++ b/test/694-clinit-jit/expected-stdout.txt
diff --git a/test/695-simplify-throws/Android.bp b/test/695-simplify-throws/Android.bp
index c97bbc2063..f0f46269e3 100644
--- a/test/695-simplify-throws/Android.bp
+++ b/test/695-simplify-throws/Android.bp
@@ -8,13 +8,13 @@ java_test {
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-695-simplify-throws-expected"],
+    data: [":art-run-test-695-simplify-throws-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-695-simplify-throws-expected",
-    out: ["art-run-test-695-simplify-throws-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-695-simplify-throws-expected-stdout",
+    out: ["art-run-test-695-simplify-throws-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/695-simplify-throws/expected.txt b/test/695-simplify-throws/expected-stdout.txt
index e69de29bb2..e69de29bb2 100644
--- a/test/695-simplify-throws/expected.txt
+++ b/test/695-simplify-throws/expected-stdout.txt
diff --git a/test/696-loop/Android.bp b/test/696-loop/Android.bp
index cdaa17b509..062d82525c 100644
--- a/test/696-loop/Android.bp
+++ b/test/696-loop/Android.bp
@@ -8,13 +8,13 @@ java_test {
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-696-loop-expected"],
+    data: [":art-run-test-696-loop-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-696-loop-expected",
-    out: ["art-run-test-696-loop-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-696-loop-expected-stdout",
+    out: ["art-run-test-696-loop-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/696-loop/expected.txt b/test/696-loop/expected-stdout.txt
index e69de29bb2..e69de29bb2 100644
--- a/test/696-loop/expected.txt
+++ b/test/696-loop/expected-stdout.txt
diff --git a/test/697-checker-string-append/Android.bp b/test/697-checker-string-append/Android.bp
index 78210fd619..2909088ff7 100644
--- a/test/697-checker-string-append/Android.bp
+++ b/test/697-checker-string-append/Android.bp
@@ -8,7 +8,7 @@ java_test {
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-697-checker-string-append-expected"],
+    data: [":art-run-test-697-checker-string-append-expected-stdout"],
     // Include the Java source files in the test's artifacts, to make Checker assertions
     // available to the TradeFed test runner.
     include_srcs: true,
@@ -16,8 +16,8 @@ java_test {
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-697-checker-string-append-expected",
-    out: ["art-run-test-697-checker-string-append-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-697-checker-string-append-expected-stdout",
+    out: ["art-run-test-697-checker-string-append-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/697-checker-string-append/expected.txt b/test/697-checker-string-append/expected-stdout.txt
index b0aad4deb5..b0aad4deb5 100644
--- a/test/697-checker-string-append/expected.txt
+++ b/test/697-checker-string-append/expected-stdout.txt
diff --git a/test/698-selects/Android.bp b/test/698-selects/Android.bp
index f9b839c429..03ce2b70f5 100644
--- a/test/698-selects/Android.bp
+++ b/test/698-selects/Android.bp
@@ -8,13 +8,13 @@ java_test {
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-698-selects-expected"],
+    data: [":art-run-test-698-selects-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-698-selects-expected",
-    out: ["art-run-test-698-selects-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-698-selects-expected-stdout",
+    out: ["art-run-test-698-selects-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/698-selects/expected.txt b/test/698-selects/expected-stdout.txt
index e69de29bb2..e69de29bb2 100644
--- a/test/698-selects/expected.txt
+++ b/test/698-selects/expected-stdout.txt
diff --git a/test/699-checker-string-append2/expected.txt b/test/699-checker-string-append2/expected-stdout.txt
index b0aad4deb5..b0aad4deb5 100644
--- a/test/699-checker-string-append2/expected.txt
+++ b/test/699-checker-string-append2/expected-stdout.txt
diff --git a/test/700-LoadArgRegs/Android.bp b/test/700-LoadArgRegs/Android.bp
index 5b16670e9f..133161e957 100644
--- a/test/700-LoadArgRegs/Android.bp
+++ b/test/700-LoadArgRegs/Android.bp
@@ -8,13 +8,13 @@ java_test {
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-700-LoadArgRegs-expected"],
+    data: [":art-run-test-700-LoadArgRegs-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-700-LoadArgRegs-expected",
-    out: ["art-run-test-700-LoadArgRegs-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-700-LoadArgRegs-expected-stdout",
+    out: ["art-run-test-700-LoadArgRegs-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/700-LoadArgRegs/expected.txt b/test/700-LoadArgRegs/expected-stdout.txt
index c0d5eeec9f..c0d5eeec9f 100644
--- a/test/700-LoadArgRegs/expected.txt
+++ b/test/700-LoadArgRegs/expected-stdout.txt
diff --git a/test/701-easy-div-rem/expected.txt b/test/701-easy-div-rem/expected-stdout.txt
index 97be3436b0..97be3436b0 100644
--- a/test/701-easy-div-rem/expected.txt
+++ b/test/701-easy-div-rem/expected-stdout.txt
diff --git a/test/702-LargeBranchOffset/expected.txt b/test/702-LargeBranchOffset/expected-stdout.txt
index 130678f291..130678f291 100644
--- a/test/702-LargeBranchOffset/expected.txt
+++ b/test/702-LargeBranchOffset/expected-stdout.txt
diff --git a/test/703-floating-point-div/Android.bp b/test/703-floating-point-div/Android.bp
index c78061cc42..d4e9463c3d 100644
--- a/test/703-floating-point-div/Android.bp
+++ b/test/703-floating-point-div/Android.bp
@@ -8,13 +8,13 @@ java_test {
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-703-floating-point-div-expected"],
+    data: [":art-run-test-703-floating-point-div-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-703-floating-point-div-expected",
-    out: ["art-run-test-703-floating-point-div-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-703-floating-point-div-expected-stdout",
+    out: ["art-run-test-703-floating-point-div-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/703-floating-point-div/expected.txt b/test/703-floating-point-div/expected-stdout.txt
index 76f5a5a5aa..76f5a5a5aa 100644
--- a/test/703-floating-point-div/expected.txt
+++ b/test/703-floating-point-div/expected-stdout.txt
diff --git a/test/704-multiply-accumulate/Android.bp b/test/704-multiply-accumulate/Android.bp
index 1906635db5..e8d271adb4 100644
--- a/test/704-multiply-accumulate/Android.bp
+++ b/test/704-multiply-accumulate/Android.bp
@@ -8,13 +8,13 @@ java_test {
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-704-multiply-accumulate-expected"],
+    data: [":art-run-test-704-multiply-accumulate-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-704-multiply-accumulate-expected",
-    out: ["art-run-test-704-multiply-accumulate-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-704-multiply-accumulate-expected-stdout",
+    out: ["art-run-test-704-multiply-accumulate-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/704-multiply-accumulate/expected.txt b/test/704-multiply-accumulate/expected-stdout.txt
index 76f5a5a5aa..76f5a5a5aa 100644
--- a/test/704-multiply-accumulate/expected.txt
+++ b/test/704-multiply-accumulate/expected-stdout.txt
diff --git a/test/705-register-conflict/Android.bp b/test/705-register-conflict/Android.bp
index e4a770db66..bf81bac591 100644
--- a/test/705-register-conflict/Android.bp
+++ b/test/705-register-conflict/Android.bp
@@ -8,13 +8,13 @@ java_test {
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-705-register-conflict-expected"],
+    data: [":art-run-test-705-register-conflict-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-705-register-conflict-expected",
-    out: ["art-run-test-705-register-conflict-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-705-register-conflict-expected-stdout",
+    out: ["art-run-test-705-register-conflict-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/705-register-conflict/expected.txt b/test/705-register-conflict/expected-stdout.txt
index 59cc7c9593..59cc7c9593 100644
--- a/test/705-register-conflict/expected.txt
+++ b/test/705-register-conflict/expected-stdout.txt
diff --git a/test/706-checker-scheduler/expected.txt b/test/706-checker-scheduler/expected-stdout.txt
index e69de29bb2..e69de29bb2 100644
--- a/test/706-checker-scheduler/expected.txt
+++ b/test/706-checker-scheduler/expected-stdout.txt
diff --git a/test/707-checker-invalid-profile/Android.bp b/test/707-checker-invalid-profile/Android.bp
index a7cac49e5d..115e706c19 100644
--- a/test/707-checker-invalid-profile/Android.bp
+++ b/test/707-checker-invalid-profile/Android.bp
@@ -8,7 +8,7 @@ java_test {
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-707-checker-invalid-profile-expected"],
+    data: [":art-run-test-707-checker-invalid-profile-expected-stdout"],
     // Include the Java source files in the test's artifacts, to make Checker assertions
     // available to the TradeFed test runner.
     include_srcs: true,
@@ -16,8 +16,8 @@ java_test {
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-707-checker-invalid-profile-expected",
-    out: ["art-run-test-707-checker-invalid-profile-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-707-checker-invalid-profile-expected-stdout",
+    out: ["art-run-test-707-checker-invalid-profile-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/707-checker-invalid-profile/expected.txt b/test/707-checker-invalid-profile/expected-stdout.txt
index 4d84c96443..4d84c96443 100644
--- a/test/707-checker-invalid-profile/expected.txt
+++ b/test/707-checker-invalid-profile/expected-stdout.txt
diff --git a/test/708-jit-cache-churn/Android.bp b/test/708-jit-cache-churn/Android.bp
index 23b37f60ef..61099c1565 100644
--- a/test/708-jit-cache-churn/Android.bp
+++ b/test/708-jit-cache-churn/Android.bp
@@ -8,13 +8,13 @@ java_test {
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-708-jit-cache-churn-expected"],
+    data: [":art-run-test-708-jit-cache-churn-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-708-jit-cache-churn-expected",
-    out: ["art-run-test-708-jit-cache-churn-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-708-jit-cache-churn-expected-stdout",
+    out: ["art-run-test-708-jit-cache-churn-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/708-jit-cache-churn/expected.txt b/test/708-jit-cache-churn/expected-stdout.txt
index 77a1486479..77a1486479 100644
--- a/test/708-jit-cache-churn/expected.txt
+++ b/test/708-jit-cache-churn/expected-stdout.txt
diff --git a/test/710-varhandle-creation/expected.txt b/test/710-varhandle-creation/expected-stdout.txt
index 89dfb48245..89dfb48245 100644
--- a/test/710-varhandle-creation/expected.txt
+++ b/test/710-varhandle-creation/expected-stdout.txt
diff --git a/test/711-checker-type-conversion/Android.bp b/test/711-checker-type-conversion/Android.bp
index 67a03e87b6..cab3f799f6 100644
--- a/test/711-checker-type-conversion/Android.bp
+++ b/test/711-checker-type-conversion/Android.bp
@@ -8,7 +8,7 @@ java_test {
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-711-checker-type-conversion-expected"],
+    data: [":art-run-test-711-checker-type-conversion-expected-stdout"],
     // Include the Java source files in the test's artifacts, to make Checker assertions
     // available to the TradeFed test runner.
     include_srcs: true,
@@ -16,8 +16,8 @@ java_test {
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-711-checker-type-conversion-expected",
-    out: ["art-run-test-711-checker-type-conversion-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-711-checker-type-conversion-expected-stdout",
+    out: ["art-run-test-711-checker-type-conversion-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/711-checker-type-conversion/expected.txt b/test/711-checker-type-conversion/expected-stdout.txt
index e69de29bb2..e69de29bb2 100644
--- a/test/711-checker-type-conversion/expected.txt
+++ b/test/711-checker-type-conversion/expected-stdout.txt
diff --git a/test/712-varhandle-invocations/expected.txt b/test/712-varhandle-invocations/expected-stdout.txt
index 1c437cf9bf..1c437cf9bf 100644
--- a/test/712-varhandle-invocations/expected.txt
+++ b/test/712-varhandle-invocations/expected-stdout.txt
diff --git a/test/713-varhandle-invokers/expected.txt b/test/713-varhandle-invokers/expected-stdout.txt
index a62d3662e1..a62d3662e1 100644
--- a/test/713-varhandle-invokers/expected.txt
+++ b/test/713-varhandle-invokers/expected-stdout.txt
diff --git a/test/714-invoke-custom-lambda-metafactory/expected.txt b/test/714-invoke-custom-lambda-metafactory/expected-stdout.txt
index c98a4c244d..c98a4c244d 100644
--- a/test/714-invoke-custom-lambda-metafactory/expected.txt
+++ b/test/714-invoke-custom-lambda-metafactory/expected-stdout.txt
diff --git a/test/715-clinit-implicit-parameter-annotations/expected.txt b/test/715-clinit-implicit-parameter-annotations/expected-stdout.txt
index 357eb6253e..357eb6253e 100644
--- a/test/715-clinit-implicit-parameter-annotations/expected.txt
+++ b/test/715-clinit-implicit-parameter-annotations/expected-stdout.txt
diff --git a/test/716-jli-jit-samples/expected.txt b/test/716-jli-jit-samples/expected-stdout.txt
index dc533f3689..dc533f3689 100644
--- a/test/716-jli-jit-samples/expected.txt
+++ b/test/716-jli-jit-samples/expected-stdout.txt
diff --git a/test/717-integer-value-of/Android.bp b/test/717-integer-value-of/Android.bp
index 655ede4360..fae88999f6 100644
--- a/test/717-integer-value-of/Android.bp
+++ b/test/717-integer-value-of/Android.bp
@@ -8,13 +8,13 @@ java_test {
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-717-integer-value-of-expected"],
+    data: [":art-run-test-717-integer-value-of-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-717-integer-value-of-expected",
-    out: ["art-run-test-717-integer-value-of-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-717-integer-value-of-expected-stdout",
+    out: ["art-run-test-717-integer-value-of-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/717-integer-value-of/expected.txt b/test/717-integer-value-of/expected-stdout.txt
index 6a5618ebc6..6a5618ebc6 100644
--- a/test/717-integer-value-of/expected.txt
+++ b/test/717-integer-value-of/expected-stdout.txt
diff --git a/test/718-zipfile-finalizer/Android.bp b/test/718-zipfile-finalizer/Android.bp
index 64c7d36838..57921b9e3a 100644
--- a/test/718-zipfile-finalizer/Android.bp
+++ b/test/718-zipfile-finalizer/Android.bp
@@ -8,13 +8,13 @@ java_test {
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-718-zipfile-finalizer-expected"],
+    data: [":art-run-test-718-zipfile-finalizer-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-718-zipfile-finalizer-expected",
-    out: ["art-run-test-718-zipfile-finalizer-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-718-zipfile-finalizer-expected-stdout",
+    out: ["art-run-test-718-zipfile-finalizer-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/718-zipfile-finalizer/expected.txt b/test/718-zipfile-finalizer/expected-stdout.txt
index e69de29bb2..e69de29bb2 100644
--- a/test/718-zipfile-finalizer/expected.txt
+++ b/test/718-zipfile-finalizer/expected-stdout.txt
diff --git a/test/719-dm-verify-redefinition/expected.txt b/test/719-dm-verify-redefinition/expected-stdout.txt
index c210c0d3c1..c210c0d3c1 100644
--- a/test/719-dm-verify-redefinition/expected.txt
+++ b/test/719-dm-verify-redefinition/expected-stdout.txt
diff --git a/test/720-thread-priority/Android.bp b/test/720-thread-priority/Android.bp
index bfd1ae45a5..ae632d3e42 100644
--- a/test/720-thread-priority/Android.bp
+++ b/test/720-thread-priority/Android.bp
@@ -8,13 +8,13 @@ java_test {
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-720-thread-priority-expected"],
+    data: [":art-run-test-720-thread-priority-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-720-thread-priority-expected",
-    out: ["art-run-test-720-thread-priority-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-720-thread-priority-expected-stdout",
+    out: ["art-run-test-720-thread-priority-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/720-thread-priority/expected.txt b/test/720-thread-priority/expected-stdout.txt
index 6a5618ebc6..6a5618ebc6 100644
--- a/test/720-thread-priority/expected.txt
+++ b/test/720-thread-priority/expected-stdout.txt
diff --git a/test/721-osr/Android.bp b/test/721-osr/Android.bp
index 0b2519dad0..d7c8d42270 100644
--- a/test/721-osr/Android.bp
+++ b/test/721-osr/Android.bp
@@ -8,13 +8,13 @@ java_test {
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-721-osr-expected"],
+    data: [":art-run-test-721-osr-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-721-osr-expected",
-    out: ["art-run-test-721-osr-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-721-osr-expected-stdout",
+    out: ["art-run-test-721-osr-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/721-osr/expected.txt b/test/721-osr/expected-stdout.txt
index e69de29bb2..e69de29bb2 100644
--- a/test/721-osr/expected.txt
+++ b/test/721-osr/expected-stdout.txt
diff --git a/test/723-string-init-range/expected.txt b/test/723-string-init-range/expected-stdout.txt
index e69de29bb2..e69de29bb2 100644
--- a/test/723-string-init-range/expected.txt
+++ b/test/723-string-init-range/expected-stdout.txt
diff --git a/test/724-invoke-super-npe/expected.txt b/test/724-invoke-super-npe/expected-stdout.txt
index e69de29bb2..e69de29bb2 100644
--- a/test/724-invoke-super-npe/expected.txt
+++ b/test/724-invoke-super-npe/expected-stdout.txt
diff --git a/test/725-imt-conflict-object/expected.txt b/test/725-imt-conflict-object/expected-stdout.txt
index e69de29bb2..e69de29bb2 100644
--- a/test/725-imt-conflict-object/expected.txt
+++ b/test/725-imt-conflict-object/expected-stdout.txt
diff --git a/test/726-array-store/Android.bp b/test/726-array-store/Android.bp
index 5ffe504390..fc688c692e 100644
--- a/test/726-array-store/Android.bp
+++ b/test/726-array-store/Android.bp
@@ -8,13 +8,13 @@ java_test {
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-726-array-store-expected"],
+    data: [":art-run-test-726-array-store-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-726-array-store-expected",
-    out: ["art-run-test-726-array-store-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-726-array-store-expected-stdout",
+    out: ["art-run-test-726-array-store-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/726-array-store/expected.txt b/test/726-array-store/expected-stdout.txt
index e69de29bb2..e69de29bb2 100644
--- a/test/726-array-store/expected.txt
+++ b/test/726-array-store/expected-stdout.txt
diff --git a/test/727-checker-unresolved-class/expected.txt b/test/727-checker-unresolved-class/expected-stdout.txt
index b33a798ab2..b33a798ab2 100644
--- a/test/727-checker-unresolved-class/expected.txt
+++ b/test/727-checker-unresolved-class/expected-stdout.txt
diff --git a/test/800-smali/expected.txt b/test/800-smali/expected-stdout.txt
index fbf10bbfc3..fbf10bbfc3 100644
--- a/test/800-smali/expected.txt
+++ b/test/800-smali/expected-stdout.txt
diff --git a/test/801-VoidCheckCast/expected.txt b/test/801-VoidCheckCast/expected-stdout.txt
index e69de29bb2..e69de29bb2 100644
--- a/test/801-VoidCheckCast/expected.txt
+++ b/test/801-VoidCheckCast/expected-stdout.txt
diff --git a/test/802-deoptimization/expected.txt b/test/802-deoptimization/expected-stdout.txt
index d5f1f08960..d5f1f08960 100644
--- a/test/802-deoptimization/expected.txt
+++ b/test/802-deoptimization/expected-stdout.txt
diff --git a/test/803-no-super/expected.txt b/test/803-no-super/expected-stdout.txt
index 5036991397..5036991397 100644
--- a/test/803-no-super/expected.txt
+++ b/test/803-no-super/expected-stdout.txt
diff --git a/test/804-class-extends-itself/expected.txt b/test/804-class-extends-itself/expected-stdout.txt
index b98f963ce7..b98f963ce7 100644
--- a/test/804-class-extends-itself/expected.txt
+++ b/test/804-class-extends-itself/expected-stdout.txt
diff --git a/test/805-TooDeepClassInstanceOf/Android.bp b/test/805-TooDeepClassInstanceOf/Android.bp
index 883248f73d..f90bc113f6 100644
--- a/test/805-TooDeepClassInstanceOf/Android.bp
+++ b/test/805-TooDeepClassInstanceOf/Android.bp
@@ -8,13 +8,13 @@ java_test {
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-805-TooDeepClassInstanceOf-expected"],
+    data: [":art-run-test-805-TooDeepClassInstanceOf-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-805-TooDeepClassInstanceOf-expected",
-    out: ["art-run-test-805-TooDeepClassInstanceOf-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-805-TooDeepClassInstanceOf-expected-stdout",
+    out: ["art-run-test-805-TooDeepClassInstanceOf-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/805-TooDeepClassInstanceOf/expected.txt b/test/805-TooDeepClassInstanceOf/expected-stdout.txt
index b0aad4deb5..b0aad4deb5 100644
--- a/test/805-TooDeepClassInstanceOf/expected.txt
+++ b/test/805-TooDeepClassInstanceOf/expected-stdout.txt
diff --git a/test/806-TooWideClassInstanceOf/Android.bp b/test/806-TooWideClassInstanceOf/Android.bp
index 358eeb5b9f..f400d2f84f 100644
--- a/test/806-TooWideClassInstanceOf/Android.bp
+++ b/test/806-TooWideClassInstanceOf/Android.bp
@@ -8,13 +8,13 @@ java_test {
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-806-TooWideClassInstanceOf-expected"],
+    data: [":art-run-test-806-TooWideClassInstanceOf-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-806-TooWideClassInstanceOf-expected",
-    out: ["art-run-test-806-TooWideClassInstanceOf-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-806-TooWideClassInstanceOf-expected-stdout",
+    out: ["art-run-test-806-TooWideClassInstanceOf-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/806-TooWideClassInstanceOf/expected.txt b/test/806-TooWideClassInstanceOf/expected-stdout.txt
index b0aad4deb5..b0aad4deb5 100644
--- a/test/806-TooWideClassInstanceOf/expected.txt
+++ b/test/806-TooWideClassInstanceOf/expected-stdout.txt
diff --git a/test/807-method-handle-and-mr/expected.txt b/test/807-method-handle-and-mr/expected-stdout.txt
index 8483fb5045..8483fb5045 100644
--- a/test/807-method-handle-and-mr/expected.txt
+++ b/test/807-method-handle-and-mr/expected-stdout.txt
diff --git a/test/808-checker-invoke-super/expected.txt b/test/808-checker-invoke-super/expected-stdout.txt
index e69de29bb2..e69de29bb2 100644
--- a/test/808-checker-invoke-super/expected.txt
+++ b/test/808-checker-invoke-super/expected-stdout.txt
diff --git a/test/809-checker-invoke-super-bss/expected.txt b/test/809-checker-invoke-super-bss/expected-stdout.txt
index e69de29bb2..e69de29bb2 100644
--- a/test/809-checker-invoke-super-bss/expected.txt
+++ b/test/809-checker-invoke-super-bss/expected-stdout.txt
diff --git a/test/810-checker-invoke-super-default/expected.txt b/test/810-checker-invoke-super-default/expected-stdout.txt
index e69de29bb2..e69de29bb2 100644
--- a/test/810-checker-invoke-super-default/expected.txt
+++ b/test/810-checker-invoke-super-default/expected-stdout.txt
diff --git a/test/811-checker-invoke-super-secondary/expected.txt b/test/811-checker-invoke-super-secondary/expected-stdout.txt
index e69de29bb2..e69de29bb2 100644
--- a/test/811-checker-invoke-super-secondary/expected.txt
+++ b/test/811-checker-invoke-super-secondary/expected-stdout.txt
diff --git a/test/812-recursive-default/Android.bp b/test/812-recursive-default/Android.bp
index 7deeecf2fc..2f5b45ef87 100644
--- a/test/812-recursive-default/Android.bp
+++ b/test/812-recursive-default/Android.bp
@@ -8,13 +8,13 @@ java_test {
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-812-recursive-default-expected"],
+    data: [":art-run-test-812-recursive-default-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-812-recursive-default-expected",
-    out: ["art-run-test-812-recursive-default-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-812-recursive-default-expected-stdout",
+    out: ["art-run-test-812-recursive-default-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/812-recursive-default/expected.txt b/test/812-recursive-default/expected-stdout.txt
index e69de29bb2..e69de29bb2 100644
--- a/test/812-recursive-default/expected.txt
+++ b/test/812-recursive-default/expected-stdout.txt
diff --git a/test/900-hello-plugin/Android.bp b/test/900-hello-plugin/Android.bp
index 4f8bbf46d0..7ff5fbb4e2 100644
--- a/test/900-hello-plugin/Android.bp
+++ b/test/900-hello-plugin/Android.bp
@@ -8,13 +8,13 @@ java_test {
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-900-hello-plugin-expected"],
+    data: [":art-run-test-900-hello-plugin-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-900-hello-plugin-expected",
-    out: ["art-run-test-900-hello-plugin-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-900-hello-plugin-expected-stdout",
+    out: ["art-run-test-900-hello-plugin-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/900-hello-plugin/expected.txt b/test/900-hello-plugin/expected-stdout.txt
index c160f65d31..c160f65d31 100644
--- a/test/900-hello-plugin/expected.txt
+++ b/test/900-hello-plugin/expected-stdout.txt
diff --git a/test/901-hello-ti-agent/Android.bp b/test/901-hello-ti-agent/Android.bp
index 25366fc3e8..cd0b9f0f6a 100644
--- a/test/901-hello-ti-agent/Android.bp
+++ b/test/901-hello-ti-agent/Android.bp
@@ -8,13 +8,13 @@ java_test {
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-901-hello-ti-agent-expected"],
+    data: [":art-run-test-901-hello-ti-agent-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-901-hello-ti-agent-expected",
-    out: ["art-run-test-901-hello-ti-agent-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-901-hello-ti-agent-expected-stdout",
+    out: ["art-run-test-901-hello-ti-agent-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/901-hello-ti-agent/expected.txt b/test/901-hello-ti-agent/expected-stdout.txt
index 73e389c8a1..73e389c8a1 100644
--- a/test/901-hello-ti-agent/expected.txt
+++ b/test/901-hello-ti-agent/expected-stdout.txt
diff --git a/test/902-hello-transformation/Android.bp b/test/902-hello-transformation/Android.bp
index 8786f8af7e..734fb912dd 100644
--- a/test/902-hello-transformation/Android.bp
+++ b/test/902-hello-transformation/Android.bp
@@ -8,13 +8,13 @@ java_test {
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-902-hello-transformation-expected"],
+    data: [":art-run-test-902-hello-transformation-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-902-hello-transformation-expected",
-    out: ["art-run-test-902-hello-transformation-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-902-hello-transformation-expected-stdout",
+    out: ["art-run-test-902-hello-transformation-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/902-hello-transformation/expected.txt b/test/902-hello-transformation/expected-stdout.txt
index 4774b81b49..4774b81b49 100644
--- a/test/902-hello-transformation/expected.txt
+++ b/test/902-hello-transformation/expected-stdout.txt
diff --git a/test/903-hello-tagging/Android.bp b/test/903-hello-tagging/Android.bp
index ccbe23b152..d92463437b 100644
--- a/test/903-hello-tagging/Android.bp
+++ b/test/903-hello-tagging/Android.bp
@@ -8,13 +8,13 @@ java_test {
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-903-hello-tagging-expected"],
+    data: [":art-run-test-903-hello-tagging-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-903-hello-tagging-expected",
-    out: ["art-run-test-903-hello-tagging-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-903-hello-tagging-expected-stdout",
+    out: ["art-run-test-903-hello-tagging-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/903-hello-tagging/expected.txt b/test/903-hello-tagging/expected-stdout.txt
index acfdbd810b..acfdbd810b 100644
--- a/test/903-hello-tagging/expected.txt
+++ b/test/903-hello-tagging/expected-stdout.txt
diff --git a/test/904-object-allocation/Android.bp b/test/904-object-allocation/Android.bp
index 32f12dcad2..cb46af511c 100644
--- a/test/904-object-allocation/Android.bp
+++ b/test/904-object-allocation/Android.bp
@@ -8,13 +8,13 @@ java_test {
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-904-object-allocation-expected"],
+    data: [":art-run-test-904-object-allocation-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-904-object-allocation-expected",
-    out: ["art-run-test-904-object-allocation-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-904-object-allocation-expected-stdout",
+    out: ["art-run-test-904-object-allocation-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/904-object-allocation/expected.txt b/test/904-object-allocation/expected-stdout.txt
index fdec470529..fdec470529 100644
--- a/test/904-object-allocation/expected.txt
+++ b/test/904-object-allocation/expected-stdout.txt
diff --git a/test/905-object-free/Android.bp b/test/905-object-free/Android.bp
index 1914fc918e..07e7bf80bb 100644
--- a/test/905-object-free/Android.bp
+++ b/test/905-object-free/Android.bp
@@ -8,13 +8,13 @@ java_test {
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-905-object-free-expected"],
+    data: [":art-run-test-905-object-free-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-905-object-free-expected",
-    out: ["art-run-test-905-object-free-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-905-object-free-expected-stdout",
+    out: ["art-run-test-905-object-free-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/905-object-free/expected.txt b/test/905-object-free/expected-stdout.txt
index dfcd7b6138..dfcd7b6138 100644
--- a/test/905-object-free/expected.txt
+++ b/test/905-object-free/expected-stdout.txt
diff --git a/test/906-iterate-heap/Android.bp b/test/906-iterate-heap/Android.bp
index 7bfc927bf7..d248bffb72 100644
--- a/test/906-iterate-heap/Android.bp
+++ b/test/906-iterate-heap/Android.bp
@@ -8,13 +8,13 @@ java_test {
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-906-iterate-heap-expected"],
+    data: [":art-run-test-906-iterate-heap-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-906-iterate-heap-expected",
-    out: ["art-run-test-906-iterate-heap-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-906-iterate-heap-expected-stdout",
+    out: ["art-run-test-906-iterate-heap-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/906-iterate-heap/expected.txt b/test/906-iterate-heap/expected-stdout.txt
index 73b7129bba..73b7129bba 100644
--- a/test/906-iterate-heap/expected.txt
+++ b/test/906-iterate-heap/expected-stdout.txt
diff --git a/test/907-get-loaded-classes/Android.bp b/test/907-get-loaded-classes/Android.bp
index 1161fec788..fd930962c1 100644
--- a/test/907-get-loaded-classes/Android.bp
+++ b/test/907-get-loaded-classes/Android.bp
@@ -8,13 +8,13 @@ java_test {
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-907-get-loaded-classes-expected"],
+    data: [":art-run-test-907-get-loaded-classes-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-907-get-loaded-classes-expected",
-    out: ["art-run-test-907-get-loaded-classes-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-907-get-loaded-classes-expected-stdout",
+    out: ["art-run-test-907-get-loaded-classes-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/907-get-loaded-classes/expected.txt b/test/907-get-loaded-classes/expected-stdout.txt
index e69de29bb2..e69de29bb2 100644
--- a/test/907-get-loaded-classes/expected.txt
+++ b/test/907-get-loaded-classes/expected-stdout.txt
diff --git a/test/908-gc-start-finish/Android.bp b/test/908-gc-start-finish/Android.bp
index 5a2fb4b509..e5f18651ee 100644
--- a/test/908-gc-start-finish/Android.bp
+++ b/test/908-gc-start-finish/Android.bp
@@ -8,13 +8,13 @@ java_test {
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-908-gc-start-finish-expected"],
+    data: [":art-run-test-908-gc-start-finish-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-908-gc-start-finish-expected",
-    out: ["art-run-test-908-gc-start-finish-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-908-gc-start-finish-expected-stdout",
+    out: ["art-run-test-908-gc-start-finish-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/908-gc-start-finish/expected.txt b/test/908-gc-start-finish/expected-stdout.txt
index 45f89dc767..45f89dc767 100644
--- a/test/908-gc-start-finish/expected.txt
+++ b/test/908-gc-start-finish/expected-stdout.txt
diff --git a/test/909-attach-agent/expected.txt b/test/909-attach-agent/expected-stdout.txt
index eec767d703..eec767d703 100644
--- a/test/909-attach-agent/expected.txt
+++ b/test/909-attach-agent/expected-stdout.txt
diff --git a/test/909-attach-agent/run b/test/909-attach-agent/run
index add558e963..71b1e1c4e5 100755
--- a/test/909-attach-agent/run
+++ b/test/909-attach-agent/run
@@ -25,7 +25,7 @@ if [[ "$@" == *"--interpreter"* ]]; then
   # On interpreter we are fully capable of providing the full jvmti api so we
   # have a slightly different expected output.
   # TODO We should really be changing this in the 'check' script.
-  patch -s expected.txt <interpreter-expected.patch
+  patch -s expected-stdout.txt <interpreter-expected.patch
 fi
 
 # Provide additional runtime options when running on device.
diff --git a/test/910-methods/Android.bp b/test/910-methods/Android.bp
index a469a911e9..e01724266f 100644
--- a/test/910-methods/Android.bp
+++ b/test/910-methods/Android.bp
@@ -8,13 +8,13 @@ java_test {
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-910-methods-expected"],
+    data: [":art-run-test-910-methods-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-910-methods-expected",
-    out: ["art-run-test-910-methods-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-910-methods-expected-stdout",
+    out: ["art-run-test-910-methods-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/910-methods/expected.txt b/test/910-methods/expected-stdout.txt
index 6672dc0d09..6672dc0d09 100644
--- a/test/910-methods/expected.txt
+++ b/test/910-methods/expected-stdout.txt
diff --git a/test/911-get-stack-trace/Android.bp b/test/911-get-stack-trace/Android.bp
index 753e9cb957..e75222f7ab 100644
--- a/test/911-get-stack-trace/Android.bp
+++ b/test/911-get-stack-trace/Android.bp
@@ -8,13 +8,13 @@ java_test {
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-911-get-stack-trace-expected"],
+    data: [":art-run-test-911-get-stack-trace-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-911-get-stack-trace-expected",
-    out: ["art-run-test-911-get-stack-trace-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-911-get-stack-trace-expected-stdout",
+    out: ["art-run-test-911-get-stack-trace-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/911-get-stack-trace/expected.txt b/test/911-get-stack-trace/expected-stdout.txt
index 86be681ba4..86be681ba4 100644
--- a/test/911-get-stack-trace/expected.txt
+++ b/test/911-get-stack-trace/expected-stdout.txt
diff --git a/test/912-classes/expected.txt b/test/912-classes/expected-stdout.txt
index d7699b6278..d7699b6278 100644
--- a/test/912-classes/expected.txt
+++ b/test/912-classes/expected-stdout.txt
diff --git a/test/913-heaps/Android.bp b/test/913-heaps/Android.bp
index 8b1a4f1c05..6ef49ad9a1 100644
--- a/test/913-heaps/Android.bp
+++ b/test/913-heaps/Android.bp
@@ -8,13 +8,13 @@ java_test {
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-913-heaps-expected"],
+    data: [":art-run-test-913-heaps-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-913-heaps-expected",
-    out: ["art-run-test-913-heaps-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-913-heaps-expected-stdout",
+    out: ["art-run-test-913-heaps-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/913-heaps/expected.txt b/test/913-heaps/expected-stdout.txt
index 8fe2ba5abf..8fe2ba5abf 100644
--- a/test/913-heaps/expected.txt
+++ b/test/913-heaps/expected-stdout.txt
diff --git a/test/914-hello-obsolescence/Android.bp b/test/914-hello-obsolescence/Android.bp
index c13ce40a18..5057f43a86 100644
--- a/test/914-hello-obsolescence/Android.bp
+++ b/test/914-hello-obsolescence/Android.bp
@@ -8,13 +8,13 @@ java_test {
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-914-hello-obsolescence-expected"],
+    data: [":art-run-test-914-hello-obsolescence-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-914-hello-obsolescence-expected",
-    out: ["art-run-test-914-hello-obsolescence-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-914-hello-obsolescence-expected-stdout",
+    out: ["art-run-test-914-hello-obsolescence-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/914-hello-obsolescence/expected.txt b/test/914-hello-obsolescence/expected-stdout.txt
index 83efda144d..83efda144d 100644
--- a/test/914-hello-obsolescence/expected.txt
+++ b/test/914-hello-obsolescence/expected-stdout.txt
diff --git a/test/915-obsolete-2/Android.bp b/test/915-obsolete-2/Android.bp
index 6acd1cb4ad..5c1669b8da 100644
--- a/test/915-obsolete-2/Android.bp
+++ b/test/915-obsolete-2/Android.bp
@@ -8,13 +8,13 @@ java_test {
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-915-obsolete-2-expected"],
+    data: [":art-run-test-915-obsolete-2-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-915-obsolete-2-expected",
-    out: ["art-run-test-915-obsolete-2-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-915-obsolete-2-expected-stdout",
+    out: ["art-run-test-915-obsolete-2-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/915-obsolete-2/expected.txt b/test/915-obsolete-2/expected-stdout.txt
index 04aff3a6dc..04aff3a6dc 100644
--- a/test/915-obsolete-2/expected.txt
+++ b/test/915-obsolete-2/expected-stdout.txt
diff --git a/test/916-obsolete-jit/Android.bp b/test/916-obsolete-jit/Android.bp
index 0bba027cac..3db5d3cc34 100644
--- a/test/916-obsolete-jit/Android.bp
+++ b/test/916-obsolete-jit/Android.bp
@@ -8,13 +8,13 @@ java_test {
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-916-obsolete-jit-expected"],
+    data: [":art-run-test-916-obsolete-jit-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-916-obsolete-jit-expected",
-    out: ["art-run-test-916-obsolete-jit-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-916-obsolete-jit-expected-stdout",
+    out: ["art-run-test-916-obsolete-jit-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/916-obsolete-jit/expected.txt b/test/916-obsolete-jit/expected-stdout.txt
index 4caefc6200..4caefc6200 100644
--- a/test/916-obsolete-jit/expected.txt
+++ b/test/916-obsolete-jit/expected-stdout.txt
diff --git a/test/917-fields-transformation/Android.bp b/test/917-fields-transformation/Android.bp
index 0661468600..f7e3d66a27 100644
--- a/test/917-fields-transformation/Android.bp
+++ b/test/917-fields-transformation/Android.bp
@@ -8,13 +8,13 @@ java_test {
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-917-fields-transformation-expected"],
+    data: [":art-run-test-917-fields-transformation-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-917-fields-transformation-expected",
-    out: ["art-run-test-917-fields-transformation-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-917-fields-transformation-expected-stdout",
+    out: ["art-run-test-917-fields-transformation-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/917-fields-transformation/expected.txt b/test/917-fields-transformation/expected-stdout.txt
index bcdd201113..bcdd201113 100644
--- a/test/917-fields-transformation/expected.txt
+++ b/test/917-fields-transformation/expected-stdout.txt
diff --git a/test/918-fields/Android.bp b/test/918-fields/Android.bp
index bf8dc9bff1..73395c2867 100644
--- a/test/918-fields/Android.bp
+++ b/test/918-fields/Android.bp
@@ -8,13 +8,13 @@ java_test {
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-918-fields-expected"],
+    data: [":art-run-test-918-fields-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-918-fields-expected",
-    out: ["art-run-test-918-fields-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-918-fields-expected-stdout",
+    out: ["art-run-test-918-fields-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/918-fields/expected.txt b/test/918-fields/expected-stdout.txt
index 0114ccc998..0114ccc998 100644
--- a/test/918-fields/expected.txt
+++ b/test/918-fields/expected-stdout.txt
diff --git a/test/919-obsolete-fields/Android.bp b/test/919-obsolete-fields/Android.bp
index 03b7fd2028..02abafd555 100644
--- a/test/919-obsolete-fields/Android.bp
+++ b/test/919-obsolete-fields/Android.bp
@@ -8,13 +8,13 @@ java_test {
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-919-obsolete-fields-expected"],
+    data: [":art-run-test-919-obsolete-fields-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-919-obsolete-fields-expected",
-    out: ["art-run-test-919-obsolete-fields-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-919-obsolete-fields-expected-stdout",
+    out: ["art-run-test-919-obsolete-fields-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/919-obsolete-fields/expected.txt b/test/919-obsolete-fields/expected-stdout.txt
index 4caefc6200..4caefc6200 100644
--- a/test/919-obsolete-fields/expected.txt
+++ b/test/919-obsolete-fields/expected-stdout.txt
diff --git a/test/920-objects/Android.bp b/test/920-objects/Android.bp
index ea73bba8ee..984d4a3aea 100644
--- a/test/920-objects/Android.bp
+++ b/test/920-objects/Android.bp
@@ -8,13 +8,13 @@ java_test {
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-920-objects-expected"],
+    data: [":art-run-test-920-objects-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-920-objects-expected",
-    out: ["art-run-test-920-objects-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-920-objects-expected-stdout",
+    out: ["art-run-test-920-objects-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/920-objects/expected.txt b/test/920-objects/expected-stdout.txt
index 80feeb93e4..80feeb93e4 100644
--- a/test/920-objects/expected.txt
+++ b/test/920-objects/expected-stdout.txt
diff --git a/test/921-hello-failure/Android.bp b/test/921-hello-failure/Android.bp
index 6a2c34d47a..40768a6b91 100644
--- a/test/921-hello-failure/Android.bp
+++ b/test/921-hello-failure/Android.bp
@@ -8,13 +8,13 @@ java_test {
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-921-hello-failure-expected"],
+    data: [":art-run-test-921-hello-failure-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-921-hello-failure-expected",
-    out: ["art-run-test-921-hello-failure-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-921-hello-failure-expected-stdout",
+    out: ["art-run-test-921-hello-failure-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/921-hello-failure/expected.txt b/test/921-hello-failure/expected-stdout.txt
index f36d1a3dd5..f36d1a3dd5 100644
--- a/test/921-hello-failure/expected.txt
+++ b/test/921-hello-failure/expected-stdout.txt
diff --git a/test/922-properties/Android.bp b/test/922-properties/Android.bp
index fb4cc99ada..594611df49 100644
--- a/test/922-properties/Android.bp
+++ b/test/922-properties/Android.bp
@@ -8,13 +8,13 @@ java_test {
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-922-properties-expected"],
+    data: [":art-run-test-922-properties-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-922-properties-expected",
-    out: ["art-run-test-922-properties-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-922-properties-expected-stdout",
+    out: ["art-run-test-922-properties-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/922-properties/expected.txt b/test/922-properties/expected-stdout.txt
index 0be939be3d..0be939be3d 100644
--- a/test/922-properties/expected.txt
+++ b/test/922-properties/expected-stdout.txt
diff --git a/test/923-monitors/Android.bp b/test/923-monitors/Android.bp
index 75b5464591..cf4262bf4b 100644
--- a/test/923-monitors/Android.bp
+++ b/test/923-monitors/Android.bp
@@ -8,13 +8,13 @@ java_test {
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-923-monitors-expected"],
+    data: [":art-run-test-923-monitors-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-923-monitors-expected",
-    out: ["art-run-test-923-monitors-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-923-monitors-expected-stdout",
+    out: ["art-run-test-923-monitors-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/923-monitors/expected.txt b/test/923-monitors/expected-stdout.txt
index 81a4fd094f..81a4fd094f 100644
--- a/test/923-monitors/expected.txt
+++ b/test/923-monitors/expected-stdout.txt
diff --git a/test/924-threads/Android.bp b/test/924-threads/Android.bp
index 40427cdc9d..052f82bdea 100644
--- a/test/924-threads/Android.bp
+++ b/test/924-threads/Android.bp
@@ -8,13 +8,13 @@ java_test {
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-924-threads-expected"],
+    data: [":art-run-test-924-threads-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-924-threads-expected",
-    out: ["art-run-test-924-threads-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-924-threads-expected-stdout",
+    out: ["art-run-test-924-threads-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/924-threads/expected.txt b/test/924-threads/expected-stdout.txt
index accc78208a..accc78208a 100644
--- a/test/924-threads/expected.txt
+++ b/test/924-threads/expected-stdout.txt
diff --git a/test/925-threadgroups/Android.bp b/test/925-threadgroups/Android.bp
index 410468e144..e162963fe8 100644
--- a/test/925-threadgroups/Android.bp
+++ b/test/925-threadgroups/Android.bp
@@ -8,13 +8,13 @@ java_test {
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-925-threadgroups-expected"],
+    data: [":art-run-test-925-threadgroups-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-925-threadgroups-expected",
-    out: ["art-run-test-925-threadgroups-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-925-threadgroups-expected-stdout",
+    out: ["art-run-test-925-threadgroups-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/925-threadgroups/expected.txt b/test/925-threadgroups/expected-stdout.txt
index 9dfa37dc76..9dfa37dc76 100644
--- a/test/925-threadgroups/expected.txt
+++ b/test/925-threadgroups/expected-stdout.txt
diff --git a/test/926-multi-obsolescence/Android.bp b/test/926-multi-obsolescence/Android.bp
index 81c3d32712..07c637e103 100644
--- a/test/926-multi-obsolescence/Android.bp
+++ b/test/926-multi-obsolescence/Android.bp
@@ -8,13 +8,13 @@ java_test {
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-926-multi-obsolescence-expected"],
+    data: [":art-run-test-926-multi-obsolescence-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-926-multi-obsolescence-expected",
-    out: ["art-run-test-926-multi-obsolescence-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-926-multi-obsolescence-expected-stdout",
+    out: ["art-run-test-926-multi-obsolescence-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/926-multi-obsolescence/expected.txt b/test/926-multi-obsolescence/expected-stdout.txt
index 0546490c44..0546490c44 100644
--- a/test/926-multi-obsolescence/expected.txt
+++ b/test/926-multi-obsolescence/expected-stdout.txt
diff --git a/test/927-timers/Android.bp b/test/927-timers/Android.bp
index 194da57190..ae3da0dfee 100644
--- a/test/927-timers/Android.bp
+++ b/test/927-timers/Android.bp
@@ -8,13 +8,13 @@ java_test {
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-927-timers-expected"],
+    data: [":art-run-test-927-timers-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-927-timers-expected",
-    out: ["art-run-test-927-timers-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-927-timers-expected-stdout",
+    out: ["art-run-test-927-timers-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/927-timers/expected.txt b/test/927-timers/expected-stdout.txt
index a4ef4424b6..a4ef4424b6 100644
--- a/test/927-timers/expected.txt
+++ b/test/927-timers/expected-stdout.txt
diff --git a/test/928-jni-table/Android.bp b/test/928-jni-table/Android.bp
index 331509c920..ef63865416 100644
--- a/test/928-jni-table/Android.bp
+++ b/test/928-jni-table/Android.bp
@@ -8,13 +8,13 @@ java_test {
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-928-jni-table-expected"],
+    data: [":art-run-test-928-jni-table-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-928-jni-table-expected",
-    out: ["art-run-test-928-jni-table-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-928-jni-table-expected-stdout",
+    out: ["art-run-test-928-jni-table-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/928-jni-table/expected.txt b/test/928-jni-table/expected-stdout.txt
index a965a70ed4..a965a70ed4 100644
--- a/test/928-jni-table/expected.txt
+++ b/test/928-jni-table/expected-stdout.txt
diff --git a/test/929-search/expected.txt b/test/929-search/expected-stdout.txt
index a965a70ed4..a965a70ed4 100644
--- a/test/929-search/expected.txt
+++ b/test/929-search/expected-stdout.txt
diff --git a/test/930-hello-retransform/Android.bp b/test/930-hello-retransform/Android.bp
index 3bea01343d..f58261abd6 100644
--- a/test/930-hello-retransform/Android.bp
+++ b/test/930-hello-retransform/Android.bp
@@ -8,13 +8,13 @@ java_test {
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-930-hello-retransform-expected"],
+    data: [":art-run-test-930-hello-retransform-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-930-hello-retransform-expected",
-    out: ["art-run-test-930-hello-retransform-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-930-hello-retransform-expected-stdout",
+    out: ["art-run-test-930-hello-retransform-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/930-hello-retransform/expected.txt b/test/930-hello-retransform/expected-stdout.txt
index 4774b81b49..4774b81b49 100644
--- a/test/930-hello-retransform/expected.txt
+++ b/test/930-hello-retransform/expected-stdout.txt
diff --git a/test/931-agent-thread/Android.bp b/test/931-agent-thread/Android.bp
index 6d594c043f..793da2d74a 100644
--- a/test/931-agent-thread/Android.bp
+++ b/test/931-agent-thread/Android.bp
@@ -8,13 +8,13 @@ java_test {
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-931-agent-thread-expected"],
+    data: [":art-run-test-931-agent-thread-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-931-agent-thread-expected",
-    out: ["art-run-test-931-agent-thread-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-931-agent-thread-expected-stdout",
+    out: ["art-run-test-931-agent-thread-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/931-agent-thread/expected.txt b/test/931-agent-thread/expected-stdout.txt
index a965a70ed4..a965a70ed4 100644
--- a/test/931-agent-thread/expected.txt
+++ b/test/931-agent-thread/expected-stdout.txt
diff --git a/test/932-transform-saves/Android.bp b/test/932-transform-saves/Android.bp
index a86603b289..022a8cbd3f 100644
--- a/test/932-transform-saves/Android.bp
+++ b/test/932-transform-saves/Android.bp
@@ -8,13 +8,13 @@ java_test {
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-932-transform-saves-expected"],
+    data: [":art-run-test-932-transform-saves-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-932-transform-saves-expected",
-    out: ["art-run-test-932-transform-saves-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-932-transform-saves-expected-stdout",
+    out: ["art-run-test-932-transform-saves-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/932-transform-saves/expected.txt b/test/932-transform-saves/expected-stdout.txt
index 5097771994..5097771994 100644
--- a/test/932-transform-saves/expected.txt
+++ b/test/932-transform-saves/expected-stdout.txt
diff --git a/test/933-misc-events/Android.bp b/test/933-misc-events/Android.bp
index d943ebc5b5..01fdefc9ea 100644
--- a/test/933-misc-events/Android.bp
+++ b/test/933-misc-events/Android.bp
@@ -8,13 +8,13 @@ java_test {
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-933-misc-events-expected"],
+    data: [":art-run-test-933-misc-events-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-933-misc-events-expected",
-    out: ["art-run-test-933-misc-events-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-933-misc-events-expected-stdout",
+    out: ["art-run-test-933-misc-events-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/933-misc-events/expected.txt b/test/933-misc-events/expected-stdout.txt
index 024c560b26..024c560b26 100644
--- a/test/933-misc-events/expected.txt
+++ b/test/933-misc-events/expected-stdout.txt
diff --git a/test/934-load-transform/expected.txt b/test/934-load-transform/expected-stdout.txt
index 2b60207f03..2b60207f03 100644
--- a/test/934-load-transform/expected.txt
+++ b/test/934-load-transform/expected-stdout.txt
diff --git a/test/935-non-retransformable/expected.txt b/test/935-non-retransformable/expected-stdout.txt
index ccd50a66a0..ccd50a66a0 100644
--- a/test/935-non-retransformable/expected.txt
+++ b/test/935-non-retransformable/expected-stdout.txt
diff --git a/test/936-search-onload/expected.txt b/test/936-search-onload/expected-stdout.txt
index 2eec8e1aac..2eec8e1aac 100644
--- a/test/936-search-onload/expected.txt
+++ b/test/936-search-onload/expected-stdout.txt
diff --git a/test/937-hello-retransform-package/Android.bp b/test/937-hello-retransform-package/Android.bp
index b2ee4b9f16..54f12bb623 100644
--- a/test/937-hello-retransform-package/Android.bp
+++ b/test/937-hello-retransform-package/Android.bp
@@ -8,13 +8,13 @@ java_test {
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-937-hello-retransform-package-expected"],
+    data: [":art-run-test-937-hello-retransform-package-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-937-hello-retransform-package-expected",
-    out: ["art-run-test-937-hello-retransform-package-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-937-hello-retransform-package-expected-stdout",
+    out: ["art-run-test-937-hello-retransform-package-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/937-hello-retransform-package/expected.txt b/test/937-hello-retransform-package/expected-stdout.txt
index 4774b81b49..4774b81b49 100644
--- a/test/937-hello-retransform-package/expected.txt
+++ b/test/937-hello-retransform-package/expected-stdout.txt
diff --git a/test/938-load-transform-bcp/expected.txt b/test/938-load-transform-bcp/expected-stdout.txt
index 16c3f8f726..16c3f8f726 100644
--- a/test/938-load-transform-bcp/expected.txt
+++ b/test/938-load-transform-bcp/expected-stdout.txt
diff --git a/test/939-hello-transformation-bcp/Android.bp b/test/939-hello-transformation-bcp/Android.bp
index adb1b9112b..2f32376cbb 100644
--- a/test/939-hello-transformation-bcp/Android.bp
+++ b/test/939-hello-transformation-bcp/Android.bp
@@ -8,13 +8,13 @@ java_test {
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-939-hello-transformation-bcp-expected"],
+    data: [":art-run-test-939-hello-transformation-bcp-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-939-hello-transformation-bcp-expected",
-    out: ["art-run-test-939-hello-transformation-bcp-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-939-hello-transformation-bcp-expected-stdout",
+    out: ["art-run-test-939-hello-transformation-bcp-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/939-hello-transformation-bcp/expected.txt b/test/939-hello-transformation-bcp/expected-stdout.txt
index 90fd25828d..90fd25828d 100644
--- a/test/939-hello-transformation-bcp/expected.txt
+++ b/test/939-hello-transformation-bcp/expected-stdout.txt
diff --git a/test/940-recursive-obsolete/Android.bp b/test/940-recursive-obsolete/Android.bp
index eab82640a7..baf1e5094d 100644
--- a/test/940-recursive-obsolete/Android.bp
+++ b/test/940-recursive-obsolete/Android.bp
@@ -8,13 +8,13 @@ java_test {
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-940-recursive-obsolete-expected"],
+    data: [":art-run-test-940-recursive-obsolete-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-940-recursive-obsolete-expected",
-    out: ["art-run-test-940-recursive-obsolete-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-940-recursive-obsolete-expected-stdout",
+    out: ["art-run-test-940-recursive-obsolete-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/940-recursive-obsolete/expected.txt b/test/940-recursive-obsolete/expected-stdout.txt
index 18ffc25d8a..18ffc25d8a 100644
--- a/test/940-recursive-obsolete/expected.txt
+++ b/test/940-recursive-obsolete/expected-stdout.txt
diff --git a/test/941-recursive-obsolete-jit/Android.bp b/test/941-recursive-obsolete-jit/Android.bp
index 2d11b989ed..166324d6b4 100644
--- a/test/941-recursive-obsolete-jit/Android.bp
+++ b/test/941-recursive-obsolete-jit/Android.bp
@@ -8,13 +8,13 @@ java_test {
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-941-recursive-obsolete-jit-expected"],
+    data: [":art-run-test-941-recursive-obsolete-jit-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-941-recursive-obsolete-jit-expected",
-    out: ["art-run-test-941-recursive-obsolete-jit-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-941-recursive-obsolete-jit-expected-stdout",
+    out: ["art-run-test-941-recursive-obsolete-jit-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/941-recursive-obsolete-jit/expected.txt b/test/941-recursive-obsolete-jit/expected-stdout.txt
index 086f7b03dc..086f7b03dc 100644
--- a/test/941-recursive-obsolete-jit/expected.txt
+++ b/test/941-recursive-obsolete-jit/expected-stdout.txt
diff --git a/test/942-private-recursive/Android.bp b/test/942-private-recursive/Android.bp
index beb8d15179..a8fd9b42cd 100644
--- a/test/942-private-recursive/Android.bp
+++ b/test/942-private-recursive/Android.bp
@@ -8,13 +8,13 @@ java_test {
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-942-private-recursive-expected"],
+    data: [":art-run-test-942-private-recursive-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-942-private-recursive-expected",
-    out: ["art-run-test-942-private-recursive-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-942-private-recursive-expected-stdout",
+    out: ["art-run-test-942-private-recursive-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/942-private-recursive/expected.txt b/test/942-private-recursive/expected-stdout.txt
index 18ffc25d8a..18ffc25d8a 100644
--- a/test/942-private-recursive/expected.txt
+++ b/test/942-private-recursive/expected-stdout.txt
diff --git a/test/943-private-recursive-jit/Android.bp b/test/943-private-recursive-jit/Android.bp
index 0814b97dee..e3cd42d421 100644
--- a/test/943-private-recursive-jit/Android.bp
+++ b/test/943-private-recursive-jit/Android.bp
@@ -8,13 +8,13 @@ java_test {
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-943-private-recursive-jit-expected"],
+    data: [":art-run-test-943-private-recursive-jit-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-943-private-recursive-jit-expected",
-    out: ["art-run-test-943-private-recursive-jit-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-943-private-recursive-jit-expected-stdout",
+    out: ["art-run-test-943-private-recursive-jit-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/943-private-recursive-jit/expected.txt b/test/943-private-recursive-jit/expected-stdout.txt
index 447f4a2245..447f4a2245 100644
--- a/test/943-private-recursive-jit/expected.txt
+++ b/test/943-private-recursive-jit/expected-stdout.txt
diff --git a/test/944-transform-classloaders/Android.bp b/test/944-transform-classloaders/Android.bp
index 8b9eca1a60..9348f512bd 100644
--- a/test/944-transform-classloaders/Android.bp
+++ b/test/944-transform-classloaders/Android.bp
@@ -8,13 +8,13 @@ java_test {
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-944-transform-classloaders-expected"],
+    data: [":art-run-test-944-transform-classloaders-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-944-transform-classloaders-expected",
-    out: ["art-run-test-944-transform-classloaders-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-944-transform-classloaders-expected-stdout",
+    out: ["art-run-test-944-transform-classloaders-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/944-transform-classloaders/expected.txt b/test/944-transform-classloaders/expected-stdout.txt
index 79522479dd..79522479dd 100644
--- a/test/944-transform-classloaders/expected.txt
+++ b/test/944-transform-classloaders/expected-stdout.txt
diff --git a/test/945-obsolete-native/Android.bp b/test/945-obsolete-native/Android.bp
index 97f927509e..38492931e5 100644
--- a/test/945-obsolete-native/Android.bp
+++ b/test/945-obsolete-native/Android.bp
@@ -8,13 +8,13 @@ java_test {
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-945-obsolete-native-expected"],
+    data: [":art-run-test-945-obsolete-native-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-945-obsolete-native-expected",
-    out: ["art-run-test-945-obsolete-native-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-945-obsolete-native-expected-stdout",
+    out: ["art-run-test-945-obsolete-native-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/945-obsolete-native/expected.txt b/test/945-obsolete-native/expected-stdout.txt
index 83efda144d..83efda144d 100644
--- a/test/945-obsolete-native/expected.txt
+++ b/test/945-obsolete-native/expected-stdout.txt
diff --git a/test/946-obsolete-throw/Android.bp b/test/946-obsolete-throw/Android.bp
index 2462bcfca2..d02117f193 100644
--- a/test/946-obsolete-throw/Android.bp
+++ b/test/946-obsolete-throw/Android.bp
@@ -8,13 +8,13 @@ java_test {
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-946-obsolete-throw-expected"],
+    data: [":art-run-test-946-obsolete-throw-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-946-obsolete-throw-expected",
-    out: ["art-run-test-946-obsolete-throw-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-946-obsolete-throw-expected-stdout",
+    out: ["art-run-test-946-obsolete-throw-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/946-obsolete-throw/expected.txt b/test/946-obsolete-throw/expected-stdout.txt
index edf796eb96..edf796eb96 100644
--- a/test/946-obsolete-throw/expected.txt
+++ b/test/946-obsolete-throw/expected-stdout.txt
diff --git a/test/947-reflect-method/Android.bp b/test/947-reflect-method/Android.bp
index 9fa7a56ed6..880cbd6abd 100644
--- a/test/947-reflect-method/Android.bp
+++ b/test/947-reflect-method/Android.bp
@@ -8,13 +8,13 @@ java_test {
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-947-reflect-method-expected"],
+    data: [":art-run-test-947-reflect-method-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-947-reflect-method-expected",
-    out: ["art-run-test-947-reflect-method-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-947-reflect-method-expected-stdout",
+    out: ["art-run-test-947-reflect-method-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/947-reflect-method/expected.txt b/test/947-reflect-method/expected-stdout.txt
index 4774b81b49..4774b81b49 100644
--- a/test/947-reflect-method/expected.txt
+++ b/test/947-reflect-method/expected-stdout.txt
diff --git a/test/948-change-annotations/expected.txt b/test/948-change-annotations/expected-stdout.txt
index 7974c7a694..7974c7a694 100644
--- a/test/948-change-annotations/expected.txt
+++ b/test/948-change-annotations/expected-stdout.txt
diff --git a/test/949-in-memory-transform/Android.bp b/test/949-in-memory-transform/Android.bp
index 257285cf93..c5c60823c4 100644
--- a/test/949-in-memory-transform/Android.bp
+++ b/test/949-in-memory-transform/Android.bp
@@ -8,13 +8,13 @@ java_test {
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-949-in-memory-transform-expected"],
+    data: [":art-run-test-949-in-memory-transform-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-949-in-memory-transform-expected",
-    out: ["art-run-test-949-in-memory-transform-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-949-in-memory-transform-expected-stdout",
+    out: ["art-run-test-949-in-memory-transform-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/949-in-memory-transform/expected.txt b/test/949-in-memory-transform/expected-stdout.txt
index 4774b81b49..4774b81b49 100644
--- a/test/949-in-memory-transform/expected.txt
+++ b/test/949-in-memory-transform/expected-stdout.txt
diff --git a/test/950-redefine-intrinsic/Android.bp b/test/950-redefine-intrinsic/Android.bp
index 858c6ccd17..cd4e610825 100644
--- a/test/950-redefine-intrinsic/Android.bp
+++ b/test/950-redefine-intrinsic/Android.bp
@@ -8,13 +8,13 @@ java_test {
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-950-redefine-intrinsic-expected"],
+    data: [":art-run-test-950-redefine-intrinsic-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-950-redefine-intrinsic-expected",
-    out: ["art-run-test-950-redefine-intrinsic-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-950-redefine-intrinsic-expected-stdout",
+    out: ["art-run-test-950-redefine-intrinsic-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/950-redefine-intrinsic/expected.txt b/test/950-redefine-intrinsic/expected-stdout.txt
index 1264c9437d..1264c9437d 100644
--- a/test/950-redefine-intrinsic/expected.txt
+++ b/test/950-redefine-intrinsic/expected-stdout.txt
diff --git a/test/951-threaded-obsolete/Android.bp b/test/951-threaded-obsolete/Android.bp
index 0adfe984c9..2aa4901a90 100644
--- a/test/951-threaded-obsolete/Android.bp
+++ b/test/951-threaded-obsolete/Android.bp
@@ -8,13 +8,13 @@ java_test {
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-951-threaded-obsolete-expected"],
+    data: [":art-run-test-951-threaded-obsolete-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-951-threaded-obsolete-expected",
-    out: ["art-run-test-951-threaded-obsolete-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-951-threaded-obsolete-expected-stdout",
+    out: ["art-run-test-951-threaded-obsolete-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/951-threaded-obsolete/expected.txt b/test/951-threaded-obsolete/expected-stdout.txt
index 83efda144d..83efda144d 100644
--- a/test/951-threaded-obsolete/expected.txt
+++ b/test/951-threaded-obsolete/expected-stdout.txt
diff --git a/test/952-invoke-custom/expected.txt b/test/952-invoke-custom/expected-stdout.txt
index ba41787ac2..ba41787ac2 100644
--- a/test/952-invoke-custom/expected.txt
+++ b/test/952-invoke-custom/expected-stdout.txt
diff --git a/test/953-invoke-polymorphic-compiler/expected.txt b/test/953-invoke-polymorphic-compiler/expected-stdout.txt
index f47ee23fd8..f47ee23fd8 100644
--- a/test/953-invoke-polymorphic-compiler/expected.txt
+++ b/test/953-invoke-polymorphic-compiler/expected-stdout.txt
diff --git a/test/954-invoke-polymorphic-verifier/expected.txt b/test/954-invoke-polymorphic-verifier/expected-stdout.txt
index d49af9648f..d49af9648f 100644
--- a/test/954-invoke-polymorphic-verifier/expected.txt
+++ b/test/954-invoke-polymorphic-verifier/expected-stdout.txt
diff --git a/test/955-methodhandles-smali/expected.txt b/test/955-methodhandles-smali/expected-stdout.txt
index 5de1274e37..5de1274e37 100644
--- a/test/955-methodhandles-smali/expected.txt
+++ b/test/955-methodhandles-smali/expected-stdout.txt
diff --git a/test/956-methodhandles/expected.txt b/test/956-methodhandles/expected-stdout.txt
index 206ab2050c..206ab2050c 100644
--- a/test/956-methodhandles/expected.txt
+++ b/test/956-methodhandles/expected-stdout.txt
diff --git a/test/957-methodhandle-transforms/expected.txt b/test/957-methodhandle-transforms/expected-stdout.txt
index cf6b5a14b5..cf6b5a14b5 100644
--- a/test/957-methodhandle-transforms/expected.txt
+++ b/test/957-methodhandle-transforms/expected-stdout.txt
diff --git a/test/958-methodhandle-stackframe/expected.txt b/test/958-methodhandle-stackframe/expected-stdout.txt
index 5f3825962d..5f3825962d 100644
--- a/test/958-methodhandle-stackframe/expected.txt
+++ b/test/958-methodhandle-stackframe/expected-stdout.txt
diff --git a/test/959-invoke-polymorphic-accessors/expected.txt b/test/959-invoke-polymorphic-accessors/expected-stdout.txt
index 9df450b550..9df450b550 100644
--- a/test/959-invoke-polymorphic-accessors/expected.txt
+++ b/test/959-invoke-polymorphic-accessors/expected-stdout.txt
diff --git a/test/960-default-smali/expected.txt b/test/960-default-smali/expected-stdout.txt
index 8153d7d4eb..8153d7d4eb 100644
--- a/test/960-default-smali/expected.txt
+++ b/test/960-default-smali/expected-stdout.txt
diff --git a/test/960-default-smali/info.txt b/test/960-default-smali/info.txt
index 9583abbdc1..cb525a22fd 100644
--- a/test/960-default-smali/info.txt
+++ b/test/960-default-smali/info.txt
@@ -17,4 +17,4 @@ To update the test files do the following steps:
     <Add new classes/interfaces>
     <Add these classes/interfaces to ./smali/classes.xml>
     JAVA_HOME="/path/to/java-8-jdk" ../run-test --use-java-home --update --jvm --host 956-default-smali
-    git add ./smali/classes.xml ./expected.txt
+    git add ./smali/classes.xml ./expected-stdout.txt
diff --git a/test/961-default-iface-resolution-gen/build b/test/961-default-iface-resolution-gen/build
index 1d245894de..b9b36d0f86 100755
--- a/test/961-default-iface-resolution-gen/build
+++ b/test/961-default-iface-resolution-gen/build
@@ -19,7 +19,7 @@ set -e
 
 mkdir -p ./src
 
-# Generate the smali files and expected.txt or fail
-./util-src/generate_java.py ./src ./expected.txt
+# Generate the smali files and expected-stdout.txt or fail
+./util-src/generate_java.py ./src ./expected-stdout.txt
 
 ./default-build "$@" --experimental default-methods
diff --git a/test/961-default-iface-resolution-gen/expected.txt b/test/961-default-iface-resolution-gen/expected-stdout.txt
index 1ddd65d177..1ddd65d177 100644
--- a/test/961-default-iface-resolution-gen/expected.txt
+++ b/test/961-default-iface-resolution-gen/expected-stdout.txt
diff --git a/test/961-default-iface-resolution-gen/info.txt b/test/961-default-iface-resolution-gen/info.txt
index 2cd2cc75b7..b5a04fd852 100644
--- a/test/961-default-iface-resolution-gen/info.txt
+++ b/test/961-default-iface-resolution-gen/info.txt
@@ -13,5 +13,5 @@ Care should be taken when updating the generate_smali.py script. It should alway
 return equivalent output when run multiple times and the expected output should
 be valid.
 
-Do not modify the expected.txt file. It is generated on each run by
+Do not modify the expected-stdout.txt file. It is generated on each run by
 util-src/generate_smali.py.
diff --git a/test/962-iface-static/expected.txt b/test/962-iface-static/expected-stdout.txt
index 6d98ea1571..6d98ea1571 100644
--- a/test/962-iface-static/expected.txt
+++ b/test/962-iface-static/expected-stdout.txt
diff --git a/test/963-default-range-smali/Android.bp b/test/963-default-range-smali/Android.bp
index 71d0242286..0ad2cae003 100644
--- a/test/963-default-range-smali/Android.bp
+++ b/test/963-default-range-smali/Android.bp
@@ -8,13 +8,13 @@ java_test {
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-963-default-range-smali-expected"],
+    data: [":art-run-test-963-default-range-smali-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-963-default-range-smali-expected",
-    out: ["art-run-test-963-default-range-smali-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-963-default-range-smali-expected-stdout",
+    out: ["art-run-test-963-default-range-smali-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/963-default-range-smali/expected.txt b/test/963-default-range-smali/expected-stdout.txt
index af17d2f873..af17d2f873 100644
--- a/test/963-default-range-smali/expected.txt
+++ b/test/963-default-range-smali/expected-stdout.txt
diff --git a/test/964-default-iface-init-gen/build b/test/964-default-iface-init-gen/build
index 1d245894de..b9b36d0f86 100755
--- a/test/964-default-iface-init-gen/build
+++ b/test/964-default-iface-init-gen/build
@@ -19,7 +19,7 @@ set -e
 
 mkdir -p ./src
 
-# Generate the smali files and expected.txt or fail
-./util-src/generate_java.py ./src ./expected.txt
+# Generate the smali files and expected-stdout.txt or fail
+./util-src/generate_java.py ./src ./expected-stdout.txt
 
 ./default-build "$@" --experimental default-methods
diff --git a/test/964-default-iface-init-gen/expected.txt b/test/964-default-iface-init-gen/expected-stdout.txt
index 1ddd65d177..1ddd65d177 100644
--- a/test/964-default-iface-init-gen/expected.txt
+++ b/test/964-default-iface-init-gen/expected-stdout.txt
diff --git a/test/964-default-iface-init-gen/info.txt b/test/964-default-iface-init-gen/info.txt
index 5805a86854..641fd03c79 100644
--- a/test/964-default-iface-init-gen/info.txt
+++ b/test/964-default-iface-init-gen/info.txt
@@ -13,5 +13,5 @@ Care should be taken when updating the generate_smali.py script. It should alway
 return equivalent output when run multiple times and the expected output should
 be valid.
 
-Do not modify the expected.txt file. It is generated on each run by
+Do not modify the expected-stdout.txt file. It is generated on each run by
 util-src/generate_smali.py.
diff --git a/test/965-default-verify/expected.txt b/test/965-default-verify/expected-stdout.txt
index b31314ffc6..b31314ffc6 100644
--- a/test/965-default-verify/expected.txt
+++ b/test/965-default-verify/expected-stdout.txt
diff --git a/test/966-default-conflict/expected.txt b/test/966-default-conflict/expected-stdout.txt
index bbd733ca90..bbd733ca90 100644
--- a/test/966-default-conflict/expected.txt
+++ b/test/966-default-conflict/expected-stdout.txt
diff --git a/test/967-default-ame/expected.txt b/test/967-default-ame/expected-stdout.txt
index cbd4ad32eb..cbd4ad32eb 100644
--- a/test/967-default-ame/expected.txt
+++ b/test/967-default-ame/expected-stdout.txt
diff --git a/test/968-default-partial-compile-gen/build b/test/968-default-partial-compile-gen/build
index c8f0384645..38e84a5aed 100755
--- a/test/968-default-partial-compile-gen/build
+++ b/test/968-default-partial-compile-gen/build
@@ -23,14 +23,14 @@ if [[ $@ == *"--jvm"* ]]; then
   mkdir -p src
   echo "${JAVAC} \$@" >> ./javac_exec.sh
   # This will use java_exec.sh to execute the javac compiler. It will place the
-  # compiled class files in ./classes and the expected values in expected.txt
+  # compiled class files in ./classes and the expected values in expected-stdout.txt
   #
   # After this the src directory will contain the final versions of all files.
-  ./util-src/generate_java.py ./javac_exec.sh ./src ./classes ./expected.txt ./build_log
+  ./util-src/generate_java.py ./javac_exec.sh ./src ./classes ./expected-stdout.txt ./build_log
 else
   mkdir -p ./smali
-  # Generate the smali files and expected.txt or fail
-  ./util-src/generate_smali.py ./smali ./expected.txt
+  # Generate the smali files and expected-stdout.txt or fail
+  ./util-src/generate_smali.py ./smali ./expected-stdout.txt
   # Use the default build script
   ./default-build "$@" "$EXTRA_ARGS" --experimental default-methods
 fi
diff --git a/test/968-default-partial-compile-gen/expected.txt b/test/968-default-partial-compile-gen/expected-stdout.txt
index 1ddd65d177..1ddd65d177 100644
--- a/test/968-default-partial-compile-gen/expected.txt
+++ b/test/968-default-partial-compile-gen/expected-stdout.txt
diff --git a/test/968-default-partial-compile-gen/info.txt b/test/968-default-partial-compile-gen/info.txt
index bc1c42816e..e4bd5a7469 100644
--- a/test/968-default-partial-compile-gen/info.txt
+++ b/test/968-default-partial-compile-gen/info.txt
@@ -13,5 +13,5 @@ Care should be taken when updating the generate_smali.py script. It should alway
 return equivalent output when run multiple times and the expected output should
 be valid.
 
-Do not modify the expected.txt file. It is generated on each run by
+Do not modify the expected-stdout.txt file. It is generated on each run by
 util-src/generate_smali.py.
diff --git a/test/969-iface-super/expected.txt b/test/969-iface-super/expected-stdout.txt
index f7a63d6b08..f7a63d6b08 100644
--- a/test/969-iface-super/expected.txt
+++ b/test/969-iface-super/expected-stdout.txt
diff --git a/test/970-iface-super-resolution-gen/build b/test/970-iface-super-resolution-gen/build
index 0594501c91..6eecd71386 100755
--- a/test/970-iface-super-resolution-gen/build
+++ b/test/970-iface-super-resolution-gen/build
@@ -23,11 +23,11 @@ if [[ $@ == *"--jvm"* ]]; then
   # Build the Java files
   mkdir -p src
   mkdir -p src2
-  ./util-src/generate_java.py ./src2 ./src ./expected.txt
+  ./util-src/generate_java.py ./src2 ./src ./expected-stdout.txt
 else
-  # Generate the smali files and expected.txt or fail
+  # Generate the smali files and expected-stdout.txt or fail
   mkdir -p smali
-  ./util-src/generate_smali.py ./smali ./expected.txt
+  ./util-src/generate_smali.py ./smali ./expected-stdout.txt
 fi
 
 ./default-build "$@" --experimental default-methods
diff --git a/test/970-iface-super-resolution-gen/expected.txt b/test/970-iface-super-resolution-gen/expected-stdout.txt
index 1ddd65d177..1ddd65d177 100644
--- a/test/970-iface-super-resolution-gen/expected.txt
+++ b/test/970-iface-super-resolution-gen/expected-stdout.txt
diff --git a/test/970-iface-super-resolution-gen/info.txt b/test/970-iface-super-resolution-gen/info.txt
index 2cd2cc75b7..b5a04fd852 100644
--- a/test/970-iface-super-resolution-gen/info.txt
+++ b/test/970-iface-super-resolution-gen/info.txt
@@ -13,5 +13,5 @@ Care should be taken when updating the generate_smali.py script. It should alway
 return equivalent output when run multiple times and the expected output should
 be valid.
 
-Do not modify the expected.txt file. It is generated on each run by
+Do not modify the expected-stdout.txt file. It is generated on each run by
 util-src/generate_smali.py.
diff --git a/test/971-iface-super/build b/test/971-iface-super/build
index c8f0384645..38e84a5aed 100755
--- a/test/971-iface-super/build
+++ b/test/971-iface-super/build
@@ -23,14 +23,14 @@ if [[ $@ == *"--jvm"* ]]; then
   mkdir -p src
   echo "${JAVAC} \$@" >> ./javac_exec.sh
   # This will use java_exec.sh to execute the javac compiler. It will place the
-  # compiled class files in ./classes and the expected values in expected.txt
+  # compiled class files in ./classes and the expected values in expected-stdout.txt
   #
   # After this the src directory will contain the final versions of all files.
-  ./util-src/generate_java.py ./javac_exec.sh ./src ./classes ./expected.txt ./build_log
+  ./util-src/generate_java.py ./javac_exec.sh ./src ./classes ./expected-stdout.txt ./build_log
 else
   mkdir -p ./smali
-  # Generate the smali files and expected.txt or fail
-  ./util-src/generate_smali.py ./smali ./expected.txt
+  # Generate the smali files and expected-stdout.txt or fail
+  ./util-src/generate_smali.py ./smali ./expected-stdout.txt
   # Use the default build script
   ./default-build "$@" "$EXTRA_ARGS" --experimental default-methods
 fi
diff --git a/test/971-iface-super/expected.txt b/test/971-iface-super/expected-stdout.txt
index 1ddd65d177..1ddd65d177 100644
--- a/test/971-iface-super/expected.txt
+++ b/test/971-iface-super/expected-stdout.txt
diff --git a/test/971-iface-super/info.txt b/test/971-iface-super/info.txt
index bc1c42816e..e4bd5a7469 100644
--- a/test/971-iface-super/info.txt
+++ b/test/971-iface-super/info.txt
@@ -13,5 +13,5 @@ Care should be taken when updating the generate_smali.py script. It should alway
 return equivalent output when run multiple times and the expected output should
 be valid.
 
-Do not modify the expected.txt file. It is generated on each run by
+Do not modify the expected-stdout.txt file. It is generated on each run by
 util-src/generate_smali.py.
diff --git a/test/972-default-imt-collision/expected.txt b/test/972-default-imt-collision/expected-stdout.txt
index e69de29bb2..e69de29bb2 100644
--- a/test/972-default-imt-collision/expected.txt
+++ b/test/972-default-imt-collision/expected-stdout.txt
diff --git a/test/972-iface-super-multidex/expected.txt b/test/972-iface-super-multidex/expected-stdout.txt
index a9d31a5320..a9d31a5320 100644
--- a/test/972-iface-super-multidex/expected.txt
+++ b/test/972-iface-super-multidex/expected-stdout.txt
diff --git a/test/973-default-multidex/expected.txt b/test/973-default-multidex/expected-stdout.txt
index b376e81554..b376e81554 100644
--- a/test/973-default-multidex/expected.txt
+++ b/test/973-default-multidex/expected-stdout.txt
diff --git a/test/974-verify-interface-super/expected.txt b/test/974-verify-interface-super/expected-stdout.txt
index 7ba7491891..7ba7491891 100644
--- a/test/974-verify-interface-super/expected.txt
+++ b/test/974-verify-interface-super/expected-stdout.txt
diff --git a/test/975-iface-private/expected.txt b/test/975-iface-private/expected-stdout.txt
index 908a8f2131..908a8f2131 100644
--- a/test/975-iface-private/expected.txt
+++ b/test/975-iface-private/expected-stdout.txt
diff --git a/test/976-conflict-no-methods/expected.txt b/test/976-conflict-no-methods/expected-stdout.txt
index 656dfc57d5..656dfc57d5 100644
--- a/test/976-conflict-no-methods/expected.txt
+++ b/test/976-conflict-no-methods/expected-stdout.txt
diff --git a/test/978-virtual-interface/expected.txt b/test/978-virtual-interface/expected-stdout.txt
index 99071b1d4e..99071b1d4e 100644
--- a/test/978-virtual-interface/expected.txt
+++ b/test/978-virtual-interface/expected-stdout.txt
diff --git a/test/979-const-method-handle/expected.txt b/test/979-const-method-handle/expected-stdout.txt
index 85317092ff..85317092ff 100644
--- a/test/979-const-method-handle/expected.txt
+++ b/test/979-const-method-handle/expected-stdout.txt
diff --git a/test/980-redefine-object/expected.txt b/test/980-redefine-object/expected-stdout.txt
index 0a80882de1..0a80882de1 100644
--- a/test/980-redefine-object/expected.txt
+++ b/test/980-redefine-object/expected-stdout.txt
diff --git a/test/980-redefine-object/info.txt b/test/980-redefine-object/info.txt
index f3e01b596d..187dc24218 100644
--- a/test/980-redefine-object/info.txt
+++ b/test/980-redefine-object/info.txt
@@ -20,4 +20,4 @@ to the <init> function.
 
 It is also possible it could fail due to the pattern of allocations caused by
 doing string concatenation or printing changing. In this case you should simply
-update the expected.txt file.
+update the expected-stdout.txt file.
diff --git a/test/981-dedup-original-dex/expected.txt b/test/981-dedup-original-dex/expected-stdout.txt
index e69de29bb2..e69de29bb2 100644
--- a/test/981-dedup-original-dex/expected.txt
+++ b/test/981-dedup-original-dex/expected-stdout.txt
diff --git a/test/982-ok-no-retransform/Android.bp b/test/982-ok-no-retransform/Android.bp
index cb1ae9a2ab..cca926e5cf 100644
--- a/test/982-ok-no-retransform/Android.bp
+++ b/test/982-ok-no-retransform/Android.bp
@@ -8,13 +8,13 @@ java_test {
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-982-ok-no-retransform-expected"],
+    data: [":art-run-test-982-ok-no-retransform-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-982-ok-no-retransform-expected",
-    out: ["art-run-test-982-ok-no-retransform-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-982-ok-no-retransform-expected-stdout",
+    out: ["art-run-test-982-ok-no-retransform-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/982-ok-no-retransform/expected.txt b/test/982-ok-no-retransform/expected-stdout.txt
index 317e9677c3..317e9677c3 100644
--- a/test/982-ok-no-retransform/expected.txt
+++ b/test/982-ok-no-retransform/expected-stdout.txt
diff --git a/test/983-source-transform-verify/Android.bp b/test/983-source-transform-verify/Android.bp
index 4572d67686..02a8427761 100644
--- a/test/983-source-transform-verify/Android.bp
+++ b/test/983-source-transform-verify/Android.bp
@@ -8,13 +8,13 @@ java_test {
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-983-source-transform-verify-expected"],
+    data: [":art-run-test-983-source-transform-verify-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-983-source-transform-verify-expected",
-    out: ["art-run-test-983-source-transform-verify-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-983-source-transform-verify-expected-stdout",
+    out: ["art-run-test-983-source-transform-verify-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/983-source-transform-verify/expected.txt b/test/983-source-transform-verify/expected-stdout.txt
index aa51ea08ae..aa51ea08ae 100644
--- a/test/983-source-transform-verify/expected.txt
+++ b/test/983-source-transform-verify/expected-stdout.txt
diff --git a/test/984-obsolete-invoke/Android.bp b/test/984-obsolete-invoke/Android.bp
index 25d8f76b0c..7640387220 100644
--- a/test/984-obsolete-invoke/Android.bp
+++ b/test/984-obsolete-invoke/Android.bp
@@ -8,13 +8,13 @@ java_test {
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-984-obsolete-invoke-expected"],
+    data: [":art-run-test-984-obsolete-invoke-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-984-obsolete-invoke-expected",
-    out: ["art-run-test-984-obsolete-invoke-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-984-obsolete-invoke-expected-stdout",
+    out: ["art-run-test-984-obsolete-invoke-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/984-obsolete-invoke/expected.txt b/test/984-obsolete-invoke/expected-stdout.txt
index 8052c46971..8052c46971 100644
--- a/test/984-obsolete-invoke/expected.txt
+++ b/test/984-obsolete-invoke/expected-stdout.txt
diff --git a/test/985-re-obsolete/Android.bp b/test/985-re-obsolete/Android.bp
index c8f73ffb47..cdc24801fa 100644
--- a/test/985-re-obsolete/Android.bp
+++ b/test/985-re-obsolete/Android.bp
@@ -8,13 +8,13 @@ java_test {
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-985-re-obsolete-expected"],
+    data: [":art-run-test-985-re-obsolete-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-985-re-obsolete-expected",
-    out: ["art-run-test-985-re-obsolete-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-985-re-obsolete-expected-stdout",
+    out: ["art-run-test-985-re-obsolete-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/985-re-obsolete/expected.txt b/test/985-re-obsolete/expected-stdout.txt
index 5159a00f43..5159a00f43 100644
--- a/test/985-re-obsolete/expected.txt
+++ b/test/985-re-obsolete/expected-stdout.txt
diff --git a/test/986-native-method-bind/Android.bp b/test/986-native-method-bind/Android.bp
index b5ce5444f3..4181983a6b 100644
--- a/test/986-native-method-bind/Android.bp
+++ b/test/986-native-method-bind/Android.bp
@@ -8,13 +8,13 @@ java_test {
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-986-native-method-bind-expected"],
+    data: [":art-run-test-986-native-method-bind-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-986-native-method-bind-expected",
-    out: ["art-run-test-986-native-method-bind-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-986-native-method-bind-expected-stdout",
+    out: ["art-run-test-986-native-method-bind-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/986-native-method-bind/expected.txt b/test/986-native-method-bind/expected-stdout.txt
index a470285cea..a470285cea 100644
--- a/test/986-native-method-bind/expected.txt
+++ b/test/986-native-method-bind/expected-stdout.txt
diff --git a/test/987-agent-bind/Android.bp b/test/987-agent-bind/Android.bp
index 44888478bb..914a1a7711 100644
--- a/test/987-agent-bind/Android.bp
+++ b/test/987-agent-bind/Android.bp
@@ -8,13 +8,13 @@ java_test {
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-987-agent-bind-expected"],
+    data: [":art-run-test-987-agent-bind-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-987-agent-bind-expected",
-    out: ["art-run-test-987-agent-bind-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-987-agent-bind-expected-stdout",
+    out: ["art-run-test-987-agent-bind-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/987-agent-bind/expected.txt b/test/987-agent-bind/expected-stdout.txt
index ee4a4247bd..ee4a4247bd 100644
--- a/test/987-agent-bind/expected.txt
+++ b/test/987-agent-bind/expected-stdout.txt
diff --git a/test/988-method-trace/Android.bp b/test/988-method-trace/Android.bp
index bec9837b94..ed4fc5947c 100644
--- a/test/988-method-trace/Android.bp
+++ b/test/988-method-trace/Android.bp
@@ -8,13 +8,13 @@ java_test {
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-988-method-trace-expected"],
+    data: [":art-run-test-988-method-trace-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-988-method-trace-expected",
-    out: ["art-run-test-988-method-trace-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-988-method-trace-expected-stdout",
+    out: ["art-run-test-988-method-trace-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/988-method-trace/expected.txt b/test/988-method-trace/expected-stdout.txt
index b263308573..b263308573 100644
--- a/test/988-method-trace/expected.txt
+++ b/test/988-method-trace/expected-stdout.txt
diff --git a/test/989-method-trace-throw/Android.bp b/test/989-method-trace-throw/Android.bp
index 3cf8e354bb..30a37b61a0 100644
--- a/test/989-method-trace-throw/Android.bp
+++ b/test/989-method-trace-throw/Android.bp
@@ -8,13 +8,13 @@ java_test {
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-989-method-trace-throw-expected"],
+    data: [":art-run-test-989-method-trace-throw-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-989-method-trace-throw-expected",
-    out: ["art-run-test-989-method-trace-throw-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-989-method-trace-throw-expected-stdout",
+    out: ["art-run-test-989-method-trace-throw-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/989-method-trace-throw/expected.txt b/test/989-method-trace-throw/expected-stdout.txt
index 0911bc35e8..0911bc35e8 100644
--- a/test/989-method-trace-throw/expected.txt
+++ b/test/989-method-trace-throw/expected-stdout.txt
diff --git a/test/990-field-trace/Android.bp b/test/990-field-trace/Android.bp
index 929f43d030..83ce7db072 100644
--- a/test/990-field-trace/Android.bp
+++ b/test/990-field-trace/Android.bp
@@ -8,13 +8,13 @@ java_test {
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-990-field-trace-expected"],
+    data: [":art-run-test-990-field-trace-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-990-field-trace-expected",
-    out: ["art-run-test-990-field-trace-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-990-field-trace-expected-stdout",
+    out: ["art-run-test-990-field-trace-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/990-field-trace/expected.txt b/test/990-field-trace/expected-stdout.txt
index cceb008383..cceb008383 100644
--- a/test/990-field-trace/expected.txt
+++ b/test/990-field-trace/expected-stdout.txt
diff --git a/test/991-field-trace-2/Android.bp b/test/991-field-trace-2/Android.bp
index 00216f3384..e5e8e10c74 100644
--- a/test/991-field-trace-2/Android.bp
+++ b/test/991-field-trace-2/Android.bp
@@ -8,13 +8,13 @@ java_test {
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-991-field-trace-2-expected"],
+    data: [":art-run-test-991-field-trace-2-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-991-field-trace-2-expected",
-    out: ["art-run-test-991-field-trace-2-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-991-field-trace-2-expected-stdout",
+    out: ["art-run-test-991-field-trace-2-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/991-field-trace-2/expected.txt b/test/991-field-trace-2/expected-stdout.txt
index 8da8ffdae6..8da8ffdae6 100644
--- a/test/991-field-trace-2/expected.txt
+++ b/test/991-field-trace-2/expected-stdout.txt
diff --git a/test/992-source-data/Android.bp b/test/992-source-data/Android.bp
index 8b27e34566..a0cbac5f39 100644
--- a/test/992-source-data/Android.bp
+++ b/test/992-source-data/Android.bp
@@ -8,13 +8,13 @@ java_test {
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-992-source-data-expected"],
+    data: [":art-run-test-992-source-data-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-992-source-data-expected",
-    out: ["art-run-test-992-source-data-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-992-source-data-expected-stdout",
+    out: ["art-run-test-992-source-data-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/992-source-data/expected.txt b/test/992-source-data/expected-stdout.txt
index 7f59682b1d..7f59682b1d 100644
--- a/test/992-source-data/expected.txt
+++ b/test/992-source-data/expected-stdout.txt
diff --git a/test/993-breakpoints/Android.bp b/test/993-breakpoints/Android.bp
index e65f96047c..125f31f2b0 100644
--- a/test/993-breakpoints/Android.bp
+++ b/test/993-breakpoints/Android.bp
@@ -8,13 +8,13 @@ java_test {
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-993-breakpoints-expected"],
+    data: [":art-run-test-993-breakpoints-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-993-breakpoints-expected",
-    out: ["art-run-test-993-breakpoints-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-993-breakpoints-expected-stdout",
+    out: ["art-run-test-993-breakpoints-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/993-breakpoints/expected.txt b/test/993-breakpoints/expected-stdout.txt
index 1749a77e9d..1749a77e9d 100644
--- a/test/993-breakpoints/expected.txt
+++ b/test/993-breakpoints/expected-stdout.txt
diff --git a/test/994-breakpoint-line/Android.bp b/test/994-breakpoint-line/Android.bp
index c1dc98db14..707e4a9a83 100644
--- a/test/994-breakpoint-line/Android.bp
+++ b/test/994-breakpoint-line/Android.bp
@@ -8,13 +8,13 @@ java_test {
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-994-breakpoint-line-expected"],
+    data: [":art-run-test-994-breakpoint-line-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-994-breakpoint-line-expected",
-    out: ["art-run-test-994-breakpoint-line-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-994-breakpoint-line-expected-stdout",
+    out: ["art-run-test-994-breakpoint-line-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/994-breakpoint-line/expected.txt b/test/994-breakpoint-line/expected-stdout.txt
index 5899659b3c..5899659b3c 100644
--- a/test/994-breakpoint-line/expected.txt
+++ b/test/994-breakpoint-line/expected-stdout.txt
diff --git a/test/995-breakpoints-throw/Android.bp b/test/995-breakpoints-throw/Android.bp
index 001847c477..54d2646049 100644
--- a/test/995-breakpoints-throw/Android.bp
+++ b/test/995-breakpoints-throw/Android.bp
@@ -8,13 +8,13 @@ java_test {
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-995-breakpoints-throw-expected"],
+    data: [":art-run-test-995-breakpoints-throw-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-995-breakpoints-throw-expected",
-    out: ["art-run-test-995-breakpoints-throw-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-995-breakpoints-throw-expected-stdout",
+    out: ["art-run-test-995-breakpoints-throw-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/995-breakpoints-throw/expected.txt b/test/995-breakpoints-throw/expected-stdout.txt
index a565b7cf14..a565b7cf14 100644
--- a/test/995-breakpoints-throw/expected.txt
+++ b/test/995-breakpoints-throw/expected-stdout.txt
diff --git a/test/996-breakpoint-obsolete/Android.bp b/test/996-breakpoint-obsolete/Android.bp
index da4ae0f7bd..52a69ee82c 100644
--- a/test/996-breakpoint-obsolete/Android.bp
+++ b/test/996-breakpoint-obsolete/Android.bp
@@ -8,13 +8,13 @@ java_test {
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-996-breakpoint-obsolete-expected"],
+    data: [":art-run-test-996-breakpoint-obsolete-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-996-breakpoint-obsolete-expected",
-    out: ["art-run-test-996-breakpoint-obsolete-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-996-breakpoint-obsolete-expected-stdout",
+    out: ["art-run-test-996-breakpoint-obsolete-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/996-breakpoint-obsolete/expected.txt b/test/996-breakpoint-obsolete/expected-stdout.txt
index e0d419e3f5..e0d419e3f5 100644
--- a/test/996-breakpoint-obsolete/expected.txt
+++ b/test/996-breakpoint-obsolete/expected-stdout.txt
diff --git a/test/997-single-step/Android.bp b/test/997-single-step/Android.bp
index 7eef9b9e07..9cca0fb119 100644
--- a/test/997-single-step/Android.bp
+++ b/test/997-single-step/Android.bp
@@ -8,13 +8,13 @@ java_test {
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-997-single-step-expected"],
+    data: [":art-run-test-997-single-step-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-997-single-step-expected",
-    out: ["art-run-test-997-single-step-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-997-single-step-expected-stdout",
+    out: ["art-run-test-997-single-step-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/997-single-step/expected.txt b/test/997-single-step/expected-stdout.txt
index 69c554ca7f..69c554ca7f 100644
--- a/test/997-single-step/expected.txt
+++ b/test/997-single-step/expected-stdout.txt
diff --git a/test/998-redefine-use-after-free/expected.txt b/test/998-redefine-use-after-free/expected-stdout.txt
index e69de29bb2..e69de29bb2 100644
--- a/test/998-redefine-use-after-free/expected.txt
+++ b/test/998-redefine-use-after-free/expected-stdout.txt
diff --git a/test/999-redefine-hiddenapi/expected.txt b/test/999-redefine-hiddenapi/expected-stdout.txt
index 6a5618ebc6..6a5618ebc6 100644
--- a/test/999-redefine-hiddenapi/expected.txt
+++ b/test/999-redefine-hiddenapi/expected-stdout.txt
diff --git a/test/Android.bp b/test/Android.bp
index 1ee5164e4f..dc125898ed 100644
--- a/test/Android.bp
+++ b/test/Android.bp
@@ -837,138 +837,138 @@ java_library {
 
 // CTS test runner in cts/hostsidetests/jvmti looks for an expected test
 // result for the test NN in the file results.NN.expected.txt while in the
-// source tree each expected test result is in the NN-xxxx/expected.txt.
+// source tree each expected test result is in the NN-xxxx/expected-stdout.txt.
 // Copy+rename them them to a temporary directory and them zip them.
 java_genrule {
     name: "expected_cts_outputs_gen",
     srcs: [
-        "901-hello-ti-agent/expected.txt",
-        "902-hello-transformation/expected.txt",
-        "903-hello-tagging/expected.txt",
-        "904-object-allocation/expected.txt",
-        "905-object-free/expected.txt",
-        "906-iterate-heap/expected.txt",
-        "907-get-loaded-classes/expected.txt",
-        "908-gc-start-finish/expected.txt",
-        "910-methods/expected.txt",
+        "901-hello-ti-agent/expected-stdout.txt",
+        "902-hello-transformation/expected-stdout.txt",
+        "903-hello-tagging/expected-stdout.txt",
+        "904-object-allocation/expected-stdout.txt",
+        "905-object-free/expected-stdout.txt",
+        "906-iterate-heap/expected-stdout.txt",
+        "907-get-loaded-classes/expected-stdout.txt",
+        "908-gc-start-finish/expected-stdout.txt",
+        "910-methods/expected-stdout.txt",
         "911-get-stack-trace/expected-cts-version.txt",
-        "912-classes/expected.txt",
-        "913-heaps/expected.txt",
-        "914-hello-obsolescence/expected.txt",
-        "915-obsolete-2/expected.txt",
-        "917-fields-transformation/expected.txt",
-        "918-fields/expected.txt",
-        "919-obsolete-fields/expected.txt",
-        "920-objects/expected.txt",
-        "922-properties/expected.txt",
-        "923-monitors/expected.txt",
-        "924-threads/expected.txt",
-        "925-threadgroups/expected.txt",
-        "926-multi-obsolescence/expected.txt",
-        "927-timers/expected.txt",
-        "928-jni-table/expected.txt",
-        "930-hello-retransform/expected.txt",
-        "931-agent-thread/expected.txt",
-        "932-transform-saves/expected.txt",
-        "933-misc-events/expected.txt",
-        "940-recursive-obsolete/expected.txt",
-        "942-private-recursive/expected.txt",
-        "944-transform-classloaders/expected.txt",
-        "945-obsolete-native/expected.txt",
-        "947-reflect-method/expected.txt",
-        "951-threaded-obsolete/expected.txt",
-        "982-ok-no-retransform/expected.txt",
-        "983-source-transform-verify/expected.txt",
-        "984-obsolete-invoke/expected.txt",
-        "985-re-obsolete/expected.txt",
-        "986-native-method-bind/expected.txt",
-        "988-method-trace/expected.txt",
-        "989-method-trace-throw/expected.txt",
-        "990-field-trace/expected.txt",
-        "991-field-trace-2/expected.txt",
-        "992-source-data/expected.txt",
-        "993-breakpoints/expected.txt",
-        "994-breakpoint-line/expected.txt",
-        "995-breakpoints-throw/expected.txt",
-        "996-breakpoint-obsolete/expected.txt",
-        "997-single-step/expected.txt",
-        "1900-track-alloc/expected.txt",
-        "1901-get-bytecodes/expected.txt",
-        "1902-suspend/expected.txt",
-        "1903-suspend-self/expected.txt",
-        "1904-double-suspend/expected.txt",
-        "1906-suspend-list-me-first/expected.txt",
-        "1907-suspend-list-self-twice/expected.txt",
-        "1908-suspend-native-resume-self/expected.txt",
-        "1909-per-agent-tls/expected.txt",
-        "1910-transform-with-default/expected.txt",
-        "1911-get-local-var-table/expected.txt",
-        "1912-get-set-local-primitive/expected.txt",
-        "1913-get-set-local-objects/expected.txt",
-        "1914-get-local-instance/expected.txt",
-        "1915-get-set-local-current-thread/expected.txt",
-        "1916-get-set-current-frame/expected.txt",
-        "1917-get-stack-frame/expected.txt",
-        "1920-suspend-native-monitor/expected.txt",
-        "1921-suspend-native-recursive-monitor/expected.txt",
-        "1922-owned-monitors-info/expected.txt",
-        "1923-frame-pop/expected.txt",
-        "1924-frame-pop-toggle/expected.txt",
-        "1925-self-frame-pop/expected.txt",
-        "1926-missed-frame-pop/expected.txt",
-        "1927-exception-event/expected.txt",
-        "1928-exception-event-exception/expected.txt",
-        "1930-monitor-info/expected.txt",
-        "1931-monitor-events/expected.txt",
-        "1932-monitor-events-misc/expected.txt",
-        "1933-monitor-current-contended/expected.txt",
-        "1934-jvmti-signal-thread/expected.txt",
-        "1936-thread-end-events/expected.txt",
-        "1937-transform-soft-fail/expected.txt",
-        "1939-proxy-frames/expected.txt",
-        "1941-dispose-stress/expected.txt",
-        "1942-suspend-raw-monitor-exit/expected.txt",
-        "1943-suspend-raw-monitor-wait/expected.txt",
-        "1953-pop-frame/expected.txt",
-        "1958-transform-try-jit/expected.txt",
-        "1962-multi-thread-events/expected.txt",
-        "1963-add-to-dex-classloader-in-memory/expected.txt",
-        "1967-get-set-local-bad-slot/expected.txt",
-        "1968-force-early-return/expected.txt",
-        "1969-force-early-return-void/expected.txt",
-        "1970-force-early-return-long/expected.txt",
-        "1971-multi-force-early-return/expected.txt",
-        "1974-resize-array/expected.txt",
-        "1975-hello-structural-transformation/expected.txt",
-        "1976-hello-structural-static-methods/expected.txt",
-        "1977-hello-structural-obsolescence/expected.txt",
-        "1978-regular-obsolete-then-structural-obsolescence/expected.txt",
-        "1979-threaded-structural-transformation/expected.txt",
+        "912-classes/expected-stdout.txt",
+        "913-heaps/expected-stdout.txt",
+        "914-hello-obsolescence/expected-stdout.txt",
+        "915-obsolete-2/expected-stdout.txt",
+        "917-fields-transformation/expected-stdout.txt",
+        "918-fields/expected-stdout.txt",
+        "919-obsolete-fields/expected-stdout.txt",
+        "920-objects/expected-stdout.txt",
+        "922-properties/expected-stdout.txt",
+        "923-monitors/expected-stdout.txt",
+        "924-threads/expected-stdout.txt",
+        "925-threadgroups/expected-stdout.txt",
+        "926-multi-obsolescence/expected-stdout.txt",
+        "927-timers/expected-stdout.txt",
+        "928-jni-table/expected-stdout.txt",
+        "930-hello-retransform/expected-stdout.txt",
+        "931-agent-thread/expected-stdout.txt",
+        "932-transform-saves/expected-stdout.txt",
+        "933-misc-events/expected-stdout.txt",
+        "940-recursive-obsolete/expected-stdout.txt",
+        "942-private-recursive/expected-stdout.txt",
+        "944-transform-classloaders/expected-stdout.txt",
+        "945-obsolete-native/expected-stdout.txt",
+        "947-reflect-method/expected-stdout.txt",
+        "951-threaded-obsolete/expected-stdout.txt",
+        "982-ok-no-retransform/expected-stdout.txt",
+        "983-source-transform-verify/expected-stdout.txt",
+        "984-obsolete-invoke/expected-stdout.txt",
+        "985-re-obsolete/expected-stdout.txt",
+        "986-native-method-bind/expected-stdout.txt",
+        "988-method-trace/expected-stdout.txt",
+        "989-method-trace-throw/expected-stdout.txt",
+        "990-field-trace/expected-stdout.txt",
+        "991-field-trace-2/expected-stdout.txt",
+        "992-source-data/expected-stdout.txt",
+        "993-breakpoints/expected-stdout.txt",
+        "994-breakpoint-line/expected-stdout.txt",
+        "995-breakpoints-throw/expected-stdout.txt",
+        "996-breakpoint-obsolete/expected-stdout.txt",
+        "997-single-step/expected-stdout.txt",
+        "1900-track-alloc/expected-stdout.txt",
+        "1901-get-bytecodes/expected-stdout.txt",
+        "1902-suspend/expected-stdout.txt",
+        "1903-suspend-self/expected-stdout.txt",
+        "1904-double-suspend/expected-stdout.txt",
+        "1906-suspend-list-me-first/expected-stdout.txt",
+        "1907-suspend-list-self-twice/expected-stdout.txt",
+        "1908-suspend-native-resume-self/expected-stdout.txt",
+        "1909-per-agent-tls/expected-stdout.txt",
+        "1910-transform-with-default/expected-stdout.txt",
+        "1911-get-local-var-table/expected-stdout.txt",
+        "1912-get-set-local-primitive/expected-stdout.txt",
+        "1913-get-set-local-objects/expected-stdout.txt",
+        "1914-get-local-instance/expected-stdout.txt",
+        "1915-get-set-local-current-thread/expected-stdout.txt",
+        "1916-get-set-current-frame/expected-stdout.txt",
+        "1917-get-stack-frame/expected-stdout.txt",
+        "1920-suspend-native-monitor/expected-stdout.txt",
+        "1921-suspend-native-recursive-monitor/expected-stdout.txt",
+        "1922-owned-monitors-info/expected-stdout.txt",
+        "1923-frame-pop/expected-stdout.txt",
+        "1924-frame-pop-toggle/expected-stdout.txt",
+        "1925-self-frame-pop/expected-stdout.txt",
+        "1926-missed-frame-pop/expected-stdout.txt",
+        "1927-exception-event/expected-stdout.txt",
+        "1928-exception-event-exception/expected-stdout.txt",
+        "1930-monitor-info/expected-stdout.txt",
+        "1931-monitor-events/expected-stdout.txt",
+        "1932-monitor-events-misc/expected-stdout.txt",
+        "1933-monitor-current-contended/expected-stdout.txt",
+        "1934-jvmti-signal-thread/expected-stdout.txt",
+        "1936-thread-end-events/expected-stdout.txt",
+        "1937-transform-soft-fail/expected-stdout.txt",
+        "1939-proxy-frames/expected-stdout.txt",
+        "1941-dispose-stress/expected-stdout.txt",
+        "1942-suspend-raw-monitor-exit/expected-stdout.txt",
+        "1943-suspend-raw-monitor-wait/expected-stdout.txt",
+        "1953-pop-frame/expected-stdout.txt",
+        "1958-transform-try-jit/expected-stdout.txt",
+        "1962-multi-thread-events/expected-stdout.txt",
+        "1963-add-to-dex-classloader-in-memory/expected-stdout.txt",
+        "1967-get-set-local-bad-slot/expected-stdout.txt",
+        "1968-force-early-return/expected-stdout.txt",
+        "1969-force-early-return-void/expected-stdout.txt",
+        "1970-force-early-return-long/expected-stdout.txt",
+        "1971-multi-force-early-return/expected-stdout.txt",
+        "1974-resize-array/expected-stdout.txt",
+        "1975-hello-structural-transformation/expected-stdout.txt",
+        "1976-hello-structural-static-methods/expected-stdout.txt",
+        "1977-hello-structural-obsolescence/expected-stdout.txt",
+        "1978-regular-obsolete-then-structural-obsolescence/expected-stdout.txt",
+        "1979-threaded-structural-transformation/expected-stdout.txt",
         // TODO Requires VarHandles to be un-@hide. See b/64382372
-        // "test/1981-structural-redef-private-method-handles/expected.txt",
+        // "test/1981-structural-redef-private-method-handles/expected-stdout.txt",
         "1981-structural-redef-private-method-handles/expected_no_mh.txt",
-        "1982-no-virtuals-structural-redefinition/expected.txt",
+        "1982-no-virtuals-structural-redefinition/expected-stdout.txt",
         // JNI-id use can change the outcome of this test on device.
         "1983-structural-redefinition-failures/expected-cts.txt",
-        "1984-structural-redefine-field-trace/expected.txt",
-        "1988-multi-structural-redefine/expected.txt",
-        "1989-transform-bad-monitor/expected.txt",
-        "1990-structural-bad-verify/expected.txt",
-        "1991-hello-structural-retransform/expected.txt",
-        "1992-retransform-no-such-field/expected.txt",
-        "1994-final-virtual-structural/expected.txt",
-        "1995-final-virtual-structural-multithread/expected.txt",
-        "1996-final-override-virtual-structural/expected.txt",
-        "1997-structural-shadow-method/expected.txt",
-        "1998-structural-shadow-field/expected.txt",
-        "1999-virtual-structural/expected.txt",
-        "2001-virtual-structural-multithread/expected.txt",
-        "2002-virtual-structural-initializing/expected.txt",
-        "2003-double-virtual-structural/expected.txt",
-        "2004-double-virtual-structural-abstract/expected.txt",
-        "2005-pause-all-redefine-multithreaded/expected.txt",
-        "2006-virtual-structural-finalizing/expected.txt",
-        "2007-virtual-structural-finalizable/expected.txt",
+        "1984-structural-redefine-field-trace/expected-stdout.txt",
+        "1988-multi-structural-redefine/expected-stdout.txt",
+        "1989-transform-bad-monitor/expected-stdout.txt",
+        "1990-structural-bad-verify/expected-stdout.txt",
+        "1991-hello-structural-retransform/expected-stdout.txt",
+        "1992-retransform-no-such-field/expected-stdout.txt",
+        "1994-final-virtual-structural/expected-stdout.txt",
+        "1995-final-virtual-structural-multithread/expected-stdout.txt",
+        "1996-final-override-virtual-structural/expected-stdout.txt",
+        "1997-structural-shadow-method/expected-stdout.txt",
+        "1998-structural-shadow-field/expected-stdout.txt",
+        "1999-virtual-structural/expected-stdout.txt",
+        "2001-virtual-structural-multithread/expected-stdout.txt",
+        "2002-virtual-structural-initializing/expected-stdout.txt",
+        "2003-double-virtual-structural/expected-stdout.txt",
+        "2004-double-virtual-structural-abstract/expected-stdout.txt",
+        "2005-pause-all-redefine-multithreaded/expected-stdout.txt",
+        "2006-virtual-structural-finalizing/expected-stdout.txt",
+        "2007-virtual-structural-finalizable/expected-stdout.txt",
     ],
     out: ["expected_cts_outputs.jar"],
     tools: ["soong_zip"],
diff --git a/test/README.md b/test/README.md
index c7e5a3fca6..35a82a2a20 100644
--- a/test/README.md
+++ b/test/README.md
@@ -40,8 +40,8 @@ by `test/etc/default-run`.
 
 After the execution of a run-test, the check step's default behavior
 (implemented in `test/etc/default-check`) is to compare its standard output with
-the contents of the `expected.txt` file contained in the test's directory; any
-mismatch triggers a test failure.
+the contents of the `expected-stdout.txt` file contained in the test's directory;
+any mismatch triggers a test failure.
 
 The `test/run-test` script handles the execution of a single run-test in a given
 configuration. The Python script `test/testrunner/testrunner.py` is a convenient
diff --git a/test/etc/run-test-jar b/test/etc/run-test-jar
index 487958f40a..c76487e14a 100755
--- a/test/etc/run-test-jar
+++ b/test/etc/run-test-jar
@@ -1370,7 +1370,7 @@ else
         echo 'STDERR=$(mktemp)' >> ${DEX_LOCATION}/runit.sh
         echo 'STDOUT=$(mktemp)' >> ${DEX_LOCATION}/runit.sh
         echo $cmdline '2>${STDERR} >${STDOUT}' >> ${DEX_LOCATION}/runit.sh
-        echo 'if diff ${STDOUT} $ANDROID_DATA/expected.txt; then' >> ${DEX_LOCATION}/runit.sh
+        echo 'if diff ${STDOUT} $ANDROID_DATA/expected-stdout.txt; then' >> ${DEX_LOCATION}/runit.sh
         echo '  rm -f ${STDOUT} ${STDERR}' >> ${DEX_LOCATION}/runit.sh
         echo '  exit 0' >> ${DEX_LOCATION}/runit.sh
         echo 'else' >> ${DEX_LOCATION}/runit.sh
diff --git a/test/run-test b/test/run-test
index 83897c5b7b..e51d9f8a4a 100755
--- a/test/run-test
+++ b/test/run-test
@@ -122,7 +122,7 @@ chroot=
 info="info.txt"
 build="build"
 run="run"
-expected="expected.txt"
+expected="expected-stdout.txt"
 check_cmd="check"
 output="output.txt"
 build_output="build-output.txt"
@@ -764,7 +764,7 @@ if [ "$usage" = "yes" ]; then
         echo "              The script will only run the test portion, and " \
              "share oat and dex files."
         echo "  $prog --update [options] [test-name]  Update mode" \
-             "(replaces expected.txt)."
+             "(replaces expected-stdout.txt)."
         echo '  Omitting the test name or specifying "-" will use the' \
              "current directory."
         echo "  Runtime Options:"
@@ -1129,7 +1129,7 @@ if [ "$bisection_search" = "yes" -a "$good" != "yes" ]; then
         $maybe_device_mode \
         --raw-cmd="$raw_cmd" \
         --check-script="$cwd/check" \
-        --expected-output="$cwd/expected.txt" \
+        --expected-output="$cwd/expected-stdout.txt" \
         --logfile="$cwd/bisection_log.txt" \
         --timeout=${timeout:-300}
     fi
diff --git a/test/utils/regen-test-files b/test/utils/regen-test-files
index 07ec968565..479dde9345 100755
--- a/test/utils/regen-test-files
+++ b/test/utils/regen-test-files
@@ -373,14 +373,14 @@ java_test {
     defaults: ["art-run-test-defaults"],
     test_config_template: ":$test_config_template",
     srcs: ["src/**/*.java"],
-    data: [":$run_test_name-expected"],
+    data: [":$run_test_name-expected-stdout"],
 $include_src}
 
 // Test's expected output.
 genrule {
-    name: "$run_test_name-expected",
-    out: ["$run_test_name-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "$run_test_name-expected-stdout",
+    out: ["$run_test_name-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f \$(in) \$(out)",
 }
 EOF