diff --git a/buildtests/runtests.py b/buildtests/runtests.py
index fe39a91..a06a147 100644
--- a/buildtests/runtests.py
+++ b/buildtests/runtests.py
@@ -1,3 +1,4 @@
+#!/usr/bin/env python
 # Copyright (C) 2005, Giovanni Bajo
 # Based on previous work under copyright (c) 2001, 2002 McMillan Enterprises, Inc.
 #
@@ -51,26 +52,17 @@ def clean():
         except OSError, e:
             print e
 
-    specfiles = glob.glob(os.path.join(here, 'test*.spec'))
-    for file in specfiles:
-        try:
-            os.remove(file)
-        except OSError, e:
-            print e
-
-
 def runtests():
     global here
     sources = glob.glob(os.path.join(here, 'test*[0-9].py'))
     for src in sources:
         print
-	print "################## EXECUTING TEST %s ################################" % src
+        print "################## EXECUTING TEST %s ################################" % src
         print
-        os.system('%s ../Makespec.py %s' % (PYTHON, src))
         test = os.path.splitext(os.path.basename(src))[0]
         os.system('%s ../Build.py %s' % (PYTHON, test+".spec"))
         os.system('dist%s%s%s' % (test, os.sep, test))
-	print "################## FINISHING TEST %s  ################################" % src
+        print "################## FINISHING TEST %s  ################################" % src
 
 if __name__ == '__main__':
     if len(sys.argv) == 1:
diff --git a/buildtests/test1.spec b/buildtests/test1.spec
new file mode 100644
index 0000000..07ce665
--- /dev/null
+++ b/buildtests/test1.spec
@@ -0,0 +1,13 @@
+a = Analysis(['../support/_mountzlib.py', 'test1.py'],
+             pathex=[],
+             hookspath=['hooks1'])
+pyz = PYZ(a.pure)
+exe = EXE(pyz,
+          a.scripts,
+          exclude_binaries=1,
+          name='buildtest1/test1.exe',
+          debug=0,
+          console=1)
+coll = COLLECT( exe,
+               a.binaries,
+               name='disttest1')
diff --git a/buildtests/test2.spec b/buildtests/test2.spec
new file mode 100644
index 0000000..c823a8c
--- /dev/null
+++ b/buildtests/test2.spec
@@ -0,0 +1,16 @@
+config['useZLIB'] = 0
+a = Analysis(['../support/_mountzlib.py', 'test2.py'],
+             pathex=[],
+             hookspath=['hooks1'])
+pyz = PYZ(a.pure, level=0)
+exe = EXE(pyz,
+          a.scripts,
+          exclude_binaries=1,
+          name='buildtest2/test2.exe',
+          icon='test2.ico',
+          version='test2-version.txt',
+          debug=0,
+          console=1)
+coll = COLLECT( exe,
+               a.binaries - [('zlib','','EXTENSION')],
+               name='disttest2')
diff --git a/buildtests/test3.spec b/buildtests/test3.spec
new file mode 100644
index 0000000..c260d2e
--- /dev/null
+++ b/buildtests/test3.spec
@@ -0,0 +1,13 @@
+a = Analysis(['../support/_mountzlib.py', 'test3.py'],
+             pathex=[])
+pyz = PYZ(a.pure)
+exe = EXE(pyz,
+          a.scripts,
+          [('f','','OPTION')],
+          exclude_binaries=1,
+          name='buildtest3/test3.exe',
+          debug=0,
+          console=1)
+coll = COLLECT( exe,
+               a.binaries,
+               name='disttest3')
diff --git a/buildtests/test4.spec b/buildtests/test4.spec
new file mode 100644
index 0000000..e4b7b94
--- /dev/null
+++ b/buildtests/test4.spec
@@ -0,0 +1,13 @@
+a = Analysis(['../support/_mountzlib.py', 'test4.py'],
+             pathex=[])
+pyz = PYZ(a.pure)
+exe = EXE(pyz,
+          a.scripts,
+          [('u', '', 'OPTION')],
+          exclude_binaries=1,
+          name='buildtest4/test4.exe',
+          debug=0,
+          console=1)
+coll = COLLECT( exe,
+               a.binaries,
+               name='disttest4')
diff --git a/buildtests/test5.spec b/buildtests/test5.spec
new file mode 100644
index 0000000..42599d6
--- /dev/null
+++ b/buildtests/test5.spec
@@ -0,0 +1,13 @@
+a = Analysis(['../support/_mountzlib.py', 'test5.py'],
+             pathex=[])
+pyz = PYZ(a.pure)
+exe = EXE(pyz,
+          a.scripts,
+          [('W ignore', '', 'OPTION')],
+          exclude_binaries=1,
+          name='buildtest5/test5.exe',
+          debug=0,
+          console=1)
+coll = COLLECT( exe,
+               a.binaries,
+               name='disttest5')
diff --git a/buildtests/test6.spec b/buildtests/test6.spec
new file mode 100644
index 0000000..f9574a7
--- /dev/null
+++ b/buildtests/test6.spec
@@ -0,0 +1,12 @@
+a = Analysis(['../support/_mountzlib.py', 'test6.py'],
+             pathex=[])
+pyz = PYZ(a.pure)
+exe = EXE(pyz,
+          a.scripts,
+          exclude_binaries=1,
+          name='buildtest6/test6.exe',
+          debug=0,
+          console=1)
+coll = COLLECT( exe,
+               a.binaries,
+               name='disttest6')
diff --git a/buildtests/test7.spec b/buildtests/test7.spec
new file mode 100644
index 0000000..10c7435
--- /dev/null
+++ b/buildtests/test7.spec
@@ -0,0 +1,12 @@
+a = Analysis(['../support/_mountzlib.py', 'test7.py'],
+             pathex=[])
+pyz = PYZ(a.pure)
+exe = EXE(pyz,
+          a.scripts,
+          exclude_binaries=1,
+          name='buildtest7/test7.exe',
+          debug=0,
+          console=1)
+coll = COLLECT( exe,
+               a.binaries,
+               name='disttest7')
diff --git a/buildtests/test8.spec b/buildtests/test8.spec
new file mode 100644
index 0000000..efd804b
--- /dev/null
+++ b/buildtests/test8.spec
@@ -0,0 +1,16 @@
+a = Analysis([os.path.join(HOMEPATH,'support\\_mountzlib.py'), os.path.join(HOMEPATH,'support\\useUnicode.py'), 'test8.py'],
+             pathex=['D:\\Work\\pyinstaller\\buildtests'])
+pyz = PYZ(a.pure)
+exe = EXE(pyz,
+          a.scripts,
+          exclude_binaries=1,
+          name='buildtest8/test8.exe',
+          debug=0,
+          strip=0,
+          upx=0,
+          console=1 )
+coll = COLLECT( exe,
+               a.binaries,
+               strip=0,
+               upx=0,
+               name='disttest8')