diff --git a/testing/constant_iterator.cu b/testing/constant_iterator.cu
index cbf771c9a..6d49169f6 100644
--- a/testing/constant_iterator.cu
+++ b/testing/constant_iterator.cu
@@ -46,17 +46,6 @@ void TestConstantIteratorIncrement(void)
 }
 DECLARE_UNITTEST(TestConstantIteratorIncrement);
 
-void TestConstantIteratorIncrementBig(void)
-{
-    long long int n = 10000000000ULL;
-
-    thrust::constant_iterator<long long int> begin(1);
-    thrust::constant_iterator<long long int> end = begin + n;
-
-    ASSERT_EQUAL(thrust::distance(begin, end), n);
-}
-DECLARE_UNITTEST(TestConstantIteratorIncrementBig);
-
 void TestConstantIteratorComparison(void)
 {
     using namespace thrust;
@@ -96,7 +85,7 @@ void TestMakeConstantIterator(void)
     ASSERT_EQUAL(13, *iter0);
 
     // test two argument version
-    constant_iterator<int,thrust::detail::intmax_t> iter1 = make_constant_iterator<int,thrust::detail::intmax_t>(13, 7);
+    constant_iterator<int,int> iter1 = make_constant_iterator<int,int>(13, 7);
 
     ASSERT_EQUAL(13, *iter1);
     ASSERT_EQUAL(7, iter1 - iter0);
diff --git a/thrust/iterator/detail/constant_iterator_base.h b/thrust/iterator/detail/constant_iterator_base.h
index 56b1cc4f4..6b35a906b 100644
--- a/thrust/iterator/detail/constant_iterator_base.h
+++ b/thrust/iterator/detail/constant_iterator_base.h
@@ -45,7 +45,7 @@ template<typename Value,
   // the incrementable type is int unless otherwise specified
   typedef typename thrust::detail::ia_dflt_help<
     Incrementable,
-    thrust::detail::identity_<thrust::detail::intmax_t>
+    thrust::detail::identity_<int>
   >::type incrementable;
 
   typedef typename thrust::counting_iterator<