diff --git a/src/tests/e2e-test b/src/tests/e2e-test
index b6ca353..8ce54b8 100755
--- a/src/tests/e2e-test
+++ b/src/tests/e2e-test
@@ -247,9 +247,15 @@ for run in $server_tests; do
 	    test_error "server harness exited with status %s\n" "$server_rv"
 	fi
     fi
-    # Check for "round-trip" failures
-    if grep -q "round-trip Instruction verification failed" "${test_dir}/${run}.server.stderr"; then
-	test_error "Round-trip Instruction verification failed on server during %s\n" "$run"
+    if [ "${run}" != "direct" ]; then
+	# Check for "round-trip" failures
+	if grep -q "round-trip Instruction verification failed" "${test_dir}/${run}.server.stderr"; then
+	    test_error "Round-trip Instruction verification failed on server during %s\n" "$run"
+	fi
+	# Check for 0-timeout select() issue
+	if egrep -q "(polls, rate limiting|consecutive polls)" "${test_dir}/${run}.server.stderr"; then
+	    test_error "select() with zero timeout called too often on server during %s\n" "$run"
+	fi
     fi
     # XXX We'd also like to check for "target state Instruction
     # verification failed", a new check, but tmux's lack of BCE