diff --git a/src/runtime/Codecs/EnumPyIntCodec.cs b/src/runtime/Codecs/EnumPyIntCodec.cs
index 7d33b34ce..42f5eb1b2 100644
--- a/src/runtime/Codecs/EnumPyIntCodec.cs
+++ b/src/runtime/Codecs/EnumPyIntCodec.cs
@@ -55,11 +55,11 @@ public bool TryDecode<T>(PyObject pyObj, out T? value)
 
             try
             {
-                return new PyInt((long)value);
+                return new PyInt(Convert.ToInt64(value));
             }
-            catch (InvalidCastException)
+            catch (OverflowException)
             {
-                return new PyInt((ulong)value);
+                return new PyInt(Convert.ToUInt64(value));
             }
         }
 
diff --git a/tests/test_codec.py b/tests/test_codec.py
index 9744d3856..6c74bd8eb 100644
--- a/tests/test_codec.py
+++ b/tests/test_codec.py
@@ -1,39 +1,53 @@
 # -*- coding: utf-8 -*-
 
 """Test conversions using codecs from client python code"""
-import clr
-import System
+
 import pytest
 import Python.Runtime
+import Python.Test as Test
 from Python.Test import ListConversionTester, ListMember, CodecResetter
 
-class int_iterable():
+
+@pytest.fixture(autouse=True)
+def reset():
+    yield
+    CodecResetter.Reset()
+
+
+class int_iterable:
     def __init__(self):
         self.counter = 0
+
     def __iter__(self):
         return self
+
     def __next__(self):
         if self.counter == 3:
             raise StopIteration
         self.counter = self.counter + 1
         return self.counter
 
-class obj_iterable():
+
+class obj_iterable:
     def __init__(self):
         self.counter = 0
+
     def __iter__(self):
         return self
+
     def __next__(self):
         if self.counter == 3:
             raise StopIteration
         self.counter = self.counter + 1
         return ListMember(self.counter, "Number " + str(self.counter))
 
+
 def test_iterable():
-    """Test that a python iterable can be passed into a function that takes an IEnumerable<object>"""
+    """Test that a python iterable can be passed into a function that takes an
+    IEnumerable<object>"""
 
-    #Python.Runtime.Codecs.ListDecoder.Register()
-    #Python.Runtime.Codecs.SequenceDecoder.Register()
+    # Python.Runtime.Codecs.ListDecoder.Register()
+    # Python.Runtime.Codecs.SequenceDecoder.Register()
     Python.Runtime.Codecs.IterableDecoder.Register()
     ob = ListConversionTester()
 
@@ -43,28 +57,58 @@ def test_iterable():
     iterable2 = obj_iterable()
     assert 3 == ob.GetLength2(iterable2)
 
-    CodecResetter.Reset()
 
 def test_sequence():
     Python.Runtime.Codecs.SequenceDecoder.Register()
     ob = ListConversionTester()
 
-    tup = (1,2,3)
+    tup = (1, 2, 3)
     assert 3 == ob.GetLength(tup)
 
     tup2 = (ListMember(1, "one"), ListMember(2, "two"), ListMember(3, "three"))
     assert 3 == ob.GetLength(tup2)
 
-    CodecResetter.Reset()
 
 def test_list():
     Python.Runtime.Codecs.SequenceDecoder.Register()
     ob = ListConversionTester()
 
-    l = [1,2,3]
+    l = [1, 2, 3]
     assert 3 == ob.GetLength(l)
 
     l2 = [ListMember(1, "one"), ListMember(2, "two"), ListMember(3, "three")]
     assert 3 == ob.GetLength(l2)
 
-    CodecResetter.Reset()
+
+def test_enum():
+    Python.Runtime.PyObjectConversions.RegisterEncoder(
+        Python.Runtime.Codecs.EnumPyIntCodec.Instance
+    )
+
+    assert Test.ByteEnum.Zero == 0
+    assert Test.ByteEnum.One == 1
+    assert Test.ByteEnum.Two == 2
+    assert Test.SByteEnum.Zero == 0
+    assert Test.SByteEnum.One == 1
+    assert Test.SByteEnum.Two == 2
+    assert Test.ShortEnum.Zero == 0
+    assert Test.ShortEnum.One == 1
+    assert Test.ShortEnum.Two == 2
+    assert Test.UShortEnum.Zero == 0
+    assert Test.UShortEnum.One == 1
+    assert Test.UShortEnum.Two == 2
+    assert Test.IntEnum.Zero == 0
+    assert Test.IntEnum.One == 1
+    assert Test.IntEnum.Two == 2
+    assert Test.UIntEnum.Zero == 0
+    assert Test.UIntEnum.One == 1
+    assert Test.UIntEnum.Two == 2
+    assert Test.LongEnum.Zero == 0
+    assert Test.LongEnum.One == 1
+    assert Test.LongEnum.Two == 2
+    assert Test.ULongEnum.Zero == 0
+    assert Test.ULongEnum.One == 1
+    assert Test.ULongEnum.Two == 2
+    assert Test.LongEnum.Max == 9223372036854775807
+    assert Test.LongEnum.Min == -9223372036854775808
+    assert int(Test.ULongEnum.Max) == 18446744073709551615

<!DOCTYPE html PUBLIC '-//W3C//DTD XHTML 1.0 Transitional//EN' 'http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd'>
<html xmlns='http://www.w3.org/1999/xhtml'>
<head>
<title>pFad - Phonifier reborn</title>
<meta http-equiv='Content-Type' content='text/html; charset=utf-8' />
</head>
<body>
<h1>Pfad - The Proxy pFad of &#169; 2024 Garber Painting. All rights reserved.</h1>


<!-- Disclaimer -->
<p>Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.</p>
<br>
<p>Alternative Proxies:</p><p><a href="http://rainy.clevelandohioweatherforecast.com/php-proxy/index.php?q=https://patch-diff.githubusercontent.com/raw/pythonnet/pythonnet/pull/1621.diff" target="_blank">Alternative Proxy</a></p><p><a href="http://rainy.clevelandohioweatherforecast.com/pFad/index.php?u=https://patch-diff.githubusercontent.com/raw/pythonnet/pythonnet/pull/1621.diff" target="_blank">pFad Proxy</a></p><p><a href="http://rainy.clevelandohioweatherforecast.com/pFad/v3index.php?u=https://patch-diff.githubusercontent.com/raw/pythonnet/pythonnet/pull/1621.diff" target="_blank">pFad v3 Proxy</a></p><p><a href="http://rainy.clevelandohioweatherforecast.com/pFad/v4index.php?u=https://patch-diff.githubusercontent.com/raw/pythonnet/pythonnet/pull/1621.diff" target="_blank">pFad v4 Proxy</a></p></body>
</html>