diff --git a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/metastore/HiveMetastoreModule.java b/plugin/trino-hive/src/main/java/io/trino/plugin/hive/metastore/HiveMetastoreModule.java
index 0c2411703ddc..157c65dbb2f5 100644
--- a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/metastore/HiveMetastoreModule.java
+++ b/plugin/trino-hive/src/main/java/io/trino/plugin/hive/metastore/HiveMetastoreModule.java
@@ -26,6 +26,7 @@
 import java.util.Optional;
 
 import static io.airlift.configuration.ConditionalModule.conditionalModule;
+import static io.airlift.configuration.ConfigBinder.configBinder;
 
 public class HiveMetastoreModule
         extends AbstractConfigurationAwareModule
@@ -42,9 +43,8 @@ protected void setup(Binder binder)
     {
         if (metastore.isPresent()) {
             binder.bind(HiveMetastoreFactory.class).annotatedWith(RawHiveMetastoreFactory.class).toInstance(HiveMetastoreFactory.ofInstance(metastore.get()));
-            MetastoreTypeConfig metastoreTypeConfig = new MetastoreTypeConfig();
-            metastoreTypeConfig.setMetastoreType("provided");
-            binder.bind(MetastoreTypeConfig.class).toInstance(metastoreTypeConfig);
+            configBinder(binder).bindConfigDefaults(MetastoreTypeConfig.class, config -> config.setMetastoreType("provided"));
+            configBinder(binder).bindConfig(MetastoreTypeConfig.class);
         }
         else {
             bindMetastoreModule("thrift", new ThriftMetastoreModule());
diff --git a/plugin/trino-hive/src/test/java/io/trino/plugin/hive/HiveQueryRunner.java b/plugin/trino-hive/src/test/java/io/trino/plugin/hive/HiveQueryRunner.java
index 3a12ac6d7090..6567290498ad 100644
--- a/plugin/trino-hive/src/test/java/io/trino/plugin/hive/HiveQueryRunner.java
+++ b/plugin/trino-hive/src/test/java/io/trino/plugin/hive/HiveQueryRunner.java
@@ -65,6 +65,7 @@
 import static java.util.Locale.ENGLISH;
 import static java.util.Objects.requireNonNull;
 import static java.util.concurrent.TimeUnit.SECONDS;
+import static org.assertj.core.api.Assertions.assertThat;
 import static org.testng.Assert.assertEquals;
 
 public final class HiveQueryRunner
@@ -138,6 +139,9 @@ public SELF setSkipTimezoneSetup(boolean skipTimezoneSetup)
 
         public SELF setHiveProperties(Map<String, String> hiveProperties)
         {
+            assertThat(hiveProperties)
+                    .withFailMessage("Setting hive.metastore is not allowed in HiveQueryRunner")
+                    .doesNotContainKey("hive.metastore");
             this.hiveProperties = ImmutableMap.<String, String>builder()
                     .putAll(requireNonNull(hiveProperties, "hiveProperties is null"));
             return self();