diff --git a/.travis.yml b/.travis.yml
new file mode 100644
index 0000000..a3fc107
--- /dev/null
+++ b/.travis.yml
@@ -0,0 +1,15 @@
+language: python
+sudo: required
+dist: trusty
+
+before_install:
+- sudo apt-get update -qq
+- sudo apt-get install -qq vlan
+
+install:
+- sudo util/install.sh -fnvw
+
+script:
+- sudo mn --test pingall
+- sudo python mininet/test/runner.py -v -quick
+- sudo python examples/test/runner.py -v -quick
diff --git a/README.md b/README.md
index 9ef9a87..6d087eb 100644
--- a/README.md
+++ b/README.md
@@ -1,5 +1,6 @@
 Mininet: Rapid Prototyping for Software Defined Networks
 ========================================================
+[![Build Status](https://travis-ci.org/mininet/mininet.svg?branch=master)](https://travis-ci.org/mininet/mininet)
 
 *The best way to emulate almost any network on your laptop!*
 
diff --git a/examples/test/runner.py b/examples/test/runner.py
index 6bf872c..fb9534e 100755
--- a/examples/test/runner.py
+++ b/examples/test/runner.py
@@ -32,7 +32,8 @@ def runTests( testDir, verbosity=1 ):
     # discover all tests in testDir
     testSuite = unittest.defaultTestLoader.discover( testDir )
     # run tests
-    MininetTestRunner( verbosity=verbosity ).run( testSuite )
+    success = MininetTestRunner( verbosity=verbosity ).run( testSuite ).wasSuccessful()
+    sys.exit( 0 if success else 1 )
 
 if __name__ == '__main__':
     # get the directory containing example tests
diff --git a/examples/test/test_hwintf.py b/examples/test/test_hwintf.py
index aafd643..843fc40 100755
--- a/examples/test/test_hwintf.py
+++ b/examples/test/test_hwintf.py
@@ -57,8 +57,8 @@ class testHwintf( unittest.TestCase ):
         p.wait()
 
     def tearDown( self ):
-        self.h3.terminate()
-        self.n0.terminate()
+        self.h3.stop( deleteIntfs=True )
+        self.n0.stop( deleteIntfs=True )
 
 if __name__ == '__main__':
     setLogLevel( 'warning' )
diff --git a/mininet/test/runner.py b/mininet/test/runner.py
index dcfff66..32f6174 100755
--- a/mininet/test/runner.py
+++ b/mininet/test/runner.py
@@ -21,7 +21,8 @@ def runTests( testDir, verbosity=1 ):
     # discover all tests in testDir
     testSuite = defaultTestLoader.discover( testDir )
     # run tests
-    TextTestRunner( verbosity=verbosity ).run( testSuite )
+    success = TextTestRunner( verbosity=verbosity ).run( testSuite ).wasSuccessful()
+    sys.exit( 0 if success else 1 )
 
 if __name__ == '__main__':
     setLogLevel( 'warning' )