diff --git a/bidi.js b/bidi.js
index 3b82d65..f7fa23c 100644
--- a/bidi.js
+++ b/bidi.js
@@ -109,8 +109,10 @@ try {
     // base64 encoded PNG, works fine
     // const screenshot = await b.takeScreenshot();
 
+    /*
     console.log("\n\nFinished. Press Control-C to exit");
     await new Promise(resolve => setTimeout(resolve, 100000));
+    */
 } finally {
     await b.deleteSession();
 }
diff --git a/test/run b/test/run
index 5c14f0d..157504e 100755
--- a/test/run
+++ b/test/run
@@ -1,5 +1,5 @@
 #! /bin/sh
-set -eu
+set -eux
 
 # This is the expected entry point for Cockpit CI; will be called without
 # arguments but with an appropriate $TEST_OS, and optionally $TEST_SCENARIO
@@ -8,5 +8,16 @@ TEST_SCENARIO="${TEST_SCENARIO:-}"
 [ "${TEST_SCENARIO}" = "${TEST_SCENARIO##firefox}" ] || export TEST_BROWSER=firefox
 export RUN_TESTS_OPTIONS=--track-naughties
 
-make codecheck
-make check
+# make codecheck
+make prepare-check
+
+bots/machine/testvm.py $TEST_OS &
+VM_PID=$!
+trap "kill $VM_PID" EXIT INT QUIT PIPE
+
+# Wait for the VM to be ready
+until nc -z 127.0.0.2 2201; do
+    sleep 1
+done
+
+node bidi.js