diff --git a/nylas/client/restful_models.py b/nylas/client/restful_models.py
index 93488a0..e73c100 100644
--- a/nylas/client/restful_models.py
+++ b/nylas/client/restful_models.py
@@ -179,11 +179,11 @@ class Folder(NylasAPIObject):
 
     @property
     def threads(self):
-        return self.child_collection({'in': self.id})
+        return self.child_collection(Thread, folder_id=self.id)
 
     @property
     def messages(self):
-        return self.child_collection({'in': self.id})
+        return self.child_collection(Message, folder_id=self.id)
 
 
 class Label(NylasAPIObject):
@@ -195,11 +195,11 @@ class Label(NylasAPIObject):
 
     @property
     def threads(self):
-        return self.child_collection({'in': self.id})
+        return self.child_collection(Thread, label_id=self.id)
 
     @property
     def messages(self):
-        return self.child_collection({'in': self.id})
+        return self.child_collection(Message, label_id=self.id)
 
 
 class Thread(NylasAPIObject):

Fix all xfail tests
diff --git a/tests/conftest.py b/tests/conftest.py
index 05ac31b..a33ee02 100644
--- a/tests/conftest.py
+++ b/tests/conftest.py
@@ -199,10 +199,10 @@ def mock_label(api_url, account_id):
             "object": "label"
         }
     )
-    endpoint = re.compile(api_url + '/labels/anuep8pe5ugmxrucchrzba2o8')
+    url = api_url + '/labels/anuep8pe5ugmxrucchrzba2o8'
     responses.add(
         responses.GET,
-        endpoint,
+        url,
         content_type='application/json',
         status=200,
         body=response_body,
@@ -219,10 +219,10 @@ def mock_folder(api_url, account_id):
         "object": "folder"
         }
     response_body = json.dumps(folder)
-    endpoint = re.compile(api_url + '/folders/anuep8pe5ug3xrupchwzba2o8')
+    url = api_url + '/folders/anuep8pe5ug3xrupchwzba2o8'
     responses.add(
         responses.GET,
-        endpoint,
+        url,
         content_type='application/json',
         status=200,
         body=response_body,
@@ -236,7 +236,7 @@ def mock_folder(api_url, account_id):
 
     responses.add_callback(
         responses.PUT,
-        endpoint,
+        url,
         content_type='application/json',
         callback=request_callback,
     )
diff --git a/tests/test_folders.py b/tests/test_folders.py
index 50daf92..407c0d3 100644
--- a/tests/test_folders.py
+++ b/tests/test_folders.py
@@ -16,7 +16,6 @@ def test_get_change_folder(api_client):
 
 
 @responses.activate
-@pytest.mark.xfail
 @pytest.mark.usefixtures("mock_folder", "mock_threads")
 def test_folder_threads(api_client):
     folder = api_client.folders.find('anuep8pe5ug3xrupchwzba2o8')
@@ -26,7 +25,6 @@ def test_folder_threads(api_client):
 
 
 @responses.activate
-@pytest.mark.xfail
 @pytest.mark.usefixtures("mock_folder", "mock_messages")
 def test_folder_messages(api_client):
     folder = api_client.folders.find('anuep8pe5ug3xrupchwzba2o8')
diff --git a/tests/test_labels.py b/tests/test_labels.py
index 48acd86..74cf02e 100644
--- a/tests/test_labels.py
+++ b/tests/test_labels.py
@@ -1,6 +1,6 @@
 import pytest
 import responses
-from nylas.client.restful_models import Label
+from nylas.client.restful_models import Label, Thread, Message
 
 
 @responses.activate
@@ -19,3 +19,21 @@ def test_get_label(api_client):
     assert label is not None
     assert isinstance(label, Label)
     assert label.display_name == 'Important'
+
+
+@responses.activate
+@pytest.mark.usefixtures("mock_label", "mock_threads")
+def test_label_threads(api_client):
+    label = api_client.labels.find('anuep8pe5ugmxrucchrzba2o8')
+    assert label.threads
+    assert all(isinstance(thread, Thread)
+               for thread in label.threads)
+
+
+@responses.activate
+@pytest.mark.usefixtures("mock_label", "mock_messages")
+def test_label_messages(api_client):
+    label = api_client.labels.find('anuep8pe5ugmxrucchrzba2o8')
+    assert label.messages
+    assert all(isinstance(message, Message)
+               for message in label.messages)

pip install -e .[test]
parse_log_pytest
requirements.txt
pytest
3.9
requirements/base.txt
pytest --no-header -rA --tb=line --color=no -p no:cacheprovider -W ignore::DeprecationWarning
astroid==3.3.9
bump2version==1.0.1
bumpversion==0.6.0
certifi==2025.1.31
cffi==1.17.1
charset-normalizer==3.4.1
coverage==7.8.0
cryptography==44.0.2
dill==0.3.9
exceptiongroup==1.2.2
httpretty==1.1.4
idna==3.10
iniconfig==2.1.0
isort==6.0.1
mccabe==0.7.0
ndg-httpsclient==0.5.1
-e git+https://github.com/nylas/nylas-python.git@6a9b1e5c0774b2a198496daedb980b5bbc091d30#egg=nylas
packaging==24.2
platformdirs==4.3.7
pluggy==1.5.0
pyasn1==0.6.1
pycparser==2.22
pylint==3.3.6
pyOpenSSL==25.0.0
pytest==8.3.5
pytest-cov==6.0.0
pytest-pylint==0.21.0
PyYAML==6.0.2
requests==2.32.3
responses==0.25.7
six==1.17.0
tomli==2.2.1
tomlkit==0.13.2
typing_extensions==4.13.0
urllib3==2.3.0
URLObject==2.4.3

name: nylas-python
channels:
  - defaults
  - https://repo.anaconda.com/pkgs/main
  - https://repo.anaconda.com/pkgs/r
  - conda-forge
dependencies:
  - _libgcc_mutex=0.1=main
  - _openmp_mutex=5.1=1_gnu
  - ca-certificates=2025.2.25=h06a4308_0
  - ld_impl_linux-64=2.40=h12ee557_0
  - libffi=3.4.4=h6a678d5_1
  - libgcc-ng=11.2.0=h1234567_1
  - libgomp=11.2.0=h1234567_1
  - libstdcxx-ng=11.2.0=h1234567_1
  - ncurses=6.4=h6a678d5_0
  - openssl=3.0.16=h5eee18b_0
  - pip=25.0=py39h06a4308_0
  - python=3.9.21=he870216_1
  - readline=8.2=h5eee18b_0
  - setuptools=75.8.0=py39h06a4308_0
  - sqlite=3.45.3=h5eee18b_0
  - tk=8.6.14=h39e8969_0
  - tzdata=2025a=h04d1e81_0
  - wheel=0.45.1=py39h06a4308_0
  - xz=5.6.4=h5eee18b_1
  - zlib=1.2.13=h5eee18b_1
  - pip:
      - astroid==3.3.9
      - bump2version==1.0.1
      - bumpversion==0.6.0
      - certifi==2025.1.31
      - cffi==1.17.1
      - charset-normalizer==3.4.1
      - coverage==7.8.0
      - cryptography==44.0.2
      - dill==0.3.9
      - exceptiongroup==1.2.2
      - httpretty==1.1.4
      - idna==3.10
      - iniconfig==2.1.0
      - isort==6.0.1
      - mccabe==0.7.0
      - ndg-httpsclient==0.5.1
      - packaging==24.2
      - platformdirs==4.3.7
      - pluggy==1.5.0
      - pyasn1==0.6.1
      - pycparser==2.22
      - pylint==3.3.6
      - pyopenssl==25.0.0
      - pytest==8.3.5
      - pytest-cov==6.0.0
      - pytest-pylint==0.21.0
      - pyyaml==6.0.2
      - requests==2.32.3
      - responses==0.25.7
      - six==1.17.0
      - tomli==2.2.1
      - tomlkit==0.13.2
      - typing-extensions==4.13.0
      - urllib3==2.3.0
      - urlobject==2.4.3
prefix: /opt/conda/envs/nylas-python

tests/test_folders.py::test_folder_threads tests/test_folders.py::test_folder_messages tests/test_labels.py::test_label_threads tests/test_labels.py::test_label_messages
tests/test_folders.py::test_get_change_folder tests/test_labels.py::test_list_labels tests/test_labels.py::test_get_label
nylas/client/restful_models.py
nylas/client/restful_models.py