Index: include/clang/Basic/DiagnosticGroups.td
===================================================================
--- include/clang/Basic/DiagnosticGroups.td
+++ include/clang/Basic/DiagnosticGroups.td
@@ -763,7 +763,8 @@
     MissingMethodReturnType,
     SignCompare,
     UnusedParameter,
-    NullPointerArithmetic
+    NullPointerArithmetic,
+    TautologicalUnsignedZeroCompare
   ]>;
 
 def Most : DiagGroup<"most", [
Index: test/Sema/tautological-unsigned-zero-compare.c
===================================================================
--- test/Sema/tautological-unsigned-zero-compare.c
+++ test/Sema/tautological-unsigned-zero-compare.c
@@ -8,6 +8,12 @@
 // RUN:            -verify -x c++ %s
 // RUN: %clang_cc1 -fsyntax-only \
 // RUN:            -verify=silence -x c++ %s
+// RUN: %clang_cc1 -fsyntax-only \
+// RUN:            -Wextra -Wno-sign-compare\
+// RUN:            -verify %s
+// RUN: %clang_cc1 -fsyntax-only \
+// RUN:            -Wextra -Wno-sign-compare\
+// RUN:            -verify -x c++ %s
 
 unsigned uvalue(void);
 signed int svalue(void);