diff --git a/sphinx/domains/python.py b/sphinx/domains/python.py
index af8b2eda1..de1ab84c3 100644
--- a/sphinx/domains/python.py
+++ b/sphinx/domains/python.py
@@ -569,6 +569,8 @@ class PythonDomain(Domain):
         else:
             if name in objects:
                 newname = name
+            elif classname and classname + '.' + name in objects:
+                newname = classname + '.' + name
             elif modname and modname + '.' + name in objects:
                 newname = modname + '.' + name
             elif modname and classname and \