diff --git a/polygraph/types/basic_type.py b/polygraph/types/basic_type.py
index 7e889d1..20dc9b6 100644
--- a/polygraph/types/basic_type.py
+++ b/polygraph/types/basic_type.py
@@ -1,6 +1,6 @@
 from polygraph.exceptions import PolygraphValueError
 from polygraph.types.api import typedef
-from polygraph.types.definitions import TypeDefinition, TypeKind
+from polygraph.types.definitions import EnumValue, TypeDefinition, TypeKind
 from polygraph.utils.trim_docstring import trim_docstring
 
 
@@ -12,6 +12,12 @@ def get_field_list(namespace):
     ]
 
 
+def get_enum_value_list(namespace):
+    return [
+        value for value in namespace.values() if isinstance(value, EnumValue)
+    ]
+
+
 class PolygraphTypeMeta(type):
     def __new__(cls, name, bases, namespace):
         default_description = trim_docstring(namespace.get("__doc__", ""))
@@ -33,7 +39,7 @@ class PolygraphTypeMeta(type):
                 fields=get_field_list(namespace),
                 possible_types=getattr(meta, "possible_types", None),
                 interfaces=None,  # FIXME
-                enum_values=None,  # FIXME
+                enum_values=get_enum_value_list(namespace),
                 input_fields=None,  # FIXME
                 of_type=getattr(meta, "of_type", None)
             )
diff --git a/polygraph/types/definitions.py b/polygraph/types/definitions.py
index 1d0008a..5943fc1 100644
--- a/polygraph/types/definitions.py
+++ b/polygraph/types/definitions.py
@@ -29,6 +29,20 @@ Field = namedtuple(
 )
 
 
+class EnumValue:
+    __slots__ = ["name", "description", "is_deprecated", "deprecation_reason", "parent"]
+
+    def __init__(self, name, parent, description=None, deprecation_reason=None):
+        self.name = name
+        self.description = description
+        self.is_deprecated = bool(deprecation_reason)
+        self.deprecation_reason = deprecation_reason
+        self.parent = parent
+
+    def __repr__(self):
+        return "EnumValue('{}')".format(self.name)
+
+
 TypeDefinition = namedtuple(
     "TypeDefinition",
     [
diff --git a/polygraph/types/enum.py b/polygraph/types/enum.py
index 42efa7f..110d0ff 100644
--- a/polygraph/types/enum.py
+++ b/polygraph/types/enum.py
@@ -4,21 +4,7 @@ from polygraph.types.basic_type import (
     PolygraphOutputType,
     PolygraphTypeMeta,
 )
-from polygraph.types.definitions import TypeKind
-
-
-class EnumValue:
-    __slots__ = ["name", "description", "is_deprecated", "deprecation_reason", "parent"]
-
-    def __init__(self, name, parent, description=None, deprecation_reason=None):
-        self.name = name
-        self.description = description
-        self.is_deprecated = bool(deprecation_reason)
-        self.deprecation_reason = deprecation_reason
-        self.parent = parent
-
-    def __repr__(self):
-        return "EnumValue('{}')".format(self.name)
+from polygraph.types.definitions import EnumValue, TypeKind
 
 
 class EnumTypeMeta(PolygraphTypeMeta):

Populate EnumValue field for Enum type definiton
diff --git a/polygraph/types/tests/test_enum.py b/polygraph/types/tests/test_enum.py
index c59940c..dabba73 100644
--- a/polygraph/types/tests/test_enum.py
+++ b/polygraph/types/tests/test_enum.py
@@ -1,6 +1,7 @@
 from unittest import TestCase
 
 from polygraph.exceptions import PolygraphValueError
+from polygraph.types.api import typedef
 from polygraph.types.enum import EnumType
 
 
@@ -10,6 +11,12 @@ class Colours(EnumType):
     BLUE = "The colour of sloth"
 
 
+class Shapes(EnumType):
+    RECTANGLE = "A quadrangle"
+    SQUARE = "Also a quadrangle"
+    RHOMBUS = "Yet another quadrangle"
+
+
 class EnumTest(TestCase):
 
     def test_simple_enum(self):
@@ -29,3 +36,14 @@ class EnumTest(TestCase):
         self.assertEqual(Colours(Colours.RED), Colours.RED)
         with self.assertRaises(PolygraphValueError):
             Colours("RED")
+
+    def test_enum_values_dont_mix(self):
+        with self.assertRaises(PolygraphValueError):
+            Colours(Shapes.RECTANGLE)
+
+        with self.assertRaises(PolygraphValueError):
+            Shapes(Colours.BLUE)
+
+    def test_enum_type(self):
+        colour_type = typedef(Colours)
+        self.assertEqual(len(colour_type.enum_values), 3)

pip install -e .[dev]
parse_log_pytest
pytest
pytest
3.6
pytest --no-header -rA --tb=line --color=no -p no:cacheprovider -W ignore::DeprecationWarning
args==0.1.0
attrs @ file:///opt/conda/conda-bld/attrs_1642510447205/work
autopep8==2.0.4
backcall==0.2.0
certifi==2021.5.30
charset-normalizer==2.0.12
clint==0.5.1
coverage==6.2
decorator==5.1.1
distlib==0.3.9
filelock==3.4.1
flake8==2.5.5
graphql-core==3.2.6
idna==3.10
importlib-metadata==4.8.3
importlib-resources==5.4.0
iniconfig @ file:///home/linux1/recipes/ci/iniconfig_1610983019677/work
ipython==7.16.3
ipython-genutils==0.2.0
isort==5.10.1
jedi==0.17.2
mccabe==0.4.0
more-itertools @ file:///tmp/build/80754af9/more-itertools_1637733554872/work
packaging @ file:///tmp/build/80754af9/packaging_1637314298585/work
parso==0.7.1
pbr==6.1.1
pep8==1.7.1
pexpect==4.9.0
pickleshare==0.7.5
pkginfo==1.10.0
platformdirs==2.4.0
pluggy @ file:///tmp/build/80754af9/pluggy_1615976315926/work
-e git+https://github.com/polygraph-python/polygraph.git@ad747c9e64f551b9a8b0392994675a4bb79de4a7#egg=polygraph
prompt-toolkit==3.0.36
ptyprocess==0.7.0
pudb==2017.1.2
py @ file:///opt/conda/conda-bld/py_1644396412707/work
pycodestyle==2.10.0
pyflakes==1.0.0
Pygments==2.14.0
pyparsing @ file:///tmp/build/80754af9/pyparsing_1635766073266/work
pytest==6.2.4
requests==2.27.1
requests-toolbelt==1.0.0
six==1.17.0
stevedore==3.5.2
toml @ file:///tmp/build/80754af9/toml_1616166611790/work
tomli==1.2.3
traitlets==4.3.3
twine==1.8.1
typing_extensions @ file:///opt/conda/conda-bld/typing_extensions_1647553014482/work
urllib3==1.26.20
urwid==2.1.2
virtualenv==20.17.1
virtualenv-clone==0.5.7
virtualenvwrapper==4.8.4
wcwidth==0.2.13
zipp @ file:///tmp/build/80754af9/zipp_1633618647012/work

name: polygraph
channels:
  - defaults
  - https://repo.anaconda.com/pkgs/main
  - https://repo.anaconda.com/pkgs/r
  - conda-forge
dependencies:
  - _libgcc_mutex=0.1=main
  - _openmp_mutex=5.1=1_gnu
  - attrs=21.4.0=pyhd3eb1b0_0
  - ca-certificates=2025.2.25=h06a4308_0
  - certifi=2021.5.30=py36h06a4308_0
  - importlib_metadata=4.8.1=hd3eb1b0_0
  - iniconfig=1.1.1=pyhd3eb1b0_0
  - ld_impl_linux-64=2.40=h12ee557_0
  - libffi=3.3=he6710b0_2
  - libgcc-ng=11.2.0=h1234567_1
  - libgomp=11.2.0=h1234567_1
  - libstdcxx-ng=11.2.0=h1234567_1
  - more-itertools=8.12.0=pyhd3eb1b0_0
  - ncurses=6.4=h6a678d5_0
  - openssl=1.1.1w=h7f8727e_0
  - packaging=21.3=pyhd3eb1b0_0
  - pip=21.2.2=py36h06a4308_0
  - pluggy=0.13.1=py36h06a4308_0
  - py=1.11.0=pyhd3eb1b0_0
  - pyparsing=3.0.4=pyhd3eb1b0_0
  - pytest=6.2.4=py36h06a4308_2
  - python=3.6.13=h12debd9_1
  - readline=8.2=h5eee18b_0
  - setuptools=58.0.4=py36h06a4308_0
  - sqlite=3.45.3=h5eee18b_0
  - tk=8.6.14=h39e8969_0
  - toml=0.10.2=pyhd3eb1b0_0
  - typing_extensions=4.1.1=pyh06a4308_0
  - wheel=0.37.1=pyhd3eb1b0_0
  - xz=5.6.4=h5eee18b_1
  - zipp=3.6.0=pyhd3eb1b0_0
  - zlib=1.2.13=h5eee18b_1
  - pip:
      - args==0.1.0
      - autopep8==2.0.4
      - backcall==0.2.0
      - charset-normalizer==2.0.12
      - clint==0.5.1
      - coverage==6.2
      - decorator==5.1.1
      - distlib==0.3.9
      - filelock==3.4.1
      - flake8==2.5.5
      - graphql-core==3.2.6
      - idna==3.10
      - importlib-metadata==4.8.3
      - importlib-resources==5.4.0
      - ipython==7.16.3
      - ipython-genutils==0.2.0
      - isort==5.10.1
      - jedi==0.17.2
      - mccabe==0.4.0
      - parso==0.7.1
      - pbr==6.1.1
      - pep8==1.7.1
      - pexpect==4.9.0
      - pickleshare==0.7.5
      - pkginfo==1.10.0
      - platformdirs==2.4.0
      - prompt-toolkit==3.0.36
      - ptyprocess==0.7.0
      - pudb==2017.1.2
      - pycodestyle==2.10.0
      - pyflakes==1.0.0
      - pygments==2.14.0
      - requests==2.27.1
      - requests-toolbelt==1.0.0
      - six==1.17.0
      - stevedore==3.5.2
      - tomli==1.2.3
      - traitlets==4.3.3
      - twine==1.8.1
      - urllib3==1.26.20
      - urwid==2.1.2
      - virtualenv==20.17.1
      - virtualenv-clone==0.5.7
      - virtualenvwrapper==4.8.4
      - wcwidth==0.2.13
prefix: /opt/conda/envs/polygraph

polygraph/types/tests/test_enum.py::EnumTest::test_enum_type
polygraph/types/tests/test_enum.py::EnumTest::test_enum_value polygraph/types/tests/test_enum.py::EnumTest::test_enum_values_dont_mix polygraph/types/tests/test_enum.py::EnumTest::test_simple_enum
polygraph/types/enum.py polygraph/types/basic_type.py polygraph/types/definitions.py
polygraph/types/enum.py polygraph/types/basic_type.py polygraph/types/definitions.py