diff --git a/Makefile b/Makefile
index 080d831..e297b19 100644
--- a/Makefile
+++ b/Makefile
@@ -16,6 +16,10 @@ all:
 	cd $(hbase_tmp_path)/hbase-protocol-shaded/src/main/protobuf; \
 	protoc -I=/usr/local/include/ --proto_path=. --python_out=$(bindings_path) server/zookeeper/*.proto
 
+test:
+	./hbase-setup.sh
+	./bash_unit
+	./bash_unit tests/test_hbase_up.sh
 
 clean:
 	rm -rf $(hbase_tmp_path)
diff --git a/tests/test_hbase_up.sh b/tests/test_hbase_up.sh
new file mode 100644
index 0000000..331178b
--- /dev/null
+++ b/tests/test_hbase_up.sh
@@ -0,0 +1,29 @@
+#!/usr/bin/env bash
+
+HBASE_HOST="127.0.0.1"
+HBASE_PORT=16200
+ZK_HOST=$HBASE_HOST
+ZK_PORT=2181
+HBASE_TIME_STARTUP=8
+HBASE_VERSION="2.4.1"
+
+run_hbase() {
+    cd "../hbase-${HBASE_VERSION}"
+    ./bin/hbase-daemon.sh --config conf start $1
+    sleep ${HBASE_TIME_STARTUP}
+}
+
+test_hbase_running() {
+    nc -vnu -w1 $1 $2
+}
+
+test_hbase_zk_running() {
+    nc -vnu -w1 $1 $2 <<END
+"ruok"
+END
+}
+
+export JAVA_HOME=${JAVA_HOME:-"/usr/local"}
+run_hbase "master"
+test_hbase_running ${HBASE_HOST} ${HBASE_PORT}
+test_hbase_zk_running ${ZK_HOST} ${ZK_PORT}