2 files changed, 2 insertions, 3 deletions
diff --git a/clang/test/SemaTemplate/instantiate-expr-1.cpp b/clang/test/SemaTemplate/instantiate-expr-1.cpp
index 5752033fbd3..663749ddce5 100644
--- a/clang/test/SemaTemplate/instantiate-expr-1.cpp
+++ b/clang/test/SemaTemplate/instantiate-expr-1.cpp
@@ -35,8 +35,7 @@ void test_BitfieldMinus() {
 template<int I, int J>
 struct BitfieldDivide {
   int bitfield : I / J; // expected-error{{expression is not an integer constant expression}} \
-                        // expected-note{{division by zero}} \
-                        // expected-warning {{division by zero is undefined}}
+                        // expected-note{{division by zero}}
 };
 
 void test_BitfieldDivide() {
diff --git a/clang/test/SemaTemplate/instantiate-static-var.cpp b/clang/test/SemaTemplate/instantiate-static-var.cpp
index 1fcc36b43cc..789fe3db872 100644
--- a/clang/test/SemaTemplate/instantiate-static-var.cpp
+++ b/clang/test/SemaTemplate/instantiate-static-var.cpp
@@ -2,7 +2,7 @@
 template<typename T, T Divisor>
 class X {
 public:
-  static const T value = 10 / Divisor; // expected-error{{in-class initializer is not an integral constant expression}} expected-warning {{division by zero is undefined}}
+  static const T value = 10 / Divisor; // expected-error{{in-class initializer is not an integral constant expression}}
 };
 
 int array1[X<int, 2>::value == 5? 1 : -1];