Index: test/std/utilities/variant/variant.get/get_index.pass.cpp
===================================================================
--- test/std/utilities/variant/variant.get/get_index.pass.cpp
+++ test/std/utilities/variant/variant.get/get_index.pass.cpp
@@ -43,8 +43,8 @@
   {
     using V = std::variant<int, const long>;
     constexpr V v(42);
-#ifndef __clang__ // Avoid https://bugs.llvm.org/show_bug.cgi?id=15481
-    ASSERT_NOEXCEPT(std::get<0>(v));
+#if !defined(__GNUC__) || defined(__clang__) // Avoid https://gcc.gnu.org/bugzilla/show_bug.cgi?id=86044
+    ASSERT_NOT_NOEXCEPT(std::get<0>(v));
 #endif
     ASSERT_SAME_TYPE(decltype(std::get<0>(v)), const int &);
     static_assert(std::get<0>(v) == 42, "");
@@ -59,8 +59,8 @@
   {
     using V = std::variant<int, const long>;
     constexpr V v(42l);
-#ifndef __clang__ // Avoid https://bugs.llvm.org/show_bug.cgi?id=15481
-    ASSERT_NOEXCEPT(std::get<1>(v));
+#if !defined(__GNUC__) || defined(__clang__) // Avoid https://gcc.gnu.org/bugzilla/show_bug.cgi?id=86044
+    ASSERT_NOT_NOEXCEPT(std::get<0>(v));
 #endif
     ASSERT_SAME_TYPE(decltype(std::get<1>(v)), const long &);
     static_assert(std::get<1>(v) == 42, "");
Index: test/std/utilities/variant/variant.get/get_type.pass.cpp
===================================================================
--- test/std/utilities/variant/variant.get/get_type.pass.cpp
+++ test/std/utilities/variant/variant.get/get_type.pass.cpp
@@ -37,8 +37,8 @@
   {
     using V = std::variant<int, const long>;
     constexpr V v(42);
-#ifndef __clang__ // Avoid https://bugs.llvm.org/show_bug.cgi?id=15481
-    ASSERT_NOEXCEPT(std::get<int>(v));
+#if !defined(__GNUC__) || defined(__clang__) // Avoid https://gcc.gnu.org/bugzilla/show_bug.cgi?id=86044
+    ASSERT_NOT_NOEXCEPT(std::get<int>(v));
 #endif
     ASSERT_SAME_TYPE(decltype(std::get<0>(v)), const int &);
     static_assert(std::get<int>(v) == 42, "");
@@ -53,8 +53,8 @@
   {
     using V = std::variant<int, const long>;
     constexpr V v(42l);
-#ifndef __clang__ // Avoid https://bugs.llvm.org/show_bug.cgi?id=15481
-    ASSERT_NOEXCEPT(std::get<const long>(v));
+#if !defined(__GNUC__) || defined(__clang__) // Avoid https://gcc.gnu.org/bugzilla/show_bug.cgi?id=86044
+    ASSERT_NOT_NOEXCEPT(std::get<const long>(v));
 #endif
     ASSERT_SAME_TYPE(decltype(std::get<const long>(v)), const long &);
     static_assert(std::get<const long>(v) == 42, "");