diff --git a/plugin/trino-kudu/src/test/java/io/trino/plugin/kudu/BaseKuduConnectorSmokeTest.java b/plugin/trino-kudu/src/test/java/io/trino/plugin/kudu/BaseKuduConnectorSmokeTest.java
index 8bc528470ed1..ae8c3ac2fbd5 100644
--- a/plugin/trino-kudu/src/test/java/io/trino/plugin/kudu/BaseKuduConnectorSmokeTest.java
+++ b/plugin/trino-kudu/src/test/java/io/trino/plugin/kudu/BaseKuduConnectorSmokeTest.java
@@ -74,7 +74,7 @@ protected String getCreateTableDefaultDefinition()
     public void testShowCreateTable()
     {
         assertThat((String) computeScalar("SHOW CREATE TABLE region"))
-                .isEqualTo("CREATE TABLE kudu.tpch.region (\n" +
+                .isEqualTo("CREATE TABLE kudu." + getSession().getSchema().orElseThrow() + ".region (\n" +
                         "   regionkey bigint COMMENT '' WITH ( nullable = true ),\n" +
                         "   name varchar COMMENT '' WITH ( nullable = true ),\n" +
                         "   comment varchar COMMENT '' WITH ( nullable = true )\n" +
diff --git a/plugin/trino-kudu/src/test/java/io/trino/plugin/kudu/AbstractKuduWithDisabledInferSchemaConnectorTest.java b/plugin/trino-kudu/src/test/java/io/trino/plugin/kudu/BaseKuduWithDisabledInferSchemaConnectorSmokeTest.java
similarity index 73%
rename from plugin/trino-kudu/src/test/java/io/trino/plugin/kudu/AbstractKuduWithDisabledInferSchemaConnectorTest.java
rename to plugin/trino-kudu/src/test/java/io/trino/plugin/kudu/BaseKuduWithDisabledInferSchemaConnectorSmokeTest.java
index 4e1df344abcf..2b314b473352 100644
--- a/plugin/trino-kudu/src/test/java/io/trino/plugin/kudu/AbstractKuduWithDisabledInferSchemaConnectorTest.java
+++ b/plugin/trino-kudu/src/test/java/io/trino/plugin/kudu/BaseKuduWithDisabledInferSchemaConnectorSmokeTest.java
@@ -25,8 +25,8 @@
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
 
-public abstract class AbstractKuduWithDisabledInferSchemaConnectorTest
-        extends AbstractKuduConnectorTest
+public abstract class BaseKuduWithDisabledInferSchemaConnectorSmokeTest
+        extends BaseKuduConnectorSmokeTest
 {
     @Override
     protected Optional<String> getKuduSchemaEmulationPrefix()
@@ -59,25 +59,9 @@ public void testCreateSchema()
 
     @Test
     @Override
-    public void testRenameTableAcrossSchema()
+    public void testRenameTableAcrossSchemas()
     {
-        assertThatThrownBy(super::testRenameTableAcrossSchema)
-                .hasMessage("Creating schema in Kudu connector not allowed if schema emulation is disabled.");
-    }
-
-    @Test
-    @Override
-    public void testRenameTableToUnqualifiedPreservesSchema()
-    {
-        assertThatThrownBy(super::testRenameTableToUnqualifiedPreservesSchema)
-                .hasMessage("Creating schema in Kudu connector not allowed if schema emulation is disabled.");
-    }
-
-    @Test
-    @Override
-    public void testDropNonEmptySchemaWithTable()
-    {
-        assertThatThrownBy(super::testDropNonEmptySchemaWithTable)
+        assertThatThrownBy(super::testRenameTableAcrossSchemas)
                 .hasMessage("Creating schema in Kudu connector not allowed if schema emulation is disabled.");
     }
 }
diff --git a/plugin/trino-kudu/src/test/java/io/trino/plugin/kudu/AbstractKuduConnectorTest.java b/plugin/trino-kudu/src/test/java/io/trino/plugin/kudu/TestKuduConnectorTest.java
similarity index 95%
rename from plugin/trino-kudu/src/test/java/io/trino/plugin/kudu/AbstractKuduConnectorTest.java
rename to plugin/trino-kudu/src/test/java/io/trino/plugin/kudu/TestKuduConnectorTest.java
index 3bde39422640..b55c42b12718 100644
--- a/plugin/trino-kudu/src/test/java/io/trino/plugin/kudu/AbstractKuduConnectorTest.java
+++ b/plugin/trino-kudu/src/test/java/io/trino/plugin/kudu/TestKuduConnectorTest.java
@@ -39,21 +39,17 @@
 import static org.testng.Assert.assertNull;
 import static org.testng.Assert.assertTrue;
 
-public abstract class AbstractKuduConnectorTest
+public class TestKuduConnectorTest
         extends BaseConnectorTest
 {
     private TestingKuduServer kuduServer;
 
-    protected abstract String getKuduServerVersion();
-
-    protected abstract Optional<String> getKuduSchemaEmulationPrefix();
-
     @Override
     protected QueryRunner createQueryRunner()
             throws Exception
     {
-        kuduServer = new TestingKuduServer(getKuduServerVersion());
-        return createKuduQueryRunnerTpch(kuduServer, getKuduSchemaEmulationPrefix(), REQUIRED_TPCH_TABLES);
+        kuduServer = new TestingKuduServer();
+        return createKuduQueryRunnerTpch(kuduServer, Optional.empty(), REQUIRED_TPCH_TABLES);
     }
 
     @AfterClass(alwaysRun = true)
@@ -89,6 +85,38 @@ protected boolean hasBehavior(TestingConnectorBehavior connectorBehavior)
         }
     }
 
+    @Test
+    @Override
+    public void testCreateSchema()
+    {
+        assertThatThrownBy(super::testCreateSchema)
+                .hasMessage("Creating schema in Kudu connector not allowed if schema emulation is disabled.");
+    }
+
+    @Test
+    @Override
+    public void testDropNonEmptySchemaWithTable()
+    {
+        assertThatThrownBy(super::testDropNonEmptySchemaWithTable)
+                .hasMessage("Creating schema in Kudu connector not allowed if schema emulation is disabled.");
+    }
+
+    @Test
+    @Override
+    public void testRenameTableAcrossSchema()
+    {
+        assertThatThrownBy(super::testRenameTableAcrossSchema)
+                .hasMessage("Creating schema in Kudu connector not allowed if schema emulation is disabled.");
+    }
+
+    @Test
+    @Override
+    public void testRenameTableToUnqualifiedPreservesSchema()
+    {
+        assertThatThrownBy(super::testRenameTableToUnqualifiedPreservesSchema)
+                .hasMessage("Creating schema in Kudu connector not allowed if schema emulation is disabled.");
+    }
+
     @Test
     @Override
     public void testDescribeTable()
diff --git a/plugin/trino-kudu/src/test/java/io/trino/plugin/kudu/TestKuduLatestWithDisabledInferSchemaConnectorTest.java b/plugin/trino-kudu/src/test/java/io/trino/plugin/kudu/TestKuduLatestWithDisabledInferSchemaConnectorSmokeTest.java
similarity index 84%
rename from plugin/trino-kudu/src/test/java/io/trino/plugin/kudu/TestKuduLatestWithDisabledInferSchemaConnectorTest.java
rename to plugin/trino-kudu/src/test/java/io/trino/plugin/kudu/TestKuduLatestWithDisabledInferSchemaConnectorSmokeTest.java
index 904d394e0a9a..f3a2f5f382b8 100644
--- a/plugin/trino-kudu/src/test/java/io/trino/plugin/kudu/TestKuduLatestWithDisabledInferSchemaConnectorTest.java
+++ b/plugin/trino-kudu/src/test/java/io/trino/plugin/kudu/TestKuduLatestWithDisabledInferSchemaConnectorSmokeTest.java
@@ -15,8 +15,8 @@
 
 import static io.trino.plugin.kudu.TestingKuduServer.LATEST_TAG;
 
-public class TestKuduLatestWithDisabledInferSchemaConnectorTest
-        extends AbstractKuduWithDisabledInferSchemaConnectorTest
+public class TestKuduLatestWithDisabledInferSchemaConnectorSmokeTest
+        extends BaseKuduWithDisabledInferSchemaConnectorSmokeTest
 {
     @Override
     protected String getKuduServerVersion()
diff --git a/plugin/trino-kudu/src/test/java/io/trino/plugin/kudu/TestKuduWithDisabledInferSchemaConnectorTest.java b/plugin/trino-kudu/src/test/java/io/trino/plugin/kudu/TestKuduWithDisabledInferSchemaConnectorSmokeTest.java
similarity index 85%
rename from plugin/trino-kudu/src/test/java/io/trino/plugin/kudu/TestKuduWithDisabledInferSchemaConnectorTest.java
rename to plugin/trino-kudu/src/test/java/io/trino/plugin/kudu/TestKuduWithDisabledInferSchemaConnectorSmokeTest.java
index 3d6057650088..961d11b3f64f 100644
--- a/plugin/trino-kudu/src/test/java/io/trino/plugin/kudu/TestKuduWithDisabledInferSchemaConnectorTest.java
+++ b/plugin/trino-kudu/src/test/java/io/trino/plugin/kudu/TestKuduWithDisabledInferSchemaConnectorSmokeTest.java
@@ -15,8 +15,8 @@
 
 import static io.trino.plugin.kudu.TestingKuduServer.EARLIEST_TAG;
 
-public class TestKuduWithDisabledInferSchemaConnectorTest
-        extends AbstractKuduWithDisabledInferSchemaConnectorTest
+public class TestKuduWithDisabledInferSchemaConnectorSmokeTest
+        extends BaseKuduWithDisabledInferSchemaConnectorSmokeTest
 {
     @Override
     protected String getKuduServerVersion()