diff --git a/docs/source/clientcode.rst b/docs/source/clientcode.rst
index af27e9e..3834893 100644
--- a/docs/source/clientcode.rst
+++ b/docs/source/clientcode.rst
@@ -125,9 +125,7 @@ For normal usage, there's not a single line of Pyro specific code once you have
 Accessing remote attributes
 ===========================
 You can access exposed attributes of your remote objects directly via the proxy.
-If you try to access an undefined or unexposed attribute, the proxy will raise an AttributeError stating the problem.
-Note that direct remote attribute access only works if the metadata feature is enabled (``METADATA`` config item, enabled by default).
-::
+If you try to access an undefined or unexposed attribute, the proxy will raise an AttributeError stating the problem::
 
     import Pyro5.api
 
diff --git a/tests/test_server.py b/tests/test_server.py
index aa64ffc..da79784 100644
--- a/tests/test_server.py
+++ b/tests/test_server.py
@@ -278,7 +278,7 @@ def testProxyMetadata(self):
             assert p._pyroAttrs == set()
             assert p._pyroMethods == set()
             assert p._pyroOneway == set()
-            # connecting it should obtain metadata (as long as METADATA is true)
+            # connecting it should obtain metadata
             p._pyroBind()
             assert p._pyroAttrs == {'value', 'dictionary'}
             assert p._pyroMethods == {'echo', 'getDict', 'divide', 'nonserializableException', 'ping', 'oneway_delay', 'delayAndId', 'delay', 'testargs',
@@ -299,7 +299,7 @@ def testProxyAttrsMetadataOn(self):
         # read attributes
         with Pyro5.client.Proxy(self.objectUri) as p:
             # unconnected proxy still has empty metadata.
-            # but, as soon as an attribute is used, the metadata is obtained (as long as METADATA is true)
+            # but, as soon as an attribute is used, the metadata is obtained
             a = p.value
             assert a == 12345
             a = p.multiply