diff --git a/build.xml b/build.xml
index ed8fd449..ca8ef2b5 100644
--- a/build.xml
+++ b/build.xml
@@ -493,7 +493,7 @@
     <mkdir dir="${cobertura.class.dir}" />
     <junit
       printsummary="yes" showoutput="${test.output}"
-      haltonfailure="no" fork="yes" maxmemory="256m"
+      haltonfailure="no" fork="yes" maxmemory="512m"
       errorProperty="tests.failed" failureProperty="tests.failed"
       timeout="${test.timeout}"
       dir="${build.test}/data">
diff --git a/src/test/com/cloudera/sqoop/hbase/HBaseTestCase.java b/src/test/com/cloudera/sqoop/hbase/HBaseTestCase.java
index bc1d1f4c..6ad9137a 100644
--- a/src/test/com/cloudera/sqoop/hbase/HBaseTestCase.java
+++ b/src/test/com/cloudera/sqoop/hbase/HBaseTestCase.java
@@ -62,11 +62,13 @@ public class HBaseTestCase extends ImportJobTestCase {
 
     if (includeHadoopFlags) {
       CommonArgs.addHadoopFlags(args);
+      args.add("-D");
+      args.add("hbase.zookeeper.property.clientPort=21818");
     }
 
     if (null != queryStr) {
       args.add("--query");
-      args.add(queryStr); 
+      args.add(queryStr);
     } else {
       args.add("--table");
       args.add(getTableName());
@@ -119,7 +121,7 @@ public void shutdown() throws Exception {
       hbaseTestUtil.shutdownMiniCluster();
       this.hbaseTestUtil = null;
     }
-    LOG.info("shutdown() method returning."); 
+    LOG.info("shutdown() method returning.");
   }
 
   @Override
@@ -139,7 +141,8 @@ protected void verifyHBaseCell(String tableName, String rowKey,
       String colFamily, String colName, String val) throws IOException {
     Get get = new Get(Bytes.toBytes(rowKey));
     get.addColumn(Bytes.toBytes(colFamily), Bytes.toBytes(colName));
-    HTable table = new HTable(Bytes.toBytes(tableName));
+    HTable table = new HTable(new Configuration(
+        hbaseTestUtil.getConfiguration()), Bytes.toBytes(tableName));
     try {
       Result r = table.get(get);
       byte [] actualVal = r.getValue(Bytes.toBytes(colFamily),