diff --git a/kgb/pytest_plugin.py b/kgb/pytest_plugin.py
new file mode 100644
index 0000000000000000000000000000000000000000..23230ed1d9b2dfc790ac9dc220c560b7535da9bd
--- /dev/null
+++ b/kgb/pytest_plugin.py
@@ -0,0 +1,27 @@
+"""Pytest plugin for kgb.
+
+Version Added:
+    7.0
+"""
+
+from __future__ import unicode_literals
+
+import pytest
+
+from kgb import SpyAgency
+
+
+@pytest.fixture
+def spy_agency():
+    """Provide a KGB spy agency to a Pytest unit test.
+
+    Yields:
+        kgb.SpyAgency:
+        The spy agency.
+    """
+    agency = SpyAgency()
+
+    try:
+        yield agency
+    finally:
+        agency.unspy_all()
diff --git a/kgb/tests/test_pytest_plugin.py b/kgb/tests/test_pytest_plugin.py
new file mode 100644
index 0000000000000000000000000000000000000000..5bf49ceb2e66cffe783b7395e161cc640ec038d7
--- /dev/null
+++ b/kgb/tests/test_pytest_plugin.py
@@ -0,0 +1,20 @@
+"""Unit tests for kgb.pytest_plugin.
+
+Version Added:
+    7.0
+"""
+
+from __future__ import unicode_literals
+
+from kgb.agency import SpyAgency
+from kgb.tests.base import MathClass
+
+
+def test_pytest_plugin(spy_agency):
+    """Testing pytest spy_agency fixture"""
+    assert isinstance(spy_agency, SpyAgency)
+
+    obj = MathClass()
+
+    spy = spy_agency.spy_on(obj.do_math)
+    assert spy_agency.spies == {spy}
diff --git a/setup.py b/setup.py
index eed0d9b3b5bf56bede7b2ddc68f1ff48acd71573..4bfe415eecdddccda4f6711cf1413ded961aa518 100755
--- a/setup.py
+++ b/setup.py
@@ -49,6 +49,11 @@ setup(name=PACKAGE_NAME,
       packages=find_packages(),
       maintainer='Christian Hammond',
       maintainer_email='christian@beanbaginc.com',
+      entry_points={
+          'pytest11': [
+              'kgb = kgb.pytest_plugin',
+          ],
+      },
       python_requires=','.join([
           '>=2.7',
           '!=3.0.*',
@@ -61,6 +66,7 @@ setup(name=PACKAGE_NAME,
       classifiers=[
           'Development Status :: 5 - Production/Stable',
           'Environment :: Other Environment',
+          'Framework :: Pytest',
           'Intended Audience :: Developers',
           'License :: OSI Approved :: MIT License',
           'Operating System :: OS Independent',