diff --git a/source4/scripting/python/subunit/__init__.py b/lib/subunit/python/__init__.py
similarity index 100%
rename from source4/scripting/python/subunit/__init__.py
rename to lib/subunit/python/__init__.py
diff --git a/source4/scripting/python/subunit/tests/TestUtil.py b/lib/subunit/python/tests/TestUtil.py
similarity index 100%
rename from source4/scripting/python/subunit/tests/TestUtil.py
rename to lib/subunit/python/tests/TestUtil.py
diff --git a/source4/scripting/python/subunit/tests/__init__.py b/lib/subunit/python/tests/__init__.py
similarity index 100%
rename from source4/scripting/python/subunit/tests/__init__.py
rename to lib/subunit/python/tests/__init__.py
diff --git a/source4/scripting/python/subunit/tests/sample-script.py b/lib/subunit/python/tests/sample-script.py
similarity index 100%
rename from source4/scripting/python/subunit/tests/sample-script.py
rename to lib/subunit/python/tests/sample-script.py
diff --git a/source4/scripting/python/subunit/tests/sample-two-script.py b/lib/subunit/python/tests/sample-two-script.py
similarity index 100%
rename from source4/scripting/python/subunit/tests/sample-two-script.py
rename to lib/subunit/python/tests/sample-two-script.py
diff --git a/source4/scripting/python/subunit/tests/test_test_protocol.py b/lib/subunit/python/tests/test_test_protocol.py
similarity index 100%
rename from source4/scripting/python/subunit/tests/test_test_protocol.py
rename to lib/subunit/python/tests/test_test_protocol.py
diff --git a/source4/scripting/bin/subunitrun b/source4/scripting/bin/subunitrun
index 6f1086ad376..bc35c7ce228 100755
--- a/source4/scripting/bin/subunitrun
+++ b/source4/scripting/bin/subunitrun
@@ -21,6 +21,7 @@ import sys
 
 # Find right directory when running from source tree
 sys.path.insert(0, "bin/python")
+sys.path.insert(0, "../lib/subunit/python")
 
 from subunit import SubunitTestRunner
 from unittest import TestProgram
diff --git a/source4/scripting/python/config.mk b/source4/scripting/python/config.mk
index b494ee6e8d4..c88728a9fdc 100644
--- a/source4/scripting/python/config.mk
+++ b/source4/scripting/python/config.mk
@@ -23,7 +23,7 @@ python_misc_OBJ_FILES = $(pyscriptsrcdir)/misc_wrap.o
 
 $(python_misc_OBJ_FILES): CFLAGS+=$(CFLAG_NO_UNUSED_MACROS) $(CFLAG_NO_CAST_QUAL)
 
-_PY_FILES = $(shell find $(pyscriptsrcdir)/samba $(pyscriptsrcdir)/subunit -name "*.py")
+_PY_FILES = $(shell find $(pyscriptsrcdir)/samba ../lib/subunit/python -name "*.py")
 
 $(foreach pyfile, $(_PY_FILES),$(eval $(call python_py_module_template,$(patsubst $(pyscriptsrcdir)/%,%,$(pyfile)),$(pyfile))))
 
@@ -32,6 +32,6 @@ $(eval $(call python_py_module_template,samba/misc.py,$(pyscriptsrcdir)/misc.py)
 EPYDOC_OPTIONS = --no-private --url http://www.samba.org/ --no-sourcecode
 
 epydoc:: pythonmods
-	PYTHONPATH=$(pythonbuilddir) epydoc $(EPYDOC_OPTIONS) samba tdb ldb subunit
+	PYTHONPATH=$(pythonbuilddir):../lib/subunit/python epydoc $(EPYDOC_OPTIONS) samba tdb ldb subunit
 
 install:: installpython