diff --git a/llvm/test/Assembler/2008-09-02-FunctionNotes2.ll b/llvm/test/Assembler/2008-09-02-FunctionNotes2.ll
deleted file mode 100644
index 47eb011343fbe..0000000000000
--- a/llvm/test/Assembler/2008-09-02-FunctionNotes2.ll
+++ /dev/null
@@ -1,6 +0,0 @@
-; Test function notes
-; RUN: not llvm-as %s -o /dev/null 2>&1 | grep "Attributes 'noinline and alwaysinline' are incompatible"
-define void @fn1() alwaysinline  noinline {
-  ret void
-}
-
diff --git a/llvm/test/Verifier/2008-09-02-FunctionNotes2.ll b/llvm/test/Verifier/2008-09-02-FunctionNotes2.ll
new file mode 100644
index 0000000000000..086f58f521d8d
--- /dev/null
+++ b/llvm/test/Verifier/2008-09-02-FunctionNotes2.ll
@@ -0,0 +1,7 @@
+; Test function notes
+; RUN: not llvm-as -disable-output %s 2>&1 | FileCheck %s
+
+; CHECK: Attributes 'noinline and alwaysinline' are incompatible
+define void @fn1() alwaysinline noinline {
+  ret void
+}