diff --git a/clang/test/CXX/drs/dr20xx.cpp b/clang/test/CXX/drs/dr20xx.cpp
index c167f41397c19..61fdb81854a44 100644
--- a/clang/test/CXX/drs/dr20xx.cpp
+++ b/clang/test/CXX/drs/dr20xx.cpp
@@ -3,12 +3,22 @@
 // RUN: %clang_cc1 -std=c++11 -triple x86_64-unknown-unknown %s -verify -fexceptions -fcxx-exceptions -pedantic-errors
 // RUN: %clang_cc1 -std=c++14 -triple x86_64-unknown-unknown %s -verify -fexceptions -fcxx-exceptions -pedantic-errors
 // RUN: %clang_cc1 -std=c++17 -triple x86_64-unknown-unknown %s -verify -fexceptions -fcxx-exceptions -pedantic-errors
-// RUN: %clang_cc1 -std=c++2a -triple x86_64-unknown-unknown %s -verify -fexceptions -fcxx-exceptions -pedantic-errors
+// RUN: %clang_cc1 -std=c++20 -triple x86_64-unknown-unknown %s -verify -fexceptions -fcxx-exceptions -pedantic-errors
+// RUN: %clang_cc1 -std=c++2b -triple x86_64-unknown-unknown %s -verify -fexceptions -fcxx-exceptions -pedantic-errors
 
 #if __cplusplus < 201103L
 #define static_assert(...) _Static_assert(__VA_ARGS__)
 #endif
 
+namespace dr2007 { // dr2007: 3.4
+template<typename T> struct A { typename T::error e; };
+template<typename T> struct B { };
+B<A<void> > b1;
+B<A<void> > b2 = b1;
+int a = b2[0]; // expected-error {{does not provide a subscript operator}}
+int b = __builtin_addressof(b2)->foo; // expected-error {{no member}}
+}
+
 namespace dr2026 { // dr2026: 11
   template<int> struct X {};
 
diff --git a/clang/www/cxx_dr_status.html b/clang/www/cxx_dr_status.html
index 863e20a57e2cd..67350fa35938e 100755
--- a/clang/www/cxx_dr_status.html
+++ b/clang/www/cxx_dr_status.html
@@ -11849,7 +11849,7 @@ <h2 id="cxxdr">C++ defect report implementation status</h2>
     <td><a href="https://wg21.link/cwg2007">2007</a></td>
     <td>CD6</td>
     <td>Argument-dependent lookup for <TT>operator=</TT></td>
-    <td class="none" align="center">Unknown</td>
+    <td class="full" align="center">Clang 3.4</td>
   </tr>
   <tr id="2008">
     <td><a href="https://wg21.link/cwg2008">2008</a></td>