diff --git a/tests/client/torture_auth.c b/tests/client/torture_auth.c
index 79dbd4a7..ff0a8df8 100644
--- a/tests/client/torture_auth.c
+++ b/tests/client/torture_auth.c
@@ -736,7 +736,7 @@ static void torture_auth_cert(void **state) {
 
 static void torture_auth_agent_cert(void **state)
 {
-#if OPENSSH_VERSION_MAJOR < 8
+#if OPENSSH_VERSION_MAJOR < 8 || (OPENSSH_VERSION_MAJOR == 8 && OPENSSH_VERSION_MINOR == 0)
     struct torture_state *s = *state;
     ssh_session session = s->ssh.session;
     int rc;
@@ -756,7 +756,7 @@ static void torture_auth_agent_cert(void **state)
                              "ssh-rsa-cert-v01@openssh.com");
         assert_int_equal(rc, SSH_OK);
     }
-#endif /* OPENSSH_VERSION_MAJOR < 8 */
+#endif /* OPENSSH_VERSION_MAJOR < 8.1 */
 
     /* Setup loads a different key, tests are exactly the same. */
     torture_auth_agent(state);
@@ -764,7 +764,7 @@ static void torture_auth_agent_cert(void **state)
 
 static void torture_auth_agent_cert_nonblocking(void **state)
 {
-#if OPENSSH_VERSION_MAJOR < 8
+#if OPENSSH_VERSION_MAJOR < 8 || (OPENSSH_VERSION_MAJOR == 8 && OPENSSH_VERSION_MINOR == 0)
     struct torture_state *s = *state;
     ssh_session session = s->ssh.session;
     int rc;
@@ -784,7 +784,7 @@ static void torture_auth_agent_cert_nonblocking(void **state)
                              "ssh-rsa-cert-v01@openssh.com");
         assert_int_equal(rc, SSH_OK);
     }
-#endif /* OPENSSH_VERSION_MAJOR < 8 */
+#endif /* OPENSSH_VERSION_MAJOR < 8.1 */
 
     torture_auth_agent_nonblocking(state);
 }