diff --git a/AUTHORS b/AUTHORS
index e355f01e0..4ea26481c 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -211,6 +211,7 @@ Raphael Castaneda
 Raphael Pierzina
 Raquel Alegre
 Ravi Chandra
+Robert Holt
 Roberto Polli
 Roland Puntaier
 Romain Dorgueil
diff --git a/changelog/2270.bugfix.rst b/changelog/2270.bugfix.rst
new file mode 100644
index 000000000..0da084597
--- /dev/null
+++ b/changelog/2270.bugfix.rst
@@ -0,0 +1,2 @@
+Fixed ``self`` reference in function-scoped fixtures defined plugin classes: previously ``self``
+would be a reference to a *test* class, not the *plugin* class.
diff --git a/src/_pytest/fixtures.py b/src/_pytest/fixtures.py
index 9a904758f..e78ed011e 100644
--- a/src/_pytest/fixtures.py
+++ b/src/_pytest/fixtures.py
@@ -900,6 +900,12 @@ def resolve_fixture_function(fixturedef, request):
         # request.instance so that code working with "fixturedef" behaves
         # as expected.
         if request.instance is not None:
+            # handle the case where fixture is defined not in a test class, but some other class
+            # (for example a plugin class with a fixture), see #2270
+            if hasattr(fixturefunc, "__self__") and not isinstance(
+                request.instance, fixturefunc.__self__.__class__
+            ):
+                return fixturefunc
             fixturefunc = getimfunc(fixturedef.func)
             if fixturefunc != fixturedef.func:
                 fixturefunc = fixturefunc.__get__(request.instance)
diff --git a/testing/python/fixtures.py b/testing/python/fixtures.py
index d998e9726..43a05e7bb 100644
--- a/testing/python/fixtures.py
+++ b/testing/python/fixtures.py
@@ -3946,6 +3946,38 @@ class TestScopeOrdering:
         reprec = testdir.inline_run()
         reprec.assertoutcome(passed=2)
 
+    def test_class_fixture_self_instance(self, testdir):
+        """Check that plugin classes which implement fixtures receive the plugin instance
+        as self (see #2270).
+        """
+        testdir.makeconftest(
+            """
+            import pytest
+
+            def pytest_configure(config):
+                config.pluginmanager.register(MyPlugin())
+
+            class MyPlugin():
+                def __init__(self):
+                    self.arg = 1
+
+                @pytest.fixture(scope='function')
+                def myfix(self):
+                    assert isinstance(self, MyPlugin)
+                    return self.arg
+        """
+        )
+
+        testdir.makepyfile(
+            """
+            class TestClass(object):
+                def test_1(self, myfix):
+                    assert myfix == 1
+        """
+        )
+        reprec = testdir.inline_run()
+        reprec.assertoutcome(passed=1)
+
 
 def test_call_fixture_function_error():
     """Check if an error is raised if a fixture function is called directly (#4545)"""