diff --git a/swh/graphql/resolvers/directory.py b/swh/graphql/resolvers/directory.py
--- a/swh/graphql/resolvers/directory.py
+++ b/swh/graphql/resolvers/directory.py
@@ -58,9 +58,8 @@
     obj: BaseRevisionNode
 
     def _get_node_data(self):
-        # self.obj.directory_swhid is the requested directory SWHID
-        directory_id = self.obj.directory_swhid.object_id
-        return self._get_directory_by_id(directory_id)
+        # self.obj.directory_hash is the requested directory Id
+        return self._get_directory_by_id(self.obj.directory_hash)
 
 
 class TargetDirectoryNode(BaseDirectoryNode):
diff --git a/swh/graphql/resolvers/revision.py b/swh/graphql/resolvers/revision.py
--- a/swh/graphql/resolvers/revision.py
+++ b/swh/graphql/resolvers/revision.py
@@ -32,10 +32,8 @@
         ]
 
     @property
-    def directory_swhid(self):  # for RevisionDirectoryNode resolver
-        return CoreSWHID(
-            object_type=ObjectType.DIRECTORY, object_id=self._node.directory
-        )
+    def directory_hash(self):  # for RevisionDirectoryNode resolver
+        return self._node.directory
 
     @property
     def type(self):
diff --git a/swh/graphql/tests/functional/test_directory.py b/swh/graphql/tests/functional/test_directory.py
new file mode 100644
--- /dev/null
+++ b/swh/graphql/tests/functional/test_directory.py
@@ -0,0 +1,74 @@
+# Copyright (C) 2022 The Software Heritage developers
+# See the AUTHORS file at the top-level directory of this distribution
+# License: GNU General Public License version 3, or any later version
+# See top-level LICENSE file for more information
+
+import pytest
+
+from . import utils
+from ..data import get_directories
+
+
+@pytest.mark.parametrize("directory", get_directories())
+def test_get_directory(client, directory):
+    query_str = """
+    {
+      directory(swhid: "%s") {
+        swhid
+      }
+    }
+    """
+    data, _ = utils.get_query_response(client, query_str % directory.swhid())
+    assert data["directory"] == {"swhid": str(directory.swhid())}
+
+
+def test_get_directory_with_invalid_swhid(client):
+    query_str = """
+    {
+      directory(swhid: "swh:1:dir:invalid") {
+        swhid
+      }
+    }
+    """
+    errors = utils.get_error_response(client, query_str)
+    # API will throw an error in case of an invalid SWHID
+    assert len(errors) == 1
+    assert "Invalid SWHID: invalid syntax" in errors[0]["message"]
+
+
+def test_get_revision_directory(client):
+    query_str = """
+    {
+      revision(swhid: "swh:1:rev:66c7c1cd9673275037140f2abff7b7b11fc9439c") {
+        swhid
+        directory {
+          swhid
+        }
+      }
+    }
+    """
+    data, _ = utils.get_query_response(client, query_str)
+    assert data["revision"]["directory"] == {
+        "swhid": "swh:1:dir:0101010101010101010101010101010101010101"
+    }
+
+
+def test_get_target_directory(client):
+    # TargetDirectoryNode is returned from snapshotbranch, release
+    # and directory entry nodes. Release node is used for testing here
+    query_str = """
+    {
+      release(swhid: "swh:1:rel:ee4d20e80af850cc0f417d25dc5073792c5010d2") {
+        swhid
+        target {
+          ...on Directory {
+            swhid
+          }
+        }
+      }
+    }
+    """
+    data, _ = utils.get_query_response(client, query_str)
+    assert data["release"]["target"] == {
+        "swhid": "swh:1:dir:0505050505050505050505050505050505050505"
+    }
diff --git a/swh/graphql/tests/functional/test_directory_entry.py b/swh/graphql/tests/functional/test_directory_entry.py
new file mode 100644
--- /dev/null
+++ b/swh/graphql/tests/functional/test_directory_entry.py
@@ -0,0 +1,37 @@
+# Copyright (C) 2022 The Software Heritage developers
+# See the AUTHORS file at the top-level directory of this distribution
+# License: GNU General Public License version 3, or any later version
+# See top-level LICENSE file for more information
+
+import pytest
+
+from . import utils
+from ..data import get_directories
+
+
+@pytest.mark.parametrize("directory", get_directories())
+def test_get_directory_entry_connection(client, directory):
+    query_str = """
+    {
+      directory(swhid: "%s") {
+        swhid
+        entries {
+          nodes {
+            type
+            name {
+              text
+            }
+          }
+        }
+      }
+    }
+    """
+    data, _ = utils.get_query_response(client, query_str % directory.swhid())
+    directory_entries = data["directory"]["entries"]["nodes"]
+    assert len(directory_entries) == len(directory.entries)
+    output = [
+        {"name": {"text": de.name.decode()}, "type": de.type}
+        for de in directory.entries
+    ]
+    for each_entry in output:
+        assert each_entry in directory_entries