diff --git a/hbase-it/src/test/java/org/apache/hadoop/hbase/IntegrationTestingUtility.java b/hbase-it/src/test/java/org/apache/hadoop/hbase/IntegrationTestingUtility.java
index afb21e4b942..a1a81eddbcb 100644
--- a/hbase-it/src/test/java/org/apache/hadoop/hbase/IntegrationTestingUtility.java
+++ b/hbase-it/src/test/java/org/apache/hadoop/hbase/IntegrationTestingUtility.java
@@ -132,6 +132,7 @@ public class IntegrationTestingUtility extends HBaseTestingUtility {
 
   public void createDistributedHBaseCluster() throws IOException {
     Configuration conf = getConfiguration();
+    conf.set("fs.defaultFS", conf.get("original.defaultFS"));
     Class<? extends ClusterManager> clusterManagerClass = conf.getClass(HBASE_CLUSTER_MANAGER_CLASS,
       DEFAULT_HBASE_CLUSTER_MANAGER_CLASS, ClusterManager.class);
     ClusterManager clusterManager = ReflectionUtils.newInstance(
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/HBaseTestingUtility.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/HBaseTestingUtility.java
index 4f55199c467..2bdfd2d89c2 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/HBaseTestingUtility.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/HBaseTestingUtility.java
@@ -346,6 +346,9 @@ public class HBaseTestingUtility extends HBaseZKTestingUtility {
       }
     }
 
+    // Save this for when setting default file:// breaks things
+    this.conf.set("original.defaultFS", this.conf.get("fs.defaultFS"));
+
     // Every cluster is a local cluster until we start DFS
     // Note that conf could be null, but this.conf will not be
     String dataTestDir = getDataTestDir().toString();