diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index f2a143ea106..565b32cbeae 100644
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,5 +1,10 @@
 2016-10-19  Jonathan Wakely  <jwakely@redhat.com>
 
+	* testsuite/experimental/memory/shared_ptr/cons/unique_ptr_ctor.cc:
+	Add tests for valid and invalid conversions.
+	* testsuite/experimental/memory/shared_ptr/cons/weak_ptr_ctor.cc:
+	Likewise.
+
 	* testsuite/20_util/unique_ptr/cons/cv_qual.cc: Move negative tests
 	to new file.
 	* testsuite/20_util/unique_ptr/cons/cv_qual_neg.cc: New file.  Fix
diff --git a/libstdc++-v3/testsuite/experimental/memory/shared_ptr/cons/unique_ptr_ctor.cc b/libstdc++-v3/testsuite/experimental/memory/shared_ptr/cons/unique_ptr_ctor.cc
index 631212fc4cd..0e61a3c662a 100644
--- a/libstdc++-v3/testsuite/experimental/memory/shared_ptr/cons/unique_ptr_ctor.cc
+++ b/libstdc++-v3/testsuite/experimental/memory/shared_ptr/cons/unique_ptr_ctor.cc
@@ -29,10 +29,35 @@ struct A : std::experimental::enable_shared_from_this<A>
   ~A() { ++destroyed; }
 };
 
+struct B : A { };
+
 // 8.2.1.1 shared_ptr constructors [memory.smartptr.shared.const]
 
 // Construction from unique_ptr<A[]>
 
+template<typename From, typename To>
+constexpr bool constructible()
+{
+  using std::experimental::shared_ptr;
+  using std::experimental::is_constructible_v;
+  using std::unique_ptr;
+  return is_constructible_v<shared_ptr<To>, unique_ptr<From>>;
+}
+
+static_assert(  constructible< A,    A    >(), "A -> A compatible" );
+static_assert( !constructible< A,    A[]  >(), "A -> A[] not compatible" );
+static_assert( !constructible< A,    A[1] >(), "A -> A[1] not compatible" );
+static_assert( !constructible< A[],  A    >(), "A[] -> A not compatible" );
+static_assert(  constructible< A[],  A[]  >(), "A[] -> A[] compatible" );
+static_assert( !constructible< A[],  A[1] >(), "A[] -> A[1] not compatible" );
+
+static_assert(  constructible< B,    A    >(), "B -> A compatible" );
+static_assert( !constructible< B,    A[]  >(), "B -> A[] not compatible" );
+static_assert( !constructible< B,    A[1] >(), "B -> A[1] not compatible" );
+static_assert( !constructible< B[],  A    >(), "B[] -> A not compatible" );
+static_assert( !constructible< B[],  A[]  >(), "B[] -> A[] not compatible" );
+static_assert( !constructible< B[],  A[1] >(), "B[2] -> A[1] not compatible" );
+
 void
 test01()
 {
diff --git a/libstdc++-v3/testsuite/experimental/memory/shared_ptr/cons/weak_ptr_ctor.cc b/libstdc++-v3/testsuite/experimental/memory/shared_ptr/cons/weak_ptr_ctor.cc
index 71cf583af32..3436c01eea1 100644
--- a/libstdc++-v3/testsuite/experimental/memory/shared_ptr/cons/weak_ptr_ctor.cc
+++ b/libstdc++-v3/testsuite/experimental/memory/shared_ptr/cons/weak_ptr_ctor.cc
@@ -23,11 +23,46 @@
 #include <testsuite_hooks.h>
 
 struct A { };
+struct B : A { };
 
 // 8.2.1.1 shared_ptr constructors [memory.smartptr.shared.const]
 
+template<typename From, typename To>
+constexpr bool constructible()
+{
+  using std::experimental::shared_ptr;
+  using std::experimental::weak_ptr;
+  using std::experimental::is_constructible_v;
+  return is_constructible_v<shared_ptr<To>, weak_ptr<From>>
+    && is_constructible_v<shared_ptr<To>, const weak_ptr<From>&>;
+}
+
+static_assert(  constructible< A,    A    >(), "A -> A compatible" );
+static_assert( !constructible< A,    A[]  >(), "A -> A[] not compatible" );
+static_assert( !constructible< A,    A[1] >(), "A -> A[1] not compatible" );
+static_assert( !constructible< A[],  A    >(), "A[] -> A not compatible" );
+static_assert(  constructible< A[],  A[]  >(), "A[] -> A[] compatible" );
+static_assert( !constructible< A[],  A[1] >(), "A[] -> A[1] not compatible" );
+static_assert( !constructible< A[1], A    >(), "A[1] -> A not compatible" );
+static_assert(  constructible< A[1], A[]  >(), "A[1] -> A[] compatible" );
+static_assert(  constructible< A[1], A[1] >(), "A[1] -> A[1] compatible" );
+static_assert( !constructible< A[2], A[1] >(), "A[2] -> A[1] not compatible" );
+
+static_assert(  constructible< B,    A    >(), "B -> A compatible" );
+static_assert( !constructible< B,    A[]  >(), "B -> A[] not compatible" );
+static_assert( !constructible< B,    A[1] >(), "B -> A[1] not compatible" );
+static_assert( !constructible< B[],  A    >(), "B[] -> A not compatible" );
+static_assert( !constructible< B[],  A[]  >(), "B[] -> A[] not compatible" );
+static_assert( !constructible< B[],  A[1] >(), "B[] -> A[1] not compatible" );
+static_assert( !constructible< B[1], A    >(), "B[] -> A not compatible" );
+static_assert( !constructible< B[1], A[]  >(), "B[] -> A[] not compatible" );
+static_assert( !constructible< B[1], A[1] >(), "B[] -> A[1] not compatible" );
+static_assert( !constructible< B[2], A[1] >(), "B[2] -> A[1] not compatible" );
+
+
+
 // Construction from weak_ptr
-int
+void
 test01()
 {
   A * a = new A[5];
@@ -39,14 +74,10 @@ test01()
   VERIFY( a3.get() == a );
   VERIFY( a2.use_count() == wa.use_count() );
   VERIFY( a3.use_count() == wa.use_count() );
-
-  return 0;
 }
 
-
 int
 main()
 {
   test01();
-  return 0;
 }