diff --git a/.travis/build.sh b/.travis/build.sh
index cf6297d7..834e59df 100755
--- a/.travis/build.sh
+++ b/.travis/build.sh
@@ -55,7 +55,7 @@ if [ "$arch" == 's390x' ]; then
     mvn test-compile spotbugs:check -e -V -B -f testsuite
     set +e
     clearDockerEnv
-    mvn -e -V -B clean install -f testsuite -Pcustom -Dkafka.docker.image=quay.io/strimzi/kafka:0.33.2-kafka-3.4.0
+    mvn -e -V -B clean install -f testsuite -Pcustom -Dkafka.docker.image=quay.io/strimzi/kafka:0.37.0-kafka-3.5.0
     EXIT=$?
     exitIfError
     set -e
@@ -64,6 +64,11 @@ elif [[ "$arch" != 'ppc64le' ]]; then
 
   set +e
 
+  clearDockerEnv
+  mvn -e -V -B clean install -f testsuite -Pkafka-3_5_0
+  EXIT=$?
+  exitIfError
+
   clearDockerEnv
   mvn -e -V -B clean install -f testsuite -Pkafka-3_4_0
   EXIT=$?
diff --git a/pom.xml b/pom.xml
index 3ef50c4f..e343c777 100644
--- a/pom.xml
+++ b/pom.xml
@@ -103,7 +103,7 @@
         <maven.resources.version>3.3.0</maven.resources.version>
         <spotbugs.version>4.7.3</spotbugs.version>
         <sonatype.nexus.staging>1.6.3</sonatype.nexus.staging>
-        <kafka.version>3.5.0</kafka.version>
+        <kafka.version>3.6.0</kafka.version>
         <jackson.version>2.15.2</jackson.version>
         <jackson.databind.version>2.15.2</jackson.databind.version>
         <jsonpath.version>2.8.0</jsonpath.version>
diff --git a/testsuite/common/src/main/java/io/strimzi/testsuite/oauth/common/TestUtil.java b/testsuite/common/src/main/java/io/strimzi/testsuite/oauth/common/TestUtil.java
index a2764653..23473401 100644
--- a/testsuite/common/src/main/java/io/strimzi/testsuite/oauth/common/TestUtil.java
+++ b/testsuite/common/src/main/java/io/strimzi/testsuite/oauth/common/TestUtil.java
@@ -120,4 +120,12 @@ public static int countLogForRegex(List<String> log, String regex) {
         }
         return count;
     }
+
+    public static Throwable getRootCause(Throwable e) {
+        Throwable cause = e;
+        while (cause != null && cause.getCause() != null) {
+            cause = cause.getCause();
+        }
+        return cause == e ? null : cause;
+    }
 }
diff --git a/testsuite/keycloak-errors-tests/src/test/java/io/strimzi/testsuite/oauth/auth/ErrorReportingTests.java b/testsuite/keycloak-errors-tests/src/test/java/io/strimzi/testsuite/oauth/auth/ErrorReportingTests.java
index 63c47b7d..620b9b1d 100644
--- a/testsuite/keycloak-errors-tests/src/test/java/io/strimzi/testsuite/oauth/auth/ErrorReportingTests.java
+++ b/testsuite/keycloak-errors-tests/src/test/java/io/strimzi/testsuite/oauth/auth/ErrorReportingTests.java
@@ -24,6 +24,7 @@
 import static io.strimzi.testsuite.oauth.auth.Common.buildProducerConfigOAuthBearer;
 import static io.strimzi.testsuite.oauth.auth.Common.buildProducerConfigPlain;
 import static io.strimzi.testsuite.oauth.common.TestUtil.getContainerLogsForString;
+import static io.strimzi.testsuite.oauth.common.TestUtil.getRootCause;
 
 public class ErrorReportingTests {
 
@@ -463,7 +464,7 @@ private void cantConnectKeycloakWithTimeout() {
         } catch (Exception e) {
             long diff = System.currentTimeMillis() - start;
             Assert.assertTrue("is instanceof KafkaException", e instanceof KafkaException);
-            Assert.assertTrue("Failed due to LoginException", e.getCause().toString().contains("LoginException"));
+            Assert.assertTrue("Failed due to LoginException", getRootCause(e).toString().contains("LoginException"));
             Assert.assertTrue("Unexpected diff: " + diff, diff > timeout * 1000 && diff < timeout * 1000 + 1000);
         }
     }
diff --git a/testsuite/mockoauth-tests/src/test/java/io/strimzi/testsuite/oauth/mockoauth/ConnectTimeoutTests.java b/testsuite/mockoauth-tests/src/test/java/io/strimzi/testsuite/oauth/mockoauth/ConnectTimeoutTests.java
index 8e7db881..62f1ad5d 100644
--- a/testsuite/mockoauth-tests/src/test/java/io/strimzi/testsuite/oauth/mockoauth/ConnectTimeoutTests.java
+++ b/testsuite/mockoauth-tests/src/test/java/io/strimzi/testsuite/oauth/mockoauth/ConnectTimeoutTests.java
@@ -21,6 +21,7 @@
 import static io.strimzi.testsuite.oauth.common.TestUtil.getContainerLogsForString;
 import static io.strimzi.testsuite.oauth.mockoauth.Common.buildProducerConfigOAuthBearer;
 import static io.strimzi.testsuite.oauth.mockoauth.Common.changeAuthServerMode;
+import static io.strimzi.testsuite.oauth.common.TestUtil.getRootCause;
 
 public class ConnectTimeoutTests {
 
@@ -98,7 +99,7 @@ private void connectAuthServerWithTimeout() throws Exception {
         } catch (Exception e) {
             long diff = System.currentTimeMillis() - start;
             Assert.assertTrue("is instanceof KafkaException", e instanceof KafkaException);
-            Assert.assertTrue("Failed due to LoginException", e.getCause().toString().contains("LoginException"));
+            Assert.assertTrue("Failed due to LoginException", getRootCause(e).toString().contains("LoginException"));
             Assert.assertTrue("Unexpected diff: " + diff, diff > timeoutOverride * 1000 && diff < timeoutOverride * 1000 + 1000);
         } finally {
             changeAuthServerMode("token", "mode_200");
diff --git a/testsuite/mockoauth-tests/src/test/java/io/strimzi/testsuite/oauth/mockoauth/JaasClientConfigTest.java b/testsuite/mockoauth-tests/src/test/java/io/strimzi/testsuite/oauth/mockoauth/JaasClientConfigTest.java
index ad52a7a5..8576ce79 100644
--- a/testsuite/mockoauth-tests/src/test/java/io/strimzi/testsuite/oauth/mockoauth/JaasClientConfigTest.java
+++ b/testsuite/mockoauth-tests/src/test/java/io/strimzi/testsuite/oauth/mockoauth/JaasClientConfigTest.java
@@ -23,6 +23,8 @@
 import java.util.Properties;
 import java.util.concurrent.ExecutionException;
 
+import static io.strimzi.testsuite.oauth.common.TestUtil.getRootCause;
+
 
 public class JaasClientConfigTest {
 
@@ -305,7 +307,7 @@ private void assertConfigException(Throwable e, String message) {
         Throwable cause = e.getCause();
         Assert.assertEquals("is a KafkaException", KafkaException.class, e.getClass());
 
-        Throwable nestedCause = cause.getCause();
+        Throwable nestedCause = getRootCause(cause);
         Assert.assertEquals("is a ConfigException", ConfigException.class, nestedCause.getClass());
         Assert.assertTrue("Contains '" + message + "'", nestedCause.getMessage().contains(message));
     }
@@ -314,7 +316,7 @@ private void assertLoginException(Throwable e) {
         Throwable cause = e.getCause();
         Assert.assertEquals("is a KafkaException", KafkaException.class, e.getClass());
 
-        Throwable nestedCause = cause.getCause();
+        Throwable nestedCause = getRootCause(cause);
         Assert.assertEquals("is a LoginException", LoginException.class, nestedCause.getClass());
     }
 
diff --git a/testsuite/mockoauth-tests/src/test/java/io/strimzi/testsuite/oauth/mockoauth/RetriesTests.java b/testsuite/mockoauth-tests/src/test/java/io/strimzi/testsuite/oauth/mockoauth/RetriesTests.java
index 0ad21c72..41697659 100644
--- a/testsuite/mockoauth-tests/src/test/java/io/strimzi/testsuite/oauth/mockoauth/RetriesTests.java
+++ b/testsuite/mockoauth-tests/src/test/java/io/strimzi/testsuite/oauth/mockoauth/RetriesTests.java
@@ -23,6 +23,7 @@
 import static io.strimzi.testsuite.oauth.mockoauth.Common.buildProducerConfigPlain;
 import static io.strimzi.testsuite.oauth.mockoauth.Common.changeAuthServerMode;
 import static io.strimzi.testsuite.oauth.mockoauth.Common.createOAuthClient;
+import static io.strimzi.testsuite.oauth.common.TestUtil.getRootCause;
 import static io.strimzi.testsuite.oauth.mockoauth.Common.loginWithClientSecret;
 
 public class RetriesTests {
@@ -123,7 +124,7 @@ private void testClientRetries() throws Exception {
             // get the exception
 
             Assert.assertTrue("is instanceof KafkaException", e instanceof KafkaException);
-            Assert.assertTrue("Failed due to LoginException", e.getCause().toString().contains("LoginException"));
+            Assert.assertTrue("Failed due to LoginException", getRootCause(e).toString().contains("LoginException"));
         }
 
         // repeat, it should succeed
diff --git a/testsuite/pom.xml b/testsuite/pom.xml
index dd3f792d..7025372f 100644
--- a/testsuite/pom.xml
+++ b/testsuite/pom.xml
@@ -48,7 +48,7 @@
         <strimzi-oauth.version>1.0.0-SNAPSHOT</strimzi-oauth.version>
         <checkstyle.dir>..</checkstyle.dir>
 
-        <kafka.docker.image>quay.io/strimzi/kafka:0.35.1-kafka-3.4.0</kafka.docker.image>
+        <kafka.docker.image>quay.io/strimzi/kafka:0.37.0-kafka-3.5.0</kafka.docker.image>
     </properties>
 
     <dependencyManagement>
@@ -417,6 +417,13 @@
                 <kafka.docker.image>quay.io/strimzi/kafka:0.35.1-kafka-3.4.0</kafka.docker.image>
             </properties>
         </profile>
+        <profile>
+            <id>kafka-3_5_0</id>
+            <properties>
+                <!-- Uses JDK 17.0.x -->
+                <kafka.docker.image>quay.io/strimzi/kafka:0.37.0-kafka-3.5.0</kafka.docker.image>
+            </properties>
+        </profile>
         <profile>
             <!--
                 When using this profile you can use -Dkafka.docker.image=YOUR_IMAGE