6 files changed, 6 insertions, 11 deletions
diff --git a/source4/lib/ldb/tests/python/acl.py b/source4/lib/ldb/tests/python/acl.py
index 909adc5129..05c351008b 100755
--- a/source4/lib/ldb/tests/python/acl.py
+++ b/source4/lib/ldb/tests/python/acl.py
@@ -10,7 +10,6 @@ import base64
 import re
 
 sys.path.append("bin/python")
-sys.path.append("../lib/subunit/python")
 
 import samba.getopt as options
 
@@ -25,7 +24,7 @@ from samba.dcerpc import security
 
 from samba.auth import system_session
 from samba import Ldb
-from subunit import SubunitTestRunner
+from subunit.run import SubunitTestRunner
 import unittest
 
 parser = optparse.OptionParser("ldap [options] <host>")
diff --git a/source4/lib/ldb/tests/python/ldap.py b/source4/lib/ldb/tests/python/ldap.py
index c90727d720..603e1923ec 100755
--- a/source4/lib/ldb/tests/python/ldap.py
+++ b/source4/lib/ldb/tests/python/ldap.py
@@ -11,7 +11,6 @@ import base64
 import os
 
 sys.path.append("bin/python")
-sys.path.append("../lib/subunit/python")
 
 import samba.getopt as options
 
@@ -44,7 +43,7 @@ from samba import ATYPE_DISTRIBUTION_GLOBAL_GROUP
 from samba import ATYPE_DISTRIBUTION_LOCAL_GROUP
 from samba import ATYPE_DISTRIBUTION_UNIVERSAL_GROUP
 
-from subunit import SubunitTestRunner
+from subunit.run import SubunitTestRunner
 import unittest
 
 from samba.ndr import ndr_pack, ndr_unpack
diff --git a/source4/lib/ldb/tests/python/ldap_schema.py b/source4/lib/ldb/tests/python/ldap_schema.py
index 69b48cb867..201711d714 100755
--- a/source4/lib/ldb/tests/python/ldap_schema.py
+++ b/source4/lib/ldb/tests/python/ldap_schema.py
@@ -11,7 +11,6 @@ import base64
 import os
 
 sys.path.append("bin/python")
-sys.path.append("../lib/subunit/python")
 
 import samba.getopt as options
 
@@ -45,7 +44,7 @@ from samba import ATYPE_DISTRIBUTION_LOCAL_GROUP
 from samba import ATYPE_DISTRIBUTION_UNIVERSAL_GROUP
 from samba import DS_DC_FUNCTION_2003
 
-from subunit import SubunitTestRunner
+from subunit.run import SubunitTestRunner
 import unittest
 
 from samba.ndr import ndr_pack, ndr_unpack
diff --git a/source4/lib/ldb/tests/python/sec_descriptor.py b/source4/lib/ldb/tests/python/sec_descriptor.py
index 4589178a42..84edd90f7d 100755
--- a/source4/lib/ldb/tests/python/sec_descriptor.py
+++ b/source4/lib/ldb/tests/python/sec_descriptor.py
@@ -11,7 +11,6 @@ import random
 import time
 
 sys.path.append("bin/python")
-sys.path.append("../lib/subunit/python")
 
 import samba.getopt as options
 
@@ -27,7 +26,7 @@ from samba.dcerpc import security
 from samba.auth import system_session
 from samba import Ldb, DS_DOMAIN_FUNCTION_2008, SECINFO_OWNER, \
     SECINFO_GROUP, SECINFO_DACL, SECINFO_SACL
-from subunit import SubunitTestRunner
+from subunit.run import SubunitTestRunner
 import unittest
 
 parser = optparse.OptionParser("sec_descriptor [options] <host>")
diff --git a/source4/scripting/bin/subunitrun b/source4/scripting/bin/subunitrun
index 62717a78a9..6cd3943786 100755
--- a/source4/scripting/bin/subunitrun
+++ b/source4/scripting/bin/subunitrun
@@ -21,9 +21,8 @@ import sys
 
 # Find right directory when running from source tree
 sys.path.insert(0, "bin/python")
-sys.path.insert(1, "../lib/subunit/python")
 
-from subunit import SubunitTestRunner
+from subunit.run import SubunitTestRunner
 from unittest import TestProgram
 import optparse
 import os
diff --git a/source4/scripting/python/config.mk b/source4/scripting/python/config.mk
index a5e3f25d59..3d255de00e 100644
--- a/source4/scripting/python/config.mk
+++ b/source4/scripting/python/config.mk
@@ -30,6 +30,6 @@ $(eval $(foreach pyfile, $(_PY_FILES),$(call python_py_module_template,$(patsubs
 EPYDOC_OPTIONS = --no-private --url http://www.samba.org/ --no-sourcecode
 
 epydoc:: pythonmods
-	PYTHONPATH=$(pythonbuilddir):../lib/subunit/python epydoc $(EPYDOC_OPTIONS) samba tdb ldb subunit
+	PYTHONPATH=$(pythonbuilddir):../lib/subunit/python epydoc $(EPYDOC_OPTIONS) samba tdb ldb subunit testtools
 
 install:: installpython