diff --git a/include/boost/range/istream_range.hpp b/include/boost/range/istream_range.hpp
index 5da87cc..a486317 100644
--- a/include/boost/range/istream_range.hpp
+++ b/include/boost/range/istream_range.hpp
@@ -27,8 +27,8 @@ namespace boost
         istream_range(std::basic_istream<Elem, Traits>& in)
         {
             return iterator_range<std::istream_iterator<Type, Elem, Traits> >(
-                std::istream_iterator<Type>(in),
-                std::istream_iterator<Type>());
+                std::istream_iterator<Type, Elem, Traits>(in),
+                std::istream_iterator<Type, Elem, Traits>());
         }
     } // namespace range
     using range::istream_range;
diff --git a/test/istream_range.cpp b/test/istream_range.cpp
index b3e16db..7d10313 100644
--- a/test/istream_range.cpp
+++ b/test/istream_range.cpp
@@ -19,15 +19,15 @@
 
 namespace
 {
-    // Test an integer range with a step size of 1.
-    void test_istream_range()
+    template <typename CharT>
+    void test_istream_range_impl()
     {
-        std::stringstream s;
+        std::basic_stringstream<CharT> s;
         std::vector<int> reference;
         for (int i = 0; i < 10; ++i)
         {
             reference.push_back(i);
-            s << i << " ";
+            s << i << CharT(' ');
         }
 
         std::vector<int> target;
@@ -36,6 +36,13 @@ namespace
         BOOST_CHECK_EQUAL_COLLECTIONS( reference.begin(), reference.end(),
             target.begin(), target.end() );
     }
+    
+    // Test an istream range.
+    void test_istream_range()
+    {
+        test_istream_range_impl<char>();
+        test_istream_range_impl<wchar_t>();
+    }
 
 } // namespace anonymous namespace