diff --git a/scripts/supybot-test b/scripts/supybot-test
index b5338a93e..d0f0f260a 100644
--- a/scripts/supybot-test
+++ b/scripts/supybot-test
@@ -31,6 +31,7 @@
 ###
 
 import os
+import sys
 import time
 import shutil
 started = time.time()
@@ -200,9 +201,11 @@ if __name__ == '__main__':
         shutil.rmtree(conf.supybot.directories.log())
         shutil.rmtree(conf.supybot.directories.conf())
         shutil.rmtree(conf.supybot.directories.data())
-    runner.run(suite)
+    result = runner.run(suite)
 
     if hasattr(unittest, 'asserts'):
         print 'Total asserts: %s' % unittest.asserts
 
+    sys.exit(int(result.wasSuccessful()))
+
 # vim:set shiftwidth=4 softtabstop=4 expandtab textwidth=79: