diff --git a/tests/.gitignore b/tests/.gitignore
index f57b937..215de78 100644
--- a/tests/.gitignore
+++ b/tests/.gitignore
@@ -1,2 +1,4 @@
+.build
 tmpbin
 logs
+*.pyc
diff --git a/tests/run.sh b/tests/run.sh
deleted file mode 100755
index 1cedb5f..0000000
--- a/tests/run.sh
+++ /dev/null
@@ -1,75 +0,0 @@
-#!/bin/bash
-
-#
-# Test runner for the PubSubClient library
-#
-#  - Uses ino tool - http://inotool.org/
-#  - Verifies all of the sketches in the examples directory
-#    compile cleanly
-#
-
-
-DIR=`dirname $0`
-cd $DIR
-
-# Check we can find the library to test
-if [ ! -d ../PubSubClient ]
-then
-   echo "Cannot find PubSubClient library"
-   exit 1
-fi
-
-# Check ino tool is installed
-which ino > /dev/null
-if [ $? == 1 ]
-then
-   echo "Cannot find ino tool"
-   exit 1
-fi
-
-# Create tmp workspace and logs dir
-[ -d tmpbin ] && rm -rf tmpbin
-mkdir tmpbin
-[ -d logs ] && rm -rf logs
-mkdir logs
-
-cd tmpbin
-
-# Initialise the ino workspace
-ino init 
-
-# Remove the default sketch
-rm src/sketch.ino
-
-printf -v pad '%0.1s' "."{1..50}
-
-# Copy in the library
-cp -R ../../PubSubClient lib/
-
-PASS=0
-FAIL=0
-
-echo -e "\e[01;36mExamples\e[00m"
-
-for f in ../../PubSubClient/examples/*
-do
-   e=`basename $f`
-   echo -ne " \e[01;33m$e\e[00m"
-   printf ' %*.*s %s' 0 $((${#pad} - ${#e})) $pad
-
-   cp $f/$e.ino ./src/
-   ino build >../logs/$e.log 2>../logs/$e.err.log
-   if [ $? == 0 ]
-   then
-      echo -e "\e[00;32mPASS\e[00m"
-      PASS=$(($PASS+1))
-   else
-      echo -e "\e[00;31mFAIL\e[00m"
-      cat ../logs/$e.err.log
-      FAIL=$(($FAIL+1))
-   fi
-   rm ./src/*
-   ino clean
-done
-
-exit $FAIL 
diff --git a/tests/testcases/__init__.py b/tests/testcases/__init__.py
new file mode 100644
index 0000000..e69de29
diff --git a/tests/testcases/mqtt_basic.py b/tests/testcases/mqtt_basic.py
new file mode 100644
index 0000000..e3b0022
--- /dev/null
+++ b/tests/testcases/mqtt_basic.py
@@ -0,0 +1,12 @@
+import unittest
+
+class mqtt_basic(unittest.TestCase):
+  def setUp(self):
+    pass
+    
+    
+  def test_one(self):
+    self.assertEqual(3,3)
+
+  def test_two(self):
+    self.assertEqual(4,4)
diff --git a/tests/testsuite.py b/tests/testsuite.py
new file mode 100644
index 0000000..59b726b
--- /dev/null
+++ b/tests/testsuite.py
@@ -0,0 +1,151 @@
+#!/usr/bin/env python
+import os
+import os.path
+import sys
+import shutil
+from subprocess import call
+import importlib
+import unittest
+
+class Workspace(object):
+  
+  def __init__(self):
+    self.root_dir = os.getcwd()
+    self.build_dir = os.path.join(self.root_dir,"tmpbin");
+    self.log_dir = os.path.join(self.root_dir,"logs");
+    self.tests_dir = os.path.join(self.root_dir,"testcases");
+    self.examples_dir = os.path.join(self.root_dir,"../PubSubClient/examples")
+    self.examples = []
+    self.tests = []
+    if not os.path.isdir("../PubSubClient"):
+      raise Exception("Cannot find PubSubClient library")
+    try:
+      import ino
+    except:
+      raise Exception("ino tool not installed")
+
+  def init(self):
+    if os.path.isdir(self.build_dir):
+      shutil.rmtree(self.build_dir)
+    os.mkdir(self.build_dir)
+    if os.path.isdir(self.log_dir):
+      shutil.rmtree(self.log_dir)
+    os.mkdir(self.log_dir)
+    
+    os.chdir(self.build_dir)
+    call(["ino","init"])
+    
+    shutil.copytree("../../PubSubClient","lib/PubSubClient")
+    
+    filenames = []
+    for root, dirs, files in os.walk(self.examples_dir):
+      filenames += [os.path.join(root,f) for f in files if f.endswith(".ino")]
+    filenames.sort()
+    for e in filenames:
+      self.examples.append(Sketch(self,e))
+    
+    filenames = []
+    for root, dirs, files in os.walk(self.tests_dir):
+      filenames += [os.path.join(root,f) for f in files if f.endswith(".ino")]
+    filenames.sort()
+    for e in filenames:
+      self.tests.append(Sketch(self,e))
+      
+  def clean(self):
+    shutil.rmtree(self.build_dir)
+  
+class Sketch(object):
+  def __init__(self,wksp,fn):
+    self.w = wksp
+    self.filename = fn
+    self.basename = os.path.basename(self.filename)
+    self.build_log = os.path.join(self.w.log_dir,"%s.log"%(os.path.basename(self.filename),))
+    self.build_err_log = os.path.join(self.w.log_dir,"%s.err.log"%(os.path.basename(self.filename),))
+    self.build_upload_log = os.path.join(self.w.log_dir,"%s.upload.log"%(os.path.basename(self.filename),))
+
+  def build(self):
+    sys.stdout.write(" Build:   ")
+    sys.stdout.flush()
+    shutil.copy(self.filename,os.path.join(self.w.build_dir,"src","sketch.ino"))
+    fout = open(self.build_log, "w")
+    ferr = open(self.build_err_log, "w")
+    rc = call(["ino","build"],stdout=fout,stderr=ferr)
+    fout.close()
+    ferr.close()
+    if rc == 0:
+      sys.stdout.write("pass")
+      sys.stdout.write("\n")
+      return True
+    else:
+      sys.stdout.write("fail")
+      sys.stdout.write("\n")
+      with open(self.build_err_log) as f:
+        for line in f:
+          print " ",line,
+      return False
+  
+  def upload(self):
+    sys.stdout.write(" Upload:  ")
+    sys.stdout.flush()
+    fout = open(self.build_upload_log, "w")
+    rc = call(["ino","upload"],stdout=fout,stderr=fout)
+    fout.close()
+    if rc == 0:
+      sys.stdout.write("pass")
+      sys.stdout.write("\n")
+      return True
+    else:
+      sys.stdout.write("fail")
+      sys.stdout.write("\n")
+      with open(self.build_upload_log) as f:
+        for line in f:
+          print " ",line,
+      return False
+
+
+  def test(self):
+    try:
+      basename = os.path.basename(self.filename)[:-4]
+      i = importlib.import_module("testcases."+basename)
+    except:
+      sys.stdout.write(" Test:    no tests found")
+      sys.stdout.write("\n")
+      return
+    if self.upload():
+      sys.stdout.write(" Test:    ")
+      sys.stdout.flush()
+      c = getattr(i,basename)
+      suite = unittest.makeSuite(c,'test')
+      result = unittest.TestResult()
+      suite.run(result)
+      print "%d/%d"%(result.testsRun-len(result.failures)-len(result.errors),result.testsRun)
+      if not result.wasSuccessful():
+        if len(result.failures) > 0:
+          for f in result.failures:
+            print "-- %s"%(str(f[0]),)
+            print f[1]
+        if len(result.errors) > 0:
+          print " Errors:"
+          for f in result.errors:
+            print "-- %s"%(str(f[0]),)
+            print f[1]
+
+
+if __name__ == '__main__':
+  run_tests = True
+
+  w = Workspace()
+  w.init()
+  
+  for e in w.examples:
+    print "--------------------------------------"
+    print "[%s]"%(e.basename,)
+    if e.build() and run_tests:
+      e.test()
+  for e in w.tests:
+    print "--------------------------------------"
+    print "[%s]"%(e.basename,)
+    if e.build() and run_tests:
+      e.test()
+  
+  w.clean()