diff --git a/libcudacxx/test/libcudacxx/std/utilities/optional/optional.object/special_members.pass.cpp b/libcudacxx/test/libcudacxx/std/utilities/optional/optional.object/special_members.pass.cpp
index 4669be0801a..702adbb0e22 100644
--- a/libcudacxx/test/libcudacxx/std/utilities/optional/optional.object/special_members.pass.cpp
+++ b/libcudacxx/test/libcudacxx/std/utilities/optional/optional.object/special_members.pass.cpp
@@ -9,9 +9,6 @@
 
 // UNSUPPORTED: c++03, c++11
 
-// UNSUPPORTED: nvrtc
-// see nvbug4263883
-
 // <cuda/std/optional>
 
 // Make sure we properly generate special member functions for optional<T>
diff --git a/libcudacxx/test/libcudacxx/std/utilities/optional/optional.object/triviality.pass.cpp b/libcudacxx/test/libcudacxx/std/utilities/optional/optional.object/triviality.pass.cpp
index 9e6f0b1e16a..99453731a6a 100644
--- a/libcudacxx/test/libcudacxx/std/utilities/optional/optional.object/triviality.pass.cpp
+++ b/libcudacxx/test/libcudacxx/std/utilities/optional/optional.object/triviality.pass.cpp
@@ -9,9 +9,6 @@
 
 // UNSUPPORTED: c++03, c++11
 
-// UNSUPPORTED: nvrtc
-// see nvbug4263883
-
 // <cuda/std/optional>
 
 // The following special member functions should propagate the triviality of
diff --git a/libcudacxx/test/support/archetypes.ipp b/libcudacxx/test/support/archetypes.ipp
index 9066b2b026f..991fad98cf5 100644
--- a/libcudacxx/test/support/archetypes.ipp
+++ b/libcudacxx/test/support/archetypes.ipp
@@ -24,6 +24,13 @@
 #define DEFINE_ASSIGN_CONSTEXPR
 #endif
 #endif
+#ifndef DEFINE_DEFAULT_CONSTEXPR
+#if defined(TEST_COMPILER_NVRTC)
+#define DEFINE_DEFAULT_CONSTEXPR
+#else
+#define DEFINE_DEFAULT_CONSTEXPR constexpr
+#endif
+#endif
 #ifndef DEFINE_CTOR
 #define DEFINE_CTOR = default
 #undef  DEFINE_INIT_LIST // defaulted constructors do not require explicit initializers for the base class
@@ -59,7 +66,7 @@ struct AllCtors : DEFINE_BASE(AllCtors) {
   using Base::Base;
 #endif
   using Base::operator=;
-  DEFINE_CTOR_ANNOTATIONS DEFINE_EXPLICIT DEFINE_CONSTEXPR AllCtors() DEFINE_NOEXCEPT DEFINE_DEFAULT_CTOR;
+  DEFINE_CTOR_ANNOTATIONS DEFINE_EXPLICIT DEFINE_DEFAULT_CONSTEXPR AllCtors() DEFINE_NOEXCEPT DEFINE_DEFAULT_CTOR;
   DEFINE_CTOR_ANNOTATIONS DEFINE_EXPLICIT DEFINE_CONSTEXPR AllCtors(AllCtors const&) DEFINE_NOEXCEPT DEFINE_INIT_LIST DEFINE_CTOR;
   DEFINE_CTOR_ANNOTATIONS DEFINE_EXPLICIT DEFINE_CONSTEXPR AllCtors(AllCtors &&) DEFINE_NOEXCEPT DEFINE_INIT_LIST DEFINE_CTOR;
   DEFINE_ASSIGN_ANNOTATIONS DEFINE_ASSIGN_CONSTEXPR AllCtors& operator=(AllCtors const&) DEFINE_NOEXCEPT DEFINE_ASSIGN;
@@ -101,7 +108,7 @@ struct DefaultOnly : DEFINE_BASE(DefaultOnly) {
 #else
   using Base::Base;
 #endif
-  DEFINE_CTOR_ANNOTATIONS DEFINE_EXPLICIT DEFINE_CONSTEXPR DefaultOnly() DEFINE_NOEXCEPT DEFINE_DEFAULT_CTOR;
+  DEFINE_CTOR_ANNOTATIONS DEFINE_EXPLICIT DEFINE_DEFAULT_CONSTEXPR DefaultOnly() DEFINE_NOEXCEPT DEFINE_DEFAULT_CTOR;
   DefaultOnly(DefaultOnly const&) DEFINE_NOEXCEPT = delete;
   DefaultOnly& operator=(DefaultOnly const&) DEFINE_NOEXCEPT = delete;
   DEFINE_DTOR(DefaultOnly)
@@ -118,7 +125,7 @@ struct Copyable : DEFINE_BASE(Copyable) {
 #else
   using Base::Base;
 #endif
-  DEFINE_CTOR_ANNOTATIONS DEFINE_EXPLICIT DEFINE_CONSTEXPR Copyable() DEFINE_NOEXCEPT DEFINE_DEFAULT_CTOR;
+  DEFINE_CTOR_ANNOTATIONS DEFINE_EXPLICIT DEFINE_DEFAULT_CONSTEXPR Copyable() DEFINE_NOEXCEPT DEFINE_DEFAULT_CTOR;
   DEFINE_CTOR_ANNOTATIONS DEFINE_EXPLICIT DEFINE_CONSTEXPR Copyable(Copyable const &) DEFINE_NOEXCEPT DEFINE_INIT_LIST DEFINE_CTOR;
   DEFINE_ASSIGN_ANNOTATIONS Copyable &operator=(Copyable const &) DEFINE_NOEXCEPT DEFINE_ASSIGN;
   DEFINE_DTOR(Copyable)
@@ -135,7 +142,7 @@ struct CopyOnly : DEFINE_BASE(CopyOnly) {
 #else
   using Base::Base;
 #endif
-  DEFINE_CTOR_ANNOTATIONS DEFINE_EXPLICIT DEFINE_CONSTEXPR CopyOnly() DEFINE_NOEXCEPT DEFINE_DEFAULT_CTOR;
+  DEFINE_CTOR_ANNOTATIONS DEFINE_EXPLICIT DEFINE_DEFAULT_CONSTEXPR CopyOnly() DEFINE_NOEXCEPT DEFINE_DEFAULT_CTOR;
   DEFINE_CTOR_ANNOTATIONS DEFINE_EXPLICIT DEFINE_CONSTEXPR CopyOnly(CopyOnly const &) DEFINE_NOEXCEPT DEFINE_INIT_LIST DEFINE_CTOR;
   DEFINE_EXPLICIT DEFINE_CONSTEXPR CopyOnly(CopyOnly &&) DEFINE_NOEXCEPT = delete;
   DEFINE_ASSIGN_ANNOTATIONS CopyOnly &operator=(CopyOnly const &) DEFINE_NOEXCEPT DEFINE_ASSIGN;
@@ -154,7 +161,7 @@ struct NonCopyable : DEFINE_BASE(NonCopyable) {
 #else
   using Base::Base;
 #endif
-  DEFINE_CTOR_ANNOTATIONS DEFINE_EXPLICIT DEFINE_CONSTEXPR NonCopyable() DEFINE_NOEXCEPT DEFINE_DEFAULT_CTOR;
+  DEFINE_CTOR_ANNOTATIONS DEFINE_EXPLICIT DEFINE_DEFAULT_CONSTEXPR NonCopyable() DEFINE_NOEXCEPT DEFINE_DEFAULT_CTOR;
   DEFINE_EXPLICIT DEFINE_CONSTEXPR NonCopyable(NonCopyable const &) DEFINE_NOEXCEPT = delete;
   NonCopyable &operator=(NonCopyable const &) DEFINE_NOEXCEPT = delete;
   DEFINE_DTOR(NonCopyable)
@@ -171,7 +178,7 @@ struct MoveOnly : DEFINE_BASE(MoveOnly) {
 #else
   using Base::Base;
 #endif
-  DEFINE_CTOR_ANNOTATIONS DEFINE_EXPLICIT DEFINE_CONSTEXPR MoveOnly() DEFINE_NOEXCEPT DEFINE_DEFAULT_CTOR;
+  DEFINE_CTOR_ANNOTATIONS DEFINE_EXPLICIT DEFINE_DEFAULT_CONSTEXPR MoveOnly() DEFINE_NOEXCEPT DEFINE_DEFAULT_CTOR;
   DEFINE_CTOR_ANNOTATIONS DEFINE_EXPLICIT DEFINE_CONSTEXPR MoveOnly(MoveOnly &&) DEFINE_NOEXCEPT DEFINE_INIT_LIST DEFINE_CTOR;
   DEFINE_ASSIGN_ANNOTATIONS MoveOnly &operator=(MoveOnly &&) DEFINE_NOEXCEPT DEFINE_ASSIGN;
   DEFINE_DTOR(MoveOnly)
@@ -233,7 +240,7 @@ struct ConvertingType : DEFINE_BASE(ConvertingType) {
 #else
   using Base::Base;
 #endif
-  DEFINE_CTOR_ANNOTATIONS DEFINE_EXPLICIT DEFINE_CONSTEXPR ConvertingType() DEFINE_NOEXCEPT DEFINE_DEFAULT_CTOR;
+  DEFINE_CTOR_ANNOTATIONS DEFINE_EXPLICIT DEFINE_DEFAULT_CONSTEXPR ConvertingType() DEFINE_NOEXCEPT DEFINE_DEFAULT_CTOR;
   DEFINE_CTOR_ANNOTATIONS DEFINE_EXPLICIT DEFINE_CONSTEXPR ConvertingType(ConvertingType const&) DEFINE_NOEXCEPT DEFINE_INIT_LIST DEFINE_CTOR;
   DEFINE_CTOR_ANNOTATIONS DEFINE_EXPLICIT DEFINE_CONSTEXPR ConvertingType(ConvertingType &&) DEFINE_NOEXCEPT DEFINE_INIT_LIST DEFINE_CTOR;
   DEFINE_ASSIGN_ANNOTATIONS ConvertingType& operator=(ConvertingType const&) DEFINE_NOEXCEPT DEFINE_ASSIGN;