@@ -682,20 +682,34 @@ def test_iconvertible_conversion():
 
 def test_intptr_construction():
     from System import IntPtr, UIntPtr, Int64, UInt64
+    from ctypes import sizeof, c_void_p
+
+    ptr_size = sizeof(c_void_p)
+    max_intptr = 2 ** (ptr_size * 8 - 1) - 1
+    min_intptr = -max_intptr - 1
+    max_uintptr = 2 ** (ptr_size * 8) - 1
+    min_uintptr = 0
 
     ob = ConversionTest()
 
     assert ob.IntPtrField == IntPtr.Zero
     assert ob.UIntPtrField == UIntPtr.Zero
 
-    ob.IntPtrField = IntPtr(Int64(-1))
-    assert ob.IntPtrField == IntPtr(-1)
-    assert ob.IntPtrField.ToInt64() == -1
+    for v in [0, -1, 1024, max_intptr, min_intptr]:
+        ob.IntPtrField = IntPtr(Int64(v))
+        assert ob.IntPtrField == IntPtr(v)
+        assert ob.IntPtrField.ToInt64() == v
+
+    for v in [min_intptr - 1, max_intptr + 1]:
+        with pytest.raises(TypeError):
+            IntPtr(v)
+
+    for v in [0, 1024, min_uintptr, max_uintptr, max_intptr]:
+        ob.UIntPtrField = UIntPtr(UInt64(v))
+        assert ob.UIntPtrField == UIntPtr(v)
+        assert ob.UIntPtrField.ToUInt64() == v
 
-    ob.IntPtrField = IntPtr(Int64(1024))
-    assert ob.IntPtrField == IntPtr(1024)
-    assert ob.IntPtrField.ToInt64() == 1024
+    for v in [min_uintptr - 1, max_uintptr + 1, min_intptr]:
+        with pytest.raises(TypeError):
+            UIntPtr(v)
 
-    ob.UIntPtrField = UIntPtr(UInt64(1024))
-    assert ob.UIntPtrField == UIntPtr(1024)
-    assert ob.UIntPtrField.ToUInt64() == 1024