diff --git a/test-plone-4.0.x.cfg b/test-plone-4.0.x.cfg
index 724b592..4fdcefe 100644
--- a/test-plone-4.0.x.cfg
+++ b/test-plone-4.0.x.cfg
@@ -3,6 +3,7 @@ extends =
     http://svn.plone.org/svn/collective/buildout/plonetest/plone-4.0.x.cfg
 
 package-name = plone.app.discussion
+package-directory = plone/app/discussion
 
 parts +=
     omelette
@@ -50,7 +51,7 @@ url = http://siliconforks.com/jscoverage/download/jscoverage-0.5.tar.bz2
 recipe = collective.recipe.template
 input = inline:
     #!/bin/sh
-    jscoverage-server -v --ip-address=0.0.0.0 --port=9999 --encoding=UTF-8 --document-root=plone/app/discussion/ --no-instrument=/tests
+    jscoverage-server -v --ip-address=0.0.0.0 --port=9999 --encoding=UTF-8 --document-root=${buildout:package-directory} --no-instrument=/tests
 output = ${buildout:directory}/bin/jscoverage
 mode = 755
 
@@ -94,9 +95,12 @@ arguments = [
 recipe = collective.recipe.template
 input = inline:
     #!/bin/sh
-    rm pylint.log
+    if [ -s pylint.log ]; then
+      rm pylint.log
+      echo "Old pylint.log file removed"
+    fi
     echo "Running pylint"
-    find -L plone/app/discussion/ -regex ".*\.[c]?py" | xargs bin/pylint >> pylint.log
+    find -L ${buildout:package-directory} -regex ".*\.[c]?py" | xargs bin/pylint >> pylint.log
     echo "finish"
 output = ${buildout:directory}/bin/pylint-test
 mode = 755
@@ -112,14 +116,14 @@ recipe = collective.recipe.template
 input = inline:
     #!/bin/sh
     if [ -e zptlint.log ]; then
-      echo "Removing existing zptlint.log file"
+      echo "Old zptlint.log file removed"
       rm zptlint.log
     fi
     echo "Running zptlint-test"
-    TMPL=$(find plone/app/discussion -regex ".*\.[c|z]?pt")
+    TMPL=$(find ${buildout:package-directory} -regex ".*\.[c|z]?pt")
     echo "Checking"
     echo $TMPL
-    find plone/app/discussion -regex ".*\.[c|z]?pt" | xargs bin/zptlint > zptlint.log
+    find ${buildout:package-directory} -regex ".*\.[c|z]?pt" | xargs bin/zptlint > zptlint.log
     if [ -s zptlint.log ]; then
       echo "Errors were found:"
       cat zptlint.log