diff --git a/hbase-exporter b/hbase-exporter
index 05478f1..6772191 100755
--- a/hbase-exporter
+++ b/hbase-exporter
@@ -72,6 +72,7 @@ prom_hbase_writeable = Gauge('hbase_is_writeable', 'HBase is writeable')
 prom_zookeeper_num = Gauge('zookeeper_num', 'Known ZooKeeper Servers')
 prom_zookeeper_num_live = Gauge('zookeeper_num_live', 'Live ZooKeeper Servers')
 prom_zookeeper_has_leader = Gauge('zookeeper_has_leader', 'ZooKeeper cluster has a leader')
+prom_zookeeper_num_connections = Gauge('zookeeper_num_connections', 'ZooKeeper connection count for all ZooKeeper servers combined')
 
 # HDFS/HBase
 hdfs_config_file = "/etc/hadoop/conf/hdfs-site.xml"
@@ -153,7 +154,9 @@ class zk():
         zk_has_leader = 0
         zk_leader_address = ""
         num_active_servers = 0
+        num_zk_connections = 0
         re_mode = re.compile(r'^Mode:\s*(.+?)\s*$')
+        re_connections = re.compile(r'^Connections:\s*(.+?)\s*$')
 
         for address in address_list:
             logging.info("Probing zookeeper at address: " + address)
@@ -175,9 +178,16 @@ class zk():
                         zk_leader_address = address
                         prom_zookeeper_has_leader.set(zk_has_leader)
 
+                match = re_connections.match(line.decode('utf-8'))
+                if match:
+                    nconns = match.group(1)
+                    logging.info("zk: server has %s connections",  nconns)
+                    num_zk_connections += int(nconns)
+
             for line in error:
                 logging.info(line.decode('utf-8'))
 
+        prom_zookeeper_num_connections.set(num_zk_connections)
         prom_zookeeper_num_live.set(num_active_servers)
         logging.info("zk: %d active ZooKeeper servers", num_active_servers)
         if zk_has_leader:
diff --git a/tests/test_hbase_exporter.sh b/tests/test_hbase_exporter.sh
index 0893b58..1d9e23c 100644
--- a/tests/test_hbase_exporter.sh
+++ b/tests/test_hbase_exporter.sh
@@ -23,10 +23,9 @@ setup_suite() {
     # Run exporter
     cd ../../
     printf "Starting hbase-exporter\n"
-    #./hbase-exporter --zookeeper-server ${ZK_SERVER:-"127.0.0.1"} 2>&1 > /dev/null &
     ./hbase-exporter --zookeeper-server=${ZK_SERVER:-"127.0.0.1"} \
-                      --hbase-pseudo-distributed=True \
-                      --hbase-table="foo" &
+                     --hbase-pseudo-distributed=True \
+                     --hbase-table="foo" 2>&1 > /dev/null &
     PID=$!
 }
 
@@ -53,6 +52,16 @@ test_hbase_exporter_export_zk_live() {
     assert_not_equals "0.0" "$r" "Zookeeper not live"
 }
 
+test_hbase_exporter_export_hbase_up() {
+    r=$(curl -s http://127.0.0.1:9010 | grep '^hbase_up' | cut -d " " -f2)
+    assert_not_equals "0.0" "$r" "HBase down"
+}
+
+test_hbase_exporter_export_zk_connection_count() {
+    r=$(curl -s http://127.0.0.1:9010 | grep '^zookeeper_num_connections' | cut -d " " -f2)
+    assert_not_equals "0.0" "$r" "Zookeeper has no connections"
+}
+
 teardown_suite() {
     kill $PID
 }