diff --git a/pytest.ini b/pytest.ini
index 0913e7b..176f965 100644
--- a/pytest.ini
+++ b/pytest.ini
@@ -1,6 +1,10 @@
 [pytest]
 xfail_strict = true
+markers =
+    online: Online tests, that require a user account set up. Meant to be used \
+    manually, to check whether Facebook has broken something.
 addopts =
     --strict
+    -m "not online"
 testpaths = tests
 filterwarnings = error
diff --git a/tests/online/conftest.py b/tests/online/conftest.py
new file mode 100644
index 0000000..ddf1663
--- /dev/null
+++ b/tests/online/conftest.py
@@ -0,0 +1,28 @@
+import fbchat
+import pytest
+import logging
+import getpass
+
+
+@pytest.fixture(scope="session")
+def session(pytestconfig):
+    session_cookies = pytestconfig.cache.get("session_cookies", None)
+    try:
+        session = fbchat.Session.from_cookies(session_cookies)
+    except fbchat.FacebookError:
+        logging.exception("Error while logging in with cookies!")
+        session = fbchat.Session.login(input("Email: "), getpass.getpass("Password: "))
+
+    yield session
+
+    pytestconfig.cache.set("session_cookies", session.get_cookies())
+
+
+@pytest.fixture
+def client(session):
+    return fbchat.Client(session=session)
+
+
+@pytest.fixture
+def listener(session):
+    return fbchat.Listener(session=session, chat_on=False, foreground=False)
diff --git a/tests/online/test_client.py b/tests/online/test_client.py
new file mode 100644
index 0000000..0a9b518
--- /dev/null
+++ b/tests/online/test_client.py
@@ -0,0 +1,97 @@
+import pytest
+import fbchat
+import os
+
+pytestmark = pytest.mark.online
+
+
+def test_fetch(client):
+    client.fetch_users()
+
+
+def test_search_for_users(client):
+    list(client.search_for_users("test", 10))
+
+
+def test_search_for_pages(client):
+    list(client.search_for_pages("test", 100))
+
+
+def test_search_for_groups(client):
+    list(client.search_for_groups("test", 1000))
+
+
+def test_search_for_threads(client):
+    list(client.search_for_threads("test", 1000))
+
+    with pytest.raises(fbchat.HTTPError, match="rate limited"):
+        list(client.search_for_threads("test", 10000))
+
+
+def test_message_search(client):
+    list(client.search_messages("test", 500))
+
+
+def test_fetch_thread_info(client):
+    list(client.fetch_thread_info(["4"]))[0]
+
+
+def test_fetch_threads(client):
+    list(client.fetch_threads(20))
+    list(client.fetch_threads(200))
+
+
+def test_undocumented(client):
+    client.fetch_unread()
+    client.fetch_unseen()
+
+
+@pytest.mark.skip(reason="need a way to get an image id")
+def test_fetch_image_url(client):
+    client.fetch_image_url("TODO")
+
+
+@pytest.fixture
+def open_resource(pytestconfig):
+    def get_resource_inner(filename):
+        return open(os.path.join(pytestconfig.root, "resources", filename), "rb")
+
+    return get_resource_inner
+
+
+def test_upload_image(client, open_resource):
+    with open_resource("image.png") as f:
+        _ = client.upload([("image.png", f, "image/png")])
+
+
+def test_upload_many(client, open_resource):
+    with open_resource("image.png") as f_png, open_resource(
+        "image.jpg"
+    ) as f_jpg, open_resource("image.gif") as f_gif, open_resource(
+        "file.json"
+    ) as f_json, open_resource(
+        "file.txt"
+    ) as f_txt, open_resource(
+        "audio.mp3"
+    ) as f_mp3, open_resource(
+        "video.mp4"
+    ) as f_mp4:
+        files = client.upload(
+            [
+                ("image.png", f_png, "image/png"),
+                ("image.jpg", f_jpg, "image/jpeg"),
+                ("image.gif", f_gif, "image/gif"),
+                ("file.json", f_json, "application/json"),
+                ("file.txt", f_txt, "text/plain"),
+                ("audio.mp3", f_mp3, "audio/mpeg"),
+                ("video.mp4", f_mp4, "video/mp4"),
+            ]
+        )
+
+        print(files)
+
+        raise 2
+
+
+# def test_mark_as_read(client):
+#     client.mark_as_read([thread1, thread2])