diff --git a/waf b/waf
index 3de0239b..22d00ed2 100755
Binary files a/waf and b/waf differ
diff --git a/wscript b/wscript
index 759efa8d..4b143856 100644
--- a/wscript
+++ b/wscript
@@ -18,7 +18,10 @@ import Options
 import Utils
 import pproc as subprocess
 import os
-import UnitTest
+try:
+    import UnitTest
+except:
+    import unittestw as UnitTest
 import Task
 from TaskGen import extension, feature, taskgen
 import misc
@@ -531,6 +534,10 @@ def build (bld):
     if Options.commands['clean']:
         distclean ()
 
+def check (ctx):
+    # The real work happens in shutdown ()
+    pass
+
 def distclean ():
     if os.path.exists ('po/LINGUAS'):
         os.remove ('po/LINGUAS')