diff --git a/sphinx/ext/autodoc.py b/sphinx/ext/autodoc.py
index 4181818bc4..2bdba7e4fb 100644
--- a/sphinx/ext/autodoc.py
+++ b/sphinx/ext/autodoc.py
@@ -1106,7 +1106,7 @@ class DataDocumenter(ModuleLevelDocumenter):
 
     def add_directive_header(self, sig):
         ModuleLevelDocumenter.add_directive_header(self, sig)
-        if not "novalue" in self.options:
+        if not self.options.novalue:
             try:
                 objrepr = safe_repr(self.object)
             except ValueError:
@@ -1221,7 +1221,7 @@ class AttributeDocumenter(ClassLevelDocumenter):
 
     def add_directive_header(self, sig):
         ClassLevelDocumenter.add_directive_header(self, sig)
-        if not self._datadescriptor or "novalue" in self.options:
+        if not self._datadescriptor and not self.options.novalue:
             try:
                 objrepr = safe_repr(self.object)
             except ValueError:
diff --git a/tests/test_autodoc.py b/tests/test_autodoc.py
index be6c4ec9cd..bef9c33843 100644
--- a/tests/test_autodoc.py
+++ b/tests/test_autodoc.py
@@ -38,6 +38,7 @@ def setup_module():
         special_members = False,
         show_inheritance = False,
         noindex = False,
+        novalue = False,
         synopsis = '',
         platform = '',
         deprecated = False,