diff --git a/std/traits.d b/std/traits.d
index eb8634cf353..164690b01d2 100644
--- a/std/traits.d
+++ b/std/traits.d
@@ -2857,6 +2857,9 @@ unittest
  */
 template hasElaborateAssign(S)
 {
+    static assert(isRvalueAssignable!S || isLvalueAssignable!S,
+        S.stringof ~ " is neither r- nor lvalue assignable.");
+
     static if(isStaticArray!S && S.length)
     {
         enum bool hasElaborateAssign = hasElaborateAssign!(typeof(S.init[0]));
@@ -2881,7 +2884,8 @@ unittest
 
     static struct S  { void opAssign(S) {} }
     static assert( hasElaborateAssign!S);
-    static assert(!hasElaborateAssign!(const(S)));
+    static assert(!__traits(compiles, hasElaborateAssign!(const S)));
+    static assert(!__traits(compiles, hasElaborateAssign!(shared S)));
 
     static struct S1 { void opAssign(ref S1) {} }
     static struct S2 { void opAssign(int) {} }
@@ -2908,8 +2912,8 @@ unittest
     static struct S9 { this(this) {}                             void opAssign(int) {} }
     static struct S10 { ~this() { } }
     static assert( hasElaborateAssign!S6);
-    static assert(!hasElaborateAssign!S7);
-    static assert(!hasElaborateAssign!S8);
+    static assert(!__traits(compiles, hasElaborateAssign!S7));
+    static assert(!__traits(compiles, hasElaborateAssign!S8));
     static assert( hasElaborateAssign!S9);
     static assert( hasElaborateAssign!S10);
     static struct SS6 { S6 s; }
@@ -2917,8 +2921,8 @@ unittest
     static struct SS8 { S8 s; }
     static struct SS9 { S9 s; }
     static assert( hasElaborateAssign!SS6);
-    static assert( hasElaborateAssign!SS7);
-    static assert( hasElaborateAssign!SS8);
+    static assert(!__traits(compiles, hasElaborateAssign!SS7));
+    static assert(!__traits(compiles, hasElaborateAssign!SS8));
     static assert( hasElaborateAssign!SS9);
 }