diff --git a/test/Frontend/ast-attr.cpp b/test/Frontend/ast-attr.cpp
deleted file mode 100644
index ca37c3f60c..0000000000
--- a/test/Frontend/ast-attr.cpp
+++ /dev/null
@@ -1,5 +0,0 @@
-// RUN: %clang -emit-ast -o %t.ast %S/../Sema/attr-print.cpp
-// RUN: %clang_cc1 %t.ast -ast-print | FileCheck %S/../Sema/attr-print.cpp
-
-// %S/../Sema/attr-print.cpp exercises many different attributes, so we reuse
-// it here to check -emit-ast for attributes.
diff --git a/test/Sema/attr-print.cpp b/test/Misc/attr-print-emit.cpp
similarity index 97%
rename from test/Sema/attr-print.cpp
rename to test/Misc/attr-print-emit.cpp
index 0947b181e6..cc7413baf1 100644
--- a/test/Sema/attr-print.cpp
+++ b/test/Misc/attr-print-emit.cpp
@@ -1,6 +1,6 @@
 // RUN: %clang_cc1 %s -ast-print | FileCheck %s
-
-// This file is also used as input for %S/../Frontend/ast-attr.cpp.
+// RUN: %clang -emit-ast -o %t.ast %s
+// RUN: %clang_cc1 %t.ast -ast-print | FileCheck %s
 
 // CHECK: void xla(int a) __attribute__((xray_log_args(1)));
 void xla(int a) __attribute__((xray_log_args(1)));