diff --git a/swh/graphql/tests/backends/__init__.py b/swh/graphql/tests/functional/__init__.py
similarity index 100%
copy from swh/graphql/tests/backends/__init__.py
copy to swh/graphql/tests/functional/__init__.py
diff --git a/swh/graphql/tests/resolvers/__init__.py b/swh/graphql/tests/unit/__init__.py
similarity index 100%
rename from swh/graphql/tests/resolvers/__init__.py
rename to swh/graphql/tests/unit/__init__.py
diff --git a/swh/graphql/tests/backends/__init__.py b/swh/graphql/tests/unit/backends/__init__.py
similarity index 100%
copy from swh/graphql/tests/backends/__init__.py
copy to swh/graphql/tests/unit/backends/__init__.py
diff --git a/swh/graphql/tests/backends/test_archive.py b/swh/graphql/tests/unit/backends/test_archive.py
similarity index 100%
rename from swh/graphql/tests/backends/test_archive.py
rename to swh/graphql/tests/unit/backends/test_archive.py
diff --git a/swh/graphql/tests/backends/__init__.py b/swh/graphql/tests/unit/resolvers/__init__.py
similarity index 100%
rename from swh/graphql/tests/backends/__init__.py
rename to swh/graphql/tests/unit/resolvers/__init__.py
diff --git a/swh/graphql/tests/unit/resolvers/test_base_node.py b/swh/graphql/tests/unit/resolvers/test_base_node.py
new file mode 100644
index 0000000..c5f5968
--- /dev/null
+++ b/swh/graphql/tests/unit/resolvers/test_base_node.py
@@ -0,0 +1,25 @@
+"""
+"""
+
+
+class TestBaseNode:
+    def test_init(self):
+        pass
+
+    def test_get_node(self):
+        pass
+
+    def test_get_node_from_data(self):
+        pass
+
+    def test_handle_node_errors(self):
+        pass
+
+    def test_get_node_data(self):
+        pass
+
+    def test_getattr(self):
+        pass
+
+    def test_is_type_of(sellf):
+        pass
diff --git a/swh/graphql/tests/resolvers/test_origin.py b/swh/graphql/tests/unit/resolvers/test_origin.py
similarity index 100%
rename from swh/graphql/tests/resolvers/test_origin.py
rename to swh/graphql/tests/unit/resolvers/test_origin.py
diff --git a/swh/graphql/tests/unit/resolvers/test_resolve_factory.py b/swh/graphql/tests/unit/resolvers/test_resolve_factory.py
new file mode 100644
index 0000000..1db95f9
--- /dev/null
+++ b/swh/graphql/tests/unit/resolvers/test_resolve_factory.py
@@ -0,0 +1,54 @@
+import pytest
+
+from swh.graphql.resolvers import resolver_factory
+
+
+class TestFactory:
+    @pytest.mark.parametrize(
+        "input_type, expexted",
+        [
+            ("origin", "OriginNode"),
+            ("visit", "OriginVisitNode"),
+            ("visit-snapshot", "VisitSnapshotNode"),
+            ("snapshot", "SnapshotNode"),
+            ("branch-revision", "TargetRevisionNode"),
+            ("branch-release", "TargetReleaseNode"),
+            ("revision", "RevisionNode"),
+            ("revision-directory", "RevisionDirectoryNode"),
+            ("release", "ReleaseNode"),
+            ("release-revision", "TargetRevisionNode"),
+            ("release-release", "TargetReleaseNode"),
+            ("release-directory", "TargetDirectoryNode"),
+            ("release-content", "TargetContentNode"),
+            ("directory", "DirectoryNode"),
+            ("content", "ContentNode"),
+            ("dir-entry-dir", "TargetDirectoryNode"),
+            ("dir-entry-file", "TargetContentNode"),
+        ],
+    )
+    def test_get_node_resolver(self, input_type, expexted):
+        response = resolver_factory.get_node_resolver(input_type)
+        assert response.__name__ == expexted
+
+    def test_get_node_resolver_invalid_type(self):
+        with pytest.raises(AttributeError):
+            resolver_factory.get_node_resolver("invalid")
+
+    @pytest.mark.parametrize(
+        "input_type, expexted",
+        [
+            ("origins", "OriginConnection"),
+            ("origin-visits", "OriginVisitConnection"),
+            ("visit-status", "VisitStatusConnection"),
+            ("snapshot-branches", "SnapshotBranchConnection"),
+            ("revision-parents", "ParentRevisionConnection"),
+            ("directory-entries", "DirectoryEntryConnection"),
+        ],
+    )
+    def test_get_connection_resolver(self, input_type, expexted):
+        response = resolver_factory.get_connection_resolver(input_type)
+        assert response.__name__ == expexted
+
+    def test_get_connection_resolver_invalid_type(self):
+        with pytest.raises(AttributeError):
+            resolver_factory.get_connection_resolver("invalid")
diff --git a/swh/graphql/tests/unit/resolvers/test_resolvers.py b/swh/graphql/tests/unit/resolvers/test_resolvers.py
new file mode 100644
index 0000000..42b5db2
--- /dev/null
+++ b/swh/graphql/tests/unit/resolvers/test_resolvers.py
@@ -0,0 +1,2 @@
+class TestResolvers:
+    """ """