diff --git a/compiler-rt/lib/asan/Makefile.old b/compiler-rt/lib/asan/Makefile.old
index 1573c789e93b..5b78ad5971e7 100644
--- a/compiler-rt/lib/asan/Makefile.old
+++ b/compiler-rt/lib/asan/Makefile.old
@@ -213,7 +213,7 @@ test: t64 t32 output_tests lint
 	@echo "ALL TESTS PASSED"
 
 output_tests: b32 b64
-	cd tests && ./test_output.sh $(CLANG_CXX) $(CLANG_CC)
+	cd output_tests && ./test_output.sh $(CLANG_CXX) $(CLANG_CC)
 
 t64: b64
 	$(BIN)/asan_test64
diff --git a/compiler-rt/lib/asan/tests/clone_test.cc b/compiler-rt/lib/asan/output_tests/clone_test.cc
similarity index 100%
rename from compiler-rt/lib/asan/tests/clone_test.cc
rename to compiler-rt/lib/asan/output_tests/clone_test.cc
diff --git a/compiler-rt/lib/asan/tests/clone_test.tmpl b/compiler-rt/lib/asan/output_tests/clone_test.tmpl
similarity index 100%
rename from compiler-rt/lib/asan/tests/clone_test.tmpl
rename to compiler-rt/lib/asan/output_tests/clone_test.tmpl
diff --git a/compiler-rt/lib/asan/tests/deep_tail_call.cc b/compiler-rt/lib/asan/output_tests/deep_tail_call.cc
similarity index 100%
rename from compiler-rt/lib/asan/tests/deep_tail_call.cc
rename to compiler-rt/lib/asan/output_tests/deep_tail_call.cc
diff --git a/compiler-rt/lib/asan/tests/deep_tail_call.tmpl b/compiler-rt/lib/asan/output_tests/deep_tail_call.tmpl
similarity index 100%
rename from compiler-rt/lib/asan/tests/deep_tail_call.tmpl
rename to compiler-rt/lib/asan/output_tests/deep_tail_call.tmpl
diff --git a/compiler-rt/lib/asan/tests/dlclose-test-so.cc b/compiler-rt/lib/asan/output_tests/dlclose-test-so.cc
similarity index 100%
rename from compiler-rt/lib/asan/tests/dlclose-test-so.cc
rename to compiler-rt/lib/asan/output_tests/dlclose-test-so.cc
diff --git a/compiler-rt/lib/asan/tests/dlclose-test.cc b/compiler-rt/lib/asan/output_tests/dlclose-test.cc
similarity index 100%
rename from compiler-rt/lib/asan/tests/dlclose-test.cc
rename to compiler-rt/lib/asan/output_tests/dlclose-test.cc
diff --git a/compiler-rt/lib/asan/tests/dlclose-test.tmpl b/compiler-rt/lib/asan/output_tests/dlclose-test.tmpl
similarity index 100%
rename from compiler-rt/lib/asan/tests/dlclose-test.tmpl
rename to compiler-rt/lib/asan/output_tests/dlclose-test.tmpl
diff --git a/compiler-rt/lib/asan/tests/global-overflow.cc b/compiler-rt/lib/asan/output_tests/global-overflow.cc
similarity index 100%
rename from compiler-rt/lib/asan/tests/global-overflow.cc
rename to compiler-rt/lib/asan/output_tests/global-overflow.cc
diff --git a/compiler-rt/lib/asan/tests/global-overflow.tmpl b/compiler-rt/lib/asan/output_tests/global-overflow.tmpl
similarity index 100%
rename from compiler-rt/lib/asan/tests/global-overflow.tmpl
rename to compiler-rt/lib/asan/output_tests/global-overflow.tmpl
diff --git a/compiler-rt/lib/asan/tests/heap-overflow.cc b/compiler-rt/lib/asan/output_tests/heap-overflow.cc
similarity index 100%
rename from compiler-rt/lib/asan/tests/heap-overflow.cc
rename to compiler-rt/lib/asan/output_tests/heap-overflow.cc
diff --git a/compiler-rt/lib/asan/tests/heap-overflow.tmpl b/compiler-rt/lib/asan/output_tests/heap-overflow.tmpl
similarity index 100%
rename from compiler-rt/lib/asan/tests/heap-overflow.tmpl
rename to compiler-rt/lib/asan/output_tests/heap-overflow.tmpl
diff --git a/compiler-rt/lib/asan/tests/heap-overflow.tmpl.Darwin b/compiler-rt/lib/asan/output_tests/heap-overflow.tmpl.Darwin
similarity index 100%
rename from compiler-rt/lib/asan/tests/heap-overflow.tmpl.Darwin
rename to compiler-rt/lib/asan/output_tests/heap-overflow.tmpl.Darwin
diff --git a/compiler-rt/lib/asan/tests/large_func_test.cc b/compiler-rt/lib/asan/output_tests/large_func_test.cc
similarity index 100%
rename from compiler-rt/lib/asan/tests/large_func_test.cc
rename to compiler-rt/lib/asan/output_tests/large_func_test.cc
diff --git a/compiler-rt/lib/asan/tests/large_func_test.tmpl b/compiler-rt/lib/asan/output_tests/large_func_test.tmpl
similarity index 100%
rename from compiler-rt/lib/asan/tests/large_func_test.tmpl
rename to compiler-rt/lib/asan/output_tests/large_func_test.tmpl
diff --git a/compiler-rt/lib/asan/tests/match_output.py b/compiler-rt/lib/asan/output_tests/match_output.py
similarity index 100%
rename from compiler-rt/lib/asan/tests/match_output.py
rename to compiler-rt/lib/asan/output_tests/match_output.py
diff --git a/compiler-rt/lib/asan/tests/null_deref.cc b/compiler-rt/lib/asan/output_tests/null_deref.cc
similarity index 100%
rename from compiler-rt/lib/asan/tests/null_deref.cc
rename to compiler-rt/lib/asan/output_tests/null_deref.cc
diff --git a/compiler-rt/lib/asan/tests/null_deref.tmpl b/compiler-rt/lib/asan/output_tests/null_deref.tmpl
similarity index 100%
rename from compiler-rt/lib/asan/tests/null_deref.tmpl
rename to compiler-rt/lib/asan/output_tests/null_deref.tmpl
diff --git a/compiler-rt/lib/asan/tests/null_deref.tmpl.Darwin b/compiler-rt/lib/asan/output_tests/null_deref.tmpl.Darwin
similarity index 100%
rename from compiler-rt/lib/asan/tests/null_deref.tmpl.Darwin
rename to compiler-rt/lib/asan/output_tests/null_deref.tmpl.Darwin
diff --git a/compiler-rt/lib/asan/tests/shared-lib-test-so.cc b/compiler-rt/lib/asan/output_tests/shared-lib-test-so.cc
similarity index 100%
rename from compiler-rt/lib/asan/tests/shared-lib-test-so.cc
rename to compiler-rt/lib/asan/output_tests/shared-lib-test-so.cc
diff --git a/compiler-rt/lib/asan/tests/shared-lib-test.cc b/compiler-rt/lib/asan/output_tests/shared-lib-test.cc
similarity index 100%
rename from compiler-rt/lib/asan/tests/shared-lib-test.cc
rename to compiler-rt/lib/asan/output_tests/shared-lib-test.cc
diff --git a/compiler-rt/lib/asan/tests/shared-lib-test.tmpl b/compiler-rt/lib/asan/output_tests/shared-lib-test.tmpl
similarity index 100%
rename from compiler-rt/lib/asan/tests/shared-lib-test.tmpl
rename to compiler-rt/lib/asan/output_tests/shared-lib-test.tmpl
diff --git a/compiler-rt/lib/asan/tests/stack-overflow.cc b/compiler-rt/lib/asan/output_tests/stack-overflow.cc
similarity index 100%
rename from compiler-rt/lib/asan/tests/stack-overflow.cc
rename to compiler-rt/lib/asan/output_tests/stack-overflow.cc
diff --git a/compiler-rt/lib/asan/tests/stack-overflow.tmpl b/compiler-rt/lib/asan/output_tests/stack-overflow.tmpl
similarity index 100%
rename from compiler-rt/lib/asan/tests/stack-overflow.tmpl
rename to compiler-rt/lib/asan/output_tests/stack-overflow.tmpl
diff --git a/compiler-rt/lib/asan/tests/stack-use-after-return.cc b/compiler-rt/lib/asan/output_tests/stack-use-after-return.cc
similarity index 100%
rename from compiler-rt/lib/asan/tests/stack-use-after-return.cc
rename to compiler-rt/lib/asan/output_tests/stack-use-after-return.cc
diff --git a/compiler-rt/lib/asan/tests/stack-use-after-return.disabled b/compiler-rt/lib/asan/output_tests/stack-use-after-return.disabled
similarity index 100%
rename from compiler-rt/lib/asan/tests/stack-use-after-return.disabled
rename to compiler-rt/lib/asan/output_tests/stack-use-after-return.disabled
diff --git a/compiler-rt/lib/asan/tests/strncpy-overflow.cc b/compiler-rt/lib/asan/output_tests/strncpy-overflow.cc
similarity index 100%
rename from compiler-rt/lib/asan/tests/strncpy-overflow.cc
rename to compiler-rt/lib/asan/output_tests/strncpy-overflow.cc
diff --git a/compiler-rt/lib/asan/tests/strncpy-overflow.tmpl b/compiler-rt/lib/asan/output_tests/strncpy-overflow.tmpl
similarity index 100%
rename from compiler-rt/lib/asan/tests/strncpy-overflow.tmpl
rename to compiler-rt/lib/asan/output_tests/strncpy-overflow.tmpl
diff --git a/compiler-rt/lib/asan/tests/strncpy-overflow.tmpl.Darwin b/compiler-rt/lib/asan/output_tests/strncpy-overflow.tmpl.Darwin
similarity index 100%
rename from compiler-rt/lib/asan/tests/strncpy-overflow.tmpl.Darwin
rename to compiler-rt/lib/asan/output_tests/strncpy-overflow.tmpl.Darwin
diff --git a/compiler-rt/lib/asan/tests/test_output.sh b/compiler-rt/lib/asan/output_tests/test_output.sh
similarity index 100%
rename from compiler-rt/lib/asan/tests/test_output.sh
rename to compiler-rt/lib/asan/output_tests/test_output.sh
diff --git a/compiler-rt/lib/asan/tests/use-after-free.c b/compiler-rt/lib/asan/output_tests/use-after-free.c
similarity index 100%
rename from compiler-rt/lib/asan/tests/use-after-free.c
rename to compiler-rt/lib/asan/output_tests/use-after-free.c
diff --git a/compiler-rt/lib/asan/tests/use-after-free.cc b/compiler-rt/lib/asan/output_tests/use-after-free.cc
similarity index 100%
rename from compiler-rt/lib/asan/tests/use-after-free.cc
rename to compiler-rt/lib/asan/output_tests/use-after-free.cc
diff --git a/compiler-rt/lib/asan/tests/use-after-free.tmpl b/compiler-rt/lib/asan/output_tests/use-after-free.tmpl
similarity index 100%
rename from compiler-rt/lib/asan/tests/use-after-free.tmpl
rename to compiler-rt/lib/asan/output_tests/use-after-free.tmpl
diff --git a/compiler-rt/lib/asan/tests/use-after-free.tmpl.Darwin b/compiler-rt/lib/asan/output_tests/use-after-free.tmpl.Darwin
similarity index 100%
rename from compiler-rt/lib/asan/tests/use-after-free.tmpl.Darwin
rename to compiler-rt/lib/asan/output_tests/use-after-free.tmpl.Darwin