diff --git a/hpvm/test/epoch_dnn/main.py b/hpvm/test/epoch_dnn/main.py
index 2a66aae2009739d066aed8aa91a2f8d0fb611869..0397a2d1f913258191009762bf69491c0aa32c88 100644
--- a/hpvm/test/epoch_dnn/main.py
+++ b/hpvm/test/epoch_dnn/main.py
@@ -38,7 +38,7 @@ def run_test_over_ssh(host: str, password: str, working_dir: str, image_dir: Pat
 
     print(f"Running test on remote host {host}...")
     args = options.split(" ") + [host]
-    child = pexpect.spawn("ssh", args, timeout=60)
+    child = pexpect.spawn("ssh", args, timeout=None)
     child.expect(r"password:")
     child.sendline(password)
     child.expect("# ")  # The bash prompt
@@ -49,7 +49,7 @@ def run_test_over_ssh(host: str, password: str, working_dir: str, image_dir: Pat
         remote_path = f"{image_dir.name}/{image.name}"
         print(f"Sending {image.name} to run")
         child.sendline(f"./nvdla_runtime --loadable {BUFFER_NAME} --image {remote_path} --rawdump")
-        child.expect("# ")
+        child.expect("Test pass")
         child.sendline("cat output.dimg")
         child.expect("# ")
         result_lines = child.before.decode().splitlines()