diff --git a/tests/hdfs-setup.sh b/tests/hdfs-setup.sh
index a961dc3..253c28e 100755
--- a/tests/hdfs-setup.sh
+++ b/tests/hdfs-setup.sh
@@ -66,19 +66,19 @@ create_hdfs_config() {
   </property>
   <property>
     <name>dfs.namenode.rpc-address.$2.nn1</name>
-    <value>localhost:8020</value>
-  </property>
-  <property>
-    <name>dfs.namenode.rpc-address.$2.nn2</name>
     <value>master-1:8020</value>
   </property>
+  <property>
+    <name>dfs.namenode.rpc-address.$2.nn2</name>
+    <value>master-2:8020</value>
+  </property>
   <property>
      <name>dfs.namenode.http-address.$2.nn1</name>
-     <value>localhost:50070</value>
+     <value>master-1:50070</value>
   </property>
   <property>
      <name>dfs.namenode.http-address.$2.nn2</name>
-     <value>master-1:50070</value>
+     <value>master-2:50070</value>
   </property>
   <property>
     <name>dfs.namenode.name.dir</name>
diff --git a/tests/test_hbase_exporter.sh b/tests/test_hbase_exporter.sh
index 711bfc7..53ce44e 100644
--- a/tests/test_hbase_exporter.sh
+++ b/tests/test_hbase_exporter.sh
@@ -11,7 +11,12 @@ HDFS_CMD_FORMAT="./hadoop/bin/hdfs --config hadoop/etc/hadoop namenode -format"
 source setup.sh
 
 setup_suite() {
-    export JAVA_HOME=${JAVA_HOME:-"/usr/local"}
+    if [ "FreeBSD" = $(uname) ]; then
+        export JAVA_HOME=${JAVA_HOME:-"/usr/local"}
+    else
+        export JAVA_HOME=${JAVA_HOME:-"/"}
+    fi
+
     export HADOOP_PREFIX="$(pwd)/hadoop"
 
     # Setup HBase