diff --git a/clang/test/Driver/as-no-warnings.c b/clang/test/Driver/as-warnings.c
similarity index 80%
rename from clang/test/Driver/as-no-warnings.c
rename to clang/test/Driver/as-warnings.c
index d6b49217468ab..2e863637589ce 100644
--- a/clang/test/Driver/as-no-warnings.c
+++ b/clang/test/Driver/as-warnings.c
@@ -1,3 +1,7 @@
+// RUN: %clang -### %s --target=x86_64-pc-linux-gnu -c -Wa,--fatal-warnings 2>&1 | FileCheck %s --check-prefix=FATAL_WARNINGS
+
+// FATAL_WARNINGS: "-massembler-fatal-warnings"
+
 // RUN: %clang -### %s -c -o tmp.o -target i686-pc-linux-gnu -fno-integrated-as -Wa,--no-warn 2>&1 | FileCheck -check-prefix=CHECK-NOIAS %s
 // RUN: %clang -### %s -c -o tmp.o -integrated-as -Wa,--no-warn 2>&1 | FileCheck %s
 
@@ -17,7 +21,6 @@
 // CHECK-NOIAS: "--no-warn"
 // CHECK-NOIASW: "-W"
 // CHECK-AS-NOWARN-NOT: warning:
-// CHECK-AS-FATAL-NOT: warning:
-// CHECK-AS-FATAL: error
+// CHECK-AS-FATAL: error: .warning directive invoked in source file
 
 __asm(".warning");