diff --git a/cmsend.py b/cmsend.py
index df48c76..976d4c8 100644
--- a/cmsend.py
+++ b/cmsend.py
@@ -124,7 +124,8 @@ def perform_join(self, tag, invitelink):
             raise SystemExit(4)
 
         self._account.start_io()
-        self._account.secure_join(invitelink)
+        qr = self._account.check_qr(invitelink)
+        chat = self._account.secure_join(invitelink)
 
         def check_joined(event):
             if (
@@ -136,15 +137,20 @@ def check_joined(event):
         ev = self.wait_for_event(check_joined)
         print(f"established contact with contact_id == {ev.contact_id}")
 
-        def me_was_added(event):
-            if event.kind == EventType.INCOMING_MSG:
-                msg = self._account.get_message_by_id(event.msg_id)
-                text = msg.get_snapshot().text
-                if text.startswith("Member Me added"):
-                    return True
+        if qr["kind"] == "askVerifyGroup":
+            # a group is only sendable once the inviter added us
+            def me_was_added(event):
+                if event.kind == EventType.INCOMING_MSG:
+                    msg = self._account.get_message_by_id(event.msg_id)
+                    text = msg.get_snapshot().text
+                    if text.startswith("Member Me added"):
+                        return True
+
+            chat_id = self.wait_for_event(me_was_added).chat_id
+        else:
+            # 1:1 chats get no such message and are ready right away
+            chat_id = chat.id
 
-        ev_chat_id = self.wait_for_event(me_was_added)
-        chat_id = ev_chat_id.chat_id
         print(f"joining completed with chat_id == {chat_id} tag={tag}")
         self._account.set_config(f"{self.UI_CONFIG_TAGGED_CHATS}.{tag}", str(chat_id))
         list_tags = self._account.get_config(self.UI_CONFIG_TAGGED_CHATS) or ""
diff --git a/test_cmsend.py b/test_cmsend.py
index db9abe1..863ec17 100644
--- a/test_cmsend.py
+++ b/test_cmsend.py
@@ -1,50 +1,56 @@
-import pytest
+import subprocess
+import sys
 
-import cmsend
+import pytest
 
 pytest_plugins = ("deltachat_rpc_client.pytestplugin",)
 ci_chatmail_domain = "ci-chatmail.testrun.org"
 
 
 @pytest.fixture(autouse=True)
-def _inject_xdg_config_home(tmp_path, monkeypatch):
-    xdg_config = tmp_path.joinpath("xdg-config")
-    monkeypatch.setattr(cmsend, "xdg_config_home", lambda: xdg_config)
+def _isolate_env(tmp_path, monkeypatch):
+    """Keep every test off the real ~/.config/cmsend, however it invokes cmsend."""
     monkeypatch.setenv("CHATMAIL_DOMAIN", ci_chatmail_domain)
+    monkeypatch.setenv("XDG_CONFIG_HOME", str(tmp_path.joinpath("xdg-config")))
 
 
 @pytest.fixture
-def invoke_main(capsys):
-    def invoke(*args):
-        with capsys.disabled():
-            print(f"$ cmsend {' '.join(args)}")
-        ret = cmsend.main(args)
-        out, err = capsys.readouterr()
-        with capsys.disabled():
-            if out:
-                print(out)
-        return ret, out, err
+def run_cmsend(capfd):
+    """Run cmsend as a subprocess: an in-process hang would wedge pytest itself."""
 
-    return invoke
+    def run(*args, timeout=60):
+        cmd = [sys.executable, "-m", "cmsend", *args]
+        try:
+            subprocess.run(cmd, check=True, timeout=timeout)
+        except subprocess.TimeoutExpired:
+            pytest.fail(f"cmsend did not terminate within {timeout}s")
+        return capfd.readouterr().out
 
+    return run
 
-def test_init_join_and_send(acfactory, invoke_main):
+
+@pytest.mark.parametrize("invite", ["setup", "group"])
+def test_init_join_and_send(acfactory, run_cmsend, invite):
     (ac,) = acfactory.get_online_accounts(1)
 
-    invoke_main("--init", ci_chatmail_domain)
+    run_cmsend("--init", ci_chatmail_domain, timeout=120)
+
+    assert "LOG" not in run_cmsend("-l")
 
-    _ret, out, _err = invoke_main("-l")
-    assert "LOG" not in out
+    if invite == "setup":
+        invitelink = ac.get_qr_code()
+        expected_name = ac.get_config("configured_addr")
+    else:
+        invitelink = ac.create_group("cmsend log").get_qr_code()
+        expected_name = "cmsend log"
 
-    # "--join" expects a Join-Group QR code, not a Setup-Contact one.
-    group = ac.create_group("cmsend log")
-    invoke_main("-t", "LOG", "--join", group.get_qr_code())
+    run_cmsend("-t", "LOG", "--join", invitelink)
 
-    _ret, out, _err = invoke_main("-l")
+    out = run_cmsend("-l")
     assert "LOG" in out
-    assert "cmsend log" in out
+    assert expected_name in out
 
-    invoke_main("-t", "LOG", "-m", "hello from cmsend")
+    run_cmsend("-t", "LOG", "-m", "hello from cmsend")
     event = ac.wait_for_incoming_msg_event()
     snapshot = ac.get_message_by_id(event.msg_id).get_snapshot()
     assert snapshot.text == "hello from cmsend"