3 files changed, 6 insertions, 6 deletions
diff --git a/clang/test/Frontend/Weverything.c b/clang/test/Frontend/Weverything.c
index 7c87a2cca15..32f314720b2 100644
--- a/clang/test/Frontend/Weverything.c
+++ b/clang/test/Frontend/Weverything.c
@@ -2,9 +2,6 @@
 // become errors.
 //
 // RUN: %clang_cc1 -verify -Weverything -pedantic-errors %s
-//
-// FIXME: This is currently broken.
-// XFAIL: *
 
 int f0(int, unsigned);
 int f0(int x, unsigned y) {
diff --git a/clang/test/Frontend/warning-mapping-2.c b/clang/test/Frontend/warning-mapping-2.c
index 5a347ebb09c..39ba4997a4f 100644
--- a/clang/test/Frontend/warning-mapping-2.c
+++ b/clang/test/Frontend/warning-mapping-2.c
@@ -1,8 +1,5 @@
 // Check that -w has lower priority than -pedantic-errors.
 // RUN: %clang_cc1 -verify -pedantic-errors -w %s
-//
-// FIXME: We currently get this wrong.
-// XFAIL: *
 
 void f0() { f1(); } // expected-error {{implicit declaration of function}}
 
diff --git a/clang/test/Frontend/warning-mapping-4.c b/clang/test/Frontend/warning-mapping-4.c
new file mode 100644
index 00000000000..d8d2769fc53
--- /dev/null
+++ b/clang/test/Frontend/warning-mapping-4.c
@@ -0,0 +1,6 @@
+// RUN: %clang_cc1 -verify -Wno-error=sign-compare %s
+// RUN: %clang_cc1 -verify -Wsign-compare -w -Wno-error=sign-compare %s
+
+int f0(int x, unsigned y) {
+  return x < y;
+}