- Use 'test.py' as the driver for 'make test', rather than
    'utilities/testrunner.py'.

inst/Makefile.in

@@ -16,7 +16,7 @@ BASE_DIR=<<BASE_DIR>>
 BUILD_BASE=<<BUILD_BASE>>
 DISTUTILS_OPTS=<<DISTUTILS_OPTS>>
 INSTALL_FLAGS=<<INSTALL_FLAGS>>
-TESTOPTS=-v1 -e -d lib/python
+TESTOPTS=-v
 BUILD_FLAGS=--build-base="${BUILD_BASE}" \
             --build-lib="${BUILD_BASE}/build-lib" \
             --build-scripts="${BUILD_BASE}/build-scripts"\
@@ -101,7 +101,7 @@ testinst: instance
 
 # test:        Do an inplace build and run the Zope test suite.
 test: inplace
-	${PYTHON} "${BASE_DIR}/utilities/testrunner.py" ${TESTOPTS}
+	${PYTHON} "${BASE_DIR}/test.py" ${TESTOPTS}
 
 # clean:       Delete the build files and any binaries/bytecode files in
 #              the source directory for good measure.

inst/Makefile.win.in

@@ -15,7 +15,7 @@ BASE_DIR=<<BASE_DIR>>
 BUILD_BASE=<<BUILD_BASE>>
 DISTUTILS_OPTS=<<DISTUTILS_OPTS>>
 INSTALL_FLAGS=<<INSTALL_FLAGS>>
-TESTOPTS=-v1 -e -d lib/python
+TESTOPTS=-v
 BUILD_FLAGS=--build-base="$(BUILD_BASE)" \
             --build-lib="$(BUILD_BASE)\build-lib" \
             --build-scripts="$(BUILD_BASE)\build-scripts" \