diff --git a/doc/changelog.txt b/doc/changelog.txt
index db99febf6..6697dfee2 100644
--- a/doc/changelog.txt
+++ b/doc/changelog.txt
@@ -4,6 +4,10 @@ Changes between 1.0.x and 'trunk'
 * introduce py.io.TextIO and py.io.BytesIO for distinguishing between
   text/unicode and byte-streams (uses underlying standard lib io.* 
   if available) 
+
+* make py.unittest_convert helper script available which converts "unittest.py" 
+  style files into the simpler assert/direct-test-classes py.test/nosetests
+  style.  The script was written by Laura Creighton. 
  
 * simplified internal localpath implementation 
 
diff --git a/py/__init__.py b/py/__init__.py
index 57fbfed61..9c648ed7d 100644
--- a/py/__init__.py
+++ b/py/__init__.py
@@ -62,6 +62,7 @@ initpkg(__name__,
     'cmdline.pycleanup'      : ('./cmdline/pycleanup.py', 'main',),
     'cmdline.pywhich'        : ('./cmdline/pywhich.py', 'main',),
     'cmdline.pysvnwcrevert'  : ('./cmdline/pysvnwcrevert.py', 'main',),
+    'cmdline.pyconvert_unittest'  : ('./cmdline/pyconvert_unittest.py', 'main',),
 
     # helpers for use from test functions or collectors
     'test.__doc__'           : ('./test/__init__.py', '__doc__'),
diff --git a/py/bin/py.convert_unittest b/py/bin/py.convert_unittest
new file mode 100755
index 000000000..3d1382ac7
--- /dev/null
+++ b/py/bin/py.convert_unittest
@@ -0,0 +1,3 @@
+#!/usr/bin/env python
+from _findpy import py
+py.cmdline.pyconvert_unittest()
\ No newline at end of file
diff --git a/py/bin/win32/py.convert_unittest.cmd b/py/bin/win32/py.convert_unittest.cmd
new file mode 100644
index 000000000..08ef4543d
--- /dev/null
+++ b/py/bin/win32/py.convert_unittest.cmd
@@ -0,0 +1,2 @@
+@echo off
+python "%~dp0\..\py.convert_unittest" %*
\ No newline at end of file
diff --git a/py/tool/utestconvert.py b/py/cmdline/pyconvert_unittest.py
similarity index 99%
rename from py/tool/utestconvert.py
rename to py/cmdline/pyconvert_unittest.py
index 8674973a4..752db7044 100644
--- a/py/tool/utestconvert.py
+++ b/py/cmdline/pyconvert_unittest.py
@@ -185,8 +185,8 @@ def get_expr(s, char):
             pass
     raise SyntaxError       # We never found anything that worked.
 
-if __name__ == '__main__':
 
+def main():
     import sys
     import py
 
@@ -245,3 +245,5 @@ if __name__ == '__main__':
             outfile.write(s)
 
     
+if __name__ == '__main__':
+    main()
diff --git a/py/tool/testing/test_utestconvert.py b/py/cmdline/testing/test_convert_unittest.py
similarity index 99%
rename from py/tool/testing/test_utestconvert.py
rename to py/cmdline/testing/test_convert_unittest.py
index 35a0ea4a0..87fc98760 100644
--- a/py/tool/testing/test_utestconvert.py
+++ b/py/cmdline/testing/test_convert_unittest.py
@@ -1,4 +1,5 @@
-from py.__.tool.utestconvert import rewrite_utest
+from py.__.cmdline.pyconvert_unittest import rewrite_utest
+
 
 class Test_UTestConvert:
     def testall(self):
diff --git a/py/tool/__init__.py b/py/tool/__init__.py
deleted file mode 100644
index 792d60054..000000000
--- a/py/tool/__init__.py
+++ /dev/null
@@ -1 +0,0 @@
-#
diff --git a/py/tool/testing/__init__.py b/py/tool/testing/__init__.py
deleted file mode 100644
index 792d60054..000000000
--- a/py/tool/testing/__init__.py
+++ /dev/null
@@ -1 +0,0 @@
-#