diff --git a/test/Makefile b/test/Makefile
index 119d61e1..54b15eee 100644
--- a/test/Makefile
+++ b/test/Makefile
@@ -9,10 +9,12 @@ check : test
 test : utest
 	$(MAKE) -C broker test
 	$(MAKE) -C lib test
+	$(MAKE) -C client test
 
 ptest : utest
 	$(MAKE) -C broker ptest
 	$(MAKE) -C lib ptest
+	$(MAKE) -C client test
 
 utest :
 	$(MAKE) -C unit test
diff --git a/test/client/test.sh b/test/client/test.sh
new file mode 100755
index 00000000..a5229455
--- /dev/null
+++ b/test/client/test.sh
@@ -0,0 +1,46 @@
+#!/bin/bash
+
+# Very basic client testing.
+
+
+set -e
+
+export LD_LIBRARY_PATH=../lib
+export PORT=1888
+export SUB_TIMEOUT=1
+
+# Start broker
+../src/mosquitto -p ${PORT} 2>/dev/null &
+export MOSQ_PID=$!
+sleep 0.5
+
+# Kill broker on exit
+trap "kill $MOSQ_PID" EXIT
+
+
+# Simple subscribe test - single message from $SYS
+./mosquitto_sub -p ${PORT} -W ${SUB_TIMEOUT} -C 1 -t '$SYS/broker/uptime' >/dev/null
+echo "Simple subscribe ok"
+
+# Simple publish/subscribe test - single message from mosquitto_pub
+./mosquitto_sub -p ${PORT} -W ${SUB_TIMEOUT} -C 1 -t 'single/test' >/dev/null &
+export SUB_PID=$!
+./mosquitto_pub -p ${PORT} -t 'single/test' -m 'single-test'
+kill ${SUB_PID} 2>/dev/null || true
+echo "Simple publish/subscribe ok"
+
+# Publish a file and subscribe, do we get at least that many lines?
+export TEST_LINES=$(wc -l test.sh | cut -d' ' -f1)
+./mosquitto_sub -p ${PORT} -W ${SUB_TIMEOUT} -C ${TEST_LINES} -t 'file-publish' >/dev/null &
+export SUB_PID=$!
+./mosquitto_pub -p ${PORT} -t 'file-publish' -f ./test.sh
+kill ${SUB_PID} 2>/dev/null || true
+echo "File publish ok"
+
+# Publish a file from stdin and subscribe, do we get at least that many lines?
+export TEST_LINES=$(wc -l test.sh | cut -d' ' -f1)
+./mosquitto_sub -p ${PORT} -W ${SUB_TIMEOUT} -C ${TEST_LINES} -t 'file-publish' >/dev/null &
+export SUB_PID=$!
+./mosquitto_pub -p ${PORT} -t 'file-publish' -l < ./test.sh
+kill ${SUB_PID} 2>/dev/null || true
+echo "stdin publish ok"