diff --git a/hbase-common/src/main/java/org/apache/hadoop/hbase/HBaseConfiguration.java b/hbase-common/src/main/java/org/apache/hadoop/hbase/HBaseConfiguration.java
index 77793998896..1323240719f 100644
--- a/hbase-common/src/main/java/org/apache/hadoop/hbase/HBaseConfiguration.java
+++ b/hbase-common/src/main/java/org/apache/hadoop/hbase/HBaseConfiguration.java
@@ -89,6 +89,10 @@ public class HBaseConfiguration extends Configuration {
    */
   public static Configuration create() {
     Configuration conf = new Configuration();
+    // In case HBaseConfiguration is loaded from a different classloader than
+    // Configuration, conf needs to be set with appropriate class loader to resolve
+    // HBase resources.
+    conf.setClassLoader(HBaseConfiguration.class.getClassLoader());
     return addHbaseResources(conf);
   }