diff --git a/std/algorithm/iteration.d b/std/algorithm/iteration.d
index 3e828cee9..39eff0d4a 100644
--- a/std/algorithm/iteration.d
+++ b/std/algorithm/iteration.d
@@ -771,6 +771,23 @@ private struct MapResult(alias fun, Range)
     assert(dd.length == 4);
 }
 
+// Verify fix for: https://issues.dlang.org/show_bug.cgi?id=16034
+@safe unittest
+{
+    struct One
+    {
+        int entry = 1;
+        @disable this(this);
+    }
+
+    One[] ones = [One(), One()];
+
+    import std.algorithm.comparison : equal;
+
+    assert(ones.map!`a.entry + 1`.equal([2, 2]));
+}
+
+
 @safe unittest
 {
     import std.algorithm.comparison : equal;
diff --git a/std/range/primitives.d b/std/range/primitives.d
index 30a42abaf..cdab401a1 100644
--- a/std/range/primitives.d
+++ b/std/range/primitives.d
@@ -227,7 +227,7 @@ enum bool isInputRange(R) =
     }
     static assert(!isInputRange!VoidFront);
 }
-// Verify fix for: https://issues.dlang.org/show_bug.cgi?id=16034
+// https://issues.dlang.org/show_bug.cgi?id=16034
 @safe unittest
 {
     struct One
@@ -236,12 +236,7 @@ enum bool isInputRange(R) =
         @disable this(this);
     }
 
-    One[] ones = [One(), One()];
-
-    import std.algorithm.iteration : map;
-    import std.algorithm.comparison : equal;
-
-    assert(ones.map!`a.entry + 1`.equal([2, 2]));
+    assert(isInputRange!(One[]));
 }
 
 @safe unittest