diff --git a/labgrid/driver/shelldriver.py b/labgrid/driver/shelldriver.py
index 7d476f536..a2e0f83d4 100644
--- a/labgrid/driver/shelldriver.py
+++ b/labgrid/driver/shelldriver.py
@@ -197,9 +197,13 @@ def _check_prompt(self):
         self.console.sendline(f"echo '{marker[:4]}''{marker[4:]}'")
         try:
             self.console.expect(
-                rf"{marker}\s+{self.prompt}",
+                rf"{marker}\s+",
                 timeout=30
             )
+            self.console.expect(
+                rf"{self.prompt}",
+                timeout=1
+            )
             self._status = 1
         except TIMEOUT:
             self._status = 0