diff --git a/sphinx/pycode/__init__.py b/sphinx/pycode/__init__.py
index d195d6c3a..de1c3dbe1 100644
--- a/sphinx/pycode/__init__.py
+++ b/sphinx/pycode/__init__.py
@@ -168,7 +168,7 @@ class ModuleAnalyzer(object):
             filename = getattr(mod, '__file__', None)
             if filename is None:
                 raise PycodeError('no source found for module %r' % modname)
-            filename = path.normpath(filename)
+            filename = path.normpath(path.abspath(filename))
             lfilename = filename.lower()
             if lfilename.endswith('.pyo') or lfilename.endswith('.pyc'):
                 filename = filename[:-1]
diff --git a/tests/test_build.py b/tests/test_build.py
index 9d6ab2a48..18c784995 100644
--- a/tests/test_build.py
+++ b/tests/test_build.py
@@ -108,7 +108,8 @@ HTML_XPATH = {
     'contents.html': {
         ".//meta[@name='hc'][@content='hcval']": '',
         ".//meta[@name='testopt'][@content='testoverride']": '',
-        ".//td[@class='label']": r'\[Ref1\]',
+        #".//td[@class='label']": r'\[Ref1\]',   # docutils 0.5 only
+        ".//td[@class='label']": '',
         ".//li[@class='toctree-l1']/a": 'Testing various markup',
         ".//li[@class='toctree-l2']/a": 'Admonitions',
         ".//title": 'Sphinx <Tests>',
diff --git a/tests/test_env.py b/tests/test_env.py
index 94e7af931..a06656d69 100644
--- a/tests/test_env.py
+++ b/tests/test_env.py
@@ -80,7 +80,7 @@ def test_second_update():
     (root / 'autodoc.txt').unlink()
     (root / 'new.txt').write_text('New file\n========\n')
     msg, num, it = env.update(app.config, app.srcdir, app.doctreedir, app)
-    assert '1 added, 4 changed, 1 removed' in msg
+    assert '1 added, 3 changed, 1 removed' in msg
     docnames = set()
     for docname in it:
         docnames.add(docname)